refinerycms-pages 2.0.1 → 2.0.2

data/lib/generators/refinery/pages/templates/config/initializers/refinery/pages.rb.erb

@@ -7,6 +7,12 @@ Refinery::Pages.configure do |config|
   # Configure global page default parts
   # config.default_parts = <%= Refinery::Pages.default_parts.inspect %>
 
+  # Configure whether to allow adding new page parts
+  # config.new_page_parts = <%= Refinery::Pages.new_page_parts.inspect %>
+
+  # Configure whether to enable marketable_urls
+  # config.marketable_urls = <%= Refinery::Pages.marketable_urls.inspect %>
+
   # Configure how many pages per page should be displayed when a dialog is presented that contains a links to pages
   # config.pages_per_dialog = <%= Refinery::Pages.pages_per_dialog.inspect %>
 
@@ -40,5 +46,7 @@ Refinery::Pages.configure do |config|
 
   # config.use_view_templates = <%= Refinery::Pages.use_view_templates.inspect %>
 
+  # config.page_title = <%= Refinery::Pages.page_title.inspect %>
+
   # config.absolute_page_links = <%= Refinery::Pages.absolute_page_links.inspect %>
 end

data/lib/refinery/pages/content_page_presenter.rb

@@ -1,9 +1,9 @@
 module Refinery
   module Pages
-    # A type of ContentPresenter which specifically knows how to render the html for a Refinery CMS
-    # page object. Pass the page object into the constructor, and it will build sections from the
-    # page's parts. The page is not retained internally, so if the page changes, you need to rebuild
-    # this ContentPagePresenter.
+    # A type of ContentPresenter which specifically knows how to render the html
+    # for a Refinery::Page object. Pass the page object into the constructor,
+    # and it will build sections from the page's parts. The page is not retained
+    # internally, so if the page changes, you need to rebuild this ContentPagePresenter.
     class ContentPagePresenter < ContentPresenter
       def initialize(page, page_title)
         super()
@@ -12,22 +12,22 @@ module Refinery
         add_default_post_page_sections
       end
 
-      private
+    private
 
-        def add_default_title_section(title)
-          add_section TitleSectionPresenter.new(:id => :body_content_title, :fallback_html => title)
-        end
+      def add_default_title_section(title)
+        add_section TitleSectionPresenter.new(:id => :body_content_title, :fallback_html => title)
+      end
 
-        def add_default_post_page_sections
-          add_section_if_missing(:id => :body_content_left)
-          add_section_if_missing(:id => :body_content_right)
-        end
+      def add_default_post_page_sections
+        add_section_if_missing(:id => :body_content_left)
+        add_section_if_missing(:id => :body_content_right)
+      end
 
-        def add_page_parts(parts)
-          parts.each do |part|
-            add_section PagePartSectionPresenter.new(part)
-          end
+      def add_page_parts(parts)
+        parts.each do |part|
+          add_section PagePartSectionPresenter.new(part)
         end
+      end
     end
   end
 end

data/lib/refinery/pages/content_presenter.rb

@@ -1,8 +1,9 @@
 module Refinery
   module Pages
-    # Knows how to render a set of sections as html. This can be used in any refinery view that is built from
-    # a group of sections. Pass the sections into the constructor or call add_section on the instance,
-    # then render by calling to_html.
+    # Knows how to render a set of sections as html. This can be used in any
+    # Refinery view that is built from a group of sections. Pass the sections
+    # into the constructor or call add_section on the instance, then render by
+    # calling 'to_html'.
     class ContentPresenter
       include ActionView::Helpers::TagHelper
 
@@ -14,15 +15,13 @@ module Refinery
         @sections.reject {|section| section.has_content?(can_use_fallback)}.map(&:not_present_css_class)
       end
 
-      def hide_sections(ids_to_hide)
-        @sections.select {|section| ids_to_hide.include?(section.id)}.each(&:hide) unless ids_to_hide.empty?
+      def hide_sections(*ids_to_hide)
+        @sections.select {|section| ids_to_hide.include?(section.id)}.each(&:hide) if ids_to_hide.any?
       end
 
       def fetch_template_overrides
         @sections.each do |section|
-          if section.id.present?
-            section.override_html = yield section.id
-          end
+          section.override_html = yield section.id if section.id.present?
         end
       end
 
@@ -35,22 +34,24 @@ module Refinery
       end
 
       def to_html(can_use_fallback = true)
-        content_tag :section, sections_html(can_use_fallback), :id => 'body_content', :class => blank_section_css_classes(can_use_fallback).join(' ')
+        content_tag :section, sections_html(can_use_fallback),
+                    :id => 'body_content',
+                    :class => blank_section_css_classes(can_use_fallback).join(' ')
       end
 
