refinerycms-pages 0.9.9.22 → 1.0.0

data/app/controllers/admin/pages_controller.rb

@@ -12,7 +12,7 @@ module Admin
     after_filter lambda{::Page.expire_page_caching}, :only => [:update_positions]
 
     before_filter :restrict_access, :only => [:create, :update, :update_positions, :destroy], :if => proc {|c|
-      defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?
+      ::Refinery.i18n_enabled?
     }
 
     def new

data/app/controllers/pages_controller.rb

@@ -20,7 +20,7 @@ class PagesController < ApplicationController
 
     if @page.try(:live?) || (refinery_user? && current_user.authorized_plugins.include?("refinery_pages"))
       # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
-      if @page.skip_to_first_child# && (first_live_child = @page.children.order('lft ASC').live.first).present?
+      if @page.skip_to_first_child && (first_live_child = @page.children.order('lft ASC').live.first).present?
         redirect_to first_live_child.url
       elsif @page.link_url.present?
         redirect_to @page.link_url and return

data/app/models/page.rb

@@ -2,6 +2,15 @@ require 'globalize3'
 
 class Page < ActiveRecord::Base
 
+  # when a dialog pops up to link to a page, how many pages per page should there be
+  PAGES_PER_DIALOG = 14
+
+  # when listing pages out in the admin area, how many pages should show per page
+  PAGES_PER_ADMIN_INDEX = 20
+
+  # when collecting the pages path how is each of the pages seperated?
+  PATH_SEPARATOR = " - "
+
   if self.respond_to?(:translates)
     translates :title, :custom_title, :meta_keywords, :meta_description, :browser_title, :include => :seo_meta
 
@@ -34,7 +43,7 @@ class Page < ActiveRecord::Base
     end
 
     before_create :ensure_locale, :if => proc { |c|
-      defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?
+      ::Refinery.i18n_enabled?
     }
   end
 
@@ -71,18 +80,25 @@ class Page < ActiveRecord::Base
                               :custom_title, :browser_title, :all_page_part_content]
 
   before_destroy :deletable?
-  after_save :reposition_parts!, :invalidate_child_cached_url, :expire_page_caching
+  after_save :reposition_parts!, :invalidate_cached_urls, :expire_page_caching
   after_destroy :expire_page_caching
 
   # Wrap up the logic of finding the pages based on the translations table.
   if defined?(::Page::Translation)
     def self.with_globalize(conditions = {})
       conditions = {:locale => Globalize.locale}.merge(conditions)
-      where(:id => ::Page::Translation.where(conditions).select('page_id AS id')).includes(:children, :slugs)
+      globalized_conditions = {}
+      conditions.keys.each do |key|
+        if (translated_attribute_names.map(&:to_s) | %w(locale)).include?(key.to_s)
+          globalized_conditions["#{self.translation_class.table_name}.#{key}"] = conditions.delete(key)
+        end
+      end
+      # A join implies readonly which we don't really want.
+      joins(:translations).where(globalized_conditions).where(conditions).readonly(false)
     end
   else
     def self.with_globalize(conditions = {})
-      where(conditions).includes(:children, :slugs)
+      where(conditions)
     end
   end
 
@@ -95,15 +111,6 @@ class Page < ActiveRecord::Base
   # using all of the page_ids we further filter against this model's table.
   scope :in_menu, proc { where(:show_in_menu => true).with_globalize }
 
-  # when a dialog pops up to link to a page, how many pages per page should there be
-  PAGES_PER_DIALOG = 14
-
-  # when listing pages out in the admin area, how many pages should show per page
-  PAGES_PER_ADMIN_INDEX = 20
-
-  # when collecting the pages path how is each of the pages seperated?
-  PATH_SEPARATOR = " - "
-
   # Am I allowed to delete this page?
   # If a link_url is set we don't want to break the link so we don't allow them to delete
   # If deletable is set to false then we don't allow this page to be deleted. These are often Refinery system pages
