radiant 0.6.7 → 0.6.8

data/CHANGELOG

@@ -1,6 +1,38 @@
 == Change Log
 
-=== Edge
+=== 0.6.8 Incise
+* Hide page publish date selector unless page.edit.published_date? config is 
+set. [Sean Cribbs]
+* Add <r:yield /> tag to support snippets that accept blocks. [Andrew Neil]
+* Fix bug with FileNotFoundPage subclasses and draft status. [cradle]
+* Update radiant:freeze:edge task to support BRANCH, TAG, and REVISION. [John 
+Muhl]
+* Update to Haml 2.0.1. [Jim Gay]
+* Fix radiant:update:configs task to properly evaluate environment.rb
+[Sean Cribbs]
+* Fix page subclass loading issues. [Sean Cribbs]
+* Add <r:unless_ancestor_or_self> and <r:unless_self> tags. [Tim Gossett]
+* Add specific installation modes for gzip and bzip2 compression. [Sean Cribbs]
+* Added extension installation scripts. [Sean Cribbs]
+* Added find attr to r:if_content and r:unless_content to expand based on
+finding 'any' or 'all' specified parts [Jim Gay]
+* Added inherit attr to r:if_content and r:unless_content to search for parts
+independently in the page tree. [Jim Gay]
+* Update radiant:freeze:edge task to use git and GitHub. [John Muhl]
+* Update login page layout from prototype. [Sean Cribbs]
+* Change order of extension paths to prefer project extensions over Radiant's.
+[John Muhl]
+* Switch default session store to cookies [Josh French]
+* Add remember-me function to login [Josh French]
+* Allow an inclusive list of parts in r:if_content and r:unless_content [Jim Gay]
+* Added a defaults.page.filter config setting for setting a default page
+filter. [Alex Wayne]
+* Fix Users fixtures for extensions that still use test/unit. [Nick Plante]
+* Don't search for missing Page subclasses before bootstrap. [Sean Cribbs]
+* Added tolerance for missing Page class definitions. [Loren Johnson]
+* Don't require an authenticity token check on the login action. [Sean Cribbs]
+* Make sure region sets are reloaded when activating extensions in development
+mode. [Sean Cribbs]
 * Fix Haml rendering errors. [Thomas Watson Steen]
 
 === 0.6.7 Mordant
@@ -8,11 +40,11 @@
 * Convert all views to Haml. [Sean Cribbs, John Long]
 * Avoid authenticity check when listing page children. [Sean Cribbs]
 * Add radiant:extensions:update_all task. [Josh French]
-* Tweak LoginSystem to allow attempted URL redirection after login and 
+* Tweak LoginSystem to allow attempted URL redirection after login and
 auto-redirect from login URL if logged in. [Josh French]
 * Add per-user salting to password encryption. [Sean Cribbs]
 * Address CSRF vulnerabilities in forms. [Sean Cribbs]