-      private
+    private
 
-        def sections_html(can_use_fallback)
-          @sections.map {|section| section.wrapped_html(can_use_fallback)}.compact.join("\n").html_safe
-        end
+      def sections_html(can_use_fallback)
+        @sections.map {|section| section.wrapped_html(can_use_fallback)}.compact.join("\n").html_safe
+      end
 
-        def add_section_if_missing(options)
-          add_section SectionPresenter.new(options) unless has_section?(options[:id])
-        end
+      def add_section_if_missing(options)
+        add_section SectionPresenter.new(options) unless has_section?(options[:id])
+      end
 
-        def has_section?(id)
-          @sections.detect {|section| section.id == id}
-        end
+      def has_section?(id)
+        @sections.detect {|section| section.id == id}
+      end
     end
   end
 end

data/lib/refinery/pages/instance_methods.rb

@@ -4,6 +4,7 @@ module Refinery
 
       def self.included(base)
         base.send :helper_method, :refinery_menu_pages
+        base.send :alias_method_chain, :render, :presenters
       end
 
       def error_404(exception=nil)
@@ -22,9 +23,9 @@ module Refinery
       end
 
     protected
-      def render(*args)
+      def render_with_presenters(*args)
         present(@page) unless admin? or @meta.present?
-        super
+        render_without_presenters(*args)
       end
 
     private

data/lib/refinery/pages/page_part_section_presenter.rb

@@ -9,11 +9,11 @@ module Refinery
         self.id = convert_title_to_id(page_part.title) if page_part.title
       end
 
-      private
+    private
 
-        def convert_title_to_id(title)
-          title.to_s.gsub(/\ /, '').underscore.to_sym
-        end
+      def convert_title_to_id(title)
+        title.to_s.gsub(/\ /, '').underscore.to_sym
+      end
     end
   end
 end

data/lib/refinery/pages/section_presenter.rb

@@ -47,23 +47,27 @@ module Refinery
         "no_#{id}"
       end
 
-      protected
+    protected
 
-        def content_html(can_use_fallback)
-          override_html.present? ? override_html : html_from_fallback(can_use_fallback)
+      def content_html(can_use_fallback)
+        if override_html.present?
+          override_html
+        else
+          html_from_fallback(can_use_fallback)
         end
+      end
 
-        def html_from_fallback(can_use_fallback)
-          fallback_html if fallback_html.present? && can_use_fallback
-        end
+      def html_from_fallback(can_use_fallback)
+        fallback_html if fallback_html.present? && can_use_fallback
+      end
 
-      private
+    private
 
-        attr_writer :id, :fallback_html, :hidden
+      attr_writer :id, :fallback_html, :hidden
 
-        def wrap_content_in_tag(content)
-          content_tag(:section, content_tag(:div, content, :class => 'inner'), :id => id)
-        end
+      def wrap_content_in_tag(content)
+        content_tag(:section, content_tag(:div, content, :class => 'inner'), :id => id)
+      end
     end
   end
 end

data/lib/refinery/pages/title_section_presenter.rb

@@ -4,11 +4,11 @@ module Refinery
     # a title. These are much like normal sections except they are wrapped in
     # a h1 tag rather than a div.
     class TitleSectionPresenter < SectionPresenter
-      private
+    private
 
-        def wrap_content_in_tag(content)
-          content_tag(:h1, content, :id => id)
-        end
+      def wrap_content_in_tag(content)
+        content_tag(:h1, content, :id => id)
+      end
     end
   end
 end

data/refinerycms-pages.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
-  s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_dependency 'awesome_nested_set',          '~> 2.1.0'
   s.add_dependency 'seo_meta',                    '~> 1.2.0'

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

@@ -474,6 +474,26 @@ module Refinery
           end
         end
       end
+
+      describe "new page part", :js => true do
+        before do
+          Refinery::Pages.stub(:new_page_parts).and_return(true)
+        end
+
+        it "adds new page part" do
+          visit refinery.new_admin_page_path
+          click_link "add_page_part"
+
+          within "#new_page_part_dialog" do
+            fill_in "new_page_part_title", :with => "testy"
+            click_button "Save"
+          end
+
+          within "#page_parts" do
+            page.should have_content("testy")
+          end
+        end
+      end
     end
 
     describe "TranslatePages" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Philip Arndt
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 2
         - 0
-        - 1
-        version: 2.0.1
+        - 2
+        version: 2.0.2
   version_requirements: *id003
   name: refinerycms-core
   type: :runtime