trusty-cms 1.0.0 → 1.0.1

data/app/models/deprecated_tags.rb

@@ -12,31 +12,11 @@ module DeprecatedTags
     end
   end
 
-  deprecated_tag 'meta:description', :deadline => '2.0' do |tag|
-    show_tag = tag.attr['tag'] != 'false' || false
-    description = CGI.escapeHTML(tag.locals.page.field(:description).try(:content))
-    if show_tag
-      "<meta name=\"description\" content=\"#{description}\" />"
-    else
-      description
-    end
-  end
-
-  deprecated_tag 'meta:keywords', :deadline => '2.0' do |tag|
-    show_tag = tag.attr['tag'] != 'false' || false
-    keywords = CGI.escapeHTML(tag.locals.page.field(:keywords).try(:content))
-    if show_tag
-      "<meta name=\"keywords\" content=\"#{keywords}\" />"
-    else
-      keywords
-    end
-  end
-
   deprecated_tag "rfc1123_date", :deadline => '2.0' do |tag|
     page = tag.locals.page
     if date = page.published_at || page.created_at
       CGI.rfc1123_date(date.to_time)
     end
   end
-  
+
 end

data/app/models/file_not_found_page.rb

@@ -1,32 +1,32 @@
 class FileNotFoundPage < Page
-  
+
   def allowed_children
     []
   end
-  
+
   description %{
     A "File Not Found" page can be used to override the default error
     page in the event that a page is not found among a page's children.
-    
+
     To create a "File Not Found" error page for an entire Web site, create
     a page that is a child of the root page and assign it "File Not Found"
     page type.
   }
-  
+
   tag "attempted_url" do |tag|
     CGI.escapeHTML(request.request_uri) unless request.nil?
   end
-   
+
   def virtual?
     true
   end
-   
+
   def response_code
     404
   end
-  
+
   def cache?
     false
   end
-  
+
 end

data/app/models/layout.rb

@@ -1,5 +1,6 @@
 class Layout < ActiveRecord::Base
-  
+  attr_protected :created_at, :updated_at
+
   # Default Order
   default_scope :order => "name"
 
@@ -12,4 +13,4 @@ class Layout < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name
   validates_length_of :name, :maximum => 100
-end
+end

data/app/models/menu_renderer.rb

@@ -38,7 +38,7 @@ module MenuRenderer
     (allowed_children_cache.to_s.split(',') - Array(excluded_class_names)).map do |name|
       begin
         name.constantize
-      rescue LoadError, NameError => e
+      rescue LoadError, NameError => _
         nil
       end
     end.compact
@@ -64,7 +64,7 @@ module MenuRenderer
   end
 
   def menu_list
-    view.content_tag :ul, menu_items.join, :class => 'menu', :id => "allowed_children_#{id}"
+    view.content_tag :ul, menu_items.join.html_safe, :class => 'menu', :id => "allowed_children_#{id}"
   end
 
   def remove_link
@@ -80,15 +80,15 @@ module MenuRenderer
   end
 
   def disabled_add_child_link
-    view.content_tag :span, view.image('plus_disabled') + ' ' + I18n.t('add_child'), :class => 'action disabled'
+    view.content_tag :span, view.image('plus_disabled') + ' Add Child', :class => 'action disabled'
   end
 
   def add_child_link
-    view.link_to((view.image('plus') + ' ' + I18n.t('add_child')), view.new_admin_page_child_path(self, :page_class => default_child.name), :class => "action")
+    view.link_to((view.image('plus') + ' Add Child'), view.new_admin_page_child_path(self, :page_class => default_child.name), :class => "action")
   end
 
   def add_child_link_with_menu_hook
-    view.link_to((view.image('plus') + ' ' + I18n.t('add_child')), "#allowed_children_#{id}", :class => "action dropdown")
+    view.link_to((view.image('plus') + ' Add Child'), "#allowed_children_#{id}", :class => "action dropdown")
   end
 
   def add_child_menu
@@ -127,7 +127,7 @@ module MenuRenderer
     text = link_text_for_child_class(child_class.name)
     view.link_to(text, path, :title => title)
   end
