refinerycms-pages 1.0.9 → 1.0.10

data/app/models/page.rb

@@ -22,15 +22,6 @@ class Page < ActiveRecord::Base
                                                  :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
-
         # Instruct the Translation model to have meta tags.
         ::Page::Translation.send :is_seo_meta
 
@@ -38,7 +29,7 @@ class Page < ActiveRecord::Base
           self.column_names.map(&:to_sym).include?(f)
         }.map{|a| [a, :"#{a}="]}.flatten
         delegate *(fields << {:to => :translation})
-        after_save proc {|m| m.translation.save}
+        before_save {|m| m.translation.save}
       end
     end
 

data/app/views/admin/pages_dialogs/_page_link.html.erb

@@ -1,7 +1,7 @@
 <% linked = (url_for(page_link.url) == params[:current_link]) if params[:current_link].present? -%>
 <% link_args = defined?(link_to_arguments) ? link_to_arguments : {} %>
 <li class='clearfix<%= " child#{child}" if child %><%= " linked" if linked%>' id="<%= dom_id(page_link) -%>">
-  <%= link_to page_link.title_with_meta.html_safe, page_link.url,
+  <%= link_to page_link.title_with_meta.html_safe, compute_public_path(url_for(page_link.url), ''),
               { :title => t('.link_to_this_page'),
               :rel => page_link.title,
               :class => 'page_link' }.merge(link_args) %>

data/app/views/admin/pages_dialogs/link_to.html.erb

@@ -95,7 +95,7 @@
             <% @resources.each do |resource| -%>
               <% resource_linked = (resource.url == params[:current_link]) unless params[:current_link].blank? %>
               <li<%= " class='linked'" if resource_linked %>>
-                <%= link_to "#{resource.title}.#{resource.ext}", resource.url,
+                <%= link_to "#{resource.title}.#{resource.ext}", compute_public_path(resource.url, ''),
                             :title => t('link_to_this_resource', :scope => 'admin.pages_dialogs.link_to.your_resource'),
                             :rel => resource.title,
                             :class => "page_link #{resource.ext}" %>

data/db/migrate/20110329080451_create_seo_meta.rb

@@ -26,12 +26,13 @@ class CreateSeoMeta < ActiveRecord::Migration
     end
 
     # Reset column information because otherwise the old columns will still exist.
-    ::Page::Translation.reset_column_information
+    [::Page, ::Page.translation_class].each do |model|
+      ActiveRecord::Base.connection.schema_cache.clear_table_cache!(model.table_name)
+      model.reset_column_information
+    end
 
     # Re-attach seo_meta
-    ::Page::Translation.module_eval do
-      is_seo_meta
-    end
+    ::Page.translation_class.send :is_seo_meta
 
     # Migrate data
     existing_translations.each do |translation|

data/db/seeds/pages.rb

@@ -1,12 +1,3 @@
-::Page.reset_column_information
-# Check whether all columns are applied yet by seo_meta.
-unless !defined?(::SeoMeta) || ::SeoMeta.attributes.keys.all? { |k|
-  ::Page.translation_class.instance_methods.map(&:to_sym).include?(k)
-}
-  # Make pages model seo_meta because not all columns are accessible.
-  ::Page.translation_class.send :is_seo_meta
-end
-
 page_position = -1
 
 home_page = Page.create(:title => "Home",

data/features/step_definitions/page_steps.rb

@@ -36,6 +36,17 @@ Given /^the page titled "?([^\"]*)"? is a child of "?([^\"]*)"?$/ do |title, par
   Page.by_title(title).first.update_attribute(:parent_id, parent_page.id)
 end
 
+Given /^the page titled "?([^\"]*)"? is fully translated$/ do |title|
+  page = Page.by_title(title).first
+  Refinery::I18n.frontend_locales.each do |locale|
+    old_locale = Thread.current[:globalize_locale]
+    Thread.current[:globalize_locale] = locale
+    page.title = title
+    page.save
+    Thread.current[:globalize_locale] = old_locale
+  end
+end
+
 Given /^the page titled "?([^\"]*)"? is not shown in the menu$/ do |title|
   Page.by_title(title).first.update_attribute(:show_in_menu, false)
 end

data/features/support/paths.rb

@@ -11,13 +11,15 @@ module NavigationHelpers
           new_admin_page_path
         else
           begin
-            if page_name =~ /the page titled "?([^\"]*)"?/ and (page = Page.by_title($1).first).present?
+            if page_name =~ /the page titled "?([^\"]*)"? with locale "?([^\"]*)"?/ and (page = Page.by_title($1).first).present?
+              self.url_for(page.url.is_a?(String) ? "/#{$2}#{page.url}" : page.url.merge(:locale => $2))
+            elsif page_name =~ /the page titled "?([^\"]*)"?/ and (page = Page.by_title($1).first).present?
               self.url_for(page.url)
             else
               nil
             end
           rescue
-            nil
+           nil
           end
         end
       end

data/features/visit_pages.feature

@@ -59,3 +59,10 @@ Feature: Visit Pages
     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"
+
+  @pages-visit-i18n
+  Scenario: Translated URI
+    Given I have frontend locales "en, de"
+    And the page titled "Home" is fully translated
+    When I go to the page titled "Home" with locale "de"
+    Then I should see "Home" within ".selected > a"

data/lib/gemspec.rb

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

data/refinerycms-pages.gemspec

@@ -3,10 +3,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-pages}
-  s.version           = %q{1.0.9}
+  s.version           = %q{1.0.10}
   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-11-05}
+  s.date              = %q{2012-03-06}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -117,14 +117,15 @@ Gem::Specification.new do |s|
     'license.md',
     'refinerycms-pages.gemspec',
     'spec',
+    'spec/lib',
     'spec/models',
     'spec/models/page_spec.rb'
   ]
 
-  s.add_dependency 'refinerycms-core',            '= 1.0.9'
+  s.add_dependency 'refinerycms-core',            '= 1.0.10'
   s.add_dependency 'activerecord',                '~> 3.0.10'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '~> 0.1'
+  s.add_dependency 'globalize3',                  '~> 0.2.0.beta4'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'seo_meta',                    '~> 1.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-pages
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Resolve Digital
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-05 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
         - 0
-        - 9
-        version: 1.0.9
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -77,11 +77,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 1316851721
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 2
+        - 0
+        - beta
+        - 4
+        version: 0.2.0.beta4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -228,9 +231,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Pages engine for Refinery CMS
 test_files: []
 
+has_rdoc: