refinerycms-pages 0.9.9.18 → 0.9.9.19

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.18}
+  s.version           = %q{0.9.9.19}
   s.summary           = %q{Pages engine for Refinery CMS}
   s.description       = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
-  s.date              = %q{2011-04-16}
+  s.date              = %q{2011-04-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -117,6 +117,6 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.18'
+  s.add_dependency 'refinerycms-core', '= 0.9.9.19'
   s.add_dependency 'seo_meta',         '~> 1.0.4'
 end

data/spec/models/page_spec.rb

@@ -2,32 +2,16 @@ require 'spec_helper'
 
 describe Page do
 
-  def reset_page(options = {})
-    if @page
-      @page.destroy!
-      @page.children.each(&:destroy!)
-      @page = nil
-      @child = nil
-    end
-
-    @page = Page.create!({
-      :id => 1,
+  let(:page) do
+    Page.create!({
       :title => "RSpec is great for testing too",
       :deletable => true
-    }.update(options))
+    })
   end
+  let(:child) { page.children.create(:title => 'The child page') }
 
   def page_cannot_be_destroyed
-    @page.destroy.should == false
-  end
-
-  def create_child
-    @child = @page.children.create(:title => 'The child page')
-  end
-
-  def create_page_parts
-    @page.parts.create(:title => 'body', :content => "I'm the first page part for this page.")
-    @page.parts.create(:title => 'side body', :content => "Closely followed by the second page part.")
+    page.destroy.should == false
   end
 
   def turn_off_marketable_urls
@@ -38,144 +22,144 @@ describe Page do
     RefinerySetting.set(:use_marketable_urls, {:value => true, :scoping => 'pages'})
   end
 
-  before(:each) do
-    reset_page
+  def create_page_parts
+    page.parts.create(:title => 'body', :content => "I'm the first page part for this page.")
+    page.parts.create(:title => 'side body', :content => "Closely followed by the second page part.")
   end
 
   context "cannot be deleted under certain rules" do
     it "if link_url is present" do
-      reset_page({:link_url => '/plugin-name'})
+      page.link_url = '/plugin-name'
       page_cannot_be_destroyed
     end
 
 
     it "if refinery team deems it so" do
-      reset_page({:deletable => false})
+      page.deletable = false
       page_cannot_be_destroyed
     end
 
     it "if menu_match is present" do
-      reset_page({:menu_match => '^/RSpec is great for testing too.*$'})
+      page.menu_match = '^/RSpec is great for testing too.*$'
       page_cannot_be_destroyed
     end
 
     it "unless you really want it to! >:]" do
-      reset_page
-      @page.destroy!
+      page.destroy.should be
     end
   end
 
   context "page urls" do
 
     it "should return a full path" do
-      @page.path.should == 'RSpec is great for testing too'
+      page.path.should == 'RSpec is great for testing too'
     end
 
     it "and all of its parent page titles, reversed" do
-      create_child
-      @child.path.should == 'RSpec is great for testing too - The child page'
+      child.path.should == 'RSpec is great for testing too - The child page'
     end
 
     it "or normally ;-)" do
-      create_child
-      @child.path({:reversed => false}).should == 'The child page - RSpec is great for testing too'
+      child.path({:reversed => false}).should == 'The child page - RSpec is great for testing too'
     end
 
     it "should return its url" do
-      @page.link_url = '/contact'
-      @page.url.should == '/contact'
+      page.link_url = '/contact'
+      page.url.should == '/contact'
     end
 
     it "should return its path with marketable urls" do
-      @page.url[:id].should be_nil
-      @page.url[:path].should == ["rspec-is-great-for-testing-too"]
+      page.url[:id].should be_nil
+      page.url[:path].should == ["rspec-is-great-for-testing-too"]
     end
 
     it "should return its path underneath its parent with marketable urls" do
-      create_child
-      @child.url[:id].should be_nil
-      @child.url[:path].should == [@page.url[:path].first, 'the-child-page']
+      child.url[:id].should be_nil
+      child.url[:path].should == [page.url[:path].first, 'the-child-page']
     end
 
     it "should not have a path without marketable urls" do
       turn_off_marketable_urls
-      @page.url[:path].should be_nil
-      @page.url[:id].should == "rspec-is-great-for-testing-too"
+      page.url[:path].should be_nil
+      page.url[:id].should == "rspec-is-great-for-testing-too"
       turn_on_marketable_urls
     end
 
     it "should not mention its parent without marketable urls" do
       turn_off_marketable_urls
-      create_child
-      @child.url[:id].should == 'the-child-page'
-      @child.url[:path].should be_nil
+      child.url[:id].should == 'the-child-page'
+      child.url[:path].should be_nil
       turn_on_marketable_urls
     end
   end
 
   context "home page" do
     it "should respond as the home page" do
-      @page.link_url = '/'
-      @page.home?.should == true
+      page.link_url = '/'
+      page.home?.should == true
     end
 
     it "should not respond as the home page" do
-      @page.home?.should == false
+      page.home?.should == false
     end
   end
 
   context "content sections (page parts)" do
-    it "should return the content when using []" do
-      create_page_parts
+    before { create_page_parts }
 
-      @page[:body].should == "<p>I'm the first page part for this page.</p>"
-      @page["BoDY"].should == "<p>I'm the first page part for this page.</p>"
+    it "should return the content when using []" do
+      page[:body].should == "<p>I'm the first page part for this page.</p>"
+      page["BoDY"].should == "<p>I'm the first page part for this page.</p>"
     end
 
     it "should return all page part content" do
-      create_page_parts
-
-      @page.all_page_part_content.should == "<p>I'm the first page part for this page.</p> <p>Closely followed by the second page part.</p>"
+      page.all_page_part_content.should == "<p>I'm the first page part for this page.</p> <p>Closely followed by the second page part.</p>"
     end
 
     it "should reposition correctly" do
-      create_page_parts
-      @page.parts.first.position = 6
-      @page.parts.last.position = 4
+      page.parts.first.position = 6
+      page.parts.last.position = 4
 
-      @page.parts.first.position.should == 6
-      @page.parts.last.position.should == 4
+      page.parts.first.position.should == 6
+      page.parts.last.position.should == 4
 
-      @page.reposition_parts!
+      page.reposition_parts!
 
-      @page.parts.first.position.should == 0
-      @page.parts.last.position.should == 1
+      page.parts.first.position.should == 0
+      page.parts.last.position.should == 1
     end
   end
 
   context "draft pages" do
     it "should not be a live page when set to draft" do
-      @page.draft = true
-      @page.live?.should == false
+      page.draft = true
+      page.live?.should_not be
+    end
 
-      @page.draft = false
-      @page.live?.should == true
+    it "should be a live page when not set to draft" do
+      page.draft = false
+      page.live?.should be
     end
   end
 
   context "should add url suffix" do
-    before(:each) do
-      turn_on_marketable_urls
-      @reserved_word = Page.friendly_id_config.reserved_words.last
-      reset_page(:title => @reserved_word)
+    let(:reserved_word) { Page.friendly_id_config.reserved_words.last }
+    let(:page_with_reserved_title) do
+      Page.create!({
+        :title => reserved_word,
+        :deletable => true
+      })
     end
 
+    before { turn_on_marketable_urls }
+
     it "when title is set to a reserved word" do
-      @page.url[:path].should == ["#{@reserved_word}-page"]
+      page_with_reserved_title.url[:path].should == ["#{reserved_word}-page"]
     end
 
     it "when parent page title is set to a reserved word" do
-      create_child.url[:path].should == ["#{@reserved_word}-page", 'the-child-page']
+      child = page_with_reserved_title.children.create(:title => 'The child page')
+      child.url[:path].should == ["#{reserved_word}-page", 'the-child-page']
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.18
+  version: 0.9.9.19
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 Z
+date: 2011-04-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.18
+        version: 0.9.9.19
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency