radiant 0.6.7 → 0.6.8

data/spec/models/standard_tags_spec.rb

@@ -56,8 +56,11 @@ describe "Standard Tags" do
     end
 
     it 'should not list virtual pages' do
-      page.should render('<r:children:each><r:slug /> </r:children:each>').as('a b c d e f g h i j ')
-      page.should render('<r:children:each status="all"><r:slug /> </r:children:each>').as('a b c d e f g h i j draft ')
+      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 virtual 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
 
     it 'should error with invalid "limit" attribute' do
@@ -246,6 +249,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
@@ -257,9 +261,62 @@ describe "Standard Tags" do
     it "should not render the contained block if the specified part does not exist" do
       page.should render('<r:if_content part="asdf">true</r:if_content>').as('')
     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
+      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
+      end
+      describe "with the 'find' attribute set to 'any'" do
+        it "should render the contained block if any of the specified parts exist" do
+          page.should render('<r:if_content part="body, asdf" find="any">true</r:if_content>').as('true')
+        end
+      end
+      describe "with the 'find' attribute set to 'all'" 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
+      end
+    end
   end
 
   describe "<r:unless_content>" do
+    describe "with inherit attribute set to 'true'" 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
+    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
@@ -271,6 +328,43 @@ describe "Standard Tags" do
     it "should render the contained block if the specified part does not exist" do
       page.should render('<r:unless_content part="asdf">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">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">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.should render('<r:unless_content part="body, sidebar" find="all">true</r:unless_content>').as('')
+        end
+
+        it "should render the contained block unless all of the specified parts exist" 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('')
+        end
+      end
+    end
   end
 
   describe "<r:author>" do
@@ -355,7 +449,7 @@ describe "Standard Tags" do
   end
 
   describe "<r:snippet>" do
-    it "should the contents of the specified snippet" do
+    it "should render the contents of the specified snippet" do
       page.should render('<r:snippet name="first" />').as('test')
     end
 
@@ -378,6 +472,39 @@ describe "Standard Tags" do
     it "should maintain the global page when the snippet renders recursively" do
       page(:child).should render('<r:snippet name="recursive" />').as("Great GrandchildGrandchildChild")
     end
+
+    it "should render the specified snippet when called as an empty double-tag" do
+      page.should render('<r:snippet name="first"></r:snippet>').as('test')
+    end
+
+    it "should capture contents of a double tag, substituting for <r:yield/> in snippet" 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')
+    end
+
+    it "should render nested yielding snippets" 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')
+    end
+  end
+
+  it "should do nothing when called from page body" do
+    page.should render('<r:yield/>').as("")
   end
 
   it '<r:random> should render a randomly selected contained <r:option>' do
@@ -672,6 +799,16 @@ 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(:radius).should render(%{<r:find url="/"><r:unless_ancestor_or_self>true</r:unless_ancestor_or_self></r:find>}).as('')
+    end
+
+    it "should not render the tag's content when current page is 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')
+    end
+  end
 
   describe "<r:if_self>" do
     it "should render the tag's content when the current page is the same as the local contextual page" do
@@ -682,6 +819,16 @@ 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(:home).should render(%{<r:find url="/"><r:unless_self>true</r:unless_self></r:find>}).as('')
+    end
+
+    it "should not render the tag's content when the current page is 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')
+    end
+  end
 
   describe "<r:meta>" do
     it "should render <meta> tags for the description and keywords" do

data/spec/models/user_spec.rb

@@ -121,6 +121,34 @@ describe User do
     @user.salt.should_not be_nil
     @user.password.should == @user.sha1('password')
   end
+
+  describe ".remember_me" do
+    before do
+      Radiant::Config.stub!(:[]).with('session_timeout').and_return(2.weeks)
+      @user.save
+      @user.remember_me
+      @user.reload
+    end
+
+    it "should remember user" do
+      @user.session_token.should_not be_nil
+    end
+  end
+
+  describe ".forget_me" do
+
+    before do
+      Radiant::Config.stub!(:[]).with('session_timeout').and_return(2.weeks)
+      @user.save
+      @user.remember_me
+    end
+
+    it "should forget user" do
+      @user.forget_me
+      @user.session_token.should be_nil
+    end
+  end
+  
 end
 
 describe User, "class methods" do

data/spec/scenarios/file_not_found_scenario.rb

@@ -5,9 +5,14 @@ class FileNotFoundScenario < Scenario::Base
   uses :home_page
   
   def load
+    create_page "Draft File Not Found", :class_name => "FileNotFoundPage", :status_id => Status[:draft].id
     create_page "File Not Found", :slug => "missing", :class_name => "FileNotFoundPage"
     create_page "Gallery" do
+      create_page "Draft No Picture", :class_name => "CustomFileNotFoundPage", :status_id => Status[:draft].id
       create_page "No Picture", :class_name => "CustomFileNotFoundPage"
     end 
+    create_page "Drafts" do
+      create_page "Lonely Draft File Not Found", :class_name => "FileNotFoundPage", :status_id => Status[:draft].id
+    end
   end
 end

data/spec/scenarios/pages_scenario.rb

@@ -40,11 +40,17 @@ class PagesScenario < Scenario::Base
     create_page "Hidden", :status_id => Status[:hidden].id
     date = Time.utc(2006, 1, 11)
     create_page "Dated", :published_at => date, :created_at => (date - 1.day), :updated_at => (date + 1.day)
+
     create_page "Devtags" do
       create_page_part "if_dev", :content => "<r:if_dev>dev</r:if_dev>"
       create_page_part "unless_dev", :content => "<r:unless_dev>not dev</r:unless_dev>"
     end
     create_page "Virtual", :class_name => "VirtualPage", :virtual => true
+    create_page "Party" do
+      create_page_part "favors"
+      create_page_part "games"
+      create_page "Guests"
+    end
   end
   
 end

data/spec/scenarios/snippets_scenario.rb

@@ -7,6 +7,10 @@ class SnippetsScenario < Scenario::Base
     create_snippet "radius", :content => "<r:title />"
     create_snippet "global_page_cascade", :content => "<r:children:each><r:page:title /> </r:children:each>"
     create_snippet "recursive", :content => "<r:children:each><r:snippet name='recursive' /></r:children:each><r:title />"
+    create_snippet "yielding", :content => "Before...<r:yield/>...and after"
+    create_snippet "div_wrap", :content => "<div><r:yield/></div>"
+    create_snippet "nested_yields", :content => '<snippet name="div_wrap">above <r:yield/> below</snippet>'
+    create_snippet "yielding_often", :content => '<r:yield/> is <r:yield/>er than <r:yield/>'
   end
   
   helpers do

data/test/fixtures/users.yml

@@ -3,28 +3,33 @@ existing:
   id: 1
   name: Existing User
   login: existing
-  password: <%= User.sha1 'password' %>
+  salt: 42ddb5b6479872565981adc78e86ddc50fa21637
+  password: 4c5f9d5a0d4cd65d61f6b1505890576d1272986c # password
   email: existing.user@gmail.com
 another:
   id: 2
   name: Another User
   login: another
-  password: <%= User.sha1 'password' %>
+  salt: 42ddb5b6479872565981adc78e86ddc50fa21637
+  password: 4c5f9d5a0d4cd65d61f6b1505890576d1272986c # password
 admin:
   id: 3
   name: Admin User
   login: admin
-  password: <%= User.sha1 'password' %>
+  salt: 42ddb5b6479872565981adc78e86ddc50fa21637
+  password: 4c5f9d5a0d4cd65d61f6b1505890576d1272986c # password
   admin: true
 developer:
   id: 4
   name: Developer User
   login: developer
-  password: <%= User.sha1 'password' %>
+  salt: 42ddb5b6479872565981adc78e86ddc50fa21637
+  password: 4c5f9d5a0d4cd65d61f6b1505890576d1272986c # password
   developer: true
 non_admin:
   id: 5
   name: Non-Admin User
   login: non-admin
-  password: <%= User.sha1 'password' %>
-  admin: false
+  salt: 42ddb5b6479872565981adc78e86ddc50fa21637
+  password: 4c5f9d5a0d4cd65d61f6b1505890576d1272986c # password
+  admin: false

data/vendor/plugins/haml/FAQ

@@ -0,0 +1,138 @@
+= Frequently Asked Questions
+
+== Haml
+
+=== How do I put a punctuation mark after an element, like "<tt>I like <strong>cake</strong>!</tt>"?
+
+Expressing the structure of a document
+and expressing inline formatting are two very different problems.
+Haml is mostly designed for structure,
+so the best way to deal with formatting is to leave it to other languages
+that are designed for it.
+You could use Textile:
+
+  %p
+    :textile
+      I like *cake*!
+
+or Markdown:
+
+  %p
+    :markdown
+      I like **cake**!
+
+or plain old XHTML:
+
+  %p I like <strong>cake</strong>!
+
+If you're inserting something that's generated by a helper, like a link,
+then it's even easier:
+
+  %p== I like #{link_to 'chocolate', 'http://franschocolates.com'}!
+
+=== How do I stop Haml from indenting the contents of my +pre+ and +textarea+ tags?
+
+Because Haml automatically indents the HTML source code,
+the contents of whitespace-sensitive tags like +pre+ and +textarea+
+can get screwed up.
+The solution is to replace the newlines inside these tags
+with HTML newline entities (<tt>&#x000A;</tt>),
+which Haml does using the Haml::Helpers#preserve and Haml::Helpers#find_and_preserve helpers.
+
+Normally, Haml will do this for you automatically
+when you're using a tag that needs it
+(this can be customized using the <tt>:preserve</tt> option;
+see the Options section of the {Haml reference}(../classes/Haml.html)).
+For example,
+
+  %p
+    %textarea= "Foo\nBar"
+
+will be compiled to
+
+  <p>
+    <textarea>Foo&#x000A;Bar</textarea>
+  </p>
+
+However, if a helper is generating the tag,
+Haml can't detect that and so you'll have to call +find_and_preserve+ yourself.
+You can also use <tt>~</tt>, which is the same as <tt>=</tt>
+except that it automatically runs +find_and_preserve+ on its input.
+For example:
+
+  %p= find_and_preserve "<textarea>Foo\nBar</textarea>"
+
+is the same as
+
+  %p~ "<textarea>Foo\nBar</textarea>"
+
+and renders
+
+  <p><textarea>Foo&#x000A;Bar</textarea></p>
+
+=== How do I make my long lines of Ruby code look nicer in my Haml document?
+
+Put them in a helper or your model.
+
+Haml purposefully makes it annoying to put lots of Ruby code into your templates,
+because lots of code doesn't belong in the view.
+If you take that huge +link_to_remote+ call
+and move it to a +update_sidebar_link+ helper,
+it'll make your view both easier to read and more semantic.
+
+If you absolutely must put lots of code in your template,
+Haml offers a somewhat awkward multiline-continuation tool.
+Put a <tt>|</tt> (pipe character) at the end of each line you want to be merged into one
+(including the last line!).
+For example:
+
+  %p= @this.is(way.too.much). |
+      code("and I should").   |
+      really_move.it.into(    |
+        :a => @helper)        |
+
+=== I have Haml installed. Why is Rails (only looking for <tt>.html.erb</tt> files | rendering Haml files as plain text | rendering Haml files as blank pages)?
+
+There are several reasons these things might be happening.
+First of all, make sure vendor/plugins/haml really exists
+and has an init.rb file in there.
+Then try restarting Mongrel or WEBrick or whatever you might be using.
+
+Finally, if none of these work,
+chances are you've got some localization plugin like Globalize installed.
+Such plugins often don't play nicely with Haml.
+Luckily, there's usually an easy fix.
+For Globalize, just edit globalize/lib/globalize/rails/action_view.rb
+and change
+
+  @@re_extension = /\.(rjs|rhtml|rxml)$/
+
+to
+
+  @@re_extension = /\.(rjs|rhtml|rxml|erb|builder|haml)$/
+
+For other plugins, a little searching will probably turn up a way to fix them as well.
+
+== Sass
+
+=== Can I use a variable from my controller in my Sass file?
+
+No. Sass files aren't views.
+They're compiled once into static CSS files,
+then left along until they're changed and need to be compiled again.
+Not only don't you want to be running a full request cycle
+every time someone requests a stylesheet,
+but it's not a great idea to put much logic in there anyway
+due to how browsers handle them.
+
+If you really need some sort of dynamic CSS,
+the best thing to do is put only the snippet you need to dynamically set
+in the +head+ of your HTML document.
+
+== You still haven't answered my question!
+
+Sorry! Try looking at the Haml or Sass references,
+in the doucmentation for the haml and Sass modules, respectively.
+If you can't find an answer there,
+feel free to ask in #haml on irc.freenode.net
+or send an email to the {mailing list}[http://groups.google.com/group/haml?hl=en].