refinerycms-pages 2.0.9 → 2.0.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: afa1108c7b18ea0168413156287b4dbc685b6a97
+  data.tar.gz: e24e4cc3c8d1b35b51474e7d4ff1e2e78ae0506d
+SHA512:
+  metadata.gz: 31fbc30c1a4666743cde7cbbd4d1ac9f7ebc9127504a11bdec22d93854f112a20c9706c5bed4a3222ef4762c2c64b3fea0369ab7b667e2a833cbd130ea2b4ca6
+  data.tar.gz: 0d920af2461126b770741dac6a9d0aee9afb71ced6d3cef20888f725fc94a2786702c1052b04b13338ce653f6bf5961e05538946362050263dd90d98fa2456d8

data/app/controllers/refinery/admin/pages_controller.rb

@@ -74,21 +74,10 @@ module Refinery
       # We can safely assume ::Refinery::I18n is defined because this method only gets
       # Invoked when the before_filter from the plugin is run.
       def globalize!
-        unless action_name.to_s == 'index'
-          super
-
-          # Needs to take into account that slugs are translated now
-          # # Check whether we need to override e.g. on the pages form.
-          # unless params[:switch_locale] || @page.nil? || @page.new_record? || @page.slugs.where({
-          #   :locale => Refinery::I18n.current_locale
-          # }).empty?
-          #   @page.slug = @page.slugs.first if @page.slug.nil? && @page.slugs.any?
-          #   Thread.current[:globalize_locale] = @page.slug.locale if @page.slug
-          # end
-        else
-          # Always display the tree of pages from the default frontend locale.
-          Thread.current[:globalize_locale] = params[:switch_locale].try(:to_sym) || Refinery::I18n.default_frontend_locale
-        end
+        return super unless action_name.to_s == 'index'
+
+        # Always display the tree of pages from the default frontend locale.
+        Globalize.locale = params[:switch_locale].try(:to_sym) || Refinery::I18n.default_frontend_locale
       end
 
       def load_valid_templates

data/app/controllers/refinery/admin/pages_dialogs_controller.rb

@@ -62,15 +62,18 @@ module Refinery
                 url.host = URI.parse(request.url).host
               end
 
-              result = 'success' if [Net::HTTPSuccess, Net::HTTPRedirection].
-                                      include? Net::HTTP.get_response(url)
+              result = case Net::HTTP.get_response(url)
+                when Net::HTTPSuccess, Net::HTTPRedirection
+                  'success'
+                end
+               
             end
           end
 
         rescue
-          # the result is already set to failure.
+          # be quiet
         end
-
+        
         render :json => {:result => result}
       end
 

data/app/models/refinery/page.rb

@@ -14,7 +14,7 @@ module Refinery
 
     class Translation
       is_seo_meta
-      attr_accessible :browser_title, :meta_description, :meta_keywords, :locale
+      attr_accessible :browser_title, :meta_description, :meta_keywords
     end
 
     attr_accessible :title
@@ -188,6 +188,10 @@ module Refinery
       end
     end
 
+    def translated_to_default_locale?
+      persisted? && (!Refinery.i18n_enabled? || translations.where(:locale => Refinery::I18n.default_frontend_locale).any?)
+    end
+
     # The canonical page for this particular page.
     # Consists of:
     #   * The default locale's translated slug
@@ -316,7 +320,10 @@ module Refinery
     end
 
     def uncached_nested_url
-      [parent.try(:uncached_nested_url), to_param.to_s].compact.flatten
+      [
+        parent.try(:uncached_nested_url),
+        Globalize.with_locale(slug_locale) { to_param.to_s }
+      ].compact.flatten
     end
 
     # Returns an array with all ancestors to_param, allow with its own
@@ -438,7 +445,7 @@ module Refinery
     # Make sures that a translation exists for this page.
     # The translation is set to the default frontend locale.
     def ensure_locale
-      unless self.translations.present?
+      if self.translations.empty?
         self.translations.build :locale => ::Refinery::I18n.default_frontend_locale
       end
     end
@@ -446,5 +453,15 @@ module Refinery
     def expire_page_caching
       self.class.expire_page_caching
     end
+
+    def slug_locale
+      return Globalize.locale if translation_for(Globalize.locale).try(:slug).present?
+
+      if Refinery.i18n_enabled? && (translations.empty? || translation_for(Refinery::I18n.default_frontend_locale).present?)
+        Refinery::I18n.default_frontend_locale
+      else
+        translations.first.locale
+      end
+    end
   end
 end

