refinerycms-pages 2.1.5 → 3.0.0

data/spec/presenters/refinery/pages/menu_presenter_spec.rb

@@ -3,10 +3,22 @@ require "spec_helper"
 module Refinery
   module Pages
     describe MenuPresenter do
+      let!(:original_mounted_path) { Core.mounted_path }
+      let(:mounted_path) { "/" }
+
+      before do
+        allow(Core).to receive(:mounted_path).and_return(mounted_path)
+        Rails.application.reload_routes!
+      end
+
+      after do
+        allow(Core).to receive(:mounted_path).and_return(original_mounted_path)
+        Rails.application.reload_routes!
+      end
 
       let(:menu_presenter) do
         menu_items = []
-        menu_items.stub(:roots)
+        allow(menu_items).to receive(:roots)
 
         MenuPresenter.new(menu_items, view)
       end
@@ -19,16 +31,18 @@ module Refinery
           expect(menu_presenter.menu_tag).to eq(:nav)
           expect(menu_presenter.list_tag).to eq(:ul)
           expect(menu_presenter.list_item_tag).to eq(:li)
+          expect(menu_presenter.active_css).to eq(:active)
           expect(menu_presenter.selected_css).to eq(:selected)
           expect(menu_presenter.first_css).to eq(:first)
           expect(menu_presenter.last_css).to eq(:last)
+          expect(menu_presenter.list_tag_css).to eq("nav")
         end
       end
 
       describe "#roots" do
         context "when #roots is configured" do
           it "returns config.roots" do
-            menu_presenter.config.stub(:roots).and_return(["one", "two", "three"])
+            allow(menu_presenter.config).to receive(:roots).and_return(["one", "two", "three"])
             expect(menu_presenter.roots).to eq(["one", "two", "three"])
           end
         end
@@ -36,7 +50,7 @@ module Refinery
         context "when #roots isn't configured" do
           it "returns roots from passed in collection" do
             menu_items = double()
-            menu_items.stub(:roots).and_return(["three", "two", "one"])
+            allow(menu_items).to receive(:roots).and_return(["three", "two", "one"])
 
             menu_presenter = MenuPresenter.new(menu_items, view)
             expect(menu_presenter.roots).to eq(["three", "two", "one"])
@@ -45,11 +59,35 @@ module Refinery
       end
 
       describe "#to_html" do
+        let(:menu_items) {
+          Refinery::Menu.new(FactoryGirl.create(:page, :title => "Refinery CMS"))
+        }
+        let(:menu_presenter) { MenuPresenter.new(menu_items, view) }
         it "returns menu items wrapped in html" do
-          menu_items = Refinery::Menu.new(FactoryGirl.create(:page, :title => "Refinery CMS"))
+          expect(menu_presenter.to_html).to xml_eq(
+            %Q{<nav class="menu clearfix" id="menu"><ul class="nav"><li class="first last"><a href="/refinery-cms">Refinery CMS</a></li></ul></nav>}
+          )
+        end
 
-          menu_presenter = MenuPresenter.new(menu_items, view)
-          expect(menu_presenter.to_html).to eq(%Q{<nav class="menu clearfix" id="menu"><ul><li class="first last"><a href="/refinery-cms">Refinery CMS</a></li></ul></nav>})
+        context "takes mount point into account" do
+          let(:mounted_path) { "/subfolder"}
+
+          it "for normal pages" do
+            expect(menu_presenter.to_html).to xml_eq(
+              %Q{<nav class="menu clearfix" id="menu"><ul class="nav"><li class="first last"><a href="#{mounted_path}/refinery-cms">Refinery CMS</a></li></ul></nav>}
+            )
+          end
+
+          context "when page has a link_url" do
+            let(:menu_items) {
+              Menu.new(FactoryGirl.create(:page, title: "Home", link_url: "/"))
+            }
+            it "the menu item URL includes the mounted path" do
+              expect(menu_presenter.to_html).to xml_eq(
+                %Q{<nav class="menu clearfix" id="menu"><ul class="nav"><li class="first last"><a href="#{mounted_path}">Home</a></li></ul></nav>}
+              )
+            end
+          end
         end
       end
 

data/spec/presenters/refinery/pages/page_part_section_presenter_spec.rb

@@ -4,31 +4,31 @@ module Refinery
   module Pages
     describe PagePartSectionPresenter do
       it "can be built from a page part" do
-        part = double(PagePart, :body => 'part_body', :title => 'A Wonderful Page Part')
+        part = double(PagePart, :body => 'part_body', :slug => 'a_wonderful_page_part', :title => 'A Wonderful Page Part')
         section = PagePartSectionPresenter.new(part)
