radiant 0.8.0 → 0.8.1

data/lib/task_support.rb

@@ -0,0 +1,33 @@
+class TaskSupport
+  class << self
+    def establish_connection
+      unless ActiveRecord::Base.connected?
+        connection_hash = YAML.load_file("#{Rails.root}/config/database.yml").to_hash
+        env_connection = connection_hash[RAILS_ENV]
+        ActiveRecord::Base.establish_connection(env_connection)
+      end
+    end
+    def config_export(path = "#{Rails.root}/config/radiant_config.yml")
+      self.establish_connection
+      FileUtils.mkdir_p(File.dirname(path))
+      if File.open(File.expand_path(path), 'w') { |f| YAML.dump(Radiant::Config.to_hash.to_yaml,f) }
+        puts "Radiant::Config saved to #{path}"
+      end
+    end
+    def config_import(path = "#{Rails.root}/config/radiant_config.yml", clear = nil)
+      self.establish_connection
+      Radiant::Config.delete_all if clear
+      if File.exist?(path)
+          configs = YAML.load(YAML.load_file(path))
+          configs.each do |key, value|
+            c = Radiant::Config.find_or_initialize_by_key(key)
+            c.value = value
+            c.save
+          end
+        puts "Radiant::Config updated from #{path}"
+      else
+        puts "No file exists at #{path}"
+      end
+    end
+  end
+end

data/lib/tasks/cucumber.rake

@@ -1,9 +1,13 @@
 $LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
 
 begin
+  require 'cucumber/version'
   require 'cucumber/rake/task'
 
   Cucumber::Rake::Task.new(:features) do |t|
+    minor = Cucumber::VERSION::MINOR.to_i
+    tiny = Cucumber::VERSION::TINY.to_i
+    raise LoadError if (minor < 3) || (minor == 3 && tiny < 9)
     t.fork = true
     t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
     t.feature_pattern = "#{RADIANT_ROOT}/features/**/*.feature"
@@ -12,6 +16,6 @@ begin
 rescue LoadError
   desc 'Cucumber rake task not available'
   task :features do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+    abort 'Cucumber rake task is not available. Be sure to install cucumber version 0.3.9 as a gem or plugin'
   end
 end

data/lib/tasks/radiant_config.rake

@@ -0,0 +1,18 @@
+require 'task_support'
+namespace :radiant do
+  namespace :config do
+    desc "Export Radiant::Config to Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml"
+    task :export => :environment do
+      config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
+      clear = ENV['CLEAR_CONFIG'] || nil
+      TaskSupport.config_export(config_path)
+    end
+    
+    desc "Import Radiant::Config from Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import"
+    task :import => :environment do
+      config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
+      clear = ENV['CLEAR_CONFIG'] || nil
+      TaskSupport.config_import(config_path, clear)
+    end
+  end
+end

data/lib/tasks/release.rake

@@ -33,6 +33,7 @@ namespace 'radiant' do
     s.bindir = 'bin'
     s.executables = (Dir['bin/*'] + Dir['scripts/*']).map { |file| File.basename(file) } 
     s.add_dependency 'rake', '>= 0.8.3'
+    s.add_dependency 'rack', '>=1.0.0' # No longer bundled in actionpack
     s.add_dependency 'RedCloth', '>=4.0.0'
     s.has_rdoc = true
     s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'

data/public/javascripts/admin/admin.js

@@ -123,7 +123,7 @@ function valid_part_name() {
     return false;
   }
   tabControl.tabs.each(function(pair){
-    if (tabControl.tabs.get(pair.key).caption == name) {
+    if (tabControl.tabs.get(pair.key).label == name) {
       result = false;
       alert('Part name must be unique.');
       throw $break;

data/spec/controllers/admin/layouts_controller_spec.rb

@@ -14,15 +14,21 @@ describe Admin::LayoutsController do
   it "should handle Layouts" do
     controller.class.model_class.should == Layout
   end
-  
-  
+
+
   describe "show" do
     it "should redirect to the edit action" do
       get :show, :id => 1
       response.should redirect_to(edit_admin_layout_path(params[:id]))
     end
+
+    it "should show xml when format is xml" do
+      layout = Layout.first
+      get :show, :id => layout.id, :format => "xml"
+      response.body.should == layout.to_xml
+    end
   end
-  
+
   describe "with invalid page id" do
     [:edit, :remove].each do |action|
       before do
@@ -66,22 +72,22 @@ describe Admin::LayoutsController do
       end
 
       it "should allow access to developers for the #{action} action" do
-        lambda { 
-          send(method, action, :id => layout_id(:main)) 
-        }.should restrict_access(:allow => [users(:developer)], 
+        lambda {
+          send(method, action, :id => layout_id(:main))
+        }.should restrict_access(:allow => [users(:developer)],
                                  :url => '/admin/pages')
       end
 
       it "should allow access to admins for the #{action} action" do
-        lambda { 
-          send(method, action, :id => layout_id(:main)) 
-        }.should restrict_access(:allow => [users(:developer)], 
+        lambda {
+          send(method, action, :id => layout_id(:main))
+        }.should restrict_access(:allow => [users(:developer)],
                                  :url => '/admin/pages')
       end
-      
+
       it "should deny non-developers and non-admins for the #{action} action" do
-        lambda { 
-          send(method, action, :id => layout_id(:main)) 
+        lambda {
+          send(method, action, :id => layout_id(:main))
         }.should restrict_access(:deny => [users(:non_admin), users(:existing)],
                                  :url => '/admin/pages')
       end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -8,19 +8,25 @@ describe Admin::PagesController do
   end
 
   it "should route children to the pages controller" do
-    route_for(:controller => "admin/pages", :page_id => '1', 
+    route_for(:controller => "admin/pages", :page_id => '1',
       :action => "index").should == '/admin/pages/1/children'
-    route_for(:controller => "admin/pages", :page_id => '1', 
+    route_for(:controller => "admin/pages", :page_id => '1',
       :action => 'new').should == '/admin/pages/1/children/new'
   end
-  
+
   describe "show" do
     it "should redirect to the edit action" do
       get :show, :id => 1
       response.should redirect_to(edit_admin_page_path(params[:id]))
     end
+
+    it "should show xml when format is xml" do
+      page = Page.first
+      get :show, :id => page.id, :format => "xml"
+      response.body.should == page.to_xml
+    end
   end
-  
+
   describe "with invalid page id" do
     [:edit, :remove].each do |action|
       before do
@@ -52,7 +58,7 @@ describe Admin::PagesController do
       flash[:notice].should == 'Page could not be found.'
     end
   end
-  
+
   describe "viewing the sitemap" do
     integrate_views
 
@@ -101,7 +107,7 @@ describe Admin::PagesController do
       assert_rendered_nodes_where { |page| [nil, page_id(:home), page_id(:parent)].include?(page.parent_id) }
       assigns(:homepage).should_not be_nil
     end
-    
+
     it "should render the appropriate children when branch of the site map is expanded via AJAX" do
       xml_http_request :get, :index, :page_id => page_id(:home), :level => '1'
       response.should be_success
@@ -111,9 +117,9 @@ describe Admin::PagesController do
       response.charset.should == 'utf-8'
     end
   end
-  
+
   describe "permissions" do
-    
+
     [:admin, :developer, :non_admin, :existing].each do |user|
       {
         :post => :create,
@@ -125,7 +131,7 @@ describe Admin::PagesController do
           send method, action, :id => Page.first.id
           response.should redirect_to('/admin/login')
         end
-        
+
         it "should allow access to #{user.to_s.humanize}s for the #{action} action" do
           login_as user
           send method, action, :id => Page.first.id
@@ -133,26 +139,26 @@ describe Admin::PagesController do
         end
       end
     end
-    
+
     [:index, :show, :new, :edit, :remove].each do |action|
       before :each do
-        @parameters = lambda do 
+        @parameters = lambda do
           case action
           when :index
             {}
           when :new
             {:page_id => page_id(:home)}
           else
-            {:id => Page.first.id} 
+            {:id => Page.first.id}
           end
         end
       end
-      
+
       it "should require login to access the #{action} action" do
         logout
         lambda { send(:get, action, @parameters.call) }.should require_login
       end
-      
+
       if action == :show
         it "should request authentication for API access on show" do
           logout
@@ -161,33 +167,33 @@ describe Admin::PagesController do
         end
       else
         it "should allow access to admins for the #{action} action" do
-          lambda { 
-            send(:get, action, @parameters.call) 
-          }.should restrict_access(:allow => [users(:admin)], 
+          lambda {
+            send(:get, action, @parameters.call)
+          }.should restrict_access(:allow => [users(:admin)],
                                    :url => '/admin/pages')
         end
 
         it "should allow access to developers for the #{action} action" do
-          lambda { 
-            send(:get, action, @parameters.call) 
-          }.should restrict_access(:allow => [users(:developer)], 
+          lambda {
+            send(:get, action, @parameters.call)
+          }.should restrict_access(:allow => [users(:developer)],
                                    :url => '/admin/pages')
         end
-    
+
         it "should allow non-developers and non-admins for the #{action} action" do
-          lambda { 
-            send(:get, action, @parameters.call) 
+          lambda {
+            send(:get, action, @parameters.call)
           }.should restrict_access(:allow => [users(:non_admin), users(:existing)],
                                    :url => '/admin/pages')
         end
       end
     end
   end
-  
-  
+
+
   describe "prompting page removal" do
     integrate_views
-    
+
     # TODO: This should be in a view or integration spec
     it "should render the expanded descendants of the page being removed" do
       get :remove, :id => page_id(:parent), :format => 'html' # shouldn't need this!
@@ -197,7 +203,7 @@ describe Admin::PagesController do
       end
     end
   end
-  
+
   it "should initialize meta and buttons_partials in new action" do
     get :new, :page_id => page_id(:home)
     response.should be_success
@@ -211,12 +217,12 @@ describe Admin::PagesController do
     assigns(:meta).should be_kind_of(Array)
     assigns(:buttons_partials).should be_kind_of(Array)
   end
-  
+
   it "should clear the page cache when saved" do
     Radiant::Cache.should_receive(:clear)
     put :update, :id => page_id(:home), :page => {:breadcrumb => 'Homepage'}
   end
-  
+
   protected
 
     def assert_rendered_nodes_where(&block)

data/spec/controllers/admin/snippets_controller_spec.rb

@@ -15,15 +15,21 @@ describe Admin::SnippetsController do
   it "should handle Snippets" do
     controller.class.model_class.should == Snippet
   end
-  
-  
+
+
   describe "show" do
     it "should redirect to the edit action" do
       get :show, :id => 1
       response.should redirect_to(edit_admin_snippet_path(params[:id]))
     end
+
+    it "should show xml when format is xml" do
+      snippet = Snippet.first
+      get :show, :id => snippet.id, :format => "xml"
+      response.body.should == snippet.to_xml
+    end
   end
-  
+
   describe "with invalid snippet id" do
     [:edit, :remove].each do |action|
       before do
@@ -96,9 +102,9 @@ describe Admin::SnippetsController do
       end
     end
   end
-  
+
   it "should clear the page cache when saved" do
     Radiant::Cache.should_receive(:clear)
     put :update, :id => snippet_id(:first), :snippet => {:content => "Foobar."}
   end
-end
+end

data/spec/controllers/admin/welcome_controller_spec.rb

@@ -31,7 +31,7 @@ describe Admin::WelcomeController do
   describe "remember me" do
 
     before do
-      Radiant::Config.stub!(:[]).with('session_timeout').and_return(2.weeks)
+      Radiant::Config['session_timeout'] = 2.weeks
       @user = users(:admin)
       controller.stub!(:current_user).and_return(@user)
     end

data/spec/controllers/application_controller_spec.rb

@@ -62,5 +62,23 @@ describe ApplicationController do
       controller.template_name.should == 'remove'
       end
     end
+    it "should return 'show' when the action_name is show" do
+      controller.stub!(:action_name).and_return('show')
+      controller.template_name.should == 'show'
+    end
+  end
+
+  describe "set_timezone" do
+    it "should use Radiant::Config['local.timezone']" do
+      Radiant::Config['local.timezone'] = 'Kuala Lumpur'
+      controller.send(:set_timezone)
+      Time.zone.name.should == 'Kuala Lumpur'
+    end
+
+    it "should default to config.time_zone" do
+      Radiant::Config.initialize_cache # to clear out setting from previous tests
+      controller.send(:set_timezone)
+      Time.zone.name.should == 'UTC'
+    end
   end
 end

data/spec/fixtures/radiant_config.yml

@@ -0,0 +1,10 @@
+--- |
+ --- 
+ defaults.page.parts: body, extended
+ test: passes
+ admin.title: RadiantCMS
+ defaults.page.status: draft
+ admin.subtitle: Publishing for Small Teams
+ this: that
+ defaults.page.filter: ""
+ true?: true

data/spec/generators/extension_generator_spec.rb

@@ -79,6 +79,18 @@ describe "ExtensionGenerator with normal options" do
     'vendor/extensions/sample'.should have_generated_file('spec/spec.opts')
   end
   
+  it "should generate extension cucumber.yml file" do
+    'vendor/extensions/sample'.should have_generated_file('cucumber.yml')
+  end
+  
+  it "should generate extension features support directory" do
+    'vendor/extensions/sample'.should have_generated_directory('features/support')
+  end
+  
+  it "should generate extension features step_definitions directory" do
+    'vendor/extensions/sample'.should have_generated_directory('features/step_definitions/admin')
+  end
+  
   after(:each) do
     rm_rf Dir["#{RADIANT_ROOT}/vendor/extensions/*"]
     rm_rf Dir["#{RADIANT_ROOT}/vendor/generators/*"]

data/spec/helpers/admin/node_helper_spec.rb

@@ -72,6 +72,12 @@ describe Admin::NodeHelper do
     helper.node_title.should == %{<span class="title">Title</span>}
   end
 
+  it "should render the title of the current node with HTML entities escaped" do
+    assigns[:current_node] = @page
+    @page.should_receive(:title).and_return("Ham & Cheese")
+    helper.node_title.should == %{<span class="title">Ham &amp; Cheese</span>}
+  end
+
   it "should render the page type if it's not Page" do
     assigns[:current_node] = @page
     @class = mock("Class")

data/spec/helpers/application_helper_spec.rb

@@ -161,7 +161,7 @@ describe ApplicationHelper do
   end
   
   it "should render a Javascript snippet to toggle the meta area" do
-    helper.toggle_javascript_for("joe").should == "Element.toggle('joe'); Element.toggle('more-joe'); Element.toggle('less-joe');"
+    helper.toggle_javascript_for("joe").should == "Element.toggle('joe'); Element.toggle('more-joe'); Element.toggle('less-joe'); return false;"
   end
   
   it "should render an image tag with a default file extension" do

data/spec/lib/radiant/extension_loader_spec.rb

@@ -125,6 +125,13 @@ describe Radiant::ExtensionLoader do
     @instance.view_paths.all? {|f| File.directory?(f) }.should be_true
   end
 
+  it "should have metal paths" do
+    @instance.stub!(:load_extension_roots).and_return(@extension_paths)
+    @instance.should respond_to(:metal_paths)
+    @instance.metal_paths.should be_instance_of(Array)
+    @instance.metal_paths.all? {|f| File.directory?(f) }.should be_true
+  end
+
   it "should return the view paths in inverse order to the loaded" do
     extensions = [BasicExtension, OverridingExtension]
     @instance.extensions = extensions
@@ -133,6 +140,16 @@ describe Radiant::ExtensionLoader do
        "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/views"
       ]
   end
+
+  it "should return the metal paths in inverse order to the loaded" do
+    @instance.should_receive(:load_extension_roots).and_return(@extension_paths)
+    extensions = [BasicExtension, OverridingExtension]
+    @instance.extensions = extensions
+    @instance.metal_paths.should == [
+       "#{RADIANT_ROOT}/test/fixtures/extensions/02_overriding/app/metal",
+       "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/metal"
+      ]
+  end
   
   it "should load and initialize extensions when discovering" do
     @instance.should_receive(:load_extension_roots).and_return(@extension_paths)