radiant 0.9.0.rc2 → 0.9.1

data/public/stylesheets/sass/admin/partials/{_depreciated.sass → _deprecated.sass}

@@ -1,4 +1,4 @@
-// The styles here will be depreciated in a future version of Radiant, but
+// The styles here will be deprecated in a future version of Radiant, but
 // will be maintained here for a time so that older extensions continue to
 // look reasonable.
 

data/public/stylesheets/sass/admin/partials/_popup.sass

@@ -69,7 +69,7 @@ div.popup
       border: 1px solid #ddd
       color: #666
       font-family: Monaco, "Courier New", Courier, monospace
-      overflow: hidden
+      overflow: auto
       padding: 10px
     h4
       color: green

data/public/stylesheets/sass/admin/partials/_validations.sass

@@ -0,0 +1,21 @@
+#content form p span.error-with-field
+  input
+    :border
+      :color #c00
+      :width 1px
+      :style solid
+  span.error
+    :line-height 1.4
+    :background-color #c00
+    :color white
+    :padding 4px
+    :margin 0 0 0 6px
+    :background-color #c00
+    :cursor pointer
+    +round-corners
+    +box-shadow
+    a.closer
+      :margin-left 10px
+      :color #fcc
+      :text-decoration none
+  

data/spec/controllers/admin/paginated_controller_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + "/../../spec_helper"
+
+describe Admin::SnippetsController do
+  dataset :users, :snippets
+
+  it "should be paginated" do
+    Admin::SnippetsController.paginated.should be_true
+    controller.paginated?.should be_true
+  end
+  
+  it "should have pagination defaults" do
+    controller.pagination_parameters.should == {:page => 1, :per_page => 50}
+    controller.will_paginate_options.should == {:param_name => :p}
+  end
+
+  it "should override defaults with pagination settings from config" do
+    Radiant::Config['admin.pagination.per_page'] = 23
+    controller.pagination_parameters.should == {:page => 1, :per_page => 23}
+  end
+  
+  it "should override configuration with pagination settings from paginate_models" do
+    Admin::SnippetsController.send :paginate_models, {:per_page => 5, :inner_window => 12}
+    controller.pagination_parameters.should == {:page => 1, :per_page => 5}
+    controller.will_paginate_options.should == {:inner_window => 12, :param_name => :p}
+  end
+end

data/spec/controllers/admin/preferences_controller_spec.rb

@@ -40,4 +40,18 @@ describe Admin::PreferencesController do
     login_as :non_admin
     put :update, { :user => { :password => 'funtimes', :password_confirmation => 'funtimes' } }
   end
+  
+  describe "@body_classes" do
+    before do
+      login_as(:non_admin)
+    end
+    it "should return 'reversed' when the action_name is 'edit'" do
+      get :edit
+      assigns[:body_classes].should == ['reversed']
+    end
+    it "should return 'reversed' when the action_name is 'show'" do
+      get :show
+      assigns[:body_classes].should == ['reversed']
+    end
+  end
 end

data/spec/controllers/application_controller_spec.rb

@@ -38,17 +38,7 @@ describe ApplicationController do
     controller.send :set_javascripts_and_stylesheets
     controller.include_javascript('test').should include('test')
   end
-  
-  it "should set the pagination parameters" do
-    ApplicationController.filter_chain.find(:set_pagination_parameters).should_not be_nil
-    param_name = WillPaginate::ViewHelpers.pagination_options[:param_name].to_sym
-    controller.stub!(:params).and_return({param_name => 3, :per_page => 100, :next_link => 'ha'})
-    controller.send :set_pagination_parameters
-    controller.pagination_parameters[:page].should == 3
-    controller.pagination_parameters[:per_page].should == 100
-    controller.pagination_parameters[:next_link].should be_nil
-  end
-  
+    
   describe 'self.template_name' do
     it "should return 'index' when the controller action_name is 'index'" do
       controller.stub!(:action_name).and_return('index')