-        section.fallback_html.should == 'part_body'
-        section.id.should == :a_wonderful_page_part
+        expect(section.fallback_html).to eq('part_body')
+        expect(section.id).to eq(:a_wonderful_page_part)
       end
 
       it "marks the body as html safe" do
-        part = double(PagePart, :body => '<p>part_body</p>', :title => nil)
+        part = double(PagePart, :body => '<p>part_body</p>', :slug => nil, :title => nil)
         section = PagePartSectionPresenter.new(part)
-        section.fallback_html.should be_html_safe
-        section.wrapped_html.should == "<section><div class=\"inner\"><p>part_body</p></div></section>"
+        expect(section.fallback_html).to be_html_safe
+        expect(section.wrapped_html).to xml_eq(%q{<section><div class="inner"><p>part_body</p></div></section>})
       end
 
       it "handles a nil page body" do
-        part = double(PagePart, :body => nil, :title => nil)
+        part = double(PagePart, :body => nil, :slug => nil, :title => nil)
         section = PagePartSectionPresenter.new(part)
-        section.fallback_html.should be_nil
-        section.wrapped_html.should be_nil
-        section.has_content?.should be_false
+        expect(section.fallback_html).to be_nil
+        expect(section.wrapped_html).to be_nil
+        expect(section.has_content?).to be_falsey
       end
 
       it "has no id if title is nil" do
-        part = double(PagePart, :body => 'foobar', :title => nil)
+        part = double(PagePart, :body => 'foobar', :slug => nil, :title => nil)
         section = PagePartSectionPresenter.new(part)
-        section.id.should be_nil
+        expect(section.id).to be_nil
       end
     end
   end

data/spec/presenters/refinery/pages/section_presenter_spec.rb

@@ -5,79 +5,79 @@ module Refinery
     describe SectionPresenter do
       it "can build a css class for when it is not present based on id" do
         section = SectionPresenter.new(:fallback_html => 'foobar', :id => 'mynode')
-        section.not_present_css_class.should == 'no_mynode'
+        expect(section.not_present_css_class).to eq('no_mynode')
       end
 
       it "allows access to constructor arguments" do
         section = SectionPresenter.new(:fallback_html => 'foobar', :id => 'mynode', :hidden => true)
-        section.fallback_html.should == 'foobar'
-        section.id.should == 'mynode'
-        section.should be_hidden
+        expect(section.fallback_html).to eq('foobar')
+        expect(section.id).to eq('mynode')
+        expect(section).to be_hidden
       end
 
       it "should be visible if not hidden" do
         section = SectionPresenter.new(:hidden => false)
-        section.should be_visible
+        expect(section).to be_visible
       end
 
       it "should be not visible if hidden" do
         section = SectionPresenter.new(:hidden => true)
-        section.should_not be_visible
+        expect(section).not_to be_visible
       end
 
       describe "when building html for a section" do
         it "wont show a hidden section" do
           section = SectionPresenter.new(:fallback_html => 'foobar', :hidden => true)
-          section.has_content?(true).should be_false
-          section.wrapped_html(true).should be_nil
+          expect(section.has_content?(true)).to be_falsey
+          expect(section.wrapped_html(true)).to be_nil
         end
 
         it "can be hidden with the hide method" do
           section = SectionPresenter.new(:fallback_html => 'foobar')
           section.hide
-          section.has_content?(true).should be_false
-          section.wrapped_html(true).should be_nil
+          expect(section.has_content?(true)).to be_falsey
+          expect(section.wrapped_html(true)).to be_nil
         end
 
         it "will use the specified id" do
           section = SectionPresenter.new(:fallback_html => 'foobar', :id => 'mynode')
-          section.has_content?(true).should be_true
-          section.wrapped_html(true).should == '<section id="mynode"><div class="inner">foobar</div></section>'
+          expect(section.has_content?(true)).to be_truthy
+          expect(section.wrapped_html(true)).to xml_eq('<section id="mynode"><div class="inner">foobar</div></section>')
         end
 
         describe "if allowed to use fallback html" do
           it "wont show a section with no fallback or override" do
             section = SectionPresenter.new
-            section.has_content?(true).should be_false
-            section.wrapped_html(true).should be_nil
+            expect(section.has_content?(true)).to be_falsey
+            expect(section.wrapped_html(true)).to be_nil
           end
 
           it "uses wrapped fallback html" do
             section = SectionPresenter.new(:fallback_html => 'foobar')