-  
+
   def link_text_for_child_class(given_class_name)
     translation_key = if given_class_name == 'Page' || given_class_name.blank?
       'normal_page'
@@ -137,4 +137,4 @@ module MenuRenderer
     fallback = given_class_name == 'Page' ? 'Page' : given_class_name.sub('Page','').titleize
     I18n.t(translation_key, :default => fallback)
   end
-end
+end

data/app/models/page.rb

@@ -1,6 +1,7 @@
 require 'acts_as_tree'
 
 class Page < ActiveRecord::Base
+  attr_protected :created_at, :updated_at
 
   class MissingRootPageError < StandardError
     def initialize(message = 'Database missing root page'); super end
@@ -41,7 +42,7 @@ class Page < ActiveRecord::Base
   class_attribute :default_child
   self.default_child = self
 
-  set_inheritance_column :class_name
+  self.inheritance_column = 'class_name'
 
   def layout_with_inheritance
     unless layout_without_inheritance
@@ -100,15 +101,15 @@ class Page < ActiveRecord::Base
   def published?
     status == Status[:published]
   end
-  
+
   def scheduled?
     status == Status[:scheduled]
   end
-  
+
   def status
    Status.find(self.status_id)
   end
-  
+
   def status=(value)
     self.status_id = value.id
   end
@@ -202,13 +203,13 @@ class Page < ActiveRecord::Base
 
   def update_status
     self.published_at = Time.zone.now if published? && self.published_at == nil
-    
+
     if self.published_at != nil && (published? || scheduled?)
       self[:status_id] = Status[:scheduled].id if self.published_at  > Time.zone.now
       self[:status_id] = Status[:published].id if self.published_at <= Time.zone.now
     end
 
-    true    
+    true
   end
 
   def to_xml(options={}, &block)
@@ -260,7 +261,7 @@ class Page < ActiveRecord::Base
       @display_name = @display_name + " - not installed" if missing? && @display_name !~ /not installed/
       @display_name
     end
-    
+
     def display_name=(string)
       display_name(string)
     end

data/app/models/page_context.rb

@@ -1,7 +1,7 @@
 class PageContext < Radius::Context
-  
+
   attr_reader :page
-  
+
   def initialize(page)
     super
     @page = page
@@ -10,14 +10,14 @@ class PageContext < Radius::Context
       define_tag(name) { |tag_binding| page.render_tag(name, tag_binding) }
     end
   end
-  
+
   def dup
     rv = self.class.new(page)
     rv.globals = globals.dup
     rv.definitions = definitions.dup
     rv
   end
- 
+
   def render_tag(name, attributes = {}, &block)
     binding = @tag_binding_stack.last
     locals = binding ? binding.locals : globals
@@ -28,26 +28,26 @@ class PageContext < Radius::Context
     @tag_binding_stack.pop unless @tag_binding_stack.last == binding
     render_error_message(e.message)
   end
-  
+
   def tag_missing(name, attributes = {}, &block)
     super
   rescue Radius::UndefinedTagError => e
     raise StandardTags::TagError.new(e.message)
   end
-  
+
   private
-  
+
     def render_error_message(message)
       "<div><strong>#{message}</strong></div>"
     end
-    
+
     def set_process_variables(page)
       page.request ||= @page.request
       page.response ||= @page.response
     end
-    
+
     def raise_errors?
       Rails.env != 'production'
     end
-    
+
 end

data/app/models/page_field.rb

@@ -1,3 +1,4 @@
 class PageField < ActiveRecord::Base
+  attr_accessible :name, :content
   validates_presence_of :name
 end

data/app/models/page_part.rb

@@ -1,20 +1,20 @@
 class PagePart < ActiveRecord::Base
-  
+  attr_accessible :name, :filter_id, :content
+
   # Default Order
   default_scope :order => 'name'
-  
+
   # Associations
   belongs_to :page
-  
+
   # Validations
   validates_presence_of :name
   validates_length_of :name, :maximum => 100
   validates_length_of :filter_id, :maximum => 25, :allow_nil => true
