refinerycms-pages 2.0.2 → 2.0.3

data/app/controllers/refinery/admin/page_parts_controller.rb

@@ -1,4 +1,4 @@
-module ::Refinery
+module Refinery
   module Admin
     class PagePartsController < ::Refinery::AdminController
 

data/app/controllers/refinery/admin/pages_dialogs_controller.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 
-module ::Refinery
+module Refinery
   module Admin
     class PagesDialogsController < ::Refinery::Admin::DialogsController
 

data/app/helpers/refinery/admin/page_parts_helper.rb

@@ -0,0 +1,6 @@
+module Refinery
+  module Admin
+    module PagePartsHelper
+    end
+  end
+end

data/app/helpers/refinery/admin/pages_dialogs_helper.rb

@@ -0,0 +1,6 @@
+module Refinery
+  module Admin
+    module PagesDialogsHelper
+    end
+  end
+end

data/app/helpers/refinery/admin/pages_helper.rb

@@ -0,0 +1,6 @@
+module Refinery
+  module Admin
+    module PagesHelper
+    end
+  end
+end

data/app/helpers/refinery/pages/content_pages_helper.rb

@@ -1,4 +1,4 @@
-module ::Refinery
+module Refinery
   module Pages
     module ContentPagesHelper
       # Build the html for a Refinery CMS page object by creating a ContentPagePresenter. This is a

data/app/helpers/refinery/pages_helper.rb

@@ -1,4 +1,4 @@
-module ::Refinery
+module Refinery
   module PagesHelper
   end
 end

data/app/models/refinery/page.rb

@@ -1,4 +1,6 @@
 # Encoding: utf-8
+require 'acts_as_indexed'
+require 'friendly_id'
 
 module Refinery
   class Page < Refinery::Core::BaseModel
@@ -9,6 +11,11 @@ module Refinery
 
     translates :title, :menu_title, :custom_slug, :slug, :include => :seo_meta
 
+    class Translation
+      is_seo_meta
+      attr_accessible :browser_title, :meta_description, :meta_keywords, :locale
+    end
+
     attr_accessible :title
 
     # Delegate SEO Attributes to globalize3 translation

data/app/presenters/refinery/page_presenter.rb

@@ -1,7 +1,9 @@
-class PagePresenter < ::Refinery::BasePresenter
+module Refinery
+  class PagePresenter < BasePresenter
 
-  def menu_title_type
-    @model.menu_title_type
-  end
+    def menu_title_type
+      @model.menu_title_type
+    end
 
+  end
 end

data/app/views/refinery/admin/pages/_form_advanced_options.html.erb

@@ -24,7 +24,7 @@
     <% if Refinery::Pages.use_layout_templates %>
     <div class='field'>
       <span class='label_with_help'>
-        <%= label_tag :layout_template, t('.layout_template') %>
+        <%= f.label :layout_template, t('.layout_template') %>
         <%= refinery_help_tag t('.layout_template_help') %>
       </span>
       <%= f.select(:layout_template, @valid_layout_templates) %>
@@ -33,7 +33,7 @@
     <% if Refinery::Pages.use_view_templates %>
     <div class='field'>
       <span class='label_with_help'>
-        <%= label_tag :view_template, t('.view_template') %>
+        <%= f.label :view_template, t('.view_template') %>
         <%= refinery_help_tag t('.view_template_help') %>
       </span>
       <%= f.select(:view_template, @valid_view_templates.map{|t| [t.titleize, t]}) %>
@@ -42,7 +42,7 @@
 
     <div class='field'>
       <span class='label_with_help'>
-        <%= label_tag :menu_title, t('.menu_title') %>
+        <%= f.label :menu_title, t('.menu_title') %>
         <%= refinery_help_tag t('.menu_title_help') %>
       </span>
       <%= f.text_field :menu_title, :style=> 'width:400px;' %>

data/lib/refinery/pages.rb

@@ -48,8 +48,10 @@ module Refinery
   end
 end
 
-require 'awesome_nested_set'
-require 'globalize3'
+ActiveSupport.on_load(:active_record) do
+  require 'awesome_nested_set'
+  require 'globalize3'
+end
 require 'friendly_id'
 require 'seo_meta'
 require 'babosa'

