refinerycms-pages 1.0.11 → 2.0.0

data/lib/refinery/pages/instance_methods.rb

@@ -2,40 +2,26 @@ module Refinery
   module Pages
     module InstanceMethods
 
+      def self.included(base)
+        base.send :helper_method, :refinery_menu_pages
+      end
+
       def error_404(exception=nil)
-        if (@page = ::Page.where(:menu_match => '^/404$').includes(:parts, :slugs).first).present?
+        if (@page = ::Refinery::Page.where(:menu_match => "^/404$").includes(:parts).first).present?
           # render the application's custom 404 page with layout and meta.
-          render :template => '/pages/show',
-                 :format => 'html',
-                 :status => 404
+          render :template => '/refinery/pages/show', :formats => [:html], :status => 404
+          return false
         else
           super
         end
       end
 
-    protected
-      def find_pages_for_menu
-        # First, apply a filter to determine which pages to show.
-        # We need to join to the page's slug to avoid multiple queries.
-        pages = ::Page.live.in_menu.includes(:slug).order('lft ASC')
-
-        # Now we only want to select particular columns to avoid any further queries.
-        # Title is retrieved in the next block below so it's not here.
-        %w(id depth parent_id lft rgt link_url menu_match).each do |column|
-          pages = pages.select(::Page.arel_table[column.to_sym])
-        end
-
-        # If we have translations then we get the title from that table.
-        if ::Page.respond_to?(:translation_class)
-          pages = pages.joins(:translations).select("#{::Page.translation_class.table_name}.title as page_title")
-        else
-          pages = pages.select('title as page_title')
-        end
-
-        # Compile the menu
-        @menu_pages = ::Refinery::Menu.new(pages)
+      # Compiles the default menu.
+      def refinery_menu_pages
+        ::Refinery::Menu.new(::Refinery::Page.fast_menu)
       end
 
+    protected
       def render(*args)
         present(@page) unless admin? or @meta.present?
         super
@@ -45,7 +31,7 @@ module Refinery
       def store_current_location!
         return super if admin?
 
-        session[:website_return_to] = url_for(@page.url) if @page.try(:present?)
+        session[:website_return_to] = refinery.url_for(@page.url) if @page && @page.persisted?
       end
 
     end

data/lib/refinery/pages/page_part_section_presenter.rb

@@ -0,0 +1,19 @@
+module Refinery
+  module Pages
+    # A type of SectionPresenter which knows how to render a section which displays
+    # a PagePart model.
+    class PagePartSectionPresenter < SectionPresenter
+      def initialize(page_part)
+        super()
+        self.fallback_html = page_part.body.html_safe if page_part.body
+        self.id = convert_title_to_id(page_part.title) if page_part.title
+      end
+
+      private
+
+        def convert_title_to_id(title)
+          title.to_s.gsub(/\ /, '').underscore.to_sym
+        end
+    end
+  end
+end

data/lib/refinery/pages/section_presenter.rb

@@ -0,0 +1,69 @@
+module Refinery
+  module Pages
+    # Knows how to build the html for a section. A section is part of the visible html, that has
+    # content wrapped in some particular markup. Construct with the relevant options, and then
+    # call wrapped_html to get the resultant html.
+    #
+    # The content rendered will usually be the value of fallback_html, unless an override_html
+    # is specified. However, on rendering, you can elect not display sections that have no
+    # override_html by passing in false for can_use_fallback.
+    #
+    # Sections may be hidden, in which case they wont display at all.
+    class SectionPresenter
+      include ActionView::Helpers::TagHelper
+
+      def initialize(initial_hash = {})
+        initial_hash.map do |key, value|
+          send("#{key}=", value)
+        end
+      end
+
+      attr_reader :id, :fallback_html, :hidden
+      alias_method :hidden?, :hidden
+      attr_accessor :override_html
+
+      def visible?
+        !hidden?
+      end
+
+      def has_content?(can_use_fallback = true)
+        visible? && content_html(can_use_fallback).present?
+      end
+
+      def wrapped_html(can_use_fallback = true)
+        return if hidden?
+
+        content = content_html(can_use_fallback)
+        if content.present?
+          wrap_content_in_tag(content)
+        end
+      end
+
+      def hide
+        self.hidden = true
+      end
+
+      def not_present_css_class
+        "no_#{id}"
+      end
+
+      protected
+
+        def content_html(can_use_fallback)
+          override_html.present? ? override_html : html_from_fallback(can_use_fallback)
+        end
+
+        def html_from_fallback(can_use_fallback)
+          fallback_html if fallback_html.present? && can_use_fallback
+        end
+
+      private
+
+        attr_writer :id, :fallback_html, :hidden
+
+        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

