refinerycms-pages 0.9.9.10 → 0.9.9.11

data/config/locales/jp.yml

@@ -34,7 +34,7 @@ jp:
       reserved_system_word: "このタイトルはシステム用ですので使用出来ません。"
       page:
         view_live_html: "このページを表示する<br/><em>（新しいウィンドウが開きます）</em>"
-        hidden: 隠す
+        hidden: 非表示
         draft: 準備稿
       form_new_page_parts:
         title: タイトル

data/lib/pages/marketable_routes.rb

@@ -5,6 +5,6 @@ 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.split(':').first.to_s.split('/')
+    route.path.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

@@ -0,0 +1,37 @@
+module Refinery
+  module Pages
+    module InstanceMethods
+
+      def error_404(exception=nil)
+        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',
+                 :status => 404
+        else
+          super
+        end
+      end
+
+    protected
+      def find_pages_for_menu
+        @menu_pages = Page.in_menu.live.order('lft ASC').includes(:slugs)
+      end
+
+      def render(*args)
+        present(@page) unless admin? or @meta.present?
+        super
+      end
+
+    private
+      def store_current_location!
+        unless admin?
+          session[:website_return_to] = @page.url if @page.try(:present?)
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/refinerycms-pages.rb

@@ -5,6 +5,8 @@ require 'globalize3'
 module Refinery
   module Pages
 
+    autoload :InstanceMethods, File.expand_path('../refinery/pages/instance_methods', __FILE__)
+
     class << self
       attr_accessor :root
       def root
@@ -13,7 +15,6 @@ module Refinery
     end
 
     class Engine < ::Rails::Engine
-
       initializer "serve static assets" do |app|
         app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
@@ -22,6 +23,10 @@ module Refinery
         require File.expand_path('../pages/tabs', __FILE__)
       end
 
+      refinery.on_attach do
+        ::ApplicationController.send :include, ::Refinery::Pages::InstanceMethods
+      end
+
       config.after_initialize do
         ::Refinery::Plugin.register do |plugin|
           plugin.name = "refinery_pages"

data/refinerycms-pages.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{0.9.9.10}
+  s.version           = %q{0.9.9.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{2011-03-17}
+  s.date              = %q{2011-03-25}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -103,6 +103,9 @@ Gem::Specification.new do |s|
     'lib/pages',
     'lib/pages/marketable_routes.rb',
     'lib/pages/tabs.rb',
+    'lib/refinery',
+    'lib/refinery/pages',
+    'lib/refinery/pages/instance_methods.rb',
     'lib/refinerycms-pages.rb',
     'license.md',
     'refinerycms-pages.gemspec',
@@ -111,5 +114,5 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core', '~> 0.9.9.10'
+  s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.10
+  version: 0.9.9.11
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 +13:00
+date: 2011-03-25 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.10
+        version: 0.9.9.11
   type: :runtime
   version_requirements: *id001
 description: The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.
@@ -102,6 +102,7 @@ files:
 - lib/generators/refinerycms_pages_generator.rb
 - lib/pages/marketable_routes.rb
 - lib/pages/tabs.rb
+- lib/refinery/pages/instance_methods.rb
 - lib/refinerycms-pages.rb
 - license.md
 - refinerycms-pages.gemspec