radiant 0.8.2 → 0.9.0.rc2

data/spec/matchers/render_form_errors_matcher.rb

@@ -25,7 +25,7 @@ module Spec
                     :attributes => {:name => field_name}
                   },
                   :child => {
-                    :tag => 'small',
+                    :tag => 'span',
                     :attributes => {:class => 'error'},
                     :content => error_message
                   }

data/spec/models/page_spec.rb

@@ -177,6 +177,8 @@ describe Page do
     end
   end
 
+  # invalid, as published_at is set when form is submitted
+
   it 'should set published_at when published' do
     @page = Page.new(page_params(:status_id => '1', :published_at => nil))
     @page.published_at.should be_nil
@@ -205,7 +207,34 @@ describe Page do
     @page.status = Status[:draft]
     @page.published?.should be_false
   end
+  
+  it 'should answer false when not published but scheduled' do
+    @page.status = Status[:scheduled]
+    @page.published?.should be_false
+  end
 
+  it 'should change its status to scheduled when publishing in the future' do
+    @page = Page.new(page_params(:status_id => '100', :published_at => '2020-1-1'))
+    @page.save
+    @page.status_id.should == 90    
+  end
+
+  it 'should change its status to draft when set to draft' do
+    @page = pages(:scheduled)
+    @page.status_id = Status[:draft].id
+    @page.save
+    @page.status_id.should == 1    
+  end
+  
+  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.save
+    @page.status_id.should == 100
+
+  end
+  
   it "should answer the page's url" do
     @page = pages(:parent)
     @page.url.should == '/parent/'
@@ -461,6 +490,13 @@ describe Page, "class" do
     end
   end
 
+  it "should expose default page parts" do
+    override = PagePart.new(:name => 'override')
+    Page.stub!(:default_page_parts).and_return([override])
+    @page = Page.new_with_defaults({})
+    @page.parts.should eql([override])
+  end
+
   it 'should allow you to get the class name of a descendant class with a string' do
     ["", nil, "Page"].each do |value|
       Page.descendant_class(value).should == Page

data/spec/models/radiant/config_spec.rb

@@ -38,13 +38,13 @@ describe Radiant::Config do
   
   it "should update the mtime on the cache file after a record is saved" do
     FileUtils.should_receive(:mkpath).with("#{Rails.root}/tmp").at_least(:once)
-    FileUtils.should_receive(:touch).with(Rails.cache.read('Radiant.cache_file'))
+    FileUtils.should_receive(:touch).with(Radiant::Config.cache_file)
     Radiant::Config['mtime'] = 'now'
   end
   
   it "should record the cache file mtime when the cache is initialized" do
     Radiant::Config.initialize_cache
-    Rails.cache.read('Radiant.cache_mtime').should == File.mtime(Rails.cache.fetch('Radiant.cache_file'))
+    Rails.cache.read('Radiant.cache_mtime').should == File.mtime(Radiant::Config.cache_file)
   end
   
   it "should create a cache file when initializing the cache" do

data/spec/models/standard_tags_spec.rb

@@ -63,7 +63,7 @@ describe "Standard Tags" do
     it 'should not list draft pages' 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 ')
     end
-    
+
     it 'should include draft pages with status="all"' do
       page.should render('<r:children:each status="all" by="slug"><r:slug /> </r:children:each>').as('a b c d draft e f g h i j ')
     end
@@ -72,6 +72,17 @@ describe "Standard Tags" do
       page.should render('<r:children:each by="slug"><r:slug /> </r:children:each>').as('a b c d draft e f g h i j ').on('dev.site.com')
     end
 
+    it 'should not list draft pages on dev.site.com when Radiant::Config["dev.host"] is set to something else' do
+      Radiant::Config['dev.host'] = 'preview.site.com'
+      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"/)
+    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)
@@ -197,7 +208,7 @@ describe "Standard Tags" do
     it 'should render the number of children of the current page' do
       page(:parent).should render('<r:children:count />').as('3')
     end
-    
+
     it "should accept the same scoping conditions as <r:children:each>" do
       page.should render('<r:children:count />').as('10')
       page.should render('<r:children:count status="all" />').as('11')
@@ -262,6 +273,14 @@ describe "Standard Tags" do
       page(:recursive_parts).should render('<r:content part="two"/>').with_error("Recursion error: already rendering the `two' part.")
     end
 