@@ -0,0 +1,14 @@
+module Refinery
+  module Pages
+    # A type of SectionPresenter which knows how to render a section which displays
+    # a title. These are much like normal sections except they are wrapped in
+    # a h1 tag rather than a div.
+    class TitleSectionPresenter < SectionPresenter
+      private
+
+        def wrap_content_in_tag(content)
+          content_tag(:h1, content, :id => id)
+        end
+    end
+  end
+end

data/lib/refinery/pages/type.rb

@@ -0,0 +1,17 @@
+module Refinery
+  module Pages
+    class Type
+
+      attr_accessor :name, :parts, :template
+
+      def parts
+        @parts ||= []
+      end
+
+      def template
+        @template ||= "refinery/pages/#{name}"
+      end
+
+    end
+  end
+end

data/lib/refinery/pages/types.rb

@@ -0,0 +1,32 @@
+module Refinery
+  module Pages
+    class Types < Array
+
+      def register(name, &block)
+        self.class.register(name, &block)
+      end
+
+      def find_by_name(name)
+        detect {|type| type.name.to_s.downcase == name.to_s.downcase}
+      end
+
+      class << self
+        def register(name, &block)
+          type = Type.new
+          type.name = name
+
+          yield type if block_given?
+
+          raise "A page type must have a name: #{self.inspect}" if type.name.blank?
+
+          registered << type
+        end
+
+        def registered
+          @registered_types ||= new
+        end
+      end
+
+    end
+  end
+end

data/lib/refinery/pages.rb

@@ -0,0 +1,55 @@
+require 'refinerycms-core'
+
+module Refinery
+  autoload :PagesGenerator, 'generators/refinery/pages/pages_generator'
+
+  module Pages
+    require 'refinery/pages/engine'
+    require 'refinery/pages/tab'
+    require 'refinery/pages/type'
+    require 'refinery/pages/types'
+
+    # Load configuration last so that everything above is available to it.
+    require 'refinery/pages/configuration'
+
+    autoload :InstanceMethods, 'refinery/pages/instance_methods'
+
+    class << self
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def factory_paths
+        @factory_paths ||= [ root.join('spec', 'factories').to_s ]
+      end
+
+      def valid_templates(*pattern)
+        [Rails.root, Refinery::Plugins.registered.pathnames].flatten.uniq.map { |p|
+          p.join(*pattern)
+        }.map(&:to_s).map { |p|
+          Dir[p]
+        }.select(&:any?).flatten.map { |f|
+          File.basename(f)
+        }.map { |p|
+          p.split('.').first
+        }
+      end
+
+      def default_parts_for(page)
+        return default_parts unless page.view_template.present?
+
+        types.find_by_name(page.view_template).parts.map &:titleize
+      end
+    end
+
+    module Admin
+      autoload :InstanceMethods, 'refinery/pages/admin/instance_methods'
+    end
+  end
+end
+
+require 'awesome_nested_set'
+require 'globalize3'
+require 'friendly_id'
+require 'seo_meta'
+require 'babosa'

data/lib/refinerycms-pages.rb

@@ -1,61 +1 @@
-require 'refinerycms-core'
-require 'awesome_nested_set'
-require 'globalize3'
-require 'friendly_id'
-require 'seo_meta'
-
-module Refinery
-  module Pages
-
-    autoload :InstanceMethods, File.expand_path('../refinery/pages/instance_methods', __FILE__)
-    module Admin
-      autoload :InstanceMethods, File.expand_path('../refinery/pages/admin/instance_methods', __FILE__)
-    end
-
-    class << self
-      attr_accessor :root
-      def root
-        @root ||= Pathname.new(File.expand_path('../../', __FILE__))
-      end
-    end
-
-    class Engine < ::Rails::Engine
-      initializer 'serve static assets' do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
-      end
-
-      config.to_prepare do
-        require File.expand_path('../pages/tabs', __FILE__)
-      end
-
-      refinery.after_inclusion do
-        ::ApplicationController.send :include, ::Refinery::Pages::InstanceMethods
-        ::Admin::BaseController.send :include, ::Refinery::Pages::Admin::InstanceMethods
-      end
-
-      config.after_initialize do
-        ::Refinery::Plugin.register do |plugin|
-          plugin.pathname = root
-          plugin.name = 'refinery_pages'
-          plugin.directory = 'pages'
-          plugin.version = %q{1.0.0}
-          plugin.menu_match = /(refinery|admin)\/page(_part)?s(_dialogs)?$/
-          plugin.activity = {
-            :class => Page,
-            :url_prefix => 'edit',
-            :title => 'title',
-            :created_image => 'page_add.png',
-            :updated_image => 'page_edit.png'
-          }
-        end
-      end
-
-      initializer 'add marketable routes' do |app|
-        app.routes_reloader.paths << File.expand_path('../pages/marketable_routes.rb', __FILE__)
-      end
-
-    end
-  end
-end
-
-::Refinery.engines << 'pages'
+require 'refinery/pages'

data/refinerycms-pages.gemspec

@@ -1,130 +1,29 @@
 # Encoding: UTF-8
-# DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
+$:.push File.expand_path('../../core/lib', __FILE__)
+require 'refinery/version'
+
+version = Refinery::Version.to_s
 
 Gem::Specification.new do |s|
+  s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{1.0.11}
-  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{2012-05-18}
+  s.version           = version
+  s.summary           = %q{Pages extension for Refinery CMS}
+  s.description       = %q{The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.}
+  s.date              = %q{2011-10-12}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'David Jones', 'Steven Heidel']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
-  s.executables       = %w()
 
-  s.files             = [
-    'app',
-    'app/controllers',
-    'app/controllers/admin',
-    'app/controllers/admin/page_parts_controller.rb',
-    'app/controllers/admin/pages_controller.rb',
-    'app/controllers/admin/pages_dialogs_controller.rb',
-    'app/controllers/pages_controller.rb',
-    'app/helpers',
-    'app/helpers/pages_helper.rb',
-    'app/models',
-    'app/models/page.rb',
-    'app/models/page_part.rb',
-    'app/presenters',
-    'app/presenters/page_presenter.rb',
-    'app/views',
-    'app/views/admin',
-    'app/views/admin/pages',
-    'app/views/admin/pages/_actions.html.erb',
-    'app/views/admin/pages/_form.html.erb',
-    'app/views/admin/pages/_form_advanced_options.html.erb',
-    'app/views/admin/pages/_form_advanced_options_seo.html.erb',
-    'app/views/admin/pages/_form_fields_after_title.html.erb',
-    'app/views/admin/pages/_form_new_page_parts.html.erb',
-    'app/views/admin/pages/_form_page_parts.html.erb',
-    'app/views/admin/pages/_locale_picker.html.erb',
-    'app/views/admin/pages/_page.html.erb',
-    'app/views/admin/pages/_page_part_field.html.erb',
-    'app/views/admin/pages/_records.html.erb',
-    'app/views/admin/pages/_sortable_list.html.erb',
-    'app/views/admin/pages/edit.html.erb',
-    'app/views/admin/pages/index.html.erb',
-    'app/views/admin/pages/new.html.erb',
-    'app/views/admin/pages_dialogs',
-    'app/views/admin/pages_dialogs/_page_link.html.erb',
-    'app/views/admin/pages_dialogs/link_to.html.erb',
-    'app/views/pages',
-    'app/views/pages/home.html.erb',
-    'app/views/pages/show.html.erb',
-    'config',
-    'config/locales',
-    'config/locales/bg.yml',
-    'config/locales/cs.yml',
-    'config/locales/da.yml',
-    'config/locales/de.yml',
-    'config/locales/el.yml',
-    'config/locales/en.yml',
-    'config/locales/es.yml',
-    'config/locales/fi.yml',
-    'config/locales/fr.yml',
-    'config/locales/it.yml',
-    'config/locales/jp.yml',
-    'config/locales/lolcat.yml',
-    'config/locales/lt.yml',
-    'config/locales/lv.yml',
-    'config/locales/nb.yml',
-    'config/locales/nl.yml',
-    'config/locales/pl.yml',
-    'config/locales/pt-BR.yml',
-    'config/locales/rs.yml',
-    'config/locales/ru.yml',
-    'config/locales/sk.yml',
-    'config/locales/sl.yml',
-    'config/locales/sv.yml',
-    'config/locales/vi.yml',
-    'config/locales/zh-CN.yml',
-    'config/locales/zh-TW.yml',
-    'config/routes.rb',
-    'db',
-    'db/migrate',
-    'db/migrate/20100913234708_create_refinerycms_pages_schema.rb',
-    'db/migrate/20101214040815_translate_page_plugin.rb',
-    'db/migrate/20101216194133_remove_cached_slug_from_pages.rb',
-    'db/migrate/20110307025652_translate_custom_title_on_pages.rb',
-    'db/migrate/20110314213540_remove_translated_fields_from_pages.rb',
-    'db/migrate/20110329080451_create_seo_meta.rb',
-    'db/seeds',
-    'db/seeds/pages.rb',
-    'features',
-    'features/manage_pages.feature',
-    'features/step_definitions',
-    'features/step_definitions/page_steps.rb',
-    'features/support',
-    'features/support/paths.rb',
-    'features/translate_pages.feature',
-    'features/visit_pages.feature',
-    'lib',
-    'lib/gemspec.rb',
-    'lib/generators',
-    'lib/generators/refinerycms_pages_generator.rb',
-    'lib/pages',
-    'lib/pages/marketable_routes.rb',
-    'lib/pages/tabs.rb',
-    'lib/refinery',
-    'lib/refinery/pages',
-    'lib/refinery/pages/admin',
-    'lib/refinery/pages/admin/instance_methods.rb',
-    'lib/refinery/pages/instance_methods.rb',
-    'lib/refinerycms-pages.rb',
-    'license.md',
-    'refinerycms-pages.gemspec',
-    'spec',
-    'spec/models',
-    'spec/models/page_spec.rb'
-  ]
+  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 'refinerycms-core',            '= 1.0.11'
-  s.add_dependency 'activerecord',                '~> 3.0.10'
-  s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '~> 0.2.0.beta4'
-  s.add_dependency 'awesome_nested_set',          '~> 2.0'
-  s.add_dependency 'seo_meta',                    '~> 1.1'
+  s.add_dependency 'awesome_nested_set',          '~> 2.1.0'
+  s.add_dependency 'seo_meta',                    '~> 1.2.0'
+  s.add_dependency 'refinerycms-core',            version
+  s.add_dependency 'babosa',                      '!= 0.3.6'
 end

