refinerycms-core 0.9.9.15 → 0.9.9.16

data/app/controllers/sitemap_controller.rb

@@ -6,7 +6,11 @@ class SitemapController < ::Refinery::FastController
 
     respond_to do |format|
       format.xml do
-        @pages = Page.live.includes(:parts)
+        @locales = if defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?
+                     ::Refinery::I18n.frontend_locales
+                   else
+                     [::I18n.locale]
+                   end
       end
     end
   end

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

@@ -4,8 +4,8 @@
   hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) if hide_children.nil?
   # Select top menu items unless 'roots' is supplied.
   collection ||= @menu_pages
-  caching = ((defined?(cache_menu) && cache_menu) || RefinerySetting.find_or_set(:cache_menu, false)) && File.writable?(Rails.cache.cache_path)
-  cache_if(caching && !user_signed_in?, [Refinery.base_cache_key, "pages_menus", dom_id, Globalize.locale, request.path].join('_')) do
+  caching = (cache_menu ||= RefinerySetting.find_or_set(:cache_menu, false))
+  cache_if(caching, [Refinery.base_cache_key, "pages_menus", dom_id, Globalize.locale, cache_path ||= 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/admin/_resource_picker.html.erb

@@ -7,7 +7,7 @@
                   :update_resource => "current_resource_#{field}",
                   :update_text => "current_resource_text_#{field}",
                   :callback => "resource_changed_#{field}",
-                  :field => [f.object_name, field].join('_'),
+                  :field => [f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, ""), field].join('_'),
                   :current_link => "#{resource.url if resource.present?}",
                   :height => 480
                 })
@@ -45,7 +45,7 @@
       $('#no_resource_selected_<%= field %>').hide();
       $('iframe#dialog_iframe').dialog("close");
       $('iframe#dialog_iframe').remove().parents(".ui-dialog").remove();
-      $('#<%= f.object_name %>_<%= field %>').val(callback_args.id);
+      $('#<%= f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "") %>_<%= field %>').val(callback_args.id);
       $('#current_resource_link_<%= field %>').attr('href', $('#current_resource_link_<%= field %>').attr('href').replace(/current_link=([^&])*&/, "current_link=" + callback_args.href + "&"));
       $("#current_resource_<%= field %>").attr('href', callback_args.href);
       $('#current_resource_text_<%= field %>').html(callback_args.html);

data/lib/gemspec.rb

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
   s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
-  s.add_dependency 'rails',                       '~> 3.0.5'
+  s.add_dependency 'rails',                       '~> 3.0.6'
   s.add_dependency 'rdoc',                        '>= 2.5.11' # helps fix ubuntu
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'

data/lib/refinery/admin/base_controller.rb

@@ -31,24 +31,10 @@ module Refinery
         end
 
         def error_404(exception=nil)
-          if (@page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])).present?
-            params[:action] = 'error_404'
-            # change any links in the copy to the admin_root_path
-            # and any references to "home page" to "Dashboard"
-            part_symbol = Page.default_parts.first.to_sym
-            @page[part_symbol] = @page[part_symbol].to_s.gsub(
-                                   /href=(\'|\")\/(\'|\")/, "href='#{admin_root_path}'"
-                                 ).gsub("home page", "Dashboard")
-
-            render :template => "/pages/show",
-                   :layout => layout?,
-                   :status => 404
-          else
-            # fallback to the default 404.html page.
-            render :file => Rails.root.join("public", "404.html").cleanpath.to_s,
-                   :layout => false,
-                   :status => 404
-          end
+          # fallback to the default 404.html page.
+          render :file => Rails.root.join("public", "404.html").cleanpath.to_s,
+                 :layout => false,
+                 :status => 404
         end
 
       protected

data/lib/refinery/application.rb

@@ -1,5 +1,3 @@
-require 'tmpdir'
-
 module Refinery
   module Application
 
@@ -41,7 +39,7 @@ module Refinery
         base.config.filter_parameters += [:password, :password_confirmation]
 
         # Specify a cache store to use
-        base.config.cache_store = :file_store, File.join(Dir.tmpdir, base.name.to_s.gsub(':', '-'))
+        base.config.cache_store = :memory_store
 
         # Include the refinery controllers and helpers dynamically
         base.config.to_prepare do

data/refinerycms-core.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.15}
+  s.version           = %q{0.9.9.16}
   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-04-01}
+  s.date              = %q{2011-04-07}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 0.9.9.15'
-  s.add_dependency 'refinerycms-settings',        '= 0.9.9.15'
+  s.add_dependency 'refinerycms-base',            '= 0.9.9.16'
+  s.add_dependency 'refinerycms-settings',        '= 0.9.9.16'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
   s.add_dependency 'globalize3',                  '>= 0.1.0.beta'
   s.add_dependency 'moretea-awesome_nested_set',  '~> 1.4'
-  s.add_dependency 'rails',                       '~> 3.0.5'
+  s.add_dependency 'rails',                       '~> 3.0.6'
   s.add_dependency 'rdoc',                        '>= 2.5.11' # helps fix ubuntu
   s.add_dependency 'truncate_html',               '~> 0.5'
   s.add_dependency 'will_paginate',               '~> 3.0.pre'

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.15
+  version: 0.9.9.16
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 +13:00
+date: 2011-04-07 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.15
+        version: 0.9.9.16
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.15
+        version: 0.9.9.16
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.5
+        version: 3.0.6
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency