radiant 0.6.7 → 0.6.8

data/lib/radiant/extension_loader.rb

@@ -3,18 +3,18 @@ require 'method_observer'
 
 module Radiant
   class ExtensionLoader
-    
+
     class DependenciesObserver < MethodObserver
       attr_accessor :config
-      
+
       def initialize(rails_config)
         @config = rails_config
       end
-      
+
       def before_clear(*args)
         ExtensionLoader.deactivate_extensions
       end
-      
+
       def after_clear(*args)
         ExtensionLoader.load_extensions
         ExtensionLoader.activate_extensions
@@ -22,17 +22,17 @@ module Radiant
     end
 
     include Simpleton
-    
+
     attr_accessor :initializer, :extensions
-    
+
     def initialize
       self.extensions = []
     end
-    
+
     def configuration
       initializer.configuration
     end
-    
+
     def extension_load_paths
       load_extension_roots.map { |extension| load_paths_for(extension) }.flatten.select { |d| File.directory?(d) }
     end
@@ -40,14 +40,14 @@ module Radiant
     def plugin_paths
       load_extension_roots.map {|extension| "#{extension}/vendor/plugins" }.select {|d| File.directory?(d) }
     end
-    
+
     def add_extension_paths
       extension_load_paths.reverse_each do |path|
         configuration.load_paths.unshift path
         $LOAD_PATH.unshift path
       end
     end
-    
+
     def add_plugin_paths
       configuration.plugin_paths.concat plugin_paths
     end
@@ -55,15 +55,15 @@ module Radiant
     def controller_paths
       extensions.map { |extension| "#{extension.root}/app/controllers" }.select { |d| File.directory?(d) }
     end
-    
+
     def add_controller_paths
       configuration.controller_paths.concat(controller_paths)
     end
-    
+
     def view_paths
       extensions.map { |extension| "#{extension.root}/app/views" }.select { |d| File.directory?(d) }
     end
-    
+
     # Load the extensions
     def load_extensions
       @observer ||= DependenciesObserver.new(configuration).observe(::Dependencies)
@@ -80,15 +80,17 @@ module Radiant
         end
       end.compact
     end
-    
+
     def deactivate_extensions
       extensions.each &:deactivate
     end
-    
+
     def activate_extensions
       initializer.initialize_default_admin_tabs
-      # Reset the view paths after 
+      # Reset the view paths after
       initializer.initialize_framework_views
+      # Reset the admin UI regions
+      initializer.admin.load_default_regions
       extensions.each &:activate
     end
     alias :reactivate :activate_extensions
@@ -105,7 +107,7 @@ module Radiant
           []
         end
       end
-      
+
       def load_extension_roots
         @load_extension_roots ||= unless configuration.extensions.empty?
           select_extension_roots
@@ -113,10 +115,10 @@ module Radiant
           []
         end
       end
-      
+
       def select_extension_roots
         all_roots = all_extension_roots.dup
-        
+
         roots = configuration.extensions.map do |ext_name|
           if :all === ext_name
             :all
@@ -135,7 +137,7 @@ module Radiant
         end
         roots
       end
-      
+
       def all_extension_roots
         @all_extension_roots ||= configuration.extension_paths.map do |path|
           Dir["#{path}/*"].map {|f| File.expand_path(f) if File.directory?(f) }.compact.sort

data/lib/radiant/initializer.rb

@@ -21,7 +21,7 @@ module Radiant
 
     def default_extension_paths
       env = ENV["RAILS_ENV"] || RAILS_ENV
-      paths = [RADIANT_ROOT + '/vendor/extensions', RAILS_ROOT + '/vendor/extensions'].uniq
+      paths = [RAILS_ROOT + '/vendor/extensions', RADIANT_ROOT + '/vendor/extensions'].uniq
       # There's no other way it will work, config/environments/test.rb loads too late
       # TODO: Should figure out how to include this extension path only for the tests that need it
       paths.unshift(RADIANT_ROOT + "/test/fixtures/extensions") if env == "test"

data/lib/radiant/setup.rb

@@ -49,6 +49,8 @@ module Radiant
         step { Radiant::Config['admin.subtitle'] = 'Publishing for Small Teams' }
         step { Radiant::Config['defaults.page.parts' ] = 'body, extended' }
         step { Radiant::Config['defaults.page.status' ] = 'draft' }
+        step { Radiant::Config['defaults.page.filter' ] = nil }
+        step { Radiant::Config['session_timeout'] = 2.weeks }
       end
     end
     

data/lib/tasks/framework.rake

@@ -28,39 +28,41 @@ unless File.directory? "#{RAILS_ROOT}/app"
         end
       end
 
-      desc "Lock to latest Edge Radiant or a specific revision with REVISION=X (ex: REVISION=4021), a tag with TAG=Y (ex: TAG=rel_1-1-0), or a branch with BRANCH=Z (ex: BRANCH=mental)"
+      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
-        `svn --version` rescue nil
+        system "git --version" rescue nil
         unless !$?.nil? && $?.success?
-          $stderr.puts "ERROR: Must have subversion (svn) available in the PATH to lock this application to Edge Radiant"
+          $stderr.puts "ERROR: Must have git available in the PATH to lock this application to Edge Radiant"
           exit 1
         end
 
-        rm_rf   "vendor/radiant"
-        mkdir_p "vendor/radiant"
-
-        svn_root = "http://svn.radiantcms.org/radiant/"
+        radiant_git = "git://github.com/radiant/radiant.git"
 
-        case
-        when ENV['TAG']
-          radiant_svn = "#{svn_root}/tags/#{ENV['TAG']}"
-          touch "vendor/radiant/TAG_#{ENV['TAG']}"
-        when ENV['BRANCH']
-          radiant_svn = "#{svn_root}/branches/#{ENV['BRANCH']}"
-          touch "vendor/radiant/BRANCH_#{ENV['BRANCH']}"
+        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
         else
-          radiant_svn = "#{svn_root}/trunk"
-
-          if ENV['REVISION'].nil?
-            ENV['REVISION'] = /^r(\d+)/.match(%x{svn -qr HEAD log #{svn_root}})[1]
-            puts "REVISION not set. Using HEAD, which is revision #{ENV['REVISION']}."
+          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
-
-          touch "vendor/radiant/REVISION_#{ENV['REVISION']}"
         end
-      
-        system "svn export #{radiant_svn}/radiant vendor/radiant" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "") + " --force"
       end
     end
 
@@ -97,27 +99,35 @@ unless File.directory? "#{RAILS_ROOT}/app"
       task :javascripts do
         FileUtils.mkdir_p("#{RAILS_ROOT}/public/javascripts/admin/")
         copy_javascripts = proc do |project_dir, scripts|
-          scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js') 
-          FileUtils.cp(scripts, project_dir) 
+          scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js')
+          FileUtils.cp(scripts, project_dir)
         end
-        copy_javascripts[RAILS_ROOT + '/public/javascripts/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/*.js"]] 
+        copy_javascripts[RAILS_ROOT + '/public/javascripts/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/*.js"]]
         copy_javascripts[RAILS_ROOT + '/public/javascripts/admin/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/admin/*.js"]]
       end
 
       desc "Update config/boot.rb from your current radiant install"
       task :configs do
+        require 'erb'
         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"
-        unless FileUtils.compare_file(instance_env, gen_env)
+        unless FileUtils.compare_file(instance_env, tmp_env)
           FileUtils.cp(instance_env, backup_env)
-          FileUtils.cp(gen_env, instance_env)
+          FileUtils.cp(tmp_env, instance_env)
           puts "** WARNING **
-config/environment.rb has changed in Radiant 0.6.5. Your original has been
+config/environment.rb was changed in Radiant 0.6.5. Your original has been
 backed up to config/environment.bak and replaced with the packaged version.
 Please copy your customizations to the new file."
         end
+        FileUtils.rm(tmp_env)
       end
       
       desc "Update admin images from your current radiant install"

data/public/500.html

@@ -2,7 +2,7 @@
    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <body>
-  <h1>Application error (Apache)</h1>
+  <h1>Application error</h1>
   <p>Change this error message for exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code) in public/500.html</p>
 </body>
 </html>

data/public/javascripts/admin/admin.js

@@ -55,16 +55,18 @@ document.observe('dom:loaded', function() {
     });
   });
 
-  when('page_status_id', function(select){
-    if($F('page_status_id') == '100')
-      $('publication-date').show().select('select').invoke('enable');
-
-    select.observe('change', function(){
-      if($F(this) == '100')
+  when('publication-date', function(pub_date){
+    if($('page_status_id')) {
+      if($F('page_status_id') == '100')
         $('publication-date').show().select('select').invoke('enable');
-      else
-        $('publication-date').hide().select('select').invoke('disable');
-    })
+
+      $('page_status_id').observe('change', function(){
+        if($F(this) == '100')
+          $('publication-date').show().select('select').invoke('enable');
+        else
+          $('publication-date').hide().select('select').invoke('disable');
+      })
+    }
   });
 
   when('notice', function(notice) {

data/script/extension

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + "/../config/boot"
+require 'radiant/extension/script'
+
+Radiant::Extension::Script.execute ARGV

data/spec/controllers/admin/user_controller_spec.rb

@@ -6,7 +6,7 @@ describe Admin::UserController do
   
   integrate_views
   
-  it "should inherit from the abastract model controller" do
+  it "should inherit from the abstract model controller" do
     Admin::UserController.ancestors.should include(Admin::AbstractModelController)
   end
   

data/spec/controllers/admin/welcome_controller_spec.rb

@@ -28,11 +28,25 @@ describe Admin::WelcomeController do
     flash[:error].should_not be_nil
   end
   
-  it "should clear the current user and redirect on logout" do
-    controller.should_receive(:current_user=).with(nil)
-    get :logout
-    response.should be_redirect
-    response.should redirect_to(login_url)
+  describe "remember me" do
+
+    before do
+      Radiant::Config.stub!(:[]).with('session_timeout').and_return(2.weeks)
+      @user = users(:admin)
+      controller.stub!(:current_user).and_return(@user)
+    end
+
+    after do
+      post :login, :user => {:login => "admin", :password => "password"}, :remember_me => 1
+    end
+
+    it "should remember user" do
+      @user.should_receive(:remember_me)
+    end
+
+    it "should set cookie" do
+      controller.should_receive(:set_session_cookie)
+    end
   end
 
   describe "with a logged-in user" do
@@ -40,6 +54,18 @@ describe Admin::WelcomeController do
       login_as :admin
     end
 
+    it "should clear the current user and redirect on logout" do
+      controller.should_receive(:current_user=).with(nil)
+      get :logout
+      response.should be_redirect
+      response.should redirect_to(login_url)
+    end
+
+    it "should forget user on logout" do
+      controller.send(:current_user).should_receive(:forget_me)
+      get :logout
+    end
+
     it "should not show /login again" do
       get :login
       response.should redirect_to(welcome_url)

data/spec/controllers/site_controller_spec.rb

@@ -91,7 +91,7 @@ end
 describe SiteController, "when custom 404 pages are defined" do
   scenario :file_not_found
   
-  it "should use the top-most 404 page by default" do
+  it "should use the top-most published 404 page by default" do
     get :show_page, :url => "/foo"
     response.should be_missing
     assigns[:page].should == pages(:file_not_found)
@@ -101,9 +101,22 @@ describe SiteController, "when custom 404 pages are defined" do
     assigns[:page].should == pages(:file_not_found)
   end
   
-  it "should use a custom 404 page defined under a parent page" do
+  it "should use the first published custom 404 page defined under a parent page" do
     get :show_page, :url => "/gallery/draft"
     response.should be_missing
     assigns[:page].should == pages(:no_picture)
   end
+  
+  it "should not find hidden draft pages in live mode" do
+    get :show_page, :url => "/drafts/missing"
+    response.should be_missing
+    assigns[:page].should_not == pages(:lonely_draft_file_not_found)
+  end
+
+  it "should find hidden draft pages in dev mode" do
+    request.host = 'dev.mysite.com'
+    get :show_page, :url => "/drafts/missing"
+    response.should be_missing
+    assigns[:page].should == pages(:lonely_draft_file_not_found)
+  end
 end

data/spec/lib/login_system_spec.rb

@@ -7,56 +7,21 @@ class StubController < ActionController::Base
   
   def method_missing(method, *args, &block)
     if (args.size == 0) and not block_given?
-      render :text => 'just a test'
+      render :text => 'just a test' unless @performed_render || @performed_redirect
     else
       super
     end
   end
 end
 
-class LoginRequiredController < StubController
-end
-
-class NoLoginRequiredController < StubController
-  no_login_required
-end
-
-class NoLoginRequiredChildController < NoLoginRequiredController
-end
-
-class LoginRequiredGrandChildController < NoLoginRequiredChildController
-  login_required
-end
-
-class LoginRequiredGreatGrandChildController < LoginRequiredGrandChildController
-end
-
-describe StubController do
-  it "should add self to controllers_where_no_login_required" do
-    StubController.controllers_where_no_login_required.should include(NoLoginRequiredController)
-  end
-  
-  it "should inherit no_login_required" do
-    StubController.controllers_where_no_login_required.should include(NoLoginRequiredChildController)
-  end
-  
-  it "should override parent with login_required" do
-    StubController.controllers_where_no_login_required.should_not include(LoginRequiredGrandChildController)
-  end
-  
-  it "should inherit login_required" do
-    StubController.controllers_where_no_login_required.should_not include(LoginRequiredGreatGrandChildController)
-  end
-end
-
-describe NoLoginRequiredController, :type => :controller do
+describe NoLoginRequiredController = StubController.subclass('NoLoginRequiredController') { no_login_required }, :type => :controller do
   it "should not require authentication" do
     get :index
     response.should be_success
   end
 end
 
-describe LoginRequiredController, :type => :controller do
+describe LoginRequiredController = StubController.subclass('LoginRequiredController') { }, :type => :controller do
   scenario :users
 
   it "should authenticate with user in session" do
@@ -71,16 +36,99 @@ describe LoginRequiredController, :type => :controller do
   end
   
   it "should store location" do
+    session[:return_to] = nil
     get 'protected_action'
-    session[:return_to].should match(/login_required\/protected_action/)
+    session[:return_to].should match(%r{protected_action})
   end
 end
 
-class OnlyAllowAccessToWhenController < LoginRequiredController
-  only_allow_access_to :edit, :new, :when => [:admin, :developer], :denied_url => { :action => :test }, :denied_message => 'Fun.'
+describe StubController, :type => :controller do
+  it "should add self to controllers_where_no_login_required" do
+    StubController.controllers_where_no_login_required.should include(NoLoginRequiredController)
+  end
+
+  describe ".authenticate" do
+    it "should attempt to login from cookie" do
+      controller.should_receive(:login_from_cookie)
+      get :action
+    end
+  end
+
+  describe ".login_from_cookie" do
+
+    before do
+      Radiant::Config.stub!(:[]).with('session_timeout').and_return(2.weeks)
+    end
+
+    it "should not login user if no cookie found" do
+      controller.should_not_receive(:current_user=)
+      get :index
+    end
+
+    describe "with session_token" do
+      scenario :users
+
+      before do
+        @user = users(:admin)
+        User.should_receive(:find_by_session_token).and_return(@user)
+        @cookies = { :session_token => 12345 }
+        controller.stub!(:cookies).and_return(@cookies)
+      end
+
+      after do
+        controller.send :login_from_cookie
+      end
+
+      it "should log in user" do
+        controller.should_receive(:current_user=).with(@user).and_return {
+          # can't mock current_user before current_user= is
+          # called, else the method doesn't run
+          controller.stub!(:current_user).and_return(@user)
+        }
+      end
+
+      it "should remember user" do
+        @user.should_receive(:remember_me)
+      end
+
+      it "should update cookie" do
+        @cookies.should_receive(:[]=) do |name,content|
+          name.should eql(:session_token)
+          content[:value].should eql(@user.session_token)
+          content[:expires].should be_close(2.weeks.from_now.utc, 1.minute) # sometimes specs are slow
+        end
+      end
+
+    end
+  end
+end
+
+describe NoLoginRequiredChildController = NoLoginRequiredController.subclass('NoLoginRequiredChildController') { }, :type => :controller do
+  it "should inherit no_login_required" do
+    StubController.controllers_where_no_login_required.should include(NoLoginRequiredChildController)
+  end
+end
+
+describe LoginRequiredGrandChildController = NoLoginRequiredChildController.subclass('LoginRequiredGrandChildController') {
+    login_required
+  }, :type => :controller do
+    it "should override parent with login_required" do
+      StubController.controllers_where_no_login_required.should_not include(LoginRequiredGrandChildController)
+    end
+end
+
+describe LoginRequiredGreatGrandChildController = LoginRequiredGrandChildController.subclass('LoginRequiredGreatGrandChildController') { }, :type => :controller do
+  it "should inherit login_required" do
+    StubController.controllers_where_no_login_required.should_not include(LoginRequiredGreatGrandChildController)
+  end
 end
 
-describe OnlyAllowAccessToWhenController, :type => :controller do
+describe LoginRequiredController.subclass('OnlyAllowAccessToWhenController') {
+  only_allow_access_to :edit, :new, 
+                       :when => [:admin, :developer], 
+                       :denied_url => { :action => :test }, 
+                       :denied_message => 'Fun.'
+  }, :type => :controller do
   scenario :users
   
   it "should only allow access when user in roles" do
@@ -103,11 +151,12 @@ describe OnlyAllowAccessToWhenController, :type => :controller do
   end
 end
 
-class OnlyAllowAccessToWhenDefaultsController < LoginRequiredController
-  only_allow_access_to :edit, :when => :admin, :denied_url => { :action => :test }, :denied_message => 'Fun.'
-end
-
-describe OnlyAllowAccessToWhenDefaultsController, :type => :controller do
+describe LoginRequiredController.subclass('OnlyAllowAccessToWhenDefaultsController') {
+    only_allow_access_to :edit, 
+                         :when => :admin, 
+                         :denied_url => { :action => :test }, 
+                         :denied_message => 'Fun.'
+  }, :type => :controller do
   scenario :users
   
   it "should not allow access when user not in default roles" do
@@ -118,30 +167,27 @@ describe OnlyAllowAccessToWhenDefaultsController, :type => :controller do
   end
 end
 
-class OnlyAllowAccessToIfController < LoginRequiredController
-  attr_writer :condition
-  
-  def condition?
-    @condition ||= false
-  end
-  
-  only_allow_access_to :edit, :if => :condition?, :denied_url => { :action => :test }, :denied_message => 'Fun.'
-end
-
-describe OnlyAllowAccessToIfController, :type => :controller do
+describe LoginRequiredController.subclass('OnlyAllowAccessToIfController') {
+    attr_writer :condition
+    define_method(:condition?, proc { @condition ||= false })
+    only_allow_access_to :edit, :if => :condition?, 
+                         :denied_url => { :action => :test }, 
+                         :denied_message => 'Fun.'
+  }, :type => :controller do
   scenario :users
-
+  
   it "should allow access if condition is true" do
     controller.condition = true
     login_as :existing
     get :edit
     response.should be_success
   end
-  
+
   it "should not allow access if condition is false" do
     controller.condition = false
     login_as :existing
     get :edit
     response.should redirect_to(:action => :test)
   end
+
 end