data/spec/controllers/site_controller_spec.rb

@@ -170,4 +170,13 @@ describe SiteController do
       response.headers['Cache-Control'].should =~ /max-age=600/
     end
   end
+  
+  describe "pagination" do
+    it "should pass through pagination parameters to the page" do
+      @page = pages(:home)
+      Page.stub!(:find_by_url).and_return(@page)
+      @page.should_receive(:pagination_parameters=).with({:page => '3', :per_page => '12'})
+      get :show_page, :url => '/', :page => '3', :per_page => '12'
+    end
+  end
 end

data/spec/datasets/users_dataset.rb

@@ -4,7 +4,7 @@ class UsersDataset < Dataset::Base
     create_user "Existing"
     create_user "Another"
     create_user "Admin", :admin => true
-    create_user "Designer", :designer => true
+    create_user "Designer", :designer => true, :email => ''
     create_user "Non_admin", :admin => false
   end
   

data/spec/generators/instance_generator_spec.rb

@@ -81,7 +81,7 @@ share_as :AllInstanceGenerators do
   end
 
   # Check for initializers
-  %w(pagination.rb haml.rb).each do |file|
+  %w(haml.rb).each do |file|
     it "should have a #{file} initializer" do
       'config/initializers'.should have_generated_file(file)
     end

data/spec/helpers/application_helper_spec.rb

@@ -217,4 +217,42 @@ describe ApplicationHelper do
       helper.stylesheet_and_javascript_overrides.should_not have_tag('script[src*=?][type=?]','/javascripts/admin/overrides.js', 'text/javascript')
     end
   end
+  
+  # describe "pagination" do
+  #   before do
+  #     @collection = WillPaginate::Collection.new(1, 10, 100)
+  #     request = mock("request")
+  #     helper.stub!(:request).and_return(request)
+  #     helper.stub!(:will_paginate_options).and_return({})
+  #     helper.stub!(:will_paginate).and_return("pagination of some kind")
+  #     helper.stub!(:link_to).and_return("link")
+  #   end
+  #   
+  #   it "should render pagination controls for a supplied list" do
+  #     helper.pagination_for(@collection).should have_tag('div.pagination').with_tag('span.current', :text => '1')
+  #   end
+  #   
+  #   it "should include a depagination link by default" do
+  #     helper.pagination_for(@collection).should have_tag('div.depaginate')
+  #   end
+  #   
+  #   it "should omit the depagination link when :depaginate is false" do
+  #     helper.pagination_for(@collection, :depaginate => false).should_not have_tag('div.depaginate')
+  #   end
+  #   
+  #   it "should omit the depagination link when the :max_list_length is exceeded" do
+  #     helper.pagination_for(@collection, :depaginate => true, :max_list_length => 5).should_not have_tag('div.depaginate')
+  #   end
+  # 
+  #   it "should use the max_list_length config item when no other value is specified" do
+  #     Radiant::Config['pagination.max_list_length'] = 50
+  #     helper.pagination_for(@collection).should_not have_tag('div.depaginate')
+  #   end
+  # 
+  #   it "should disregard list length when max_list_length is false" do
+  #     Radiant::Config['pagination.max_list_length'] = 50
+  #     helper.pagination_for(@collection, :max_list_length => false).should_not have_tag('div.depaginate')
+  #   end
+  #   
+  # end
 end

data/spec/lib/radiant/extension/script_spec.rb

@@ -88,6 +88,10 @@ describe "Radiant::Extension::Script::Install" do
     @install = Radiant::Extension::Script::Install.new ['page_attachments']
   end
 
+  it "should fail if the extension is not found" do
+    lambda { Radiant::Extension::Script::Install.new ['non_existent_extension'] }.should raise_error
+  end
+
   it "should fail if an extension name is not given" do
     lambda { Radiant::Extension::Script::Install.new []}.should raise_error
   end