@@ -122,19 +129,17 @@ class Page < ActiveRecord::Base
   # Before destroying a page we check to see if it's a deletable page or not
   # Refinery system pages are not deletable.
   def destroy
-    if deletable?
-      super
-    else
-      unless Rails.env.test?
-        # give useful feedback when trying to delete from console
-        puts "This page is not deletable. Please use .destroy! if you really want it deleted "
-        puts "unset .link_url," if link_url.present?
-        puts "unset .menu_match," if menu_match.present?
-        puts "set .deletable to true" unless deletable
-      end
-
-      return false
+    return super if deletable?
+
+    unless Rails.env.test?
+      # give useful feedback when trying to delete from console
+      puts "This page is not deletable. Please use .destroy! if you really want it deleted "
+      puts "unset .link_url," if link_url.present?
+      puts "unset .menu_match," if menu_match.present?
+      puts "set .deletable to true" unless deletable
     end
+
+    return false
   end
 
   # If you want to destroy a page that is set to be not deletable this is the way to do it.
@@ -152,7 +157,7 @@ class Page < ActiveRecord::Base
     # Override default options with any supplied.
     options = {:reversed => true}.merge(options)
 
-    unless parent.nil?
+    unless parent_id.nil?
       parts = [title, parent.path(options)]
       parts.reverse! if options[:reversed]
       parts.join(PATH_SEPARATOR)
@@ -179,7 +184,7 @@ class Page < ActiveRecord::Base
   end
 
   def link_url_localised?
-    return link_url unless defined?(::Refinery::I18n)
+    return link_url unless ::Refinery.i18n_enabled?
 
     current_url = link_url
 
@@ -235,7 +240,7 @@ class Page < ActiveRecord::Base
   end
 
   def cache_key
-    [Refinery.base_cache_key, ::I18n.locale, super].compact.join('/')
+    [Refinery.base_cache_key, ::I18n.locale, to_param].compact.join('/')
   end
 
   # Returns true if this page is "published"
@@ -255,7 +260,7 @@ class Page < ActiveRecord::Base
 
   # Returns true if this page is the home page or links to it.
   def home?
-    link_url == "/"
+    link_url == '/'
   end
 
   # Returns all visible sibling pages that can be rendered for the menu
@@ -263,6 +268,19 @@ class Page < ActiveRecord::Base
     siblings.reject(&:not_in_menu?)
   end
 
+  def to_refinery_menu_item
+    {
+      :id => id,
+      :lft => lft,
+      :menu_match => menu_match,
+      :parent_id => parent_id,
+      :rgt => rgt,
+      :title => (page_title if respond_to?(:page_title)) || title,
+      :type => self.class.name,
+      :url => url
+    }
+  end
+
   class << self
     # Accessor to find out the default page parts created for each new page
     def default_parts
@@ -273,9 +291,7 @@ class Page < ActiveRecord::Base
     # the current frontend locale is different to the current one set by ::I18n.locale.
     # This terminates in a false if i18n engine is not defined or enabled.
     def different_frontend_locale?
-      defined?(::Refinery::I18n) &&
-        ::Refinery::I18n.enabled? &&
-        ::Refinery::I18n.current_frontend_locale != ::I18n.locale
+      ::Refinery.i18n_enabled? && ::Refinery::I18n.current_frontend_locale != ::I18n.locale
     end
 
     # Returns how many pages per page should there be when paginating pages
@@ -300,15 +316,10 @@ class Page < ActiveRecord::Base
   # Accessor method to get a page part from a page.
   # Example:
   #
-  #    Page.first[:body]
+  #    Page.first.content_for(:body)
   #
   # Will return the body page part of the first page.
