RubyGems - refinerycms-core - Versions diffs - 0.9.9.16 → 0.9.9.17 - Mend

refinerycms-core 0.9.9.16 → 0.9.9.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/app/views/admin/_head.html.erb +0 -22
data/app/views/shared/_head.html.erb +2 -24
data/app/views/shared/_header.html.erb +12 -5
data/app/views/shared/_menu.html.erb +9 -10
data/app/views/shared/_menu_branch.html.erb +7 -9
data/lib/gemspec.rb +1 -1
data/lib/refinery/catch_all_routes.rb +0 -8
data/lib/refinery/crud.rb +2 -2
data/lib/refinery/helpers/menu_helper.rb +25 -2
data/lib/tasks/refinery.rake +2 -2
data/public/javascripts/refinery/admin.js +0 -1
data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +23 -0
data/refinerycms-core.gemspec +5 -5
metadata +6 -8

data/app/views/admin/_head.html.erb CHANGED Viewed

@@ -1,21 +1,3 @@
-<%
-  if (yielded_head = yield(:head)).present?
-    logger.warn "\n-- DEPRECATION WARNING --"
-    logger.warn "The use of 'content_for :head' is DEPRECATED for the admin layouts."
-    logger.warn "For stylesheets, use content_for :stylesheets"
-    logger.warn "For javascripts, use content_for :javascripts"
-    logger.warn "For meta tags, use content_for :meta"
-    logger.warn "This change is necessary so that we can deliver a performant experience for the user."
-    logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
-  end
-  if (yielded_head_libraries = yield(:head)).present?
-    logger.warn "\n-- DEPRECATION WARNING --"
-    logger.warn "The use of 'content_for :head_libraries' is DEPRECATED for the admin layouts."
-    logger.warn "Please use content_for :before_javascript_libraries or content_for :after_javascript_libraries instead."
-    logger.warn "This change is necessary so that we can deliver a performant experience for the user."
-    logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
-  end
--%>
 <head>
   <meta charset='<%= ::Refinery::Application.config.encoding %>' />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@@ -36,8 +18,4 @@
   <%= yield :stylesheets %>
   <%= javascript_include_tag 'modernizr-min' %>
-  <% #TODO: REMOVE yielded_head and yielded_head_libraries and deprecation notice 0.9.9 <=> 1.0 %>
-  <%= yielded_head_libraries %>
-  <%= yielded_head %>
 </head>

data/app/views/shared/_head.html.erb CHANGED Viewed

@@ -1,21 +1,3 @@
-<%
-  if (yielded_head = yield(:head)).present?
-    logger.warn "\n-- DEPRECATION WARNING --"
-    logger.warn "The use of 'content_for :head' is DEPRECATED for the frontend layouts."
-    logger.warn "For stylesheets, use content_for :stylesheets"
-    logger.warn "For javascripts, use content_for :javascripts"
-    logger.warn "For meta tags, use content_for :meta"
-    logger.warn "This change is necessary so that we can deliver a performant experience for the user."
-    logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
-  end
-  if (yielded_head_libraries = yield(:head_libraries)).present?
-    logger.warn "\n-- DEPRECATION WARNING --"
-    logger.warn "The use of 'content_for :head_libraries' is DEPRECATED for the frontend layouts."
-    logger.warn "Please use content_for :before_javascript_libraries or content_for :after_javascript_libraries instead."
-    logger.warn "This change is necessary so that we can deliver a performant experience for the user."
-    logger.warn "Called from: #{caller.detect{|c| c =~ %r{#{Rails.root.to_s}}}.inspect.to_s.split(':in').first}\n\n"
-  end
-%>
 <head>
   <meta charset='<%= ::Refinery::Application.config.encoding %>' />
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
@@ -25,18 +7,14 @@
   <%= csrf_meta_tag if RefinerySetting.find_or_set(:authenticity_token_on_frontend, true)-%>
   <%= yield :meta %>
-  <%= stylesheet_link_tag stylesheets_for_head(stylesheets||=%w(application formatting theme), theme ||= false),
+  <%= stylesheet_link_tag stylesheets_for_head(stylesheets||=%w(application formatting theme), theme ||= nil),
                           :cache => ("cache/application" if Rails.root.writable? and
                                                             RefinerySetting.find_or_set(:use_resource_caching, true) and
-                                                            request.env['HTTP_USER_AGENT'] !~ /MSIE/ and (theme ||= false).blank?) %>
+                                                            request.env['HTTP_USER_AGENT'] !~ /MSIE/ and (theme ||= nil).blank?) %>
   <%= stylesheet_link_tag "home", :theme => theme if home_page? %>
   <%= yield :stylesheets %>
   <%= render :partial => '/shared/google_analytics' unless local_request? %>
   <%= javascript_include_tag 'modernizr-min' %>
-  <% #TODO: REMOVE yielded_head and yielded_head_libraries and deprecation notice 0.9.9 <=> 1.0 %>
-  <%= yielded_head_libraries %>
-  <%= yielded_head %>
 </head>

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

@@ -1,8 +1,15 @@
 <h1 id='logo'>
   <%= link_to RefinerySetting.find_or_set(:site_name, "Company Name"), root_path %>
 </h1>
-<%= render :partial => "/shared/menu",
-           :locals => {
-             :dom_id => 'menu',
-             :css => 'menu'
-           } -%>
+<%=
+  ::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 %>

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

@@ -1,22 +1,21 @@
 <%
   dom_id ||= 'menu'
-  css ||= 'menu'
-  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 = (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?
+  cache_key = [Refinery.base_cache_key, 'pages_menus', dom_id, Globalize.locale, cache_path ||= request.path].join('_')
+  cache_if(caching, cache_key) do
+    # Select top menu items unless 'roots' is supplied.
+    if (roots ||= (collection ||= @menu_pages).where(: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 = collection.detect{|page| selected_page?(page)}
-        selected_item = @page if selected_item.nil?
+        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='<%= %W(#{css} clearfix).join(' ') %>'>
+      <nav id='<%= dom_id %>' class='<%= css %>'>
         <ul>
-          <%= render :partial => "/shared/menu_branch",
+          <%= render :partial => '/shared/menu_branch',
                      :collection => roots,
                      :locals => {
                        :hide_children => hide_children,

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

@@ -1,14 +1,12 @@
 <%
-  if !!local_assigns[:apply_css] and (classes = css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count||=nil, collection, selected_item ||= nil)).any?
+  if !!local_assigns[:apply_css] and (classes = menu_branch_css(local_assigns)).any?
     css = "class='#{classes.join(' ')}'"
   end
-  dom_id = ("id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
+  dom_id = "id='item_#{menu_branch_counter}'"
-  hide_children = (defined?(hide_children) && hide_children)
-  children = if (hide_children || !menu_branch.has_descendants?)
-    []
-  else
-    collection.select { |p| p.parent_id == menu_branch.id }
+  children = []
+  if !hide_children && menu_branch.has_descendants?
+    children = collection.where(:parent_id => menu_branch.id)
   end
 -%>
 <li<%= ['', css, dom_id].compact.join(' ').gsub(/\ *$/, '') %>>
@@ -16,11 +14,11 @@
   <% if children.present? -%>
     <ul class='clearfix'>
       <%=
-        render :partial => "/shared/menu_branch",
+        render :partial => '/shared/menu_branch',
                :collection => children,
                :locals => {
                  :apply_css => local_assigns[:apply_css],
-                 :hide_children => hide_children,
+                 :hide_children => !!hide_children,
                  :collection => collection,
                  :selected_item => selected_item,
                  :sibling_count => children.size - 1

data/lib/gemspec.rb CHANGED Viewed

@@ -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.6'
+  s.add_dependency 'rails',                       '~> 3.0.7.rc1'
   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/catch_all_routes.rb CHANGED Viewed

@@ -1,11 +1,3 @@
 ::Refinery::Application.routes.draw do
-  match '/admin(/*path)', :to => redirect {|params, request|
-    request.flash[:message] = "<p>
-      The URL '/<strong>admin</strong>#{"/#{params[:path]}" unless params[:path].blank?}' will be removed in Refinery CMS version 1.0
-      <br/>
-      Please use '/<strong>refinery</strong>#{"/#{params[:path]}" unless params[:path].blank?}' instead.
-    </p>".html_safe
-    "/refinery#{"/#{params[:path]}" unless params[:path].blank?}"
-  }
   match '/refinery/*path' => 'admin/base#error_404'
 end

data/lib/refinery/crud.rb CHANGED Viewed

@@ -42,8 +42,8 @@ module Refinery
       def crudify(model_name, options = {})
         options = ::Refinery::Crud.default_options(model_name).merge(options)
-        singular_name = model_name.to_s
-        class_name = singular_name.camelize
+        class_name = model_name.to_s.camelize
+        singular_name = class_name.demodulize.underscore
         plural_name = singular_name.pluralize
         module_eval %(

data/lib/refinery/helpers/menu_helper.rb CHANGED Viewed

@@ -16,14 +16,37 @@ module Refinery
       # This was extracted from app/views/shared/_menu_branch.html.erb
       # to remove the complexity of that template by reducing logic in the view.
-      def css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count = nil, collection = [], selected_item = nil)
+      def css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count = nil, collection = [], selected_item = nil, warning = true)
+        # DEPRECATION. Remove at version 1.1
+        if warning
+          warn "\n-- DEPRECATION WARNING --"
+          warn "The use of 'css_for_menu_branch' is deprecated."
+          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
         css = []
         css << "selected" if selected_page_or_descendant_page_selected?(menu_branch, collection, selected_item)
         css << "first" if menu_branch_counter == 0
-        css << "last" if menu_branch_counter == (sibling_count ||= menu_branch.shown_siblings.size)
+        css << "last" if menu_branch_counter == sibling_count
         css
       end
+      # New method which accepts the local_assigns hash.
+      # 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
+        css_for_menu_branch(options[:menu_branch],
+                            options[:menu_branch_counter],
+                            options[:sibling_count],
+                            options[:collection],
+                            options[:selected_item],
+                            false)
+      end
       # Determines whether any page underneath the supplied page is the current page according to rails.
       # 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.

data/lib/tasks/refinery.rake CHANGED Viewed

@@ -132,8 +132,8 @@ namespace :refinery do
   desc "Un-crudify a method on a controller that uses crudify"
   task :uncrudify => :environment do
     if (model_name = ENV["model"]).present? and (action = ENV["action"]).present?
-      singular_name = model_name.to_s
-      class_name = singular_name.camelize
+      class_name = model_name.to_s.camelize
+      singular_name = class_name.demodulize.underscore
       plural_name = singular_name.pluralize
       crud_lines = Refinery.roots('core').join('lib', 'refinery', 'crud.rb').read

data/public/javascripts/refinery/admin.js CHANGED Viewed

@@ -725,7 +725,6 @@ var page_options = {
               page_options.tabs.find('> ul li a').corner('top 5px');
               $('#new_page_part_dialog').dialog('close');
-              $('#new_page_part_dialog').remove();
             }
           );
         }else{

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js CHANGED Viewed

@@ -1339,6 +1339,29 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
               end = selection.focusOffset;
             }
+            // for https://github.com/resolve/refinerycms/issues/581
+            if (typeof (start_node.insertData) === 'undefined') {
+                var j = start_node.childNodes.length - 1,
+                    tmp_start_node = start_node;
+                // @todo what then if function insertData is not found?
+                while (typeof(end_node.insertData) !== 'function' || !j) {
+                    start_node = tmp_start_node.childNodes[j--];
+                }
+                start = 0;
+            }
+            if (typeof (end_node.insertData) === 'undefined') {
+                var i = end_node.childNodes.length - 1,
+                    tmp_end_node = end_node;
+                while (typeof(end_node.insertData) !== 'function' || !i) {
+                    end_node = tmp_end_node.childNodes[i--];
+                }
+                end = end_node.length;
+            }
             // because .insertData only inserts text, we have to insert some 'meaningful' *text* only interpolation tags (no html).
             start_tag = '%%' + wym._current_unique_stamp + '%%';
             end_tag = '$$' + wym._current_unique_stamp + '$$';

data/refinerycms-core.gemspec CHANGED Viewed

@@ -2,10 +2,10 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{0.9.9.16}
+  s.version           = %q{0.9.9.17}
   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-07}
+  s.date              = %q{2011-04-15}
   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.16'
-  s.add_dependency 'refinerycms-settings',        '= 0.9.9.16'
+  s.add_dependency 'refinerycms-base',            '= 0.9.9.17'
+  s.add_dependency 'refinerycms-settings',        '= 0.9.9.17'
   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.6'
+  s.add_dependency 'rails',                       '~> 3.0.7.rc1'
   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 CHANGED Viewed

@@ -2,7 +2,7 @@
 name: refinerycms-core
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.9.9.16
+  version: 0.9.9.17
 platform: ruby
 authors:
 - Resolve Digital
@@ -13,8 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-04-07 00:00:00 +12:00
-default_executable:
+date: 2011-04-15 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-base
@@ -24,7 +23,7 @@ dependencies:
     requirements:
     - - "="
       - !ruby/object:Gem::Version
-        version: 0.9.9.16
+        version: 0.9.9.17
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
@@ -35,7 +34,7 @@ dependencies:
     requirements:
     - - "="
       - !ruby/object:Gem::Version
-        version: 0.9.9.16
+        version: 0.9.9.17
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency
@@ -101,7 +100,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.0.7.rc1
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency
@@ -480,7 +479,6 @@ files:
 - public/wymeditor/README
 - refinerycms-core.gemspec
 - spec/lib/refinery/plugins_spec.rb
-has_rdoc: true
 homepage: http://refinerycms.com
 licenses:
 - MIT
@@ -504,7 +502,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key:
 specification_version: 3
 summary: Core engine for Refinery CMS