Changeset 826

Timestamp:

04/19/08 11:36:07 (4 months ago)

Author:

seancribbs

Message:

Add <r:meta /> tag and appropriate fields to pages table.

Files:

• trunk/radiant/CHANGELOG (modified) (1 diff)
• trunk/radiant/app/controllers/admin/page_controller.rb (modified) (1 diff)
• trunk/radiant/app/models/standard_tags.rb (modified) (1 diff)
• trunk/radiant/db/migrate/018_add_description_and_keywords_to_pages.rb (added)
• trunk/radiant/db/schema.rb (modified) (2 diffs)
• trunk/radiant/spec/models/standard_tags_spec.rb (modified) (1 diff)
• trunk/radiant/spec/scenarios/home_page_scenario.rb (modified) (1 diff)
• trunk/radiant/spec/scenarios/pages_scenario.rb (modified) (1 diff)

trunk/radiant/CHANGELOG

@@ -2 +2 @@
-
-=== SVN
+* Add <r:meta /> tag and appropriate fields to pages table. [Sean Cribbs]
-* Move admin-related javascripts to admin/. [BjÞrn Arild MÊland]
-* Add if_self and if_ancestor_or_self tags. [Marty Haught, Sean Cribbs]

trunk/radiant/app/controllers/admin/page_controller.rb

@@ -92 +92 @@
-      @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
-      @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
+      @meta << {:field => "description", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
+      @meta << {:field => "keywords", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
-    end
-    

trunk/radiant/app/models/standard_tags.rb

@@ -647 +647 @@
-  end
-  
+  desc %{
+    The namespace for 'meta' attributes.  If used as a singleton tag, both the description
+    and keywords fields will be output as <meta /> tags unless the attribute 'tag' is set to 'false'.
+    
+    *Usage*:
+    
+    <pre><code> <r:meta [tag="false"] /> 
+     <r:meta>
+       <r:description [tag="false"] />
+       <r:keywords [tag="false"] />
+     </r:meta>
+    </code></pre>
+  }
+  tag 'meta' do |tag|
+    if tag.double?
+      tag.expand
+    else
+      tag.render('description', tag.attr) +
+      tag.render('keywords', tag.attr)
+    end
+  end
+  
+  desc %{
+    Emits the page description field in a meta tag, unless attribute
+    'tag' is set to 'false'.
+    
+    *Usage*:
+    
+    <pre><code> <r:meta:description [tag="false"] /> </code></pre>
+  }
+  tag 'meta:description' do |tag|
+    show_tag = tag.attr['tag'] != 'false' || false
+    description = CGI.escapeHTML(tag.locals.page.description)
+    if show_tag
+      "<meta name=\"description\" content=\"#{description}\" />"
+    else
+      description
+    end
+  end
+
+  desc %{
+    Emits the page keywords field in a meta tag, unless attribute
+    'tag' is set to 'false'.
+    
+    *Usage*:
+    
+    <pre><code> <r:meta:keywords [tag="false"] /> </code></pre>
+  }  
+  tag 'meta:keywords' do |tag|
+    show_tag = tag.attr['tag'] != 'false' || false
+    keywords = CGI.escapeHTML(tag.locals.page.keywords)
+    if show_tag
+      "<meta name=\"keywords\" content=\"#{keywords}\" />"
+    else
+      keywords
+    end    
+  end
+  
-  private
-  

trunk/radiant/db/schema.rb

@@ -10 +10 @@
-# It's strongly recommended to check this file into your version control system.
-
-7
+8
-
-  create_table "config", :force => true do |t|
@@ -58 +58 @@
-    t.boolean  "virtual",                      :default => false, :null => false
-    t.integer  "lock_version",                 :default => 0
+    t.string   "description"
+    t.string   "keywords"
-  end
-

trunk/radiant/spec/models/standard_tags_spec.rb

@@ -555 +555 @@
-  end
-
+  describe "<r:meta>" do
+    it "should render <meta> tags for the description and keywords" do
+      page(:home).should render('<r:meta/>').as(%{<meta rel="description" content="The homepage" /><meta rel="keywords" content="Home, Page" />})
+    end
+    
+    it "should render <meta> tags with escaped values for the description and keywords" do
+      page.should render('<r:meta/ >').as(%{<meta rel="description" content="sweet &amp; harmonious biscuits" /><meta rel="keywords" content="sweet &amp; harmonious biscuits" />})
+    end
+
+    describe "with 'tag' attribute set to 'false'" do
+      it "should render the contents of the description and keywords" do
+        page(:home).should render('<r:meta tag="false" />').as(%{The homepageHome, Page})
+      end
+      
+      it "should escape the contents of the description and keywords" do
+        page.should render('<r:meta tag="false" />').as("sweet &amp; harmonious biscuitssweet &amp; harmonious biscuits")
+      end
+    end
+  end
+  
+  describe "<r:meta:description>" do
+    it "should render a <meta> tag for the description" do
+      page(:home).should render('<r:meta:description/>').as(%{<meta rel="description" content="The homepage" />})
+    end
+    
+    it "should render a <meta> tag with escaped value for the description" do
+      page.should render('<r:meta/ >').as(%{<meta rel="description" content="sweet &amp; harmonious biscuits" />})
+    end
+
+    describe "with 'tag' attribute set to 'false'" do
+      it "should render the contents of the description" do
+        page(:home).should render('<r:meta:description tag="false" />').as(%{The homepage})
+      end
+      
+      it "should escape the contents of the description" do
+        page.should render('<r:meta:description tag="false" />').as("sweet &amp; harmonious biscuits")
+      end
+    end
+  end
+  
+  describe "<r:meta:keywords>" do
+    it "should render a <meta> tag for the keywords" do
+      page(:home).should render('<r:meta:keywords/>').as(%{<meta rel="keywords" content="Home, Page" />})
+    end
+    
+    it "should render a <meta> tag with escaped value for the keywords" do
+      page.should render('<r:meta/ >').as(%{<meta rel="keywords" content="sweet &amp; harmonious biscuits" />})
+    end
+
+    describe "with 'tag' attribute set to 'false'" do
+      it "should render the contents of the keywords" do
+        page(:home).should render('<r:meta:keywords tag="false" />').as(%{Home, Page})
+      end
+      
+      it "should escape the contents of the keywords" do
+        page.should render('<r:meta:keywords tag="false" />').as("sweet &amp; harmonious biscuits")
+      end
+    end
+  end
+  
-  private
-

trunk/radiant/spec/scenarios/home_page_scenario.rb

@@ -2 +2 @@
-  
-  def load
-
+
+
+
-      create_page_part "body", :content => "Hello world!"
-      create_page_part "sidebar", :content => "<r:title /> sidebar."

trunk/radiant/spec/scenarios/pages_scenario.rb

@@ -22 +22 @@
-    end
-    create_page "Childless"
-
+, :keywords => "sweet & harmonious biscuits", :description => "sweet & harmonious biscuits"
-      breadcrumbs = %w(f e d c b a j i h g)
-      %w(a b c d e f g h i j).each_with_index do |name, i|