refinerycms-pages 0.9.9.19 → 0.9.9.20

data/app/controllers/admin/pages_controller.rb

@@ -4,7 +4,7 @@ module Admin
     crudify :page,
             :conditions => nil,
             :order => "lft ASC",
-            :include => [:slugs, :translations],
+            :include => [:slugs, :translations, :children],
             :paging => false
 
     rescue_from FriendlyId::ReservedError, :with => :show_errors_for_reserved_slug

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').where(:draft=>false).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,47 +2,52 @@ require 'globalize3'
 
 class Page < ActiveRecord::Base
 
-  translates :title, :meta_keywords, :meta_description, :browser_title, :custom_title if self.respond_to?(:translates)
+  if self.respond_to?(:translates)
+    translates :title, :custom_title, :meta_keywords, :meta_description, :browser_title, :include => :seo_meta
 
-  attr_accessible :id, :deletable, :link_url, :menu_match, :meta_keywords,
-                  :skip_to_first_child, :position, :show_in_menu, :draft,
-                  :parts_attributes, :browser_title, :meta_description,
-                  :custom_title_type, :parent_id, :custom_title,
-                  :created_at, :updated_at, :page_id
-
-  # Set up support for meta tags through translations.
-  if defined?(::Page::Translation)
-    attr_accessible :title
-    # set allowed attributes for mass assignment
-    ::Page::Translation.module_eval do
-      attr_accessible :browser_title, :meta_description, :meta_keywords,
-                      :locale
-    end
-    if ::Page::Translation.table_exists?
-      def translation
-        if @translation.nil? or @translation.try(:locale) != ::Globalize.locale
-          @translation = translations.with_locale(::Globalize.locale).first
-          @translation ||= translations.build(:locale => ::Globalize.locale)
+    # Set up support for meta tags through translations.
+    if defined?(::Page::Translation)
+      attr_accessible :title
+      # set allowed attributes for mass assignment
+      ::Page::Translation.send :attr_accessible, :browser_title, :meta_description,
+                                                 :meta_keywords, :locale
+
+      if ::Page::Translation.table_exists?
+        def translation
+          if @translation.nil? or @translation.try(:locale) != ::Globalize.locale
+            @translation = translations.with_locale(::Globalize.locale).first
+            @translation ||= translations.build(:locale => ::Globalize.locale)
+          end
+
+          @translation
         end
 
-        @translation
-      end
+        # Instruct the Translation model to have meta tags.
+        ::Page::Translation.send :is_seo_meta
 
-    # Instruct the Translation model to have meta tags.
-    ::Page::Translation.send :is_seo_meta
-
-      # Delegate all SeoMeta attributes to the active translation.
-      fields = ::SeoMeta.attributes.keys.map{|a| [a, :"#{a}="]}.flatten
-      fields << {:to => :translation}
-      delegate *fields
-      after_save proc {|m| m.translation.save}
+        fields = ::SeoMeta.attributes.keys.reject{|f|
+          self.column_names.map(&:to_sym).include?(f)
+        }.map{|a| [a, :"#{a}="]}.flatten
+        delegate *(fields << {:to => :translation})
+        after_save proc {|m| m.translation.save}
+      end
     end
+
+    before_create :ensure_locale, :if => proc { |c|
+      defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?
+    }
   end
 
+  attr_accessible :id, :deletable, :link_url, :menu_match, :meta_keywords,
+                  :skip_to_first_child, :position, :show_in_menu, :draft,
+                  :parts_attributes, :browser_title, :meta_description,
+                  :custom_title_type, :parent_id, :custom_title,
+                  :created_at, :updated_at, :page_id
+
   attr_accessor :locale # to hold temporarily
   validates :title, :presence => true
 
-  acts_as_nested_set
+  acts_as_nested_set :dependent => :destroy # rather than :delete_all
 
   # Docs for friendly_id http://github.com/norman/friendly_id
   has_friendly_id :title, :use_slug => true,
@@ -56,7 +61,7 @@ class Page < ActiveRecord::Base
            :order => "position ASC",
            :inverse_of => :page,
            :dependent => :destroy,