@@ -394,7 +398,7 @@ describe "Registry::Gem" do
     File.should_receive(:open).with(/example-1.0.0\.gem/, 'w').and_yield(@file)
     @gem.should_receive(:open).and_return(StringIO.new('test'))
     @file.should_receive(:write).with('test')
-    @gem.should_receive(:`).with("gem install example-1.0.0.gem")
+    @gem.should_receive(:`).with("gem install example")
     @gem.download
   end
 

data/spec/lib/radiant/initializer_spec.rb

@@ -94,6 +94,13 @@ describe Radiant::Configuration do
       @configuration.all_available_extensions.should include(:gem_ext)
     end
   end
+
+  describe "#gem" do
+    it "should add an extension gem to extensions array" do
+      @configuration.gem 'radiant-gem_ext-extension'
+      @configuration.extensions.should include(:gem_ext)
+    end
+  end
 end
 
 describe Radiant::Initializer do

data/spec/lib/radiant_spec.rb

@@ -25,6 +25,6 @@ describe Radiant::Version do
   
   it "should join the revisions into the version number" do
     Radiant::Version.to_s.should be_kind_of(String)
-    Radiant::Version.to_s.should == [Radiant::Version::Major, Radiant::Version::Minor, Radiant::Version::Tiny, Radiant::Version::Patch].join(".") 
+    Radiant::Version.to_s.should == [Radiant::Version::Major, Radiant::Version::Minor, Radiant::Version::Tiny, Radiant::Version::Patch].delete_if{|v| v.nil?}.join(".") 
   end
 end

data/spec/lib/task_support_spec.rb

@@ -70,4 +70,18 @@ describe TaskSupport do
       js_files.each { |f| f.should =~ /^[^\/]+.js$/ }
     end
   end
+
+  describe "self.cache_admin_js" do
+    before do
+      @js_files = [ 'a.js','b.js' ]
+      TaskSupport.stub!(:find_admin_js).and_return(@js_files)
+      TaskSupport.stub!(:cache_files)
+    end
+
+    it "should cache all admin JS files as 'all.js'" do
+      TaskSupport.should_receive(:cache_files).with(
+        "#{Rails.root}/public/javascripts/admin", @js_files, 'all.js')
+      TaskSupport.cache_admin_js
+    end
+  end
 end

data/spec/matchers/render_matcher.rb

@@ -17,6 +17,7 @@ module Spec
             when @expected_error_message: false
             when @expected: @actual == @expected
             when @matching: @actual =~ @matching
+            when @not_matching: @actual !~ @not_matching
             else true
           end
         rescue => @actual_error
@@ -29,7 +30,14 @@ module Spec
         end
         
         def failure_message
-          action = @expected.nil? ? "render and match #{@matching.inspect}" : "render as #{@expected.inspect}"
+          action = case 
+          when @expected
+            "render as #{@expected.inspect}"
+          when @not_matching          
+            "render but not match #{@not_matching.inspect}"
+          else
+            "render and match #{@matching.inspect}"
+          end
           unless @error_thrown
             unless @expected_error_message
               if @content
@@ -63,6 +71,11 @@ module Spec
           self
         end
         
+        def not_matching(regexp)
+          @not_matching = regexp
+          self
+        end
+        
         def with_error(message)
           @expected_error_message = message
           self

data/spec/models/layout_spec.rb

@@ -10,11 +10,11 @@ describe Layout do
   
   it 'should validate presence of' do
     assert_valid :name, 'Just a Test'
-    assert_invalid :name, 'required', nil, '', '  '
+    assert_invalid :name, 'this must not be blank', nil, '', '  '
   end
   
   it 'should validate uniqueness of' do
-    assert_invalid :name, 'name already in use', 'Main'
+    assert_invalid :name, 'this name is already in use', 'Main'
     assert_valid :name, 'Something Else'
   end
   
@@ -22,7 +22,7 @@ describe Layout do
     {
       :name => 100
     }.each do |field, max|
-      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
+      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end