-  def [](part_title)
-    # Allow for calling attributes with [] shorthand (eg page[:parent_id])
-    return super if self.attributes.has_key?(part_title.to_s)
-
-    # the way that we call page parts seems flawed, will probably revert to page.parts[:title] in a future release.
-    # self.parts is already eager loaded so we can now just grab the first element matching the title we specified.
+  def content_for(part_title)
     part = self.parts.detect do |part|
       part.title.present? and #protecting against the problem that occurs when have nil title
       part.title == part_title.to_s or
@@ -318,6 +329,20 @@ class Page < ActiveRecord::Base
     part.try(:body)
   end
 
+  def [](part_title)
+    # Allow for calling attributes with [] shorthand (eg page[:parent_id])
+    return super if self.respond_to?(part_title.to_s.to_sym) or self.attributes.has_key?(part_title.to_s)
+
+    Refinery.deprecate({
+      :what => "page[#{part_title.inspect}]",
+      :when => '1.1',
+      :replacement => "content_for(#{part_title.inspect})",
+      :caller => caller
+    })
+
+    content_for(part_title)
+  end
+
   # In the admin area we use a slightly different title to inform the which pages are draft or hidden pages
   def title_with_meta
     title = if self.title.nil?
@@ -353,14 +378,15 @@ class Page < ActiveRecord::Base
 
 private
 
-  def invalidate_child_cached_url
+  def invalidate_cached_urls
     return true unless self.class.use_marketable_urls?
 
-    children.each do |child|
-      Rails.cache.delete(child.url_cache_key)
-      Rails.cache.delete(child.path_cache_key)
+    [self, children].flatten.each do |page|
+      Rails.cache.delete(page.url_cache_key)
+      Rails.cache.delete(page.path_cache_key)
     end
   end
+  alias_method :invalidate_child_cached_url, :invalidate_cached_urls
 
   def ensure_locale
     unless self.translations.present?

data/app/views/admin/pages/_form.html.erb

@@ -10,7 +10,7 @@
   <%= render :partial => "locale_picker",
              :locals => {
                :current_locale => Thread.current[:globalize_locale]
-             } if defined?(::Refinery::I18n) %>
+             } if ::Refinery.i18n_enabled? %>
 
   <div class="field">
     <%= f.label :title %>

data/app/views/admin/pages/_page.html.erb

@@ -2,7 +2,7 @@
   <div class='clearfix'>
     <span class='title'>
       <%= page.title_with_meta.html_safe %>
-      <% if defined?(::Refinery::I18n) and ::Refinery::I18n.frontend_locales.many? and
+      <% if ::Refinery.i18n_enabled? and ::Refinery::I18n.frontend_locales.many? and
             (locales = page.translations.map(&:locale)).present? %>
         <span class='preview'>
           <% ([page.translation.try(:locale)] | locales).each do |locale| %>

data/db/migrate/20110329080451_create_seo_meta.rb

@@ -41,6 +41,9 @@ class CreateSeoMeta < ActiveRecord::Migration
         }
       )
     end
+
+    # Reset column information again because otherwise the old columns will still exist.
+    ::Page.reset_column_information
   end
 
   def self.down
@@ -59,13 +62,26 @@ class CreateSeoMeta < ActiveRecord::Migration
 
     # Migrate data
     existing_translations.each do |translation|
-      ::Page::Translation.find(translation['id']).update_attributes(
+      ::Page::Translation.update_all(
         ::SeoMeta.attributes.keys.inject({}) {|attributes, name|
           attributes.merge(name => translation[name.to_s])
-        }
+        }, :id => translation['id']
       )
     end
 
+    ::SeoMeta.attributes.keys.each do |k|
+      ::Page::Translation.module_eval %{
+        def #{k}
+        end
+
+        def #{k}=(*args)
+        end
+      }
+    end
+
+    # Reset column information again because otherwise the old columns will still exist.
+    ::Page.reset_column_information
+
     drop_table :seo_meta
   end
 

data/db/seeds/pages.rb

