refinerycms-pages 1.0.0 → 1.0.1

data/app/controllers/pages_controller.rb

@@ -21,7 +21,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?
-        redirect_to first_live_child.url
+        redirect_to first_live_child.url and return
       elsif @page.link_url.present?
         redirect_to @page.link_url and return
       end

data/app/models/page.rb

@@ -336,7 +336,7 @@ class Page < ActiveRecord::Base
     Refinery.deprecate({
       :what => "page[#{part_title.inspect}]",
       :when => '1.1',
-      :replacement => "content_for(#{part_title.inspect})",
+      :replacement => "page.content_for(#{part_title.inspect})",
       :caller => caller
     })
 

data/lib/gemspec.rb

@@ -1,8 +1,10 @@
+# Encoding: UTF-8
 require 'pathname'
 gempath = Pathname.new(File.expand_path('../../', __FILE__))
 require gempath.join('..', 'base', 'lib', 'base', 'refinery')
 
 gemspec = <<EOF
+# Encoding: UTF-8
 # DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
 
 Gem::Specification.new do |s|
@@ -14,7 +16,7 @@ Gem::Specification.new do |s|
   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']
+  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
   s.executables       = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})

data/lib/pages/marketable_routes.rb

@@ -1,9 +1,10 @@
-::Refinery::Application.routes.draw do
-  match '*path' => 'pages#show'
-end
 
-# Add any parts of routes as reserved words.
 if Page.use_marketable_urls?
+  ::Refinery::Application.routes.draw do
+    match '*path' => 'pages#show'
+  end
+
+  # Add any parts of routes as reserved words.
   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('/')

data/lib/refinerycms-pages.rb

@@ -35,6 +35,7 @@ module Refinery
 
       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}

data/refinerycms-pages.gemspec

@@ -1,15 +1,16 @@
+# Encoding: UTF-8
 # DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{1.0.0}
+  s.version           = %q{1.0.1}
   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-28}
+  s.date              = %q{2011-06-21}
   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']
+  s.authors           = ['Resolve Digital', 'Philip Arndt', 'David Jones', 'Steven Heidel', 'Uģis Ozols']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
   s.executables       = %w()
@@ -119,7 +120,7 @@ Gem::Specification.new do |s|
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core',            '= 1.0.0'
+  s.add_dependency 'refinerycms-core',            '= 1.0.1'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '~> 0.1'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'

metadata

@@ -1,20 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 1.0.0
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Resolve Digital
 - Philip Arndt
 - David Jones
 - Steven Heidel
+- "U\xC4\xA3is Ozols"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 +12:00
-default_executable: 
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -24,7 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,6 +45,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 3
+        - 2
+        - 1
         version: 3.2.1
   type: :runtime
   version_requirements: *id002
@@ -46,6 +61,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
         version: "0.1"
   type: :runtime
   version_requirements: *id003
@@ -57,6 +76,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
   type: :runtime
   version_requirements: *id004
@@ -68,6 +91,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id005
@@ -155,7 +182,6 @@ files:
 - license.md
 - refinerycms-pages.gemspec
 - spec/models/page_spec.rb
-has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -169,17 +195,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Pages engine for Refinery CMS