data/spec/models/page_part_spec.rb

@@ -32,21 +32,21 @@ describe PagePart do
       :name => 100,
       :filter_id => 25
     }.each do |field, max|
-      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
+      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end
   
   it 'should validate presence of' do
     [:name].each do |field|
-      assert_invalid field, 'required', '', ' ', nil
+      assert_invalid field, 'this must not be blank', '', ' ', nil
     end
   end
   
   it 'should validate numericality of' do
     [:id, :page_id].each do |field|
       assert_valid field, '1', '2'
-      assert_invalid field, 'must be a number', 'abcd', '1,2', '1.3'
+      assert_invalid field, 'this must be a number', 'abcd', '1,2', '1.3'
     end
   end
 end

data/spec/models/page_spec.rb

@@ -34,34 +34,34 @@ describe Page, 'validations' do
       :slug => 100,
       :breadcrumb => 160
     }.each do |field, max|
-      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
+      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end
 
   it 'should validate presence of' do
     [:title, :slug, :breadcrumb].each do |field|
-      assert_invalid field, 'required', '', ' ', nil
+      assert_invalid field, 'this must not be blank', '', ' ', nil
     end
   end
 
   it 'should validate format of' do
     @page.parent = pages(:home)
     assert_valid :slug, 'abc', 'abcd-efg', 'abcd_efg', 'abc.html', '/', '123'
-    assert_invalid :slug, 'invalid format', 'abcd efg', ' abcd', 'abcd/efg'
+    assert_invalid :slug, 'this does not match the expected format', 'abcd efg', ' abcd', 'abcd/efg'
   end
 
   it 'should validate numericality of' do
-    assert_invalid :status_id, 'required', '', nil
+    assert_invalid :status_id, 'this must not be blank', '', nil
     [:id, :status_id, :parent_id].each do |field|
       assert_valid field, '1', '2'
-      assert_invalid field, 'must be a number', 'abcd', '1,2', '1.3'
+      assert_invalid field, 'this must be a number', 'abcd', '1,2', '1.3'
     end
   end
 
   it 'should validate uniqueness of' do
     @page.parent = pages(:parent)
-    assert_invalid :slug, 'slug already in use for child of parent', 'child', 'child-2', 'child-3'
+    assert_invalid :slug, 'this slug is already in use by a sibling of this page', 'child', 'child-2', 'child-3'
     assert_valid :slug, 'child-4'
   end
 
@@ -229,10 +229,9 @@ describe Page do
   it 'should be published status when published_at is in the past' do
     #current time 01-29-2010
     scheduled_time = '2010-1-1'
-    @page = Page.new(page_params(:status_id => '90', :published_at => scheduled_time))
+    @page = Page.new(page_params(:status_id => Status[:scheduled].id, :published_at => scheduled_time))
     @page.save
-    @page.status_id.should == 100
-
+    @page.status_id.should == Status[:published].id
   end
   
   it "should answer the page's url" do

data/spec/models/snippet_spec.rb

@@ -13,19 +13,19 @@ describe Snippet do
       :name => 100,
       :filter_id => 25
     }.each do |field, max|
-      assert_invalid field, ('%d-character limit' % max), 'x' * (max + 1)
+      assert_invalid field, ('this must not be longer than %d characters' % max), 'x' * (max + 1)
       assert_valid field, 'x' * max
     end
   end
   
   it 'should validate presence of' do
     [:name].each do |field|
-      assert_invalid field, 'required', '', ' ', nil
+      assert_invalid field, 'this must not be blank', '', ' ', nil
     end
   end
   
   it 'should validate uniqueness of' do
-    assert_invalid :name, 'name already in use', 'first', 'another', 'markdown'
+    assert_invalid :name, 'this name is already in use', 'first', 'another', 'markdown'
     assert_valid :name, 'just-a-test'
   end
   

data/spec/models/standard_tags_spec.rb