-            section.has_content?(true).should be_true
-            section.wrapped_html(true).should == '<section><div class="inner">foobar</div></section>'
+            expect(section.has_content?(true)).to be_truthy
+            expect(section.wrapped_html(true)).to xml_eq('<section><div class="inner">foobar</div></section>')
           end
 
           it "uses wrapped override html if present" do
             section = SectionPresenter.new(:fallback_html => 'foobar')
             section.override_html = 'hello world'
-            section.has_content?(true).should be_true
-            section.wrapped_html(true).should == '<section><div class="inner">hello world</div></section>'
+            expect(section.has_content?(true)).to be_truthy
+            expect(section.wrapped_html(true)).to xml_eq('<section><div class="inner">hello world</div></section>')
           end
         end
 
         describe "if not allowed to use fallback html" do
           it "wont show a section with no override" do
             section = SectionPresenter.new(:fallback_html => 'foobar')
-            section.has_content?(false).should be_false
-            section.wrapped_html(false).should be_nil
+            expect(section.has_content?(false)).to be_falsey
+            expect(section.wrapped_html(false)).to be_nil
           end
 
           it "uses wrapped override html if present" do
             section = SectionPresenter.new(:fallback_html => 'foobar')
             section.override_html = 'hello world'
-            section.has_content?(false).should be_true
-            section.wrapped_html(false).should == '<section><div class="inner">hello world</div></section>'
+            expect(section.has_content?(false)).to be_truthy
+            expect(section.wrapped_html(false)).to xml_eq('<section><div class="inner">hello world</div></section>')
           end
         end
       end

data/spec/presenters/refinery/pages/title_section_presenter_spec.rb

@@ -6,14 +6,14 @@ module Refinery
       describe "when building html for a section" do
         it "wraps a title section in a title element" do
           section = TitleSectionPresenter.new(:fallback_html => 'foobar')
-          section.has_content?(true).should be_true
-          section.wrapped_html(true).should == '<h1>foobar</h1>'
+          expect(section.has_content?(true)).to be_truthy
+          expect(section.wrapped_html(true)).to xml_eq('<h1>foobar</h1>')
         end
 
         it "will use the specified id" do
           section = TitleSectionPresenter.new(:fallback_html => 'foobar', :id => 'mynode')
-          section.has_content?(true).should be_true
-          section.wrapped_html(true).should == '<h1 id="mynode">foobar</h1>'
+          expect(section.has_content?(true)).to be_truthy
+          expect(section.wrapped_html(true)).to xml_eq('<h1 id="mynode">foobar</h1>')
         end
       end
     end

data/spec/support/refinery/pages/caching_helpers.rb

@@ -8,9 +8,9 @@ module CachingHelpers
   end
 
   def cache_page(page)
-    Refinery::PagesController.any_instance.stub(:refinery_user?).and_return(false)
+    allow_any_instance_of(Refinery::PagesController).to receive(:refinery_user?).and_return(false)
     visit refinery.page_path(page)
-    Refinery::PagesController.any_instance.unstub(:refinery_user?)
+    allow_any_instance_of(Refinery::PagesController).to receive(:refinery_user?).and_call_original
   end
 
   RSpec::Matchers.define :be_cached do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -18,70 +18,76 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.9
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 2.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -96,9 +102,23 @@ dependencies:
     - - "!="
       - !ruby/object:Gem::Version
         version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: speakingurl-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 description: The default content extension of Refinery CMS. This extension handles
   the administration and display of user-editable pages.
-email: info@refinerycms.com
+email: refinerycms@p.arndt.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -108,8 +128,6 @@ files:
 - app/controllers/refinery/admin/pages_dialogs_controller.rb
 - app/controllers/refinery/pages/admin/preview_controller.rb
 - app/controllers/refinery/pages_controller.rb
-- app/helpers/refinery/admin/page_parts_helper.rb
-- app/helpers/refinery/admin/pages_dialogs_helper.rb
 - app/helpers/refinery/admin/pages_helper.rb
 - app/helpers/refinery/pages/content_pages_helper.rb
 - app/models/refinery/page.rb
@@ -121,11 +139,11 @@ files:
 - app/presenters/refinery/pages/page_part_section_presenter.rb
 - app/presenters/refinery/pages/section_presenter.rb
 - app/presenters/refinery/pages/title_section_presenter.rb
-- app/sweepers/refinery/pages/page_sweeper.rb
 - app/views/refinery/admin/pages/_actions.html.erb
 - app/views/refinery/admin/pages/_form.html.erb
 - app/views/refinery/admin/pages/_form_advanced_options.html.erb
 - app/views/refinery/admin/pages/_form_advanced_options_seo.html.erb
