refinerycms-core 0.9.9.9 → 0.9.9.10

data/app/views/shared/_menu.html.erb

@@ -5,7 +5,7 @@
   # Select top menu items unless 'roots' is supplied.
   collection ||= @menu_pages.includes(:slugs)
   caching = ((defined?(cache_menu) && cache_menu) || RefinerySetting.find_or_set(:cache_menu, false)) && File.writable?(Rails.cache.cache_path)
-  cache_if(caching, [Refinery.base_cache_key, "pages_menus", dom_id, Globalize.locale, request.path].join('_')) do
+  cache_if(caching && !logged_in?, [Refinery.base_cache_key, "pages_menus", dom_id, Globalize.locale, request.path].join('_')) do
     if (roots ||= collection.select{|p| p.parent_id.nil?}).present?
       # In order to match items that aren't shown in menu and highlight their associations.
       # This can be supplied if the logic is different in your case.

data/app/views/shared/_site_bar.html.erb

@@ -18,7 +18,7 @@
           <%= RefinerySetting.find_or_set(:site_name, 'Company Name') %>
         </span>
 
-        <%= link_to t('.log_out', :locale => ::Refinery::I18n.current_locale),
+        <%= link_to t('.log_out', site_bar_translate_locale_args),
                     destroy_user_session_path, :id => 'logout' %>
       </div>
     </div>

data/lib/refinery/application.rb

@@ -3,7 +3,7 @@ require 'tmpdir'
 module Refinery
   module Application
     class << self
-      def refine!
+      def refinery!
         ::ApplicationHelper.send :include, ::Refinery::ApplicationHelper
 
         [::ApplicationController, ::Admin::BaseController].each do |c|
@@ -35,14 +35,7 @@ module Refinery
 
         # Include the refinery controllers and helpers dynamically
         base.config.to_prepare do
-          ::Refinery::Application.refine!
-        end
-
-        # load in any settings that the developer wants after the initialization.
-        base.config.after_initialize do
-          if (settings = Rails.root.join('config', 'settings.rb')).exist?
-            require settings.to_s
-          end
+          ::Refinery::Application.refinery!
         end
       end
     end

data/lib/refinery/helpers/site_bar_helper.rb

@@ -4,13 +4,13 @@ module Refinery
 
       # Generates the link to determine where the site bar switch button returns to.
       def site_bar_switch_link
-        link_to_if(admin?, t('.switch_to_your_website', :locale => ::Refinery::I18n.current_locale),
+        link_to_if(admin?, t('.switch_to_your_website', site_bar_translate_locale_args),
                   (if session.keys.include?(:website_return_to) and session[:website_return_to].present?
                     session[:website_return_to]
                    else
                     root_path(:locale => (::Refinery::I18n.default_frontend_locale if defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?))
                    end)) do
-          link_to t('.switch_to_your_website_editor', :locale => ::Refinery::I18n.current_locale),
+          link_to t('.switch_to_your_website_editor', site_bar_translate_locale_args),
                   (if session.keys.include?(:refinery_return_to) and session[:refinery_return_to].present?
                     session[:refinery_return_to]
                    else
@@ -19,6 +19,14 @@ module Refinery
         end
       end
 
+      def site_bar_translate_locale_args
+        if defined?(::Refinery::I18n)
+          {:locale => ::Refinery::I18n.current_locale}
+        else
+          {}
+        end
+      end
+
     end
   end
 end

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.9}
+  s.version           = %q{0.9.9.10}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-03-15}
+  s.date              = %q{2011-03-17}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '~> 0.9.9.9'
-  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.9'
+  s.add_dependency 'refinerycms-base',            '~> 0.9.9.10'
+  s.add_dependency 'refinerycms-settings',        '~> 0.9.9.10'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
@@ -136,7 +136,6 @@ Gem::Specification.new do |s|
     'lib/generators/templates/config/i18n-js.yml',
     'lib/generators/templates/config/initializers',
     'lib/generators/templates/config/initializers/devise.rb',
-    'lib/generators/templates/config/settings.rb',
     'lib/generators/templates/db',
     'lib/generators/templates/db/seeds.rb',
     'lib/refinery',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.9
+  version: 0.9.9.10
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +13:00
+date: 2011-03-17 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.9
+        version: 0.9.9.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.9
+        version: 0.9.9.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -228,7 +228,6 @@ files:
 - lib/generators/templates/config/database.yml.sqlite3
 - lib/generators/templates/config/i18n-js.yml
 - lib/generators/templates/config/initializers/devise.rb
-- lib/generators/templates/config/settings.rb
 - lib/generators/templates/db/seeds.rb
 - lib/refinery/activity.rb
 - lib/refinery/admin/base_controller.rb

data/lib/generators/templates/config/settings.rb

@@ -1,2 +0,0 @@
-# Other settings go here as below.
-# These settings are ones that are set for all environments and need to be set AFTER the refinery boot process.