refinerycms-core 0.9.9.19 → 0.9.9.20

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

@@ -1,15 +1,7 @@
 <h1 id='logo'>
   <%= link_to RefinerySetting.find_or_set(:site_name, "Company Name"), root_path %>
 </h1>
-<%=
-  ::Fiber.new {
-    ::Fiber.yield(
-      render(:partial => "/shared/menu", :locals => {
-               :dom_id => 'menu',
-               :css => 'menu',
-               :roots => @menu_pages.where(:parent_id => nil),
-               :collection => @menu_pages.where(@menu_pages.arel_table[:parent_id].not_eq(nil)),
-               :selected_item => (@page if defined?(::Page))
-             })
-    )
-  }.resume %>
+<%= render(:partial => "/shared/menu", :locals => {
+             :dom_id => 'menu',
+             :css => 'menu'
+           }) %>

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

@@ -1,33 +1,32 @@
 <%
   dom_id ||= 'menu'
   caching = (cache_menu ||= RefinerySetting.find_or_set(:cache_menu, false))
-  cache_key = [Refinery.base_cache_key, 'pages_menus', dom_id, Globalize.locale, cache_path ||= request.path].join('_')
-  cache_if(caching, cache_key) do
+  cache_key = [Refinery.base_cache_key, 'pages_menus', dom_id, Globalize.locale].join('_')
+  # cache the pages first
+  collection = if caching
+    Rails.cache.fetch(cache_key) { (collection ||= @menu_pages).to_a }
+  else
+    (collection ||= @menu_pages).to_a
+  end
+
+  # cache the generation of the menu based on the pages.
+  cache_if(caching, ([cache_key, cache_path ||= request.path].join('_'))) do
     # Select top menu items unless 'roots' is supplied.
-    if (roots ||= (collection ||= @menu_pages).where(:parent_id => nil)).present?
+    if (roots ||= collection.select{|c| c.parent_id.nil?}).present?
       css = [(css || 'menu'), 'clearfix'].flatten.join(' ')
-      # 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.
-      unless defined?(selected_item)
-        selected_item = @page || collection.detect{|page| selected_page?(page)}
-      end
       hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) if hide_children.nil?
   -%>
       <nav id='<%= dom_id %>' class='<%= css %>'>
         <ul>
-          <% roots.each_with_index do |menu_branch, index| %>
-            <%= render :partial => '/shared/menu_branch',
-                       :locals => {
-                         :menu_branch => menu_branch,
-                         :menu_branch_counter => index,
-                         :hide_children => hide_children,
-                         :sibling_count => (roots.length - 1),
-                         :collection => collection,
-                         :selected_item => selected_item,
-                         :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
-                       }
-            -%>
-          <% end %>
+          <%= render :partial => '/shared/menu_branch',
+                     :collection => roots,
+                     :locals => {
+                       :hide_children => hide_children,
+                       :sibling_count => (roots.length - 1),
+                       :collection => collection,
+                       :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
+                     }
+          -%>
         </ul>
       </nav>
   <% end -%>

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

@@ -4,28 +4,20 @@
   end
   dom_id = "id='item_#{menu_branch_counter}'"
 
-  children = []
-  if !hide_children && menu_branch.has_descendants?
-    children = collection.where(:parent_id => menu_branch.id)
-  end
+  children = menu_branch.children.live.in_menu unless hide_children
 -%>
 <li<%= ['', css, dom_id].compact.join(' ').gsub(/\ *$/, '') %>>
   <%= link_to menu_branch.title, menu_branch.url -%>
   <% if children.present? -%>
     <ul class='clearfix'>
-      <% children.each_with_index do |child, index| %>
-        <%=
-          render :partial => '/shared/menu_branch',
+      <%= render :partial => '/shared/menu_branch',
+                 :collection => children,
                  :locals => {
-                   :menu_branch => child,
-                   :menu_branch_counter => index,
                    :apply_css => local_assigns[:apply_css],
                    :hide_children => !!hide_children,
                    :collection => collection,
-                   :selected_item => selected_item,
-                   :sibling_count => children.size - 1
+                   :sibling_count => children.length - 1
                  } -%>
-      <% end %>
     </ul>
   <% end -%>
 </li>

data/lib/generators/refinerycms_generator.rb

@@ -82,6 +82,7 @@ class RefinerycmsGenerator < ::Refinery::Generators::EngineInstaller
 
 
     # Append seeds.
+    create_file "db/seeds.rb" unless Rails.root.join('db', 'seeds.rb').file?
     append_file 'db/seeds.rb', :verbose => true do
       self.class.source_root.join('db', 'seeds.rb').read
     end

data/lib/refinery/helpers/menu_helper.rb

@@ -20,7 +20,7 @@ module Refinery
         # DEPRECATION. Remove at version 1.1
         if warning
           warn "\n-- DEPRECATION WARNING --"
-          warn "The use of 'css_for_menu_branch' is deprecated."
+          warn "The use of 'css_for_menu_branch' is deprecated and will be removed at version 1.1."
           warn "Please use menu_branch_css(local_assigns) instead."
           warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
         end
@@ -36,14 +36,13 @@ module Refinery
       # This maps to the older css_for_menu_branch method.
       def menu_branch_css(local_assigns)
         options = {:collection => []}.merge(local_assigns)
-        if options.keys.exclude?(:sibling_count) || options[:sibling_count].nil?
-          options.update(:sibling_count => options[:menu_branch].shown_siblings.size)
-        end
+        options.update(:sibling_count => options[:menu_branch].shown_siblings.size) unless options[:sibling_count]
+
         css_for_menu_branch(options[:menu_branch],
                             options[:menu_branch_counter],
                             options[:sibling_count],
                             options[:collection],
-                            options[:selected_item],
+                            options[:selected_item], # TODO: DEPRECATED, remove at 1.1
                             false)
       end
 
@@ -51,30 +50,31 @@ module Refinery
       # Just calls selected_page? for each descendant of the supplied page.
       # if you pass a collection it won't check its own descendants but use the collection supplied.
       def descendant_page_selected?(page, collection = [], selected_item = nil)
-        return false unless page.has_descendants? or (selected_item && !selected_item.in_menu?)
-
-        descendants = if collection.present? and (!selected_item or (selected_item && selected_item.in_menu?))
-          collection.select{ |item| item.parent_id == page.id }
-        else
-          page.descendants
+        if selected_item
+          warn "\n-- DEPRECATION WARNING --"
+          warn "The use of 'selected_item' is deprecated and will be removed at version 1.1."
+          warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
         end
 
-        descendants.any? do |descendant|
-          selected_item ? selected_item == descendant : selected_page?(descendant)
-        end
+        return false unless page.has_descendants?
+        return false unless selected_item.nil? or !selected_item.in_menu?
+
+        page.descendants.any? { |descendant|
+          !selected_item ? selected_page?(descendant) : selected_item == descendant
+        }
       end
 
       def selected_page_or_descendant_page_selected?(page, collection = [], selected_item = nil)
-        selected = false
-        selected = selected_item ? selected_item === page : selected_page?(page)
-        selected = descendant_page_selected?(page, collection, selected_item) unless selected
-        selected
+        return true if selected_page?(page) || selected_item === page
+        return true if descendant_page_selected?(page, collection, selected_item)
+        false
       end
 
       # Determine whether the supplied page is the currently open page according to Refinery.
       # Also checks whether Rails thinks it is selected after that using current_page?
       def selected_page?(page)
         path = request.path
+        path = path.force_encoding('utf-8') if path.respond_to?(:force_encoding)
 
         # Ensure we match the path without the locale, if present.
         if defined?(::Refinery::I18n) and ::Refinery::I18n.enabled? and path =~ %r{^/#{::I18n.locale}}
@@ -84,8 +84,9 @@ module Refinery
 
         # Match path based on cascading rules.
         (path =~ Regexp.new(page.menu_match) if page.menu_match.present?) or
-          (path == page.link_url) or
-          (path == page.nested_path) or
+          path == page.link_url or
+          path == page.nested_path or
+          URI.decode(path) == page.nested_path or
           current_page?(page)
       end
 

data/lib/refinery/helpers/meta_helper.rb

@@ -47,7 +47,7 @@ module Refinery
           else
             obj.title
           end
-          title << link_to_if(options[:link], obj_title, obj.url)
+          title << link_to_if(options[:link] && obj.respond_to?(:url), obj_title, obj.url)
         end
 
         final_title = title.pop

data/lib/refinery/helpers/script_helper.rb

@@ -25,7 +25,7 @@ module Refinery
         else
           "#{javascript_include_tag("http://www.google.com/jsapi").gsub(".js", "")}
           <script>
-            google.load('jquery', '1.5.0');
+            google.load('jquery', '1.5.2');
             #{"google.load('jqueryui', '1.8.9');" if options[:jquery_ui]}
           </script>".html_safe
         end

data/lib/refinery/plugin.rb

@@ -78,14 +78,12 @@ module Refinery
 
     # Returns a hash that can be used to create a url that points to the administration part of the plugin.
     def url
-      return @url if defined?(@url)
-
-      if self.controller.present?
-        @url = {:controller => "/admin/#{self.controller}"}
+      @url ||= if self.controller.present?
+        {:controller => "/admin/#{self.controller}"}
       elsif self.directory.present?
-        @url = {:controller => "/admin/#{self.directory.split('/').pop}"}
+        {:controller => "/admin/#{self.directory.split('/').pop}"}
       else
-        @url = {:controller => "/admin/#{self.name}"}
+        {:controller => "/admin/#{self.name}"}
       end
     end
 

data/lib/refinerycms-core.rb

@@ -1,6 +1,4 @@
 require 'acts_as_indexed'
-require 'awesome_nested_set'
-require 'friendly_id'
 require 'truncate_html'
 require 'will_paginate'