+    it "should allow repetition" do
+      page(:recursive_parts).should render('<r:content part="repeat"/>').as('xx')
+    end
+
+    it "should not prevent rendering a part more than once in sequence" do
+      page(:home).should render('<r:content /><r:content />').as('Hello world!Hello world!')
+    end
+
     describe "with inherit attribute" do
       it "missing or set to 'false' should render the current page's part" do
         page.should render('<r:content part="sidebar" />').as('')
@@ -307,7 +326,7 @@ describe "Standard Tags" do
   end
 
   describe "<r:if_content>" do
- 
+
     it "without 'part' attribute should render the contained block if the 'body' part exists" do
       page.should render('<r:if_content>true</r:if_content>').as('true')
     end
@@ -321,29 +340,40 @@ describe "Standard Tags" do
     end
 
     describe "with more than one part given (separated by comma)" do
-      
+
       it "should render the contained block only if all specified parts exist" do
         page(:home).should render('<r:if_content part="body, extended">true</r:if_content>').as('true')
       end
-    
+
       it "should not render the contained block if at least one of the specified parts does not exist" do
         page(:home).should render('<r:if_content part="body, madeup">true</r:if_content>').as('')
       end
-      
+
       describe "with inherit attribute set to 'true'" do
         it 'should render the contained block if the current or ancestor pages have the specified parts' do
           page(:guests).should render('<r:if_content part="favors, extended" inherit="true">true</r:if_content>').as('true')
         end
-      
+
         it 'should not render the contained block if the current or ancestor pages do not have all of the specified parts' do
           page(:guests).should render('<r:if_content part="favors, madeup" inherit="true">true</r:if_content>').as('')
         end
+        
+        describe "with find attribute set to 'any'" do
+          it 'should render the contained block if the current or ancestor pages have any of the specified parts' do
+            page(:guests).should render('<r:if_content part="favors, madeup" inherit="true" find="any">true</r:if_content>').as('true')
+          end
+          
+          it 'should still render the contained block if first of the specified parts has not been found' do
+            page(:guests).should render('<r:if_content part="madeup, favors" inherit="true" find="any">true</r:if_content>').as('true')
+          end
+        end
       end
+      
       describe "with inherit attribute set to 'false'" do
         it 'should render the contained block if the current page has the specified parts' do
           page(:guests).should render('<r:if_content part="favors, games" inherit="false">true</r:if_content>').as('')
         end
-      
+
         it 'should not render the contained block if the current or ancestor pages do not have all of the specified parts' do
           page(:guests).should render('<r:if_content part="favors, madeup" inherit="false">true</r:if_content>').as('')
         end
@@ -357,7 +387,7 @@ describe "Standard Tags" do
         it "should render the contained block if all of the specified parts exist" do
           page(:home).should render('<r:if_content part="body, sidebar" find="all">true</r:if_content>').as('true')
         end
-        
+
         it "should not render the contained block if all of the specified parts do not exist" do
           page.should render('<r:if_content part="asdf, madeup" find="all">true</r:if_content>').as('')
         end
@@ -370,7 +400,7 @@ describe "Standard Tags" do
       it 'should not render the contained block if the current or ancestor pages have the specified parts' do
         page(:guests).should render('<r:unless_content part="favors, extended" inherit="true">true</r:unless_content>').as('')
       end
-      
+
       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
@@ -378,8 +408,18 @@ describe "Standard Tags" do
       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
+      
+      describe "with find attribute set to 'any'" do
+        it 'should not render the contained block if the current or ancestor pages have any of the specified parts' do
+          page(:guests).should render('<r:unless_content part="favors, madeup" inherit="true" find="any">true</r:unless_content>').as('')
+        end
+        
+        it 'should still not render the contained block if first of the specified parts has not been found' do
+          page(:guests).should render('<r:unless_content part="madeup, favors" inherit="true" find="any">true</r:unless_content>').as('')
+        end
+      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
@@ -395,27 +435,27 @@ describe "Standard Tags" do
     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
-    
+
       it "should not render the contained block if all of the specified parts exist" do
         page(:home).should render('<r:unless_content part="body, extended">true</r:unless_content>').as('')
       end