@@ -3,7 +3,6 @@ page_position = -1
 home_page = Page.create(:title => "Home",
             :deletable => false,
             :link_url => "/",
-            :menu_match => "^/$",
             :position => (page_position += 1))
 home_page.parts.create({
               :title => "Body",

data/features/step_definitions/page_steps.rb

@@ -8,6 +8,10 @@ Given /^the page titled "?([^\"]*)"? has a menu match "?([^\"]*)"?$/ do |title,
   Page.by_title(title).first.update_attribute(:menu_match, menu_match)
 end
 
+Given /^the page titled "?([^\"]*)"? is set to skip to first child$/ do |title|
+  Page.by_title(title).first.update_attribute(:skip_to_first_child, true)
+end
+
 Given /^I (only )?have pages titled "?([^\"]*)"?$/ do |only, titles|
   Page.delete_all if only
   titles.split(', ').each do |title|
@@ -28,7 +32,8 @@ Given /^I (only )?have a page titled "?([^\"]*)"?$/ do |only, title|
 end
 
 Given /^the page titled "?([^\"]*)"? is a child of "?([^\"]*)"?$/ do |title, parent_title|
-  Page.by_title(title).first.update_attribute(:parent, Page.by_title(parent_title).first)
+  parent_page = Page.by_title(parent_title).first
+  Page.by_title(title).first.update_attribute(:parent_id, parent_page.id)
 end
 
 Given /^the page titled "?([^\"]*)"? is not shown in the menu$/ do |title|

data/features/visit_pages.feature

@@ -13,18 +13,21 @@ Feature: Visit Pages
     And the page titled "Hidden" is a child of Home
     And the page titled "Hidden" is not shown in the menu
 
+  @pages-visit-home
   Scenario: Home Page
     When I go to the home page
     Then I should see "Home"
     And I should see "About"
     And I should see "Home" within ".selected"
 
+  @pages-visit-show
   Scenario: Content Page
     When I go to the page titled "About"
     Then I should see "Home"
     And I should see "About"
     And I should see "About" within ".selected > a"
 
+  @pages-visit-special
   Scenario: Special Characters Title
     When I go to the page titled "ä ö ü spéciål chåråctÉrs"
     Then I should see "Home"
@@ -32,6 +35,7 @@ Feature: Visit Pages
     And I should see "ä ö ü spéciål chåråctÉrs"
     And I should see "ä ö ü spéciål chåråctÉrs" within ".selected > a"
 
+  @pages-visit-special
   Scenario: Special Characters Title as submenu page
     Given the page titled "ä ö ü spéciål chåråctÉrs" is a child of About
     When I go to the page titled "ä ö ü spéciål chåråctÉrs"
@@ -40,8 +44,18 @@ Feature: Visit Pages
     And I should see "ä ö ü spéciål chåråctÉrs"
     And I should see "ä ö ü spéciål chåråctÉrs" within ".selected * > .selected a"
 
+  @pages-visit-hidden
   Scenario: Hidden Page
     When I go to the page titled "Hidden"
     Then I should see "Home"
     And I should see "About"
-    And I should see "Home" within ".selected > a"
+    And I should see "Hidden"
+    And I should not see "Hidden" within "nav"
+
+  @pages-visit-skip
+  Scenario: Skip to first child
+    Given I have a page titled "Child Page"
+    And the page titled "Child Page" is a child of About
+    And the page titled "About" is set to skip to first child
+    When I go to the page titled "About"
+    Then I should see "Child Page" within ".selected * > .selected a"

data/lib/gemspec.rb

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'refinerycms-core',            '= #{::Refinery::Version}'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '>= 0.1.0.beta2'
+  s.add_dependency 'globalize3',                  '~> 0.1'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'seo_meta',                    '~> 1.1'
 end

data/lib/pages/marketable_routes.rb

@@ -4,7 +4,8 @@ end
 
 # Add any parts of routes as reserved words.
 if Page.use_marketable_urls?
-  Page.friendly_id_config.reserved_words |= ::Refinery::Application.routes.named_routes.map { |name, route|
-    route.path.gsub(/^\//, '').to_s.split('(').first.to_s.split(':').first.to_s.split('/')
+  route_paths = ::Refinery::Application.routes.named_routes.routes.map{|name, route| route.path}
+  Page.friendly_id_config.reserved_words |= route_paths.map { |path|
+    path.to_s.gsub(/^\//, '').to_s.split('(').first.to_s.split(':').first.to_s.split('/')
   }.flatten.reject{|w| w =~ /\_/}.uniq
 end

data/lib/refinery/pages/instance_methods.rb

@@ -3,9 +3,9 @@ module Refinery
     module InstanceMethods
 
       def error_404(exception=nil)
-        if (@page = ::Page.where(:menu_match => "^/404$").includes(:parts, :slugs).first).present?
+        if (@page = ::Page.where(:menu_match => '^/404$').includes(:parts, :slugs).first).present?
           # render the application's custom 404 page with layout and meta.
-          render :template => "/pages/show",
+          render :template => '/pages/show',
                  :format => 'html',
                  :status => 404
         else
@@ -15,7 +15,25 @@ module Refinery
 
     protected
       def find_pages_for_menu
-        @menu_pages = ::Page.roots.live.in_menu.order('lft ASC').includes(:children)
+        # 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)
       end
 
       def render(*args)

data/lib/refinerycms-pages.rb

@@ -37,7 +37,7 @@ module Refinery
         ::Refinery::Plugin.register do |plugin|
           plugin.name = 'refinery_pages'
           plugin.directory = 'pages'
-          plugin.version = %q{0.9.9.21}
+          plugin.version = %q{1.0.0}
           plugin.menu_match = /(refinery|admin)\/page(_part)?s(_dialogs)?$/
           plugin.activity = {
             :class => Page,

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.22}
+  s.version           = %q{1.0.0}
   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-05-22}
+  s.date              = %q{2011-05-28}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -119,9 +119,9 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core',            '= 0.9.9.22'
+  s.add_dependency 'refinerycms-core',            '= 1.0.0'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '>= 0.1.0.beta2'
+  s.add_dependency 'globalize3',                  '~> 0.1'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'seo_meta',                    '~> 1.1'
 end

data/spec/models/page_spec.rb

@@ -107,9 +107,14 @@ describe Page do
   context "content sections (page parts)" do
     before { create_page_parts }
 
-    it "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>"
+    it "return the content when using [] and moan about it" do
+      capture_stdout { page[:body].should == "<p>I'm the first page part for this page.</p>" }[:stderr].should =~ /DEPRECATION\ WARNING/
+      capture_stdout { page["BoDY"].should == "<p>I'm the first page part for this page.</p>" }[:stderr].should =~ /DEPRECATION\ WARNING/
+    end
+
+    it "return the content when using content_for" do
+      page.content_for(:body).should == "<p>I'm the first page part for this page.</p>"
+      page.content_for("BoDY").should == "<p>I'm the first page part for this page.</p>"
     end
 
     it "return all page part content" do
@@ -150,6 +155,9 @@ describe Page do
         :deletable => true
       })
     end
+    let(:child_with_reserved_title_parent) do
+      page_with_reserved_title.children.create(:title => 'reserved title child page')
+    end
 
     before { turn_on_marketable_urls }
 
@@ -158,8 +166,7 @@ describe Page do
     end
 
     it "when parent page title is set to a reserved word" do
-      child = page_with_reserved_title.children.create(:title => 'The child page')
-      child.url[:path].should == ["#{reserved_word}-page", 'the-child-page']
+      child_with_reserved_title_parent.url[:path].should == ["#{reserved_word}-page", 'reserved-title-child-page']
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.22
+  version: 1.0.0
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-22 00:00:00 +12:00
+date: 2011-05-28 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.22
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,9 +44,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0.beta2
+        version: "0.1"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency