radiant 0.6.8 → 0.6.9

data/CHANGELOG

@@ -1,10 +1,21 @@
 == Change Log
 
+=== 0.6.9 Etch
+* Make <r:random> accept dynamically generated options. [Jim Gay, Sean Cribbs]
+* Correctly set default 'inherit' to false on <r:unless_content> [Mark A. Yoon]
+* Correct authenticity token errors when using cookie session store [Sean 
+Cribbs]
+* Make script/extension executable. [Sean Cribbs]
+* Correct bugs in radiant:freeze:edge task. [Sean Cribbs]
+* Fix strange Page subclass loading errors in development mode. [Sean Cribbs]
+* Fix typo in if_content description. [Jim Gay]
+* Correct error in radiant:update:configs task. [Sean Cribbs]
+
 === 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]
+* Fix bug with FileNotFoundPage subclasses and draft status. [Glenn Murray]
 * Update radiant:freeze:edge task to support BRANCH, TAG, and REVISION. [John 
 Muhl]
 * Update to Haml 2.0.1. [Jim Gay]

data/CONTRIBUTORS

@@ -4,9 +4,14 @@
 The following people have submitted changes which have been applied to the
 core:
 
+=== 0.6.9 Etch
+* Mark A. Yoon
+* Jim Gay
+* Sean Cribbs
+
 === 0.6.8 Incise
 * Andrew Neil
-* cradle
+* Glenn Murray
 * Tim Gossett
 * John Muhl
 * Josh French

data/app/controllers/application.rb

@@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base
   
   filter_parameter_logging :password, :password_confirmation
   
-  protect_from_forgery :secret => "sweet-harmonious-biscuits"
+  protect_from_forgery
   
   before_filter :set_current_user
   before_filter :set_javascripts_and_stylesheets

data/app/models/page.rb