-  
+
   object_id_attr :filter, TextFilter
 
   def after_initialize
     self.filter_id ||= TrustyCms::Config['defaults.page.filter'] if new_record?
   end
-
 end

data/app/models/standard_tags.rb

@@ -15,7 +15,7 @@ module StandardTags
     Causes the tags referring to a page's attributes to refer to the current page.
 
     *Usage:*
-    
+
     <pre><code><r:page>...</r:page></code></pre>
   }
   tag 'page' do |tag|
@@ -44,7 +44,7 @@ module StandardTags
     Gives access to a page's children.
 
     *Usage:*
-    
+
     <pre><code><r:children>...</r:children></code></pre>
   }
   tag 'children' do |tag|
@@ -66,7 +66,7 @@ module StandardTags
     the first child. Takes the same ordering options as @<r:children:each>@.
 
     *Usage:*
-    
+
     <pre><code><r:children:first>...</r:children:first></code></pre>
   }
   tag 'children:first' do |tag|
@@ -83,7 +83,7 @@ module StandardTags
     the last child. Takes the same ordering options as @<r:children:each>@.
 
     *Usage:*
-    
+
     <pre><code><r:children:last>...</r:children:last></code></pre>
   }
   tag 'children:last' do |tag|
@@ -98,16 +98,16 @@ module StandardTags
   desc %{
     Cycles through each of the children. Inside this tag all page attribute tags
     are mapped to the current child page.
-    
+
     Supply @paginated="true"@ to paginate the displayed list. will_paginate view helper
     options can also be specified, including @per_page@, @previous_label@, @next_label@,
     @class@, @separator@, @inner_window@ and @outer_window@.
 
     *Usage:*
-    
+
     <pre><code><r:children:each [offset="number"] [limit="number"]
      [by="published_at|updated_at|created_at|slug|title|keywords|description"]
-     [order="asc|desc"] 
+     [order="asc|desc"]
      [status="draft|reviewed|published|hidden|all"]
      [paginated="true"]
      [per_page="number"]
@@ -125,7 +125,7 @@ module StandardTags
     be automatically display only the current page of results, with pagination controls at the bottom.
 
     *Usage:*
-    
+
     <pre><code><r:children:each paginated="true" per_page="50" container="false" previous_label="foo" next_label="bar">
       <r:child>...</r:child>
     </r:children:each>
@@ -143,7 +143,7 @@ module StandardTags
     current child.
 
     *Usage:*
-    
+
     <pre><code><r:children:each>
       <r:child>...</r:child>
     </r:children:each>
@@ -153,81 +153,81 @@ module StandardTags
     tag.locals.page = tag.locals.child
     tag.expand
   end
-  
+
   desc %{
     Renders the tag contents only if the current page is the first child in the context of
     a children:each tag
-    
+
     *Usage:*
-    
+
     <pre><code><r:children:each>
       <r:if_first >
         ...
       </r:if_first>
     </r:children:each>
     </code></pre>
-    
+
   }
   tag 'children:each:if_first' do |tag|
     tag.expand if tag.locals.first_child
   end
 
-  
+
   desc %{
     Renders the tag contents unless the current page is the first child in the context of
     a children:each tag
-    
+
     *Usage:*
-    
+
     <pre><code><r:children:each>
       <r:unless_first >
         ...
       </r:unless_first>
     </r:children:each>
     </code></pre>
-    
+
   }
   tag 'children:each:unless_first' do |tag|
     tag.expand unless tag.locals.first_child
   end
-  
+
   desc %{
     Renders the tag contents only if the current page is the last child in the context of
     a children:each tag
-    
+
     *Usage:*
-    
+
     <pre><code><r:children:each>
       <r:if_last >
         ...
       </r:if_last>
     </r:children:each>
     </code></pre>
-    
+
   }
   tag 'children:each:if_last' do |tag|
     tag.expand if tag.locals.last_child
   end
 
-  
+
   desc %{
     Renders the tag contents unless the current page is the last child in the context of
     a children:each tag
-    
+
     *Usage:*
-    
+
     <pre><code><r:children:each>
       <r:unless_last >
         ...
       </r:unless_last>
     </r:children:each>
     </code></pre>
-    
+
   }
   tag 'children:each:unless_last' do |tag|
     tag.expand unless tag.locals.last_child
   end
-  
+
   desc %{
     Renders the tag contents only if the contents do not match the previous header. This
     is extremely useful for rendering date headers for a list of child pages.
@@ -241,7 +241,7 @@ module StandardTags
     separated list.
 
     *Usage:*
-    
+
     <pre><code><r:children:each>
       <r:header [name="header_name"] [restart="name1[;name2;...]"]>
         ...
@@ -269,7 +269,7 @@ module StandardTags
     Page attribute tags inside this tag refer to the parent of the current page.
 
     *Usage:*
-    
+
     <pre><code><r:parent>...</r:parent></code></pre>
   }
   tag "parent" do |tag|
@@ -283,7 +283,7 @@ module StandardTags
     is not the root page.
 
     *Usage:*
-    
+
     <pre><code><r:if_parent>...</r:if_parent></code></pre>
   }
   tag "if_parent" do |tag|