+- app/views/refinery/admin/pages/_form_extra_fields_for_more_options.html.erb
 - app/views/refinery/admin/pages/_form_fields_after_title.html.erb
 - app/views/refinery/admin/pages/_form_new_page_parts.html.erb
 - app/views/refinery/admin/pages/_form_page_parts.html.erb
@@ -143,6 +161,7 @@ files:
 - app/views/refinery/pages/home.html.erb
 - app/views/refinery/pages/show.html.erb
 - config/locales/bg.yml
+- config/locales/ca.yml
 - config/locales/cs.yml
 - config/locales/da.yml
 - config/locales/de.yml
@@ -174,14 +193,17 @@ files:
 - config/locales/zh-TW.yml
 - config/routes.rb
 - db/migrate/20100913234708_create_refinerycms_pages_schema.rb
+- db/migrate/20140105190324_add_custom_slug_to_refinery_pages.rb
+- db/migrate/20150130044643_add_slug_to_refinery_page_parts.rb
+- db/migrate/20150720155305_update_slug_and_title_in_refinery_page_parts.rb
 - db/seeds.rb
 - lib/generators/refinery/pages/pages_generator.rb
 - lib/generators/refinery/pages/templates/config/initializers/refinery/pages.rb.erb
 - lib/refinery/pages.rb
 - lib/refinery/pages/admin/instance_methods.rb
-- lib/refinery/pages/caching.rb
 - lib/refinery/pages/configuration.rb
 - lib/refinery/pages/engine.rb
+- lib/refinery/pages/finder.rb
 - lib/refinery/pages/instance_methods.rb
 - lib/refinery/pages/render_options.rb
 - lib/refinery/pages/tab.rb
@@ -191,6 +213,7 @@ files:
 - lib/refinerycms-pages.rb
 - license.md
 - refinerycms-pages.gemspec
+- spec/controllers/refinery/admin/pages_controller_spec.rb
 - spec/controllers/refinery/pages_controller_spec.rb
 - spec/factories/pages.rb
 - spec/features/refinery/admin/pages_spec.rb
@@ -199,17 +222,20 @@ files:
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb
 - spec/lib/pages_spec.rb
-- spec/lib/refinery/pages/caching_spec.rb
 - spec/lib/refinery/pages/tab_spec.rb
 - spec/lib/refinery/pages/url_spec.rb
+- spec/models/refinery/page_finder_spec.rb
+- spec/models/refinery/page_menu_spec.rb
+- spec/models/refinery/page_meta_data_spec.rb
+- spec/models/refinery/page_part_spec.rb
 - spec/models/refinery/page_spec.rb
+- spec/models/refinery/page_url_spec.rb
 - spec/presenters/refinery/pages/content_page_presenter_spec.rb
 - spec/presenters/refinery/pages/content_presenter_spec.rb
 - spec/presenters/refinery/pages/menu_presenter_spec.rb
 - spec/presenters/refinery/pages/page_part_section_presenter_spec.rb
 - spec/presenters/refinery/pages/section_presenter_spec.rb
 - spec/presenters/refinery/pages/title_section_presenter_spec.rb
-- spec/support/refinery/pages/caching.rb
 - spec/support/refinery/pages/caching_helpers.rb
 homepage: http://refinerycms.com
 licenses:
@@ -223,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -231,11 +257,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Pages extension for Refinery CMS
 test_files:
+- spec/controllers/refinery/admin/pages_controller_spec.rb
 - spec/controllers/refinery/pages_controller_spec.rb
 - spec/factories/pages.rb
 - spec/features/refinery/admin/pages_spec.rb
@@ -244,15 +271,18 @@ test_files:
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb
 - spec/lib/pages_spec.rb
-- spec/lib/refinery/pages/caching_spec.rb
 - spec/lib/refinery/pages/tab_spec.rb
 - spec/lib/refinery/pages/url_spec.rb
+- spec/models/refinery/page_finder_spec.rb
+- spec/models/refinery/page_menu_spec.rb
+- spec/models/refinery/page_meta_data_spec.rb
+- spec/models/refinery/page_part_spec.rb
 - spec/models/refinery/page_spec.rb
+- spec/models/refinery/page_url_spec.rb
 - spec/presenters/refinery/pages/content_page_presenter_spec.rb
 - spec/presenters/refinery/pages/content_presenter_spec.rb
 - spec/presenters/refinery/pages/menu_presenter_spec.rb
 - spec/presenters/refinery/pages/page_part_section_presenter_spec.rb
 - spec/presenters/refinery/pages/section_presenter_spec.rb
 - spec/presenters/refinery/pages/title_section_presenter_spec.rb
-- spec/support/refinery/pages/caching.rb
 - spec/support/refinery/pages/caching_helpers.rb