data/lib/refinery/pages/content_page_presenter.rb

@@ -19,6 +19,10 @@ module Refinery
       end
 
       def add_default_post_page_sections
+        add_section_if_missing(:id => :body)
+        add_section_if_missing(:id => :side_body)
+
+        # Deprecated in 2.1
         add_section_if_missing(:id => :body_content_left)
         add_section_if_missing(:id => :body_content_right)
       end

data/lib/refinery/pages/content_presenter.rb

@@ -16,9 +16,14 @@ module Refinery
       end
 
       def hide_sections(*ids_to_hide)
+        ids_to_hide.flatten!
         @sections.select {|section| ids_to_hide.include?(section.id)}.each(&:hide) if ids_to_hide.any?
       end
 
+      def hidden_sections
+        @sections.select {|section| section.hidden? }
+      end
+
       def fetch_template_overrides
         @sections.each do |section|
           section.override_html = yield section.id if section.id.present?
@@ -42,7 +47,21 @@ module Refinery
     private
 
       def sections_html(can_use_fallback)
-        @sections.map {|section| section.wrapped_html(can_use_fallback)}.compact.join("\n").html_safe
+        @sections.map do |section|
+          # Remove in 2.1
+          check_deprecated_sections(section)
+          section.wrapped_html(can_use_fallback)
+        end.compact.join("\n").html_safe
+      end
+
+      def check_deprecated_sections(section)
+        if section.has_content?
+          if section.id == :body_content_left
+            Refinery.deprecate "content_for :body_content_left", :when => '2.1.0', :replacement => "content_for :body"
+          elsif section.id == :body_content_right
+            Refinery.deprecate "content_for :body_content_right", :when => '2.1.0', :replacement => "content_for :side_body"
+          end
+        end
       end
 
       def add_section_if_missing(options)

data/lib/refinery/pages/engine.rb

@@ -8,11 +8,6 @@ module Refinery
 
       config.autoload_paths += %W( #{config.root}/lib )
 
-      config.to_prepare do |app|
-        Refinery::Page.translation_class.send(:is_seo_meta)
-        Refinery::Page.translation_class.send(:attr_accessible, :browser_title, :meta_description, :meta_keywords, :locale)
-      end
-
       before_inclusion do
         ::ApplicationController.send :helper, Refinery::Pages::ContentPagesHelper
         Refinery::AdminController.send :helper, Refinery::Pages::ContentPagesHelper
@@ -38,8 +33,8 @@ module Refinery
         append_marketable_routes if Refinery::Pages.marketable_urls
       end
 
-      initializer "add marketable route parts to reserved words", :after => :set_routes_reloader_hook do |app|
-        add_route_parts_as_reserved_words(app) if Refinery::Pages.marketable_urls
+      initializer "add marketable route parts to reserved words", :after => :set_routes_reloader_hook do
+        add_route_parts_as_reserved_words if Refinery::Pages.marketable_urls
       end
 
       config.after_initialize do
@@ -56,12 +51,14 @@ module Refinery
       end
 
       # Add any parts of routes as reserved words.
-      def add_route_parts_as_reserved_words(app)
-        route_paths = app.routes.named_routes.routes.map { |name, route| route.path.spec }
-        route_paths.reject! {|path| path.to_s =~ %r{^/(rails|refinery)}}
-        Refinery::Page.friendly_id_config.reserved_words |= route_paths.map { |path|
-          path.to_s.gsub(%r{^/}, '').to_s.split('(').first.to_s.split(':').first.to_s.split('/')
-        }.flatten.reject { |w| w =~ %r{_|\.} }.uniq
+      def add_route_parts_as_reserved_words
+        ActiveSupport.on_load(:active_record) do
+          route_paths = Rails.application.routes.named_routes.routes.map { |name, route| route.path.spec }
+          route_paths.reject! {|path| path.to_s =~ %r{^/(rails|refinery)}}
+          Refinery::Page.friendly_id_config.reserved_words |= route_paths.map { |path|
+            path.to_s.gsub(%r{^/}, '').to_s.split('(').first.to_s.split(':').first.to_s.split('/')
+          }.flatten.reject { |w| w =~ %r{_|\.} }.uniq
+        end
       end
     end
   end

data/refinerycms-pages.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   s.add_dependency 'awesome_nested_set',          '~> 2.1.0'
-  s.add_dependency 'seo_meta',                    '~> 1.2.0'
+  s.add_dependency 'seo_meta',                    '~> 1.3.0'
   s.add_dependency 'refinerycms-core',            version
   s.add_dependency 'babosa',                      '!= 0.3.6'
 end

data/spec/lib/pages/content_page_presenter_spec.rb

@@ -24,18 +24,18 @@ module Refinery
 
         it "adds body content left and right after page parts" do
           content = ContentPagePresenter.new(page_with_one_part, title)
-          content.get_section(2).id.should == :body_content_left
-          content.get_section(3).id.should == :body_content_right
+          content.get_section(2).id.should == :body
+          content.get_section(3).id.should == :side_body
         end
 
         it "doesnt add page parts if page is nil" do
           content = ContentPagePresenter.new(nil, title)
-          content.get_section(1).id.should == :body_content_left
+          content.get_section(1).id.should == :body
         end
 
         it "doesnt add title if it is blank" do
           content = ContentPagePresenter.new(nil, '')
-          content.get_section(0).id.should == :body_content_left
+          content.get_section(0).id.should == :body
         end
       end
     end

data/spec/lib/pages/content_presenter_spec.rb

@@ -34,9 +34,23 @@ module Refinery
         end
 
         it "hides a section specified by id" do
-          section2.should_receive(:hide)
-          @content.hide_sections('bar')
+          section2.should_receive :hide
+          @content.hide_sections 'bar'
         end
+
+        # Regression for https://github.com/resolve/refinerycms/issues/1516
+        it "accepts an array" do
+          section2.should_receive :hide
+          @content.hide_sections ['bar']
+        end
+
+        it "hides nothing if nil" do
+          section1.stub(:hidden?).and_return false
+          section2.stub(:hidden?).and_return false
+          @content.hide_sections nil
+          @content.hidden_sections.count.should == 0
+        end
+
       end
 
       describe "when fetching template overrides" do

data/spec/requests/refinery/admin/pages_spec.rb

@@ -136,6 +136,18 @@ module Refinery
 
           Refinery::Page.count.should == 1
         end
+
+        it "includes menu title field" do
+          visit refinery.new_admin_page_path
+
+          fill_in "Title", :with => "My first page"
+          fill_in "Menu title", :with => "The first page"
+
+          click_button "Save"
+
+          page.should have_content("'My first page' was successfully added.")
+          page.body.should =~ %r{/pages/the-first-page}
+        end
       end
 
       describe "edit/update" do

metadata

@@ -1,103 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-pages
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.0.3
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 2
-  version: 2.0.2
 platform: ruby
-authors: 
+authors:
 - Philip Arndt
-- "U\xC4\xA3is Ozols"
+- Uģis Ozols
 - David Jones
 - Steven Heidel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: awesome_nested_set
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  version_requirements: *id001
-  name: awesome_nested_set
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  version_requirements: *id002
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   name: seo_meta
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
-  version_requirements: *id003
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
   name: refinerycms-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "!="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  version_requirements: *id004
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
   name: babosa
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
   type: :runtime
-description: The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+description: The default content extension of Refinery CMS. This extension handles
+  the administration and display of user-editable pages.
 email: info@refinerycms.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/refinery/admin/page_parts_controller.rb
 - app/controllers/refinery/admin/pages_controller.rb
 - app/controllers/refinery/admin/pages_dialogs_controller.rb
 - app/controllers/refinery/page_sweeper.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/helpers/refinery/pages_helper.rb
 - app/models/refinery/page.rb
@@ -185,39 +180,37 @@ files:
 - spec/requests/refinery/admin/pages_spec.rb
 - spec/requests/refinery/pages_spec.rb
 homepage: http://refinerycms.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 515173493532561148
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 515173493532561148
 requirements: []
-
 rubyforge_project: refinerycms
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Pages extension for Refinery CMS
-test_files: 
+test_files:
 - spec/factories/pages.rb
 - spec/helpers/refinery/pages/content_pages_helper_spec.rb
 - spec/lib/generators/refinery/pages/pages_generator_spec.rb