@@ -296,7 +296,7 @@ module StandardTags
     is the root page.
 
     *Usage:*
-    
+
     <pre><code><r:unless_parent>...</r:unless_parent></code></pre>
   }
   tag "unless_parent" do |tag|
@@ -311,7 +311,7 @@ module StandardTags
     non-virtual pages regardless of status.
 
     *Usage:*
-    
+
     <pre><code><r:if_children [status="published"]>...</r:if_children></code></pre>
   }
   tag "if_children" do |tag|
@@ -326,21 +326,21 @@ module StandardTags
     regardless of status.
 
     *Usage:*
-    
+
     <pre><code><r:unless_children [status="published"]>...</r:unless_children></code></pre>
   }
   tag "unless_children" do |tag|
     children = tag.locals.page.children.where(children_find_options(tag)[:conditions]).count
     tag.expand unless children > 0
   end
-  
+
     desc %{
     Aggregates the children of multiple paths using the @paths@ attribute.
     Useful for combining many different sections/categories into a single
     feed or listing.
-    
+
     *Usage*:
-    
+
     <pre><code><r:aggregate paths="/section1; /section2; /section3"> ... </r:aggregate></code></pre>
   }
   tag "aggregate" do |tag|
@@ -350,13 +350,13 @@ module StandardTags
     tag.locals.parent_ids = parent_ids
     tag.expand
   end
-  
+
   desc %{
     Sets the scope to the individual aggregated page allowing you to
     iterate through each of the listed paths.
-    
+
     *Usage*:
-    
+
     <pre><code><r:aggregate:each paths="/section1; /section2; /section3"> ... </r:aggregate:each></code></pre>
   }
   tag "aggregate:each" do |tag|
@@ -368,12 +368,12 @@ module StandardTags
     end
     aggregates.flatten.join('')
   end
-  
+
   tag "aggregate:each:children" do |tag|
     tag.locals.children = tag.locals.page.children
     tag.expand
   end
-  
+
   tag "aggregate:each:children:each" do |tag|
     options = children_find_options(tag)
     result = []
@@ -386,21 +386,21 @@ module StandardTags
     end
     result.flatten.join('')
   end
-  
+
   tag "aggregate:children" do |tag|
     tag.expand
   end
-  
+
   desc %{
     Renders the total count of children of the aggregated pages.  Accepts the
     same options as @<r:children:each />@.
 
     *Usage*:
-    
+
     <pre><code><r:aggregate paths="/section1; /section2; /section3">
       <r:children:count />
     </r:aggregate></code></pre>
-  }  
+  }
   tag "aggregate:children:count" do |tag|
     options = aggregate_children(tag)
     if ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql'
@@ -415,7 +415,7 @@ module StandardTags
     same options as the plain @<r:children:each />@.
 
     *Usage*:
-    
+
     <pre><code><r:aggregate paths="/section1; /section2; /section3">
       <r:children:each>
         ...
@@ -425,13 +425,13 @@ module StandardTags
   tag "aggregate:children:each" do |tag|
     render_children_with_pagination(tag, :aggregate => true)
   end
-  
+
   desc %{
     Renders the first child of the aggregated pages.  Accepts the
     same options as @<r:children:each />@.
 
     *Usage*:
-    
+
     <pre><code><r:aggregate paths="/section1; /section2; /section3">
       <r:children:first>
         ...
@@ -448,13 +448,13 @@ module StandardTags
       tag.expand
     end
   end
-  
+
   desc %{
     Renders the last child of the aggregated pages.  Accepts the
     same options as @<r:children:each />@.
 
     *Usage*:
-    
+
     <pre><code><r:aggregate paths="/section1; /section2; /section3">
       <r:children:last>
         ...
@@ -473,15 +473,15 @@ module StandardTags
   end
 
   desc %{
-    Renders a counter value or one of the values given based on a global cycle counter. 
-    
+    Renders a counter value or one of the values given based on a global cycle counter.
+
     To get a numeric counter just use the tag, or specify a start value with @start@.
     Use the @reset@ attribute to reset the cycle to the beginning. Using @reset@ on a
-    numbered cycle will begin at 0. Use the @name@  attribute to track multiple cycles; 
+    numbered cycle will begin at 0. Use the @name@  attribute to track multiple cycles;
     the default is @cycle@.
 
     *Usage:*
-    
+
     <pre><code><r:cycle [values="first, second, third"] [reset="true|false"] [name="cycle"] [start="second"] /></code></pre>
     <pre><code><r:cycle start="3" /></code></pre>
   }
@@ -523,7 +523,7 @@ module StandardTags
     is set to true.
 
     *Usage:*
-    
+
     <pre><code><r:content [part="part_name"] [inherit="true|false"] [contextual="true|false"] /></code></pre>
   }
   tag 'content' do |tag|
@@ -562,7 +562,7 @@ module StandardTags
     By default the @find@ attribute is set to @all@.
 
     *Usage:*
-    
+
     <pre><code><r:if_content [part="part_name, other_part"] [inherit="true"] [find="any"]>...</r:if_content></code></pre>
   }
   tag 'if_content' do |tag|
@@ -597,7 +597,7 @@ module StandardTags
     By default the @find@ attribute is set to @all@.
 
     *Usage:*
-    
+
     <pre><code><r:unless_content [part="part_name, other_part"] [inherit="false"] [find="any"]>...</r:unless_content></code></pre>
   }
   tag 'unless_content' do |tag|
@@ -629,7 +629,7 @@ module StandardTags
     match is case sensitive. By default, @ignore_case@ is set to true.
 
     *Usage:*
-    
+
     <pre><code><r:if_path matches="regexp" [ignore_case="true|false"]>...</r:if_path></code></pre>
   }
   tag 'if_path' do |tag|
@@ -645,7 +645,7 @@ module StandardTags
     The opposite of the @if_path@ tag.
 
     *Usage:*
-    
+
     <pre><code><r:unless_path matches="regexp" [ignore_case="true|false"]>...</r:unless_path></code></pre>
   }
   tag 'unless_path' do |tag|
@@ -663,7 +663,7 @@ module StandardTags
     This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is or descends from the current page.
 
     *Usage:*
-    
+
     <pre><code><r:if_ancestor_or_self>...</r:if_ancestor_or_self></code></pre>
   }
   tag "if_ancestor_or_self" do |tag|
@@ -676,7 +676,7 @@ module StandardTags
     This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up unless the child element is or descends from the current page.
 
     *Usage:*
-    
+
     <pre><code><r:unless_ancestor_or_self>...</r:unless_ancestor_or_self></code></pre>
   }
   tag "unless_ancestor_or_self" do |tag|
@@ -689,7 +689,7 @@ module StandardTags
     This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up if the child element is the current page.
 
     *Usage:*
-    
+
     <pre><code><r:if_self>...</r:if_self></code></pre>
   }
   tag "if_self" do |tag|