data/app/views/refinery/admin/pages/_form.html.erb

@@ -1,5 +1,4 @@
-<%= form_for [refinery, :admin, @page],
-             :url => (refinery.admin_page_path(@page.uncached_nested_url) if @page.persisted?) do |f| %>
+<%= form_for [refinery, :admin, @page], :url => (refinery.admin_page_path(@page.nested_url) if @page.persisted?) do |f| %>
 
   <%= render '/refinery/admin/error_messages', :object => @page, :include_object_name => true %>
 
@@ -29,7 +28,8 @@
                :name => nil,
                :class => "wymupdate button",
                :tooltip => t('.preview_changes')
-             ) %>
+             ),
+             :cancel_url => refinery.admin_pages_path %>
 
   <%= render 'form_new_page_parts', :f => f if Refinery::Pages.new_page_parts %>
 <% end %>

data/app/views/refinery/admin/pages/_form_page_parts.html.erb

@@ -21,7 +21,6 @@
                   :name => t('.delete_content_section'),
                   :id => 'delete_page_part' %>
     </li>
-    <li>
   </ul>
 <% end %>
 <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>

data/app/views/refinery/admin/pages/_locale_picker.html.erb

@@ -4,7 +4,7 @@
     <% locales.each do |locale| %>
       <li<%= " class='selected'".html_safe if locale.to_s == local_assigns[:current_locale].to_s %>>
         <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => "32x22"),
-                    refinery.url_for(:switch_locale => locale) %>
+                    refinery.url_for(params.merge(:switch_locale => locale)) %>
       </li>
     <% end %>
   </ul>

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

@@ -10,12 +10,12 @@
       <%= page_title_with_translations page %>
       <%= page_meta_information page %>
     </span>
-    <% if Refinery.i18n_enabled? and Refinery::I18n.frontend_locales.many? %>
+    <% if Refinery.i18n_enabled? && Refinery::I18n.frontend_locales.many? %>
       <span class='locales'>
-        <% page.translations.each do |translation| %>
+        <% page.translations.sort_by{|t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
           <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
                       refinery.edit_admin_page_path(page.nested_url, :switch_locale => translation.locale),
-                      :class => 'locale' if translation.title.present? %>
+                      :class => 'locale' %>
         <% end %>
       </span>
     <% end %>
@@ -30,7 +30,7 @@
                   :title => t('new', :scope => 'refinery.admin.pages') %>
 
       <%= link_to refinery_icon_tag('application_edit.png'),
-                  refinery.edit_admin_page_path(page.uncached_nested_url),
+                  refinery.edit_admin_page_path(page.uncached_nested_url, :switch_locale => (page.translations.first.locale unless page.translated_to_default_locale?)),
                   :title => t('edit', :scope => 'refinery.admin.pages') %>
 
       <%= link_to refinery_icon_tag('delete.png'),

data/lib/generators/refinery/pages/pages_generator.rb

@@ -1,9 +1,17 @@
 module Refinery
   class PagesGenerator < Rails::Generators::Base
+    class_option :skip_migrations, :type => :boolean, :default => false, :aliases => nil, :group => :runtime,
+                           :desc => "Skip over installing or running migrations."
+
     source_root File.expand_path('../templates', __FILE__)
 
+    def rake_db
+      rake "refinery_pages:install:migrations" unless self.options[:skip_migrations]
+    end
+
     def generate_pages_initializer
-      template "config/initializers/refinery/pages.rb.erb", File.join(destination_root, "config", "initializers", "refinery", "pages.rb")
+      template "config/initializers/refinery/pages.rb.erb",
+               File.join(destination_root, "config", "initializers", "refinery", "pages.rb")
     end
 
     def append_load_seed_data

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2012 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2013 [Resolve Digital](http://www.resolvedigital.com)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/spec/lib/generators/refinery/pages/pages_generator_spec.rb

@@ -9,7 +9,7 @@ module Refinery
 
     before do
       prepare_destination
-      run_generator
+      run_generator %w[--skip-migrations]
     end
 
     specify do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 2.0.9
-  prerelease: 
+  version: 2.0.10
 platform: ruby
 authors:
 - Philip Arndt
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,33 +43,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.10
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '!='
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.3.6
 description: The default content extension of Refinery CMS. This extension handles
@@ -184,33 +175,26 @@ files:
 homepage: http://refinerycms.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2294357088628806628
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2294357088628806628
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pages extension for Refinery CMS
 test_files:
 - spec/controllers/refinery/admin/pages_controller_spec.rb