-    
+
       it "should render the contained block if at least one of the specified parts exists" do
         page(:home).should render('<r:unless_content part="body, madeup">true</r:unless_content>').as('true')
       end
-      
+
       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" 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" 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(:home).should render('<r:unless_content part="body, sidebar" find="all">true</r:unless_content>').as('')
@@ -425,7 +465,7 @@ describe "Standard Tags" do
           page.should render('<r:unless_content part="body, madeup" find="all">true</r:unless_content>').as('true')
         end
       end
-      
+
       describe "with the 'find' attribute set to 'any'" do
         it "should not render the contained block if any of the specified parts exist" do
           page.should render('<r:unless_content part="body, madeup" find="any">true</r:unless_content>').as('')
@@ -548,7 +588,7 @@ describe "Standard Tags" do
       page.should render('<r:snippet name="yielding">inner</r:snippet>').
         as('Before...inner...and after')
     end
-    
+
     it "should do nothing with contents of double tag when snippet doesn't yield" do
       page.should render('<r:snippet name="first">content disappears!</r:snippet>').
         as('test')
@@ -558,12 +598,12 @@ describe "Standard Tags" do
       page.should render('<r:snippet name="div_wrap"><r:snippet name="yielding">Hello, World!</r:snippet></r:snippet>').
       as('<div>Before...Hello, World!...and after</div>')
     end
-    
+
     it "should render double-tag snippets called from within a snippet" do
       page.should render('<r:snippet name="nested_yields">the content</r:snippet>').
         as('<snippet name="div_wrap">above the content below</snippet>')
     end
-    
+
     it "should render contents each time yield is called" do
       page.should render('<r:snippet name="yielding_often">French</r:snippet>').
         as('French is Frencher than French')
@@ -577,7 +617,7 @@ 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
@@ -651,6 +691,36 @@ describe "Standard Tags" do
       expected = %{<strong><a href="/">Home: Boy</a></strong> | <a href="/archive/">Archives</a> | <a href="/documentation/">Docs</a>}
       page(:radius).should render(tags).as(expected)
     end