@@ -77,12 +77,31 @@ describe "Standard Tags" do
       page.should render('<r:children:each by="title"><r:slug /> </r:children:each>').as('a b c d e f g h i j ').on('dev.site.com')
     end
 
-    it 'should paginate results when "paginated" attribute is "true"' do
-      page.pagination_parameters = {:page => 1, :per_page => 10}
-      page.should render('<r:children:each paginated="true" per_page="10"><r:slug /> </r:children:each>').as('a b c d e f g h i j ')
-      page.should render('<r:children:each paginated="true" per_page="2"><r:slug /> </r:children:each>').matching(/div class="pagination"/)
+    describe 'with paginated="true"' do
+      it 'should limit correctly the result set' do
+        page.pagination_parameters = {:page => 1, :per_page => 10}
+        page.should render('<r:children:each paginated="true" per_page="10"><r:slug /> </r:children:each>').as('a b c d e f g h i j ')
+        page.should render('<r:children:each paginated="true" per_page="2"><r:slug /> </r:children:each>').not_matching(/a b c/)
+      end
+      it 'should display a pagination control block' do
+        page.pagination_parameters = {:page => 1, :per_page => 1}
+        page.should render('<r:children:each paginated="true"><r:slug /> </r:children:each>').matching(/div class="pagination"/)
+      end
+      it 'should link to the correct paginated page' do
+        page(:another)
+        page.pagination_parameters = {:page => 1, :per_page => 1}
+        page.should render('<r:find url="/assorted"><r:children:each paginated="true"><r:slug /> </r:children:each></r:find>').matching(%r{href="/another})
+      end
+      it 'should pass through selected will_paginate parameters' do
+        page(:assorted)
+        page.pagination_parameters = {:page => 5, :per_page => 1}
+        page.should render('<r:children:each paginated="true" separator="not that likely a choice"><r:slug /> </r:children:each>').matching(/not that likely a choice/)
+        page.should render('<r:children:each paginated="true" previous_label="before"><r:slug /> </r:children:each>').matching(/before/)
+        page.should render('<r:children:each paginated="true" next_label="after"><r:slug /> </r:children:each>').matching(/after/)
+        page.should render('<r:children:each paginated="true" inner_window="1" outer_window="0"><r:slug /> </r:children:each>').not_matching(/\?p=2/)
+      end
     end
-
+    
     it 'should error with invalid "limit" attribute' do
       message = "`limit' attribute of `each' tag must be a positive number between 1 and 4 digits"
       page.should render(page_children_each_tags(%{limit="a"})).with_error(message)
@@ -474,6 +493,51 @@ describe "Standard Tags" do
     end
   end
 
+  describe "<r:aggregate>" do
+    it "should raise an error when given no 'urls' attribute" do
+      pages(:home).should render('<r:aggregate></r:aggregate>').with_error("`urls' attribute required")
+    end
+    it "should expand its contents with a given 'urls' attribute formatted as '/url1; /url2;'" do
+      pages(:home).should render('<r:aggregate urls="/parent/child; /first;">true</r:aggregate>').as('true')
+    end
+  end
+  
+  describe "<r:aggregate:children>" do
+    it "should expand its contents" do
+      pages(:home).should render('<r:aggregate urls="/parent/child; /first;"><r:children>true</r:children></r:aggregate>').as('true') 
+    end
+  end
+  
+  describe "<r:aggregate:children:count>" do
+    it "should display the number of aggregated children" do
+      pages(:home).should render('<r:aggregate urls="/news; /assorted"><r:children:count /></r:aggregate>').as('14')
+    end
+  end
+  
+  describe "<r:aggregate:children:each>" do
+    it "should loop through each child from the given urls" do
+      pages(:home).should render('<r:aggregate urls="/parent; /news"><r:children:each><r:title/> </r:children:each></r:aggregate>').as('Article Article 2 Article 3 Article 4 Child Child 2 Child 3 ')
+    end
+    it "should sort the children by the given 'by' attribute" do
+      pages(:home).should render('<r:aggregate urls="/assorted; /news"><r:children:each by="slug"><r:slug /> </r:children:each></r:aggregate>').as('a article article-2 article-3 article-4 b c d e f g h i j ')
+    end
+    it "should order the children by the given 'order' attribute when used with 'by'" do
+      pages(:home).should render('<r:aggregate urls="/assorted; /news"><r:children:each by="slug" order="desc"><r:slug /> </r:children:each></r:aggregate>').as('j i h g f e d c b article-4 article-3 article-2 article a ')
+    end
+    it "should limit the number of results with the given 'limit' attribute" do
+      pages(:home).should render('<r:aggregate urls="/assorted; /news"><r:children:each by="slug" order="desc" limit="3"><r:slug /> </r:children:each></r:aggregate>').as('j i h ')
+    end
+  end
+  
+  describe "<r:aggregate:each>" do
+    it "should loop through each of the given aggregate urls" do
+      pages(:home).should render('<r:aggregate urls="/parent/child; /first; /assorted;"><r:each><r:title /> </r:each></r:aggregate>').as('Child First Assorted ')
+    end
+    it "should display it's contents in the scope of the individually aggregated page" do
+      pages(:home).should render('<r:aggregate urls="/parent; /news; /assorted;"><r:each><r:children:each><r:title /> </r:children:each></r:each></r:aggregate>').as('Child Child 2 Child 3 Article Article 2 Article 3 Article 4 a b c d e f g h i j ')
+    end
+  end
+
   describe "<r:author>" do
     it "should render the author of the current page" do
       page.should render('<r:author />').as('Admin')
@@ -484,6 +548,28 @@ describe "Standard Tags" do
     end
   end
 
+  describe "<r:gravatar>" do
+    it "should render the Gravatar URL of author of the current page" do
+      page.should render('<r:gravatar />').as('http://www.gravatar.com/avatar.php?gravatar_id=e64c7d89f26bd1972efa854d13d7dd61&rating=G&size=32')
+    end
+
+    it "should render the Gravatar URL of the name user" do
+      page.should render('<r:gravatar name="Admin" />').as('http://www.gravatar.com/avatar.php?gravatar_id=e64c7d89f26bd1972efa854d13d7dd61&rating=G&size=32')
+    end
+
+    it "should render the default avatar when the user has not set an email address" do
+      page.should render('<r:gravatar name="Designer" />').as('http://testhost.tld/images/admin/avatar_32x32.png')
+    end
+
+    it "should render the specified size" do
+      page.should render('<r:gravatar name="Designer" size="96px" />').as('http://testhost.tld/images/admin/avatar_96x96.png')
+    end
+
+    it "should render the specified rating" do
+      page.should render('<r:gravatar rating="X" />').as('http://www.gravatar.com/avatar.php?gravatar_id=e64c7d89f26bd1972efa854d13d7dd61&rating=X&size=32')
+    end
+  end
+
   describe "<r:date>" do
     before :each do
       page(:dated)
@@ -881,6 +967,10 @@ describe "Standard Tags" do
     it "should not render the contained block when not on the dev site" do
       page.should render('-<r:if_dev>dev</r:if_dev>-').as('--')
     end
+    
+    it "should not render the contained block when no request is present" do
+      page(:devtags).render_part('if_dev').should_not have_text('dev')
+    end
 
     describe "on an included page" do
       it "should render the contained block when on the dev site" do
@@ -902,6 +992,10 @@ describe "Standard Tags" do
       page.should render('-<r:unless_dev>not dev</r:unless_dev>-').as('-not dev-')
     end
 
+    it "should render the contained block when no request is present" do
+      page(:devtags).render_part('unless_dev').should have_text('not dev')
+    end
+
     describe "on an included page" do
       it "should not render the contained block when not on the dev site" do
         page.should render('-<r:find url="/devtags/"><r:content part="unless_dev" /></r:find>-').as('--').on('dev.site.com')