@@ -188,13 +188,16 @@ class Page < ActiveRecord::Base
     def load_subclasses
       ([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)
+          begin
+            p.constantize
+          rescue NameError, LoadError
+            eval(%Q{class #{p} < Page; def self.missing?; true end end}, TOPLEVEL_BINDING)
+          end
         end
       end
     end

data/app/models/standard_tags.rb

@@ -277,7 +277,7 @@ module StandardTags
   desc %{ 
     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 
+    part by separating 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@
@@ -320,13 +320,13 @@ module StandardTags
     By default the @find@ attribute is set to @all@.
     
     *Usage:*
-    <pre><code><r:unless_content [part="part_name, other_part"] [inherit="true"] [find="any"]>...</r:unless_content></code></pre>
+    <pre><code><r:unless_content [part="part_name, other_part"] [inherit="false"] [find="any"]>...</r:unless_content></code></pre>
   }
   tag 'unless_content' do |tag|
     page = tag.locals.page
     part_name = tag_part_name(tag)
     parts_arr = part_name.split(',')
-    inherit = boolean_attr_or_error(tag, 'inherit', true)
+    inherit = boolean_attr_or_error(tag, 'inherit', false)
     find = attr_or_error(tag, :attribute_name => 'find', :default => 'all', :values => 'any, all')
     expandable, all_found = true, true
     part_page = page
@@ -604,11 +604,11 @@ module StandardTags
     tag.expand
     options = tag.locals.random
     option = options[rand(options.size)]
-    option.call if option
+    option if option
   end
   tag 'random:option' do |tag|
     items = tag.locals.random
-    items << tag.block
+    items << tag.expand
   end
   
   desc %{  

data/config/environment.rb

@@ -84,6 +84,4 @@ Radiant::Initializer.run do |config|
     ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
     ResponseCache.defaults[:logger]    = ActionController::Base.logger
   end
-end
-
-Page.load_subclasses
+end

data/lib/generators/instance/templates/instance_environment.rb

@@ -84,6 +84,4 @@ Radiant::Initializer.run do |config|
     ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
     ResponseCache.defaults[:logger]    = ActionController::Base.logger
   end
-end
-
-Page.load_subclasses
+end

data/lib/radiant.rb

@@ -5,7 +5,7 @@ unless defined? Radiant::Version
     module Version
       Major = '0'
       Minor = '6'
-      Tiny  = '8'
+      Tiny  = '9'
 
       class << self
         def to_s

data/lib/radiant/extension_loader.rb

@@ -92,6 +92,8 @@ module Radiant
       # Reset the admin UI regions
       initializer.admin.load_default_regions
       extensions.each &:activate
+      # Make sure we have our subclasses loaded!
+      Page.load_subclasses
     end
     alias :reactivate :activate_extensions
 

data/lib/tasks/framework.rake

@@ -31,8 +31,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
       desc "Lock to latest Edge Radiant or a specific revision with REVISION=X (ex: REVISION=245484e), a tag with TAG=Y (ex: TAG=0.6.6), or a branch with BRANCH=Z (ex: BRANCH=mental)"
       task :edge do
         $verbose = false
-        system "git --version" rescue nil
-        unless !$?.nil? && $?.success?
+        unless system "git --version"
           $stderr.puts "ERROR: Must have git available in the PATH to lock this application to Edge Radiant"
           exit 1
         end
@@ -40,28 +39,18 @@ unless File.directory? "#{RAILS_ROOT}/app"
         radiant_git = "git://github.com/radiant/radiant.git"
 
         if File.exist?("vendor/radiant/.git/HEAD")
-          case
-          when ENV['TAG']
-            system "cd vendor/radiant; git pull origin master; git checkout -b #{ENV['TAG']}"
-          when ENV['BRANCH']
-            system "cd vendor/radiant; git pull origin master; git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"
-          when ENV['REVISION']
-            system "cd vendor/radiant; git pull origin master; git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"
-          else
-            system "cd vendor/radiant; git pull origin master"
-          end
+          system "cd vendor/radiant; git checkout master; git pull origin master"
         else
-          case
-          when ENV['TAG']
-            system "git clone #{radiant_git} vendor/radiant"
-            system "cd vendor/radiant; git checkout -b #{ENV['TAG']}"
-          when ENV['BRANCH']
-            system "git clone #{radiant_git} vendor/radiant"
-            system "cd vendor/radiant; git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"
-          when ENV['REVISION']
-            system "git clone #{radiant_git} vendor/radiant"
-            system "cd vendor/radiant; git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"
-          end
+          system "git clone #{radiant_git} vendor/radiant"
+        end
+
+        case
+        when ENV['TAG']
+          system "cd vendor/radiant; git checkout -b v#{ENV['TAG']} #{ENV['TAG']}"
+        when ENV['BRANCH']
+          system "cd vendor/radiant; git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"
+        when ENV['REVISION']
+          system "cd vendor/radiant; git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"
         end
       end
     end
@@ -70,7 +59,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
     task :unfreeze do
       rm_rf "vendor/radiant"
     end
-    
+
     desc "Update both configs, scripts and public/javascripts from Radiant"
     task :update => [ "update:scripts", "update:javascripts", "update:configs", "update:images", "update:stylesheets" ]
 
@@ -79,11 +68,11 @@ unless File.directory? "#{RAILS_ROOT}/app"
       task :scripts do
         local_base = "script"
         edge_base  = "#{File.dirname(__FILE__)}/../../scripts"
-        
+
         local = Dir["#{local_base}/**/*"].reject { |path| File.directory?(path) }
         edge  = Dir["#{edge_base}/**/*"].reject { |path| File.directory?(path) }
         edge  = edge.reject { |f| f =~ /(generate|plugin|destroy)$/ }
-        
+
         edge.each do |script|
           base_name = script[(edge_base.length+1)..-1]
           next if local.detect { |path| base_name == path[(local_base.length+1)..-1] }
@@ -112,13 +101,12 @@ unless File.directory? "#{RAILS_ROOT}/app"
         FileUtils.cp("#{File.dirname(__FILE__)}/../generators/instance/templates/instance_boot.rb", RAILS_ROOT + '/config/boot.rb')
         instance_env = "#{RAILS_ROOT}/config/environment.rb"
         tmp_env = "#{RAILS_ROOT}/config/environment.tmp"
-        File.open(tmp_env, 'w') do |f| 
-          f.write ERB.new(File.read(instance_env)).result(lambda do
-             app_name = File.basename(File.expand_path(RAILS_ROOT))
-          end)
-        end
         gen_env = "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_environment.rb"
         backup_env = "#{RAILS_ROOT}/config/environment.bak"
+        File.open(tmp_env, 'w') do |f|
+          app_name = File.basename(File.expand_path(RAILS_ROOT))
+          f.write ERB.new(File.read(gen_env)).result(binding)
+        end
         unless FileUtils.compare_file(instance_env, tmp_env)
           FileUtils.cp(instance_env, backup_env)
           FileUtils.cp(tmp_env, instance_env)
@@ -129,20 +117,20 @@ Please copy your customizations to the new file."
         end
         FileUtils.rm(tmp_env)
       end
-      
+
       desc "Update admin images from your current radiant install"
       task :images do
         project_dir = RAILS_ROOT + '/public/images/admin/'
         images = Dir["#{File.dirname(__FILE__)}/../../public/images/admin/*"]
         FileUtils.cp(images, project_dir)
       end
-      
+
       desc "Update admin stylesheets from your current radiant install"
       task :stylesheets do
         project_dir = RAILS_ROOT + '/public/stylesheets/admin/'
         stylesheets = Dir["#{File.dirname(__FILE__)}/../../public/stylesheets/admin/*.css"]
         FileUtils.cp(stylesheets, project_dir)
-      end      
+      end
     end
   end
 end

data/spec/lib/radiant/extension_loader_spec.rb

@@ -151,6 +151,16 @@ describe Radiant::ExtensionLoader do
     @instance.activate_extensions
     extensions.all?(&:active?).should be_true
   end
+  
+  it "should (re)load Page subclasses activation" do
+    @initializer.should_receive(:initialize_default_admin_tabs)
+    @initializer.should_receive(:initialize_framework_views)
+    @admin.should_receive(:load_default_regions)
+    extensions = [BasicExtension, OverridingExtension]
+    @instance.extensions = extensions
+    Page.should_receive(:load_subclasses)
+    @instance.activate_extensions
+  end
 end
 
 

data/spec/models/standard_tags_spec.rb

@@ -316,7 +316,12 @@ describe "Standard Tags" do
       it 'should render the contained block if the current or ancestor pages do not have the specified parts' do
         page(:guests).should render('<r:unless_content part="madeup, imaginary" inherit="true">true</r:unless_content>').as('true')
       end
+
+      it "should not render the contained block if the specified part does not exist but does exist on an ancestor" do
+        page.should render('<r:unless_content part="sidebar" inherit="true">false</r:unless_content>').as('')
+      end
     end
+    
     it "without 'part' attribute should not render the contained block if the 'body' part exists" do
       page.should render('<r:unless_content>false</r:unless_content>').as('')
     end
@@ -328,6 +333,10 @@ describe "Standard Tags" do
     it "should render the contained block if the specified part does not exist" do
       page.should render('<r:unless_content part="asdf">false</r:unless_content>').as('false')
     end
+
+    it "should render the contained block if the specified part does not exist but does exist on an ancestor" do
+      page.should render('<r:unless_content part="sidebar">false</r:unless_content>').as('false')
+    end
     
     describe "with more than one part given (separated by comma)" do
     
@@ -341,17 +350,17 @@ describe "Standard Tags" do
       
       describe "with the 'inherit' attribute set to 'true'" do
         it "should render the contained block if the current or ancestor pages have none of the specified parts" do
-          page.should render('<r:unless_content part="imaginary, madeup">true</r:unless_content>').as('true')
+          page.should render('<r:unless_content part="imaginary, madeup" inherit="true">true</r:unless_content>').as('true')
         end
         
         it "should not render the contained block if all of the specified parts are present on the current or ancestor pages" do
-          page(:party).should render('<r:unless_content part="favors, extended">true</r:unless_content>').as('')
+          page(:party).should render('<r:unless_content part="favors, extended" inherit="true">true</r:unless_content>').as('')
         end
       end
       
       describe "with the 'find' attribute set to 'all'" do
         it "should not render the contained block if all of the specified parts exist" do
-          page.should render('<r:unless_content part="body, sidebar" find="all">true</r:unless_content>').as('')
+          page(:home).should render('<r:unless_content part="body, sidebar" find="all">true</r:unless_content>').as('')
         end
 
         it "should render the contained block unless all of the specified parts exist" do
@@ -510,6 +519,10 @@ describe "Standard Tags" do
   it '<r:random> should render a randomly selected contained <r:option>' do
     page.should render("<r:random> <r:option>1</r:option> <r:option>2</r:option> <r:option>3</r:option> </r:random>").matching(/^(1|2|3)$/)
   end
+  
+  it '<r:random> should render a randomly selected, dynamically set <r:option>' do
+    page(:parent).should render("<r:random:children:each:option:title />").matching(/^(Child|Child\ 2|Child\ 3)$/)
+  end
 
   it '<r:comment> should render nothing it contains' do
     page.should render('just a <r:comment>small </r:comment>test').as('just a test')
@@ -802,11 +815,11 @@ describe "Standard Tags" do
   
   describe "<r:unless_ancestor_or_self>" do
     it "should render the tag's content when the current page is not an ancestor of tag.locals.page" do
-      page(:radius).should render(%{<r:find url="/"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('')
+      page(:parent).should render(%{<r:find url="/radius"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('true')
     end
 
     it "should not render the tag's content when current page is an ancestor of tag.locals.page" do
-      page(:parent).should render(%{<r:find url="/radius"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('true')
+      page(:radius).should render(%{<r:find url="/"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('')
     end
   end
 
@@ -822,11 +835,11 @@ describe "Standard Tags" do
   
   describe "<r:unless_self>" do
     it "should render the tag's content when the current page is not the same as the local contextual page" do
-      page(:home).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('')
+      page(:radius).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('true')
     end
 
     it "should not render the tag's content when the current page is the same as the local contextual page" do
-      page(:radius).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('true')
+      page(:home).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('')
     end
   end
 

data/spec/scenarios/file_not_found_scenario.rb

@@ -1,3 +1,4 @@
+require 'file_not_found_page'
 class CustomFileNotFoundPage < FileNotFoundPage
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: radiant
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire: radiant
 bindir: bin
 cert_chain: []
 
-date: 2008-07-27 00:00:00 -04:00
+date: 2008-08-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,8 +62,6 @@ files:
 - app/helpers/admin/welcome_helper.rb
 - app/helpers/application_helper.rb
 - app/helpers/site_helper.rb
-- app/migrate
-- app/migrate/020_add_session_info_to_users.rb
 - app/models
 - app/models/env_dump_page.rb
 - app/models/file_not_found_page.rb
@@ -3012,6 +3010,8 @@ rdoc_options:
 - --exclude
 - log
 - --exclude
+- pkg
+- --exclude
 - public
 - --exclude
 - script

data/app/migrate/020_add_session_info_to_users.rb

@@ -1,11 +0,0 @@
-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