+
+    it 'should render text under <r:if_first> and <r:if_last> only on the first and last item, respectively' do
+      tags = %{<r:navigation urls="Home: / | Assorted: /assorted | Parent: /parent | Radius: /radius">
+                 <r:normal><r:if_first>(</r:if_first><a href="<r:url />"><r:title /></a><r:if_last>)</r:if_last></r:normal>
+                 <r:here><r:if_first>(</r:if_first><r:title /><r:if_last>)</r:if_last></r:here>
+                 <r:selected><r:if_first>(</r:if_first><strong><a href="<r:url />"><r:title /></a></strong><r:if_last>)</r:if_last></r:selected>
+               </r:navigation>}
+      expected = %{(<strong><a href=\"/\">Home</a></strong> <a href=\"/assorted\">Assorted</a> <a href=\"/parent\">Parent</a> Radius)}
+      page(:radius).should render(tags).as(expected)
+    end
+
+    it 'should render text under <r:unless_first> on every item but the first' do
+      tags = %{<r:navigation urls="Home: / | Assorted: /assorted | Parent: /parent | Radius: /radius">
+                 <r:normal><r:unless_first>&gt; </r:unless_first><a href="<r:url />"><r:title /></a></r:normal>
+                 <r:here><r:unless_first>&gt; </r:unless_first><r:title /></r:here>
+                 <r:selected><r:unless_first>&gt; </r:unless_first><strong><a href="<r:url />"><r:title /></a></strong></r:selected>
+               </r:navigation>}
+      expected = %{<strong><a href=\"/\">Home</a></strong> &gt; <a href=\"/assorted\">Assorted</a> &gt; <a href=\"/parent\">Parent</a> &gt; Radius}
+      page(:radius).should render(tags).as(expected)
+    end
+
+    it 'should render text under <r:unless_last> on every item but the last' do
+      tags = %{<r:navigation urls="Home: / | Assorted: /assorted | Parent: /parent | Radius: /radius">
+                 <r:normal><a href="<r:url />"><r:title /></a><r:unless_last> &gt;</r:unless_last></r:normal>
+                 <r:here><r:title /><r:unless_last> &gt;</r:unless_last></r:here>
+                 <r:selected><strong><a href="<r:url />"><r:title /></a></strong><r:unless_last> &gt;</r:unless_last></r:selected>
+               </r:navigation>}
+      expected = %{<strong><a href=\"/\">Home</a></strong> &gt; <a href=\"/assorted\">Assorted</a> &gt; <a href=\"/parent\">Parent</a> &gt; Radius}
+      page(:radius).should render(tags).as(expected)
+    end
   end
 
   describe "<r:find>" do
@@ -870,7 +940,7 @@ describe "Standard Tags" do
       page(:parent).should render(%{<r:find url="/radius"><r:if_ancestor_or_self>true</r:if_ancestor_or_self></r:find>}).as('')
     end
   end
-  
+
   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(:parent).should render(%{<r:find url="/radius"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('true')
@@ -890,7 +960,7 @@ describe "Standard Tags" do
       page(:radius).should render(%{<r:find url="/"><r:if_self>true</r:if_self></r:find>}).as('')
     end
   end
-  
+
   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(:radius).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('true')
@@ -970,7 +1040,7 @@ describe "Standard Tags" do
         @page = pages(symbol)
       end
     end
-    
+
     def page_children_each_tags(attr = nil)
       attr = ' ' + attr unless attr.nil?
       "<r:children:each#{attr}><r:slug /> </r:children:each>"
@@ -989,4 +1059,4 @@ describe "Standard Tags" do
     def page_eachable_children(page)
       page.children.select(&:published?).reject(&:virtual)
     end
-end
+end

data/spec/models/user_spec.rb

@@ -18,17 +18,17 @@ describe User, "validations" do
   end
   
   
-  describe "self.protected_attributes" do
-    it "should be an array of [:password, :password_confirmation, :email]" do
+  describe "self.unprotected_attributes" do
+    it "should be an array of [:name, :email, :login, :password, :password_confirmation, :locale]" do
       # Make sure we clean up after anything set in another spec
-      User.instance_variable_set(:@protected_attributes, nil)
-      User.protected_attributes.should == [:password, :password_confirmation, :email]
+      User.instance_variable_set(:@unprotected_attributes, nil)
+      User.unprotected_attributes.should == [:name, :email, :login, :password, :password_confirmation, :locale]
     end
   end
-  describe "self.protected_attributes=" do
-    it "should set the @@protected_attributes variable to the given array" do
-      User.protected_attributes = [:password, :email, :other]
-      User.protected_attributes.should == [:password, :email, :other]
+  describe "self.unprotected_attributes=" do
+    it "should set the @@unprotected_attributes variable to the given array" do
+      User.unprotected_attributes = [:password, :email, :other]
+      User.unprotected_attributes.should == [:password, :email, :other]
     end
   end
   
@@ -175,6 +175,12 @@ describe User, "class methods" do
     user.should == expected
   end
   
+  it 'should authenticate with correct email and password' do
+    expected = users(:existing)
+    user = User.authenticate('existing@example.com', 'password')
+    user.should == expected
+  end
+  
   it 'should not authenticate with bad password' do
     User.authenticate('existing', 'bad password').should be_nil
   end
@@ -183,3 +189,21 @@ describe User, "class methods" do
     User.authenticate('nonexisting', 'password').should be_nil
   end
 end
+
+describe User, "roles" do
+  dataset :users
+  
+  it "should not have a non-existent role" do
+    users(:existing).has_role?(:foo).should be_false
+  end
+  
+  it "should not have a role for which the corresponding method returns false" do
+    users(:existing).has_role?(:designer).should be_false
+    users(:existing).has_role?(:admin).should be_false
+  end
+  
+  it "should have a role for which the corresponding method returns true" do
+    users(:designer).has_role?(:designer).should be_true
+    users(:admin).has_role?(:admin).should be_true
+  end
+end

data/test/fixtures/extensions/{01_basic → basic}/basic_extension.rb

@@ -9,9 +9,8 @@ class BasicExtension < Radiant::Extension
   end
   
   def activate
-    admin.tabs.add "Basic Extension Tab", "/admin/basic"
-  end
-  
-  def deactivate
+    tab 'Content' do
+      add_item("Basic Extension Tab", "/admin/basic", :before => 'Pages')
+    end
   end
 end