-           :include => :translations
+           :include => ((:translations) if defined?(::PagePart::Translation))
 
   accepts_nested_attributes_for :parts, :allow_destroy => true
 
@@ -69,12 +74,12 @@ class Page < ActiveRecord::Base
   after_destroy :expire_page_caching
 
   # Wrap up the logic of finding the pages based on the translations table.
-  scope :with_globalize, lambda {|t|
+  scope :with_globalize, lambda {|conditions|
     if defined?(::Page::Translation)
-      t = {:locale => Globalize.locale}.merge(t || {})
-      where(:id => ::Page::Translation.where(t).select('page_id AS id'))
+      conditions = {:locale => Globalize.locale}.merge(conditions || {})
+      where(:id => ::Page::Translation.where(conditions).select('page_id AS id')).includes(:translations)
     else
-      where(t)
+      where(conditions)
     end
   }
 
@@ -355,6 +360,12 @@ private
     end
   end
 
+  def ensure_locale
+    unless self.translations.present?
+      self.translations.build :locale => ::Refinery::I18n.default_frontend_locale
+    end
+  end
+
   def expire_page_caching
     self.class.expire_page_caching
   end

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

@@ -3,7 +3,7 @@
     <span class='title'>
       <%= page.title_with_meta.html_safe %>
       <% if defined?(::Refinery::I18n) and ::Refinery::I18n.frontend_locales.many? and
-            (locales = page.translations.collect{|t| t.locale}).present? %>
+            (locales = page.translations.map(&:locale)).present? %>
         <span class='preview'>
           <% locales.each do |locale| %>
             <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '16x11'),
@@ -29,7 +29,7 @@
   </div>
   <ul class='nested'>
     <%= render :partial => 'page',
-               :collection => collection.select{|p| p.parent_id == page.id},
+               :collection => page.children,
                :locals => {
                  :collection => collection
                } if page.has_descendants? %>

data/lib/gemspec.rb

@@ -25,8 +25,11 @@ Gem::Specification.new do |s|
     }.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n    '")}'
   ]
 
-  s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
-  s.add_dependency 'seo_meta',         '~> 1.0.4'
+  s.add_dependency 'refinerycms-core',            '= #{::Refinery::Version}'
+  s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
+  s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
+  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
+  s.add_dependency 'seo_meta',                    '~> 1.0.5'
 end
 EOF
 

data/lib/refinery/pages/instance_methods.rb

@@ -3,7 +3,7 @@ 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",
                  :format => 'html',
@@ -15,7 +15,7 @@ module Refinery
 
     protected
       def find_pages_for_menu
-        @menu_pages = Page.live.in_menu.order('lft ASC').includes(:slugs)
+        @menu_pages = ::Page.live.in_menu.order('lft ASC').includes(:slugs, :children)
       end
 
       def render(*args)

data/lib/refinerycms-pages.rb

@@ -1,6 +1,7 @@
 require 'refinerycms-core'
 require 'awesome_nested_set'
 require 'globalize3'
+require 'friendly_id'
 require 'seo_meta'
 
 module Refinery

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.19}
+  s.version           = %q{0.9.9.20}
   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-04-22}
+  s.date              = %q{2011-04-28}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -117,6 +117,9 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.19'
-  s.add_dependency 'seo_meta',         '~> 1.0.4'
+  s.add_dependency 'refinerycms-core',            '= 0.9.9.20'
+  s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
+  s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
+  s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
+  s.add_dependency 'seo_meta',                    '~> 1.0.5'
 end

data/spec/models/page_spec.rb

@@ -51,7 +51,7 @@ describe Page do
 
   context "page urls" do
 
-    it "should return a full path" do
+    it "return a full path" do
       page.path.should == 'RSpec is great for testing too'
     end
 
@@ -63,29 +63,29 @@ describe Page do
       child.path({:reversed => false}).should == 'The child page - RSpec is great for testing too'
     end
 
-    it "should return its url" do
+    it "returns its url" do
       page.link_url = '/contact'
       page.url.should == '/contact'
     end
 
-    it "should return its path with marketable urls" do
+    it "returns its path with marketable urls" do
       page.url[:id].should be_nil
       page.url[:path].should == ["rspec-is-great-for-testing-too"]
     end
 
-    it "should return its path underneath its parent with marketable urls" do
+    it "returns its path underneath its parent with marketable urls" do
       child.url[:id].should be_nil
       child.url[:path].should == [page.url[:path].first, 'the-child-page']
     end
 
-    it "should not have a path without marketable urls" do
+    it "no path parameter without marketable urls" do
       turn_off_marketable_urls
       page.url[:path].should be_nil
       page.url[:id].should == "rspec-is-great-for-testing-too"
       turn_on_marketable_urls
     end
 
-    it "should not mention its parent without marketable urls" do
+    it "doesn't mention its parent without marketable urls" do
       turn_off_marketable_urls
       child.url[:id].should == 'the-child-page'
       child.url[:path].should be_nil
@@ -94,12 +94,12 @@ describe Page do
   end
 
   context "home page" do
-    it "should respond as the home page" do
+    it "responds as the home page" do
       page.link_url = '/'
       page.home?.should == true
     end
 
-    it "should not respond as the home page" do
+    it "responds as a normal page when not set to home page" do
       page.home?.should == false
     end
   end
@@ -107,16 +107,16 @@ describe Page do
   context "content sections (page parts)" do
     before { create_page_parts }
 
-    it "should return the content when using []" do
+    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>"
     end
 
-    it "should return all page part content" do
+    it "return all page part content" do
       page.all_page_part_content.should == "<p>I'm the first page part for this page.</p> <p>Closely followed by the second page part.</p>"
     end
 
-    it "should reposition correctly" do
+    it "reposition correctly" do
       page.parts.first.position = 6
       page.parts.last.position = 4
 
@@ -131,12 +131,12 @@ describe Page do
   end
 
   context "draft pages" do
-    it "should not be a live page when set to draft" do
+    it "not live when set to draft" do
       page.draft = true
       page.live?.should_not be
     end
 
-    it "should be a live page when not set to draft" do
+    it "live when not set to draft" do
       page.draft = false
       page.live?.should be
     end
@@ -163,4 +163,64 @@ describe Page do
     end
   end
 
+  context "meta data" do
+    context "responds to" do
+      it "meta_keywords" do
+        page.respond_to?(:meta_keywords)
+      end
+
+      it "meta_description" do
+        page.respond_to?(:meta_description)
+      end
+
+      it "browser_title" do
+        page.respond_to?(:browser_title)
+      end
+    end
+
+    context "allows us to assign to" do
+      it "meta_keywords" do
+        page.meta_keywords = 'Some, great, keywords'
+        page.meta_keywords.should == 'Some, great, keywords'
+      end
+
+      it "meta_description" do
+        page.meta_description = 'This is my description of the page for search results.'
+        page.meta_description.should == 'This is my description of the page for search results.'
+      end
+
+      it "browser_title" do
+        page.browser_title = 'An awesome browser title for SEO'
+        page.browser_title.should == 'An awesome browser title for SEO'
+      end
+    end
+
+    context "allows us to update" do
+      it "meta_keywords" do
+        page.meta_keywords = 'Some, great, keywords'
+        page.save
+
+        page.reload
+        page.meta_keywords.should == 'Some, great, keywords'
+      end
+
+      it "meta_description" do
+        page.meta_description = 'This is my description of the page for search results.'
+        page.save
+
+        page.reload
+        page.meta_description.should == 'This is my description of the page for search results.'
+      end
+
+      it "browser_title" do
+        page.browser_title = 'An awesome browser title for SEO'
+        page.save
+
+        page.reload
+        page.browser_title.should == 'An awesome browser title for SEO'
+      end
+    end
+
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.19
+  version: 0.9.9.20
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,20 +23,53 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.19
+        version: 0.9.9.20
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: seo_meta
+  name: friendly_id_globalize3
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 3.2.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: globalize3
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0.beta
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: moretea-awesome_nested_set
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.4"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: seo_meta
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+  type: :runtime
+  version_requirements: *id005
 description: The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.
 email: info@refinerycms.com
 executables: []
@@ -148,3 +181,4 @@ specification_version: 3
 summary: Pages engine for Refinery CMS
 test_files: []
 
+has_rdoc: