refinerycms-pages 0.9.9.15 → 0.9.9.16

data/app/controllers/admin/pages_controller.rb

@@ -28,7 +28,12 @@ module Admin
 
         # Check whether we need to override e.g. on the pages form.
         unless params[:switch_locale] or @page.nil? or @page.slugs.where(:locale => Refinery::I18n.current_locale).nil? or !@page.persisted?
-          Thread.current[:globalize_locale] = @page.slug.locale
+          if @page.slug.nil? and @page.slugs.length > 0
+            @page.slug = @page.slugs[0]
+          end
+          if @page.slug
+            Thread.current[:globalize_locale] = @page.slug.locale
+          end
         end
       else
         Thread.current[:globalize_locale] = nil

data/app/models/page.rb

@@ -5,11 +5,11 @@ class Page < ActiveRecord::Base
   translates :title, :meta_keywords, :meta_description, :browser_title, :custom_title if self.respond_to?(:translates)
 
   # Set up support for meta tags through translations.
-  if defined?(::Page::Translation) && Page::Translation.table_exists?
+  if defined?(::Page::Translation) && ::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)
+      if @translation.nil? or @translation.try(:locale) != ::Globalize.locale
+        @translation = translations.with_locale(::Globalize.locale).first
+        @translation ||= translations.build(:locale => ::Globalize.locale)
       end
 
       @translation
@@ -262,8 +262,10 @@ class Page < ActiveRecord::Base
     end
 
     def expire_page_caching
-      if File.writable?(Rails.cache.cache_path)
-        Pathname.glob(File.join(Rails.cache.cache_path, '**', '*pages*')).each(&:delete)
+      begin
+        Rails.cache.delete_matched(/.*pages.*/)
+      rescue NotImplementedError
+        warn "**** [REFINERY] The cache store you are using is not compatible with Rails.cache#delete_matched so please disable caching to ensure proper operation. ***"
       end
     end
   end
@@ -291,7 +293,12 @@ class Page < ActiveRecord::Base
 
   # 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 = [self.title.to_s]
+    if self.title.nil?
+      title = [::Page::Translation.where(:page_id => self.id).first.title.to_s]
+    else
+      title = [self.title.to_s]
+    end
+
     title << "<em>(#{::I18n.t('hidden', :scope => 'admin.pages.page')})</em>" unless show_in_menu?
     title << "<em>(#{::I18n.t('draft', :scope => 'admin.pages.page')})</em>" if draft?
 

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

@@ -1,6 +1,6 @@
 <section id='records' class='tree'>
-  <% caching = RefinerySetting.find_or_set(:cache_pages_backend, false) && File.writable?(Rails.cache.cache_path) %>
-  <% cache_if(caching && !user_signed_in?, [Refinery.base_cache_key, "pages_backend", Globalize.locale].join('_')) do %>
+  <% caching = RefinerySetting.find_or_set(:cache_pages_backend, false) %>
+  <% cache_if(caching, [Refinery.base_cache_key, "pages_backend", Globalize.locale].join('_')) do %>
     <%= render :partial => 'records' %>
   <% end %>
 </section>

data/lib/gemspec.rb

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
-  s.add_dependency 'seo_meta',         '~> 1.0.2'
+  s.add_dependency 'seo_meta',         '~> 1.0.3'
 end
 EOF
 

data/lib/refinery/pages/admin/instance_methods.rb

@@ -0,0 +1,27 @@
+module Refinery
+  module Pages
+    module Admin
+      module InstanceMethods
+
+        def error_404(exception=nil)
+          if (@page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])).present?
+            params[:action] = 'error_404'
+            # change any links in the copy to the admin_root_path
+            # and any references to "home page" to "Dashboard"
+            part_symbol = Page.default_parts.first.to_sym
+            @page[part_symbol] = @page[part_symbol].to_s.gsub(
+                                   /href=(\'|\")\/(\'|\")/, "href='#{admin_root_path}'"
+                                 ).gsub("home page", "Dashboard")
+
+            render :template => "/pages/show",
+                   :layout => layout?,
+                   :status => 404
+          else
+            super
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/refinery/pages/instance_methods.rb

@@ -26,7 +26,7 @@ module Refinery
     private
       def store_current_location!
         unless admin?
-          session[:website_return_to] = @page.url if @page.try(:present?)
+          session[:website_return_to] = url_for(@page.url) if @page.try(:present?)
         else
           super
         end

data/lib/refinerycms-pages.rb

@@ -7,6 +7,9 @@ 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
@@ -26,6 +29,7 @@ module Refinery
 
       refinery.after_inclusion do
         ::ApplicationController.send :include, ::Refinery::Pages::InstanceMethods
+        ::Admin::BaseController.send :include, ::Refinery::Pages::Admin::InstanceMethods
       end
 
       config.after_initialize do

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.15}
+  s.version           = %q{0.9.9.16}
   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-01}
+  s.date              = %q{2011-04-07}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -106,6 +106,8 @@ Gem::Specification.new do |s|
     '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',
@@ -115,6 +117,6 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.15'
-  s.add_dependency 'seo_meta',         '~> 1.0.2'
+  s.add_dependency 'refinerycms-core', '= 0.9.9.16'
+  s.add_dependency 'seo_meta',         '~> 1.0.3'
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.15
+  version: 0.9.9.16
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +13:00
+date: 2011-04-07 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.15
+        version: 0.9.9.16
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   version_requirements: *id002
 description: The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.
@@ -114,6 +114,7 @@ files:
 - lib/generators/refinerycms_pages_generator.rb
 - lib/pages/marketable_routes.rb
 - lib/pages/tabs.rb
+- lib/refinery/pages/admin/instance_methods.rb
 - lib/refinery/pages/instance_methods.rb
 - lib/refinerycms-pages.rb
 - license.md