radiant 0.6.6 → 0.6.7

data/lib/radiant/admin_ui/region_partials.rb

@@ -0,0 +1,18 @@
+class Radiant::AdminUI::RegionPartials
+  def initialize(template)
+    @partials = Hash.new {|h,k| h[k] = "<strong>`#{k}' default partial not found!</strong>" }
+    @template = template
+  end
+  
+  def [](key)
+    @partials[key.to_s]
+  end
+  
+  def method_missing(method, *args, &block)
+    if block_given?
+      @partials[method.to_s] = @template.capture(&block)
+    else
+      @partials[method.to_s]
+    end
+  end
+end

data/lib/radiant/admin_ui/region_set.rb

@@ -0,0 +1,35 @@
+class Radiant::AdminUI::RegionSet
+
+  def initialize
+    @regions = Hash.new do |h,k|
+      h[k] = []
+    end
+    yield self if block_given?
+  end
+  
+  def [](region)
+    @regions[region.to_sym]
+  end
+  
+  def add(region=nil, partial=nil, options={})
+    raise ArgumentError, "You must specify a region and a partial" unless region and partial
+    if options[:before]
+      index = @regions[region].empty? ? 0 : (@regions[region].index(options[:before]) || @regions[region].size)
+      self[region].insert(index, partial)
+    elsif options[:after]
+      index = @regions[region].empty? ? 0 : (@regions[region].index(options[:after]) || @regions[region].size - 1)
+      self[region].insert(index + 1, partial)
+    else
+      self[region] << partial
+    end
+  end
+  
+  def method_missing(method, *args, &block)
+    if args.empty?
+      self[method]
+    else
+      super
+    end
+  end
+  
+end

data/lib/tasks/extensions.rake

@@ -69,6 +69,39 @@ namespace :spec do
   end
 end
 
+namespace :radiant do
+  namespace :extensions do
+    desc "Runs update asset task for all extensions"
+    task :update_all => :environment do
+      extension_names = Radiant::ExtensionLoader.instance.extensions.map { |f| f.to_s.underscore.sub(/_extension$/, '') }
+      extension_update_tasks = extension_names.map { |n| "radiant:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
+      extension_update_tasks.each {|t| Rake::Task[t].invoke }
+    end
+  end
+end
+
+namespace :radiant do
+  namespace :extensions do
+    desc "Runs update asset task for all extensions"
+    task :update_all => :environment do
+      extension_names = Radiant::ExtensionLoader.instance.extensions.map { |f| f.to_s.underscore.sub(/_extension$/, '') }
+      extension_update_tasks = extension_names.map { |n| "radiant:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
+      extension_update_tasks.each {|t| Rake::Task[t].invoke }
+    end
+  end
+end
+
+namespace :radiant do
+  namespace :extensions do
+    desc "Runs update asset task for all extensions"
+    task :update_all => :environment do
+      extension_names = Radiant::ExtensionLoader.instance.extensions.map { |f| f.to_s.underscore.sub(/_extension$/, '') }
+      extension_update_tasks = extension_names.map { |n| "radiant:extensions:#{n}:update" }.select { |t| Rake::Task.task_defined?(t) }
+      extension_update_tasks.each {|t| Rake::Task[t].invoke }
+    end
+  end
+end
+
 # Load any custom rakefiles from extensions
 [RAILS_ROOT, RADIANT_ROOT].uniq.each do |root|
   Dir[root + '/vendor/extensions/*/lib/tasks/*.rake'].sort.each { |ext| load ext }

data/public/javascripts/admin/admin.js

@@ -1,6 +1,12 @@
 document.observe('dom:loaded', function() {
-  when('site-map', function(table) { new SiteMap(table) });
-
+  
+  when('table.index', function(table){
+    if(table.identify() == 'site-map')
+      new SiteMap(table);
+    else
+      new RuledTable(table);
+  });
+  
   when('page_title', function(title) {
     var slug = $('page_slug'),
         breadcrumb = $('page_breadcrumb'),

data/public/javascripts/admin/sitemap.js

@@ -117,7 +117,8 @@ var SiteMap = Class.create(RuledTable, {
       {
         insertion: "after",
         onLoading:  function() { spinner.show(); this.updating = true  }.bind(this),
-        onComplete: function() { spinner.fade(); this.updating = false }.bind(this)
+        onComplete: function() { spinner.fade(); this.updating = false }.bind(this),
+        method: 'get'
       }
     );
   },

data/public/stylesheets/admin/main.css

@@ -80,6 +80,8 @@ table {
   padding-left: .9em;
   padding-right: .9em;
   text-decoration: none;
+  outline: none;
+  -moz-outline: none;
 }
 #navigation a:hover, #navigation a:visited:hover {
   text-decoration: underline;
@@ -445,6 +447,8 @@ h1 {
   padding-bottom: 4px;
   text-decoration: none;
   text-transform: titlecase;
+  outline: none;
+  -moz-outline: none;
 }
 #content #tabs .tab.here {
   background-color: white;

data/spec/controllers/admin/abstract_model_controller_spec.rb

@@ -9,6 +9,8 @@ class TestModelController < Admin::AbstractModelController
   def default_template_name(default_action_name = action_name)
     "#{Admin::LayoutController.controller_path}/#{default_action_name}"
   end
+  
+  before_filter {|c| c.send(:instance_variable_set, "@controller_name", 'layout')}
 end
 
 #

data/spec/controllers/admin/page_controller_spec.rb

@@ -95,7 +95,7 @@ describe Admin::PageController do
     page.parts.size.should == 0
 
     Page.find_by_title("New Page").should_not be_nil
-    @cache.expired_path.should == '/new-page/'
+    @cache.should be_cleared
   end
 
   it "should show errors when you try and create a new page with invalid data" do
@@ -165,7 +165,7 @@ describe Admin::PageController do
     response.should be_redirect
     page = pages(:home)
     page.title.should == "Updated Home Page"
-    @cache.expired_path.should == '/'
+    @cache.should be_cleared
   end
 
   it "should re-render the form when the page fails to save" do
@@ -175,15 +175,6 @@ describe Admin::PageController do
     assigns[:page].should == pages(:home)
   end
 
-  it "should expire the cache correctly when you change a page's slug" do
-    @cache = @controller.cache = FakeResponseCache.new
-    post :edit, :id => page_id(:first), :page => { :slug => 'monkey' }
-    response.should be_redirect
-    page = pages(:first)
-    page.slug.should == 'monkey'
-    @cache.expired_path.should == '/first/'
-  end
-
   it "should allow you to save changes to a page and its parts" do
     create_page("New Page") do
       create_page_part('test-part-1')
@@ -222,7 +213,7 @@ describe Admin::PageController do
     # but must be rendered to page
     response.should have_tag('textarea', 'changed-1')
   end
-
+  
   it "should prompt you when deleting a page" do
     page = pages(:first)
     get :remove, :id => page.id
@@ -248,22 +239,6 @@ describe Admin::PageController do
     Page.find_by_id(page.id).should be_nil
   end
 
-  it "should prompt you when clearing the page cache" do
-    @cache = @controller.cache = FakeResponseCache.new
-    get :clear_cache
-    response.should be_success
-    @response.body.should match(/Do.*?not.*?access/i)
-    @cache.should_not be_cleared
-  end
-
-  it "should allow you to clear the page cache" do
-    @cache = @controller.cache = FakeResponseCache.new
-    post :clear_cache
-    response.should redirect_to(page_index_url)
-    flash[:notice].should match(/cache.*clear/i)
-    @cache.should be_cleared
-  end
-
   it "should use the _part template when adding a part with AJAX" do
     xml_http_request :get, :add_part
     response.should be_success

data/spec/controllers/admin/user_controller_spec.rb

@@ -63,7 +63,7 @@ describe Admin::UserController do
     login_as :non_admin
     post :preferences, { :user => { :password => 'funtimes', :password_confirmation => 'funtimes' } }
     user = users(:non_admin)
-    user.password.should == User.sha1('funtimes')
+    user.password.should == user.sha1('funtimes')
     
     rails_log.should_not match(/"password"=>"funtimes"/)
     rails_log.should_not match(/"password_confirmation"=>"funtimes"/)

data/spec/controllers/admin/welcome_controller_spec.rb

@@ -34,4 +34,30 @@ describe Admin::WelcomeController do
     response.should be_redirect
     response.should redirect_to(login_url)
   end
+
+  describe "with a logged-in user" do
+    before do
+      login_as :admin
+    end
+
+    it "should not show /login again" do
+      get :login
+      response.should redirect_to(welcome_url)
+    end
+
+    describe "and a stored location" do
+      before do
+        session[:return_to] = '/stored/path'
+        post :login, :user => {:login => "admin", :password => "password"}
+      end
+
+      it "should redirect" do
+        response.should redirect_to('/stored/path')
+      end
+
+      it "should clear session[:return_to]" do
+        session[:return_to].should be_nil
+      end
+    end
+  end
 end

data/spec/helpers/admin/page_helper_spec.rb

@@ -38,4 +38,8 @@ describe Admin::PageHelper do
   it "should find the homepage" do
     homepage.should == pages(:home)
   end
+  
+  it "should render javascript for the page editing form" do
+    self.should respond_to(:page_edit_javascripts)
+  end
 end

data/spec/helpers/admin/regions_helper_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + "/../../spec_helper"
+require 'ostruct'
+
+describe Admin::RegionsHelper do
+  before :each do
+    @controller = mock('controller')
+    @controller.stub!(:controller_name).and_return('page')
+    @first_render = "admin/page/edit"
+    @admin = Radiant::AdminUI.instance
+    stub!(:admin).and_return(@admin)
+    @region_set_mock = Radiant::AdminUI::RegionSet.new
+    @admin.stub!(:page).and_return(OpenStruct.new(:edit => @region_set_mock))
+  end
+  
+  it "should initialize relevant region variables" do
+    lazy_initialize_region_set
+    @controller_name.should == 'page'
+    @template_name.should == 'edit'
+    @region_set.should === @region_set_mock
+  end
+
+  describe "rendering a region" do
+    before :each do
+      @region_set_mock.add :main, "test"
+      @template = mock('template')
+      @template.stub!(:capture).and_return("foo")
+      lazy_initialize_region_set
+    end
+    
+    it "should render a region with no default partials" do
+      should_receive(:render).with(:partial => "test").and_return("foo")
+      render_region(:main).should == "foo"
+    end
+    
+    it "should capture the passed block, yielding the RegionPartials object and concatenating" do
+      should_receive(:render).and_raise(::ActionView::ActionViewError)
+      should_receive(:concat).with("foo", anything)
+      @template.should_receive(:capture).and_return("foo")
+      render_region(:main) do |main|
+        main.should be_kind_of(Radiant::AdminUI::RegionPartials)
+        main.test do
+          "foo"
+        end
+      end
+    end
+  end
+end

data/spec/helpers/admin/user_helper_spec.rb

@@ -1,4 +1,11 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
 
 describe Admin::UserHelper do
+  scenario :users
+  
+  it "should render a string containing the user's roles" do
+    roles(users(:admin)).should == "Administrator"
+    roles(users(:developer)).should == "Developer"
+    roles(users(:existing)).should == ''
+  end
 end

data/spec/helpers/application_helper_spec.rb

@@ -137,9 +137,9 @@ describe ApplicationHelper do
   end
   
   it "should determine whether a meta area item should be visible" do
-    meta_visible(:meta_more).should be_nil
-    meta_visible(:meta_less).should == ' style="display: none"'
-    meta_visible(:meta).should == ' style="display: none"'
+    meta_visible(:meta_more).should be_empty
+    meta_visible(:meta_less).should == {:style => "display:none"} 
+    meta_visible(:meta).should == {:style => "display:none"} 
   end
   
   it "should not have meta errors" do
@@ -163,4 +163,8 @@ describe ApplicationHelper do
   it "should provide the admin object" do
     admin.should == Radiant::AdminUI.instance
   end
+  
+  it "should include the regions helper" do
+    ApplicationHelper.included_modules.should include(Admin::RegionsHelper)
+  end
 end

data/spec/lib/login_system_spec.rb

@@ -69,6 +69,11 @@ describe LoginRequiredController, :type => :controller do
     get :index
     response.should redirect_to(login_url)
   end
+  
+  it "should store location" do
+    get 'protected_action'
+    session[:return_to].should match(/login_required\/protected_action/)
+  end
 end
 
 class OnlyAllowAccessToWhenController < LoginRequiredController

data/spec/lib/radiant/admin_ui/region_partials_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + "/../../../spec_helper"
+
+class TemplateStub
+  attr_accessor :block
+  def capture(&block)
+    @block = block
+  end
+end
+
+describe Radiant::AdminUI::RegionPartials do
+  before :each do
+    @template = TemplateStub.new
+    @rp = Radiant::AdminUI::RegionPartials.new(@template)
+  end
+  
+  it "should return a string when the specified partial does not exist" do
+    @rp['foo'].should == "<strong>`foo' default partial not found!</strong>"
+  end
+  
+  it "should expose partials via bracket accessor" do
+    block = lambda { "Hello World!" }
+    @rp.main(&block)
+    @rp['main'].should === block
+  end
+  
+  it "should capture a block when passed" do
+    @rp.edit_extended_metadata do
+      "Hello, World!"
+    end
+    
+    @template.block.should be_kind_of(Proc)
+    @template.block.should === @rp.edit_extended_metadata
+    @template.block.call.should == "Hello, World!"
+  end
+end

data/spec/lib/radiant/admin_ui/region_set_spec.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + "/../../../spec_helper"
+
+describe Radiant::AdminUI::RegionSet do
+  before :each do
+    @region_set = Radiant::AdminUI::RegionSet.new
+  end
+
+  it "should create empty regions on first access" do
+    @region_set["new_region"].should == []
+  end
+
+  it "should use indifferent access on regions" do
+    @region_set["new_region"].should === @region_set[:new_region]
+  end
+
+  it "should access regions as methods" do
+    @region_set.new_region.should === @region_set["new_region"]
+  end
+
+  it "should yield itself to a passed block when initializing" do
+    @set = Radiant::AdminUI::RegionSet.new do |s|
+      @yielded = s
+    end
+    @set.should === @yielded
+  end
+
+  describe "adding partials" do
+    before :each do
+      @region_set["main"] << "one"
+    end
+
+    it "should add to the end of a region by default" do
+      @region_set.add :main, "two"
+      @region_set.main.should == ["one", "two"]
+    end
+
+    it "should add a partial before a specified partial" do
+      @region_set.add :main, "two"
+      @region_set.add :main, "three", :before => "two"
+      @region_set.main.should == ["one", "three", "two"]
+    end
+
+    it "should add a partial after a specified partial" do
+      @region_set.add :main, "two"
+      @region_set.add :main, "three", :after => "one"
+      @region_set.main.should == ["one", "three", "two"]
+    end
+
+    it "should add a partial at the end if the before partial is not found" do
+      @region_set.add :main, "two"
+      @region_set.add :main, "three", :before => "foo"
+      @region_set.main.should == ["one", "two", "three"]
+    end
+
+    it "should add a partial at the end if the after partial is not found" do
+      @region_set.add :main, "two"
+      @region_set.add :main, "three", :after => "foo"
+      @region_set.main.should == ["one", "two", "three"]
+    end
+  end
+end