data/spec/factories/pages.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :page, :class => Refinery::Page do
+    title "Test title"
+  end
+end

data/spec/helpers/refinery/pages/content_pages_helper_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+module Refinery
+  module Pages
+    describe ContentPagesHelper do
+      let(:content_presenter) { double(ContentPresenter, :hide_sections => nil, :fetch_template_overrides => nil, :to_html => nil) }
+
+      describe "when rendering content presenter" do
+        it "asks to content presenter to hide sections if told to" do
+          content_presenter.should_receive(:hide_sections).with(['foo', 'bar'])
+          render_content_presenter(content_presenter, :hide_sections => ['foo', 'bar'])
+        end
+
+        it "attempts to fetch template overrides declared elsewhere via content_for" do
+          content_presenter.should_receive(:fetch_template_overrides).and_yield(12)
+          self.should_receive(:content_for).with(12)
+          render_content_presenter(content_presenter)
+        end
+
+        it "outputs the html rendered by the content presenter" do
+          content_presenter.should_receive(:to_html).and_return('foobar')
+          render_content_presenter(content_presenter).should == 'foobar'
+        end
+
+        it "passes can_use_fallback option through to html rendering" do
+          content_presenter.should_receive(:to_html).with(true)
+          render_content_presenter(content_presenter, :can_use_fallback => true)
+        end
+      end
+
+      describe "when rendering page" do
+        let(:page) { double(Page) }
+
+        it "builds a content page presenter and returns its html" do
+          self.should_receive(:page_title).and_return('some title')
+          Refinery::Pages::ContentPagePresenter.should_receive(:new).with(page, 'some title').and_return(content_presenter)
+          content_presenter.should_receive(:to_html).and_return('barfoo')
+
+          render_content_page(page).should == 'barfoo'
+        end
+      end
+    end
+  end
+end

data/spec/lib/generators/refinery/pages/pages_generator_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'generator_spec/test_case'
+require 'generators/refinery/pages/pages_generator'
+
+module Refinery
+  describe PagesGenerator do
+    include GeneratorSpec::TestCase
+    destination File.expand_path("../../../../tmp", __FILE__)
+
+    before(:each) do
+      prepare_destination
+      run_generator
+    end
+
+    specify do
+      destination_root.should have_structure {
+        directory "config" do
+          directory "initializers" do
+            directory "refinery" do
+              file "pages.rb" do
+                contains "Refinery::Pages.configure"
+              end
+            end
+          end
+        end
+      }
+    end
+  end
+end

data/spec/lib/pages/content_page_presenter_spec.rb

@@ -0,0 +1,43 @@
+require "spec_helper"
+
+module Refinery
+  module Pages
+    describe ContentPagePresenter do
+      let(:part)  { double(PagePart, :body => 'part_body', :title => 'A Wonderful Page Part') }
+      let(:part2) { double(PagePart, :body => 'part_body2', :title => 'Another Wonderful Page Part') }
+      let(:title) { 'This Great Page' }
+
+      describe "when building for page" do
+        let(:page_with_one_part) { double(Page, :parts => [part]) }
+
+        it "adds page title section before page parts" do
+          content = ContentPagePresenter.new(page_with_one_part, title)
+          content.get_section(0).fallback_html.should == title
+        end
+
+        it "adds a section for each page part" do
+          page = double(Page, :parts => [part, part2])
+          content = ContentPagePresenter.new(page, title)
+          content.get_section(1).fallback_html.should == 'part_body'
+          content.get_section(2).fallback_html.should == 'part_body2'
+        end
+
+        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
+        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
+        end
+
+        it "doesnt add title if it is blank" do
+          content = ContentPagePresenter.new(nil, '')
+          content.get_section(0).id.should == :body_content_left
+        end
+      end
+    end
+  end
+end