-* Remove clear cache action, always clear cache after saving a page. [Sean 
+* Remove clear cache action, always clear cache after saving a page. [Sean
 Cribbs]
 
 === 0.6.6 Chiseled

data/CONTRIBUTORS

@@ -4,7 +4,17 @@
 The following people have submitted changes which have been applied to the
 core:
 
-=== Edge
+=== 0.6.8 Incise
+* Andrew Neil
+* cradle
+* Tim Gossett
+* John Muhl
+* Josh French
+* Jim Gay
+* Alex Wayne
+* Nick Plante
+* Loren Johnson
+* Sean Cribbs
 * Thomas Watson Steen
 
 === 0.6.7 Mordant

data/README

@@ -22,8 +22,9 @@ Radiant features:
 
 == License
 
-Radiant is released under the MIT license and is copyright (c) 2006 John W.
-Long. A copy of the MIT license can be found in the LICENSE file.
+Radiant is released under the MIT license and is copyright (c) 2006-2008
+John W. Long and Sean Cribbs. A copy of the MIT license can be found in the
+LICENSE file.
 
 
 == Installation and Setup
@@ -51,4 +52,5 @@ tickets.
 Enjoy!
 
 --
-John Long :: http://wiseheartdesign.com
+The Radiant Dev Team
+http://radiantcms.org

data/app/controllers/admin/welcome_controller.rb

@@ -1,5 +1,6 @@
 class Admin::WelcomeController < ApplicationController
   no_login_required
+  skip_before_filter :verify_authenticity_token
   
   def index
     redirect_to page_index_url
@@ -12,12 +13,18 @@ class Admin::WelcomeController < ApplicationController
       announce_invalid_user unless self.current_user = User.authenticate(login, password)
     end
     if current_user
+      if params[:remember_me]
+        current_user.remember_me
+        set_session_cookie
+      end
       redirect_to (session[:return_to] || welcome_url)
       session[:return_to] = nil
     end
   end
   
   def logout
+    cookies[:session_token] = { :expires => 1.day.ago }
+    self.current_user.forget_me
     self.current_user = nil
     announce_logged_out
     redirect_to login_url

data/app/migrate/020_add_session_info_to_users.rb

@@ -0,0 +1,11 @@
+class AddSessionInfoToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :session_token, :string
+    add_column :users, :session_expire, :datetime
+  end
+
+  def self.down
+    remove_column :users, :session_token
+    remove_column :users, :session_expire
+  end
+end

data/app/models/page.rb

@@ -152,9 +152,10 @@ class Page < ActiveRecord::Base
         found = child.find_by_url(url, live, clean)
         return found if found
       end
-      file_not_found_types = [FileNotFoundPage] + FileNotFoundPage.descendants
-      condition = (['class_name = ?'] * file_not_found_types.length).join(' or ')
-      file_not_found_names = file_not_found_types.map { |x| x.name }.uniq
+      file_not_found_types = ([FileNotFoundPage] + FileNotFoundPage.descendants)
+      file_not_found_names = file_not_found_types.collect { |x| x.name }
+      condition = (['class_name = ?'] * file_not_found_names.length).join(' or ')
+      condition = "status_id = #{Status[:published].id} and (#{condition})" if live
       children.find(:first, :conditions => [condition] + file_not_found_names)
     end
   end
@@ -177,14 +178,24 @@ class Page < ActiveRecord::Base
           n.strip
         end
       end
+      @display_name = @display_name + " - not installed" if missing? && @display_name !~ /not installed/
+      @display_name
     end
     def display_name=(string)
       display_name(string)
     end
     
     def load_subclasses
-      Dir["#{RADIANT_ROOT}/app/models/*_page.rb"].each do |page|
-        $1.camelize.constantize if page =~ %r{/([^/]+)\.rb}
+      ([RADIANT_ROOT] + Radiant::Extension.descendants.map(&:root)).each do |path|
+        Dir["#{path}/app/models/*_page.rb"].each do |page|
+          require page
+          $1.camelize.constantize if page =~ %r{/([^/]+)\.rb}
+        end
+      end
+      unless Page.connection.tables.empty? # Haven't bootstrapped yet
+        Page.connection.select_values("SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL").each do |p|
+          eval(%Q{class #{p} < Page; def self.missing?; true end end}, TOPLEVEL_BINDING) unless Object.const_defined?(p)
+        end
       end
     end
     
@@ -192,7 +203,7 @@ class Page < ActiveRecord::Base
       default_parts = config['defaults.page.parts'].to_s.strip.split(/\s*,\s*/)
       page = new
       default_parts.each do |name|
-        page.parts << PagePart.new(:name => name)
+        page.parts << PagePart.new(:name => name, :filter_id => config['defaults.page.filter'])
       end
       default_status = config['defaults.page.status']
       page.status = Status[default_status] if default_status
@@ -211,6 +222,10 @@ class Page < ActiveRecord::Base
         class_name.constantize
       end
     end
+    
+    def missing?
+      false
+    end
   end
   
   private
@@ -265,6 +280,4 @@ class Page < ActiveRecord::Base
       text = object.filter.filter(text) if object.respond_to? :filter_id
       text
     end  
-end
-
-Page.load_subclasses
+end

data/app/models/standard_tags.rb

@@ -275,32 +275,75 @@ module StandardTags
   end
   
   desc %{ 
-    Renders the containing elements only if the part exists on a page. By default the
-    @part@ attribute is set to @body@.
+    Renders the containing elements if all of the listed parts exist on a page.
+    By default the @part@ attribute is set to @body@, but you may list more than one
+    part by seprating them with a comma. Setting the optional @inherit@ to true will 
+    search ancestors independently for each part. By default @inherit@ is set to @false@.
+    
+    When listing more than one part, you may optionally set the @find@ attribute to @any@
+    so that it will render the containing elements if any of the listed parts are found.
+    By default the @find@ attribute is set to @all@.
     
     *Usage:*
-    <pre><code><r:if_content [part="part_name"]>...</r:if_content></code></pre>
+    <pre><code><r:if_content [part="part_name, other_part"] [inherit="true"] [find="any"]>...</r:if_content></code></pre>
   }
   tag 'if_content' do |tag|
     page = tag.locals.page
     part_name = tag_part_name(tag)
-    unless page.part(part_name).nil?
-      tag.expand
+    parts_arr = part_name.split(',')
+    inherit = boolean_attr_or_error(tag, 'inherit', 'false')
+    find = attr_or_error(tag, :attribute_name => 'find', :default => 'all', :values => 'any, all')
+    expandable = true
+    one_found = false
+    part_page = page
+    parts_arr.each do |name|
+      name.strip!
+      if inherit
+        while (part_page.part(name).nil? and (not part_page.parent.nil?)) do
+          part_page = part_page.parent
+        end
+      end
+      expandable = false if part_page.part(name).nil?
+      one_found ||= true if !part_page.part(name).nil?
     end
+    expandable = true if (find == 'any' and one_found)
+    tag.expand if expandable
   end
   
   desc %{
-    The opposite of the @if_content@ tag.
+    The opposite of the @if_content@ tag. It renders the contained elements if all of the 
+    specified parts do not exist. Setting the optional @inherit@ to true will search 
+    ancestors independently for each part. By default @inherit@ is set to @false@.
+    
+    When listing more than one part, you may optionally set the @find@ attribute to @any@
+    so that it will not render the containing elements if any of the listed parts are found.
+    By default the @find@ attribute is set to @all@.
     
     *Usage:*
-    <pre><code><r:unless_content [part="part_name"]>...</r:unless_content></code></pre>
+    <pre><code><r:unless_content [part="part_name, other_part"] [inherit="true"] [find="any"]>...</r:unless_content></code></pre>
   }
   tag 'unless_content' do |tag|
     page = tag.locals.page
     part_name = tag_part_name(tag)
-    if page.part(part_name).nil?
-      tag.expand
+    parts_arr = part_name.split(',')
+    inherit = boolean_attr_or_error(tag, 'inherit', true)
+    find = attr_or_error(tag, :attribute_name => 'find', :default => 'all', :values => 'any, all')
+    expandable, all_found = true, true
+    part_page = page
+    parts_arr.each do |name|
+      name.strip!
+      if inherit
+        while (part_page.part(name).nil? and (not part_page.parent.nil?)) do
+          part_page = part_page.parent
+        end
+      end
+      expandable = false if !part_page.part(name).nil?
+      all_found = false if part_page.part(name).nil?
+    end
+    if all_found == false and find == 'all'
+      expandable = true
     end
+    tag.expand if expandable
   end
   
   desc %{  
@@ -345,6 +388,18 @@ module StandardTags
     tag.expand if (tag.globals.page.ancestors + [tag.globals.page]).include?(tag.locals.page)
   end
   
+  desc %{
+    Renders the contained elements unless the current contextual page is either the actual page or one of its parents.
+    
+    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>...</unless_ancestor_or_self></code></pre>
+  }  
+  tag "unless_ancestor_or_self" do |tag|
+    tag.expand unless (tag.globals.page.ancestors + [tag.globals.page]).include?(tag.locals.page)
+  end
+  
   desc %{
     Renders the contained elements if the current contextual page is also the actual page.
     
@@ -357,6 +412,18 @@ module StandardTags
     tag.expand if tag.locals.page == tag.globals.page
   end
   
+  desc %{
+    Renders the contained elements unless the current contextual page is also the actual page.
+    
+    This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up unless the child element is the current page.
+    
+    *Usage:*
+    <pre><code><r:unless_self>...</unless_self></code></pre>
+  }
+  tag "unless_self" do |tag|
+    tag.expand unless tag.locals.page == tag.globals.page
+  end
+  
   desc %{
     Renders the name of the author of the current page.
   }
@@ -449,10 +516,17 @@ module StandardTags
     
     *Usage:*
     <pre><code><r:snippet name="snippet_name" /></code></pre>
+    
+    When used as a double tag, the part in between both tags may be used within the
+    snippet itself, being substituted in place of @<r:yield/>@. 
+    
+    *Usage:*
+    <pre><code><r:snippet name="snippet_name">Lorem ipsum dolor...</r:snippet></code></pre>
   }
   tag 'snippet' do |tag|
     if name = tag.attr['name']
       if snippet = Snippet.find_by_name(name.strip)
+        tag.locals.yield = tag.expand if tag.double?
         tag.globals.page.render_snippet(snippet)
       else
         raise TagError.new('snippet not found')
@@ -461,7 +535,41 @@ module StandardTags
       raise TagError.new("`snippet' tag must contain `name' attribute")
     end
   end
-
+  
+  desc %{ 
+    Used within a snippet as a placeholder for substitution of child content, when 
+    the snippet is called as a double tag.
+    
+    *Usage (within a snippet):*
+    <pre><code>
+    <div id="outer">
+      <p>before</p>
+      <r:yield/>
+      <p>after</p>
+    </div>
+    </code></pre>
+    
+    If the above snippet was named "yielding", you could call it from any Page, 
+    Layout or Snippet as follows:
+    
+    <pre><code><r:snippet name="yielding">Content within</r:snippet></code></pre>
+    
+    Which would output the following:
+    
+    <pre><code>
+    <div id="outer">
+      <p>before</p>
+      Content within
+      <p>after</p>
+    </div>
+    </code></pre>
+    
+    When called in the context of a Page or a Layout, @<r:yield/>@ outputs nothing.
+  }
+  tag 'yield' do |tag|
+    tag.locals.yield
+  end
+  
   desc %{
     Inside this tag all page related tags refer to the page found at the @url@ attribute.  
     @url@s may be relative or absolute paths.
@@ -783,4 +891,19 @@ module StandardTags
     def page_found?(page)
       page && !(FileNotFoundPage === page)
     end
+    
+    def boolean_attr_or_error(tag, attribute_name, default)
+      attribute = attr_or_error(tag, :attribute_name => attribute_name, :default => default.to_s, :values => 'true, false')
+      (attribute.to_s.downcase == 'true') ? true : false
+    end
+    
+    def attr_or_error(tag, options = {})
+      attribute_name = options[:attribute_name].to_s
+      default = options[:default]
+      values = options[:values].split(',').map!(&:strip)
+      
+      attribute = (tag.attr[attribute_name] || default).to_s
+      raise TagError.new(%{'#{attribute_name}' attribute of #{tag} tag must be one of: #{values.join(',')}}) unless values.include?(attribute)
+      return attribute
+    end
 end

data/app/models/user.rb

@@ -44,7 +44,15 @@ class User < ActiveRecord::Base
   def confirm_password?
     @confirm_password
   end
-  
+
+  def remember_me
+    update_attribute(:session_token, sha1(Time.now + Radiant::Config['session_timeout'].to_i)) unless self.session_token?
+  end
+
+  def forget_me
+    update_attribute(:session_token, nil)
+  end
+
   private
   
     def validate_length_of_password?

data/app/views/admin/page/edit.html.haml

@@ -63,10 +63,11 @@
                     %label{:for=>"page_status_id"}
                       Status
                     = select "page", "status_id", Status.find_all.map { |s| [s.name, s.id] }, {}
-                  %p#publication-date{:style => "display: none"}
-                    %label{:for=>"page_published_at"}
-                      Published At
-                    = datetime_select "page", "published_at", :disabled => true
+                  - if @config['page.edit.published_date?']
+                    %p#publication-date{:style => "display: none"}
+                      %label{:for=>"page_published_at"}
+                        Published At
+                      = datetime_select "page", "published_at", :disabled => true
                   = render_region :layout_row
                 %span.clear  
               - parts_bottom.edit_timestamp do

data/app/views/admin/welcome/login.html.haml

@@ -9,36 +9,54 @@
         margin: 2em
         margin-left: auto
         margin-right: auto
-        padding-left: 20px
+        padding: 5px 20px
+        padding-right: 22px
+        position: relative
         width: 23.5em
         h1
           font-size: 140%    
           margin: 0
-          margin-top: 18px
-          margin-bottom: 18px
-        label
-          float: left
-          clear: left
-          margin-top: 4px
-          width: 6em
-        input.textbox
-          font-size: 100%
-          width: 16em
-        .buttons
-          margin-top: 15px
-          margin-bottom: 20px
+          margin-top: 13px
+        table
+          width: 100%
+          margin: 15px 0 10px 0
+          td
+            text-align: left
+            padding: 6px 0
+            &.label
+              width: 6em
+            &.field
+              input.textbox
+                font-size: 100%
+                width: 98%
+            &.checkbox
+              font-size: 85%
+            &.buttons
+              text-align: right
+              input
+                font-size: 140%
 
 #login
   %h1 Please Login
-  
+
   - form_tag login_url do
-    %p
-      %label{:for=>"user_login"} Username
-      = text_field "user", "login", :class => 'textbox', :value => '', :maxlength => 40 
-    %p
-      %label{:for=>"user_password"} Password
-      = password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40 
-    %p.buttons
-      %input.button{:type=>"submit", :value=>"Login"}/
-  
+    %table
+      %tr
+        %td.label
+          %label{:for=>"user_login"} Username
+        %td.field{:colspan=>2}
+          = text_field "user", "login", :class => 'textbox activate', :value => '', :maxlength => 40, :size => 40
+      %tr
+        %td.label
+          %label{:for=>"user_password"} Password
+        %td.field{:colspan=>2}
+          = password_field "user", "password", :class => 'textbox', :value => '', :maxlength => 40, :size => 40
+      %tr
+        %td
+        %td.checkbox
+          = check_box_tag :remember_me, 1, false, :class => 'checkbox'
+          %label.checkbox{:for=>"remember_me"} Remember me
+        %td.buttons
+          %input.button{:type=>"submit", :value=>"Login"}/
+
 = javascript_tag "$('user_login').activate();"