@@ -739,9 +739,9 @@ module StandardTags
     size = (tag.attr['size'] || '32px')
     user = User.find_by_name(name)
     email = user ? user.email : nil
-    local_avatar_url = "/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"    
+    local_avatar_url = "/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"
     default_avatar_url = "#{request.protocol}#{request.host_with_port}#{local_avatar_url}"
-        
+
     unless email.blank?
       url = '//gravatar.com/avatar/'
       url << "#{Digest::MD5.new.update(email)}?"
@@ -809,9 +809,9 @@ module StandardTags
     *Usage:*
 
     <pre><code><r:link [anchor="name"] [other attributes...] /></code></pre>
-    
+
     or
-    
+
     <pre><code><r:link [anchor="name"] [other attributes...]>link text here</r:link></code></pre>
   }
   tag 'link' do |tag|
@@ -827,7 +827,7 @@ module StandardTags
     Renders a trail of breadcrumbs to the current page. The separator attribute
     specifies the HTML fragment that is inserted between each of the breadcrumbs. By
     default it is set to @>@. The boolean @nolinks@ attribute can be specified to render
-    breadcrumbs in plain text, without any links (useful when generating title tag). 
+    breadcrumbs in plain text, without any links (useful when generating title tag).
     Set the boolean @noself@ attribute to omit the present page (useful in page headers).
 
     *Usage:*
@@ -1129,7 +1129,7 @@ module StandardTags
       else field
     end
   end
-  
+
   tag 'site' do |tag|
     tag.expand
   end
@@ -1151,7 +1151,27 @@ module StandardTags
   tag "site:dev_host" do |tag|
     TrustyCms::Config["dev.host"]
   end
-  
+
+  tag 'meta:description' do |tag|
+    show_tag = tag.attr['tag'] != 'false' || false
+    description = CGI.escapeHTML(tag.locals.page.field(:description).try(:content)) if tag.locals.page.field(:description)
+    if show_tag
+      "<meta name=\"description\" content=\"#{description}\" />"
+    else
+      description
+    end
+  end
+
+ tag 'meta:keywords' do |tag|
+    show_tag = tag.attr['tag'] != 'false' || false
+    keywords = CGI.escapeHTML(tag.locals.page.field(:keywords).try(:content)) if tag.locals.page.field(:keywords)
+    if show_tag
+      "<meta name=\"keywords\" content=\"#{keywords}\" />"
+    else
+      keywords
+    end
+  end
+
   private
     def render_children_with_pagination(tag, opts={})
       if opts[:aggregate]
@@ -1178,7 +1198,7 @@ module StandardTags
       end
       result.flatten.join('')
     end
-    
+
     def children_find_options(tag)
       attr = tag.attr.symbolize_keys
 
@@ -1222,17 +1242,17 @@ module StandardTags
       end
       options
     end
-      
+
     def aggregate_children(tag)
       options = children_find_options(tag)
       parent_ids = tag.locals.parent_ids
-    
+
       conditions = options[:conditions]
       conditions.first << " AND parent_id IN (?)"
       conditions << parent_ids
       options
     end
-    
+
     def pagination_find_options(tag)
       attr = tag.attr.symbolize_keys
       if attr[:paginated] == 'true'
@@ -1241,7 +1261,7 @@ module StandardTags
         false
       end
     end
-    
+
     def will_paginate_options(tag)
       attr = tag.attr.symbolize_keys
       if attr[:paginated] == 'true'
@@ -1299,7 +1319,7 @@ module StandardTags
       raise TagError.new(%{`#{attribute_name}' attribute of `#{tag.name}' tag must be one of: #{values.join(', ')}}) unless values.include?(attribute)
       return attribute
     end
-    
+
     def required_attr(tag, *attribute_names)
       attr_collection = attribute_names.map{|a| "`#{a}'"}.join(' or ')
       raise TagError.new("`#{tag.name}' tag must contain a #{attr_collection} attribute.") if (tag.attr.keys & attribute_names).blank?
@@ -1314,5 +1334,5 @@ module StandardTags
         request.host =~ /^dev\./
       end
     end
-    
+
 end