refinerycms 0.9.8.5 → 0.9.8.6

data/vendor/refinerycms/core/app/views/shared/admin/_make_sortable.html.erb

@@ -1,5 +1,6 @@
-<% content_for :head_after_javascript_libraries, javascript_include_tag('refinery/nestedsortables.js') if (tree ||= false) %>
-<% content_for :head_after_javascript_libraries, javascript_include_tag('refinery/serializelist.js') %>
+<% content_for :head_after_javascript_libraries,
+               javascript_include_tag('refinery/nestedsortables.js',
+                                      'refinery/serializelist.js') -%>
 <% content_for :head do %>
   <script type='text/javascript'>
     $(document).ready(function(){

data/vendor/refinerycms/core/app/views/shared/admin/_sortable_list.html.erb

@@ -1,6 +1,5 @@
-<% if params[(list_id ||= "sortable_list").to_sym].present? and
-      (defined?(continue_reordering) ? continue_reordering == "true" : true) -%>
-  <script type='text/javascript'>
+<% if params[list_id ||= "sortable_list"].present? and !!local_assigns[:continue_reordering] -%>
+  <script>
     $(document).ready(function(){
       list_reorder.enable_reordering();
     });

data/vendor/refinerycms/core/lib/core.rb

@@ -75,7 +75,7 @@ module Refinery
       end
     end
   end
-  
+
   module Generators
     # The core engine installer streamlines the installation of custom generated
     # engines. It takes the migrations and seeds in your engine and moves them
@@ -87,7 +87,7 @@ module Refinery
         @engine_name = name unless name.nil?
         @engine_name
       end
-      
+
       # Implement the required interface for Rails::Generators::Migration.
       # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
       # can be removed once this issue is fixed:
@@ -99,7 +99,7 @@ module Refinery
           "%.3d" % (current_migration_number(dirname) + 1)
         end
       end
-      
+
       def generate
         Dir.glob(File.expand_path(File.join(self.class.source_root, '../db/**/**'))).each do |path|
           unless File.directory?(path)
@@ -110,7 +110,7 @@ module Refinery
             end
           end
         end
-        
+
         puts "------------------------"
         puts "Now run:"
         puts "rake db:migrate"
@@ -149,4 +149,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/refinery_engine_generator.rb

@@ -41,9 +41,9 @@ protected
 
   def plugin_path_for(path)
     path = path.gsub(File.dirname(__FILE__) + "/templates/", "vendor/engines/#{plural_name}/")
-  
+
     path = path.gsub("plural_name", plural_name)
     path = path.gsub("singular_name", singular_name)
   end
 
-end
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/app/views/admin/plural_name/index.html.erb

@@ -1,23 +1,25 @@
 <div id='actions'>
   <ul>
-    <li>
-      <%%= render :partial => "/shared/admin/search",
-                  :locals => {
-                    :url => admin_<%= plural_name %>_url
-                  } %>
-    </li>
+    <%% if Admin::<%= class_name.pluralize %>Controller.searchable? %>
+      <li>
+        <%%= render :partial => "/shared/admin/search",
+                    :locals => {
+                      :url => admin_<%= plural_name %>_url
+                    } %>
+      </li>
+    <%% end %>
     <li>
       <%%= link_to t('.create_new'), new_admin_<%= singular_name %>_url,
                    :class => "add_icon" %>
     </li>
-  <%% if !searching? and <%= class_name %>.count > 1 %>
+  <%% if !searching? and <%= class_name %>.count > 1 and Admin::<%= class_name.pluralize %>Controller.sortable? %>
     <li>
-      <%%= link_to t('refinery.reorder', :what => "<%= singular_name.titleize.pluralize %>"),
+      <%%= link_to t('.reorder', :what => "<%= singular_name.titleize.pluralize %>"),
                    admin_<%= plural_name %>_url,
                    :id => "reorder_action",
                    :class => "reorder_icon" %>
 
-      <%%= link_to t('refinery.reorder_done', :what => "<%= singular_name.titleize.pluralize %>"),
+      <%%= link_to t('.reorder_done', :what => "<%= singular_name.titleize.pluralize %>"),
                    admin_<%= plural_name %>_url,
                    :id => "reorder_action_done",
                    :style => "display: none;",

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb

@@ -12,4 +12,4 @@ page = Page.create(
 )
 Page.default_parts.each do |default_page_part|
   page.parts.create(:title => default_page_part, :body => nil)
-end
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/generators/refinerycms_plural_name_generator.rb

@@ -1,6 +1,6 @@
 class Refinerycms<%= class_name.pluralize %> < Refinery::Generators::EngineInstaller
-  
+
   source_root File.expand_path('../../', __FILE__)
   engine_name "<%= plural_name %>"
-  
-end
+
+end

data/vendor/refinerycms/core/lib/generators/refinery_engine/templates/lib/plural_name.rb

@@ -6,7 +6,7 @@ module Refinery
       initializer "static assets" do |app|
         app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
-      
+
       config.after_initialize do
         Refinery::Plugin.register do |plugin|
           plugin.name = "<%= class_name.pluralize.underscore.downcase %>"

data/vendor/refinerycms/core/lib/refinery/crud.rb

@@ -11,6 +11,25 @@
 module Refinery
   module Crud
 
+    def self.default_options(model_name)
+      singular_name = model_name.to_s
+      class_name = singular_name.camelize
+      plural_name = singular_name.pluralize
+      this_class = class_name.constantize
+
+      {
+        :title_attribute => "title",
+        :order => ('position ASC' if this_class.table_exists? and this_class.column_names.include?('position')),
+        :conditions => '',
+        :sortable => true,
+        :searchable => true,
+        :include => [],
+        :paging => true,
+        :search_conditions => '',
+        :redirect_to_url => "admin_#{plural_name}_url"
+      }
+    end
+
     def self.append_features(base)
       super
       base.extend(ClassMethods)
@@ -18,23 +37,13 @@ module Refinery
 
     module ClassMethods
 
-      def crudify(model_name, new_options = {})
+      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
         plural_name = singular_name.pluralize
 
-        options = {
-          :title_attribute => "title",
-          :order => 'position ASC',
-          :conditions => '',
-          :sortable => true,
-          :searchable => true,
-          :include => [],
-          :paging => true,
-          :search_conditions => '',
-          :redirect_to_url => "admin_#{plural_name}_url"
-        }.merge!(new_options)
-
         module_eval %(
           prepend_before_filter :find_#{singular_name},
                                 :only => [:update, :destroy, :edit, :show]
@@ -68,7 +77,7 @@ module Refinery
                   end
                 end
               else
-                render :text => "<script type='text/javascript'>parent.window.location = '\#{#{options[:redirect_to_url]}}';</script>"
+                render :text => "<script>parent.window.location = '\#{#{options[:redirect_to_url]}}';</script>"
               end
             else
               unless request.xhr?
@@ -105,7 +114,7 @@ module Refinery
                   end
                 end
               else
-                render :text => "<script type='text/javascript'>parent.window.location = '\#{#{options[:redirect_to_url]}}';</script>"
+                render :text => "<script>parent.window.location = '\#{#{options[:redirect_to_url]}}';</script>"
               end
             else
               unless request.xhr?
@@ -225,16 +234,19 @@ module Refinery
             def update_positions
               previous = nil
               # The list doesn't come to us in the correct order. Frustration.
-              while (index ||= 0) < (newlist ||= params[:ul]).length do
+              0.upto((newlist ||= params[:ul]).length - 1) do |index|
                 hash = newlist[index.to_s]
-                moved_item_id = hash['id'].split(/#{singular_name}/)
+                moved_item_id = hash['id'].split(/#{singular_name}\\_?/)
                 @current_#{singular_name} = #{class_name}.find_by_id(moved_item_id)
 
-                if previous.present?
-                  @previous_item = #{class_name}.find_by_id(previous)
-                  @current_#{singular_name}.move_to_right_of(@previous_item)
+                if @current_#{singular_name}.respond_to?(:move_to_root)
+                  if previous.present?
+                    @current_#{singular_name}.move_to_right_of(#{class_name}.find_by_id(previous))
+                  else
+                    @current_#{singular_name}.move_to_root
+                  end
                 else
-                   @current_#{singular_name}.move_to_root
+                  @current_#{singular_name}.update_attribute(:position, index)
                 end
 
                 if hash['children'].present?
@@ -242,31 +254,39 @@ module Refinery
                 end
 
                 previous = moved_item_id
-                index += 1
               end
-              #{class_name}.rebuild!
+
+              #{class_name}.rebuild! if #{class_name}.respond_to?(:rebuild!)
               render :nothing => true
             end
 
             def update_child_positions(node, #{singular_name})
-              child_index = 0
-              while child_index < node['children'].length do
+              0.upto(node['children'].length - 1) do |child_index|
                 child = node['children'][child_index.to_s]
-                child_id = child['id'].split(/#{singular_name}/)
+                child_id = child['id'].split(/#{singular_name}\_?/)
                 child_#{singular_name} = #{class_name}.find_by_id(child_id)
                 child_#{singular_name}.move_to_child_of(#{singular_name})
 
                 if child['children'].present?
                   update_child_positions(child, child_#{singular_name})
                 end
-
-                child_index += 1
               end
             end
 
           )
         end
 
+        module_eval %(
+          def self.sortable?
+            #{options[:sortable].to_s}
+          end
+
+          def self.searchable?
+            #{options[:searchable].to_s}
+          end
+        )
+
+
       end
 
     end

data/vendor/refinerycms/core/lib/refinery/helpers/menu_helper.rb

@@ -2,11 +2,23 @@ module Refinery
   module Helpers
     module MenuHelper
 
+      # Adds conditional caching
+      def cache_if(condition, name = {}, &block)
+        if condition
+          cache(name, &block)
+        else
+          yield
+        end
+
+        # for <%= style helpers vs <% style
+        nil
+      end
+
       # This was extracted from REFINERY_ROOT/vendor/plugins/refinery/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)
+      def css_for_menu_branch(menu_branch, menu_branch_counter, sibling_count = nil, collection = [], selected_item = nil)
         css = []
-        css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch)
+        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
@@ -14,8 +26,26 @@ module Refinery
 
       # 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.
-      def descendant_page_selected?(page)
-        page.has_descendants? and page.descendants.any? {|descendant| selected_page?(descendant) }
+      # 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
+        end
+
+        descendants.any? do |descendant|
+          selected_item ? selected_item == descendant : selected_page?(descendant)
+        end
+      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
       end
 
       # Determine whether the supplied page is the currently open page according to Refinery.

data/vendor/refinerycms/core/lib/refinery/plugin.rb

@@ -13,7 +13,7 @@ module Refinery
         Page.friendly_id_config.reserved_words << reserved_word
       end
 
-      raise "A plugin MUST have a name!: #{plugin.inspect}" if plugin.name.nil?
+      raise "A plugin MUST have a name!: #{plugin.inspect}" if plugin.name.blank?
 
       # Set the root as Rails::Engine.called_from will always be
       #                 vendor/engines/refinery/lib/refinery
@@ -104,17 +104,17 @@ module Refinery
       end
     end
 
+  # Make this protected, so that only Plugin.register can use it.
   protected
 
     def add_activity(options)
       (self.plugin_activity ||= []) << Activity::new(options)
     end
 
-    # Make this protected, so that only Plugin.register can use it.
     def initialize
-      # save the pathname to where this plugin is.
-      depth = RUBY_VERSION == "1.9.2" ? -4 : -3
-      self.pathname = Pathname.new(caller(3).first.split(File::SEPARATOR)[0..depth].join(File::SEPARATOR))
+      # save the pathname to where this plugin is using its lib directory which is standard now.
+      depth = RUBY_VERSION >= "1.9.2" ? 4 : 3
+      self.pathname = Pathname.new(caller(depth).first.match("(.*)#{File::SEPARATOR}lib")[1])
       Refinery::Plugins.registered << self # add me to the collection of registered plugins
     end
 

data/vendor/refinerycms/core/public/javascripts/rails.js

@@ -0,0 +1,152 @@
+/*
+  Taken from http://github.com/rails/jquery-ujs
+  At version http://github.com/rails/jquery-ujs/blob/f991faf0074487b43a061168cdbfd102ee0c182c/src/rails.js
+  (Because that was the current master version)
+*/ 
+
+jQuery(function ($) {
+    var csrf_token = $('meta[name=csrf-token]').attr('content'),
+        csrf_param = $('meta[name=csrf-param]').attr('content');
+
+    $.fn.extend({
+        /**
+         * Triggers a custom event on an element and returns the event result
+         * this is used to get around not being able to ensure callbacks are placed
+         * at the end of the chain.
+         *
+         * TODO: deprecate with jQuery 1.4.2 release, in favor of subscribing to our
+         *       own events and placing ourselves at the end of the chain.
+         */
+        triggerAndReturn: function (name, data) {
+            var event = new $.Event(name);
+            this.trigger(event, data);
+
+            return event.result !== false;
+        },
+
+        /**
+         * Handles execution of remote calls firing overridable events along the way
+         */
+        callRemote: function () {
+            var el      = this,
+                method  = el.attr('method') || el.attr('data-method') || 'GET',
+                url     = el.attr('action') || el.attr('href'),
+                dataType  = el.attr('data-type')  || 'script';
+
+            if (url === undefined) {
+              throw "No URL specified for remote call (action or href must be present).";
+            } else {
+                if (el.triggerAndReturn('ajax:before')) {
+                    var data = el.is('form') ? el.serializeArray() : [];
+                    $.ajax({
+                        url: url,
+                        data: data,
+                        dataType: dataType,
+                        type: method.toUpperCase(),
+                        beforeSend: function (xhr) {
+                            el.trigger('ajax:loading', xhr);
+                        },
+                        success: function (data, status, xhr) {
+                            el.trigger('ajax:success', [data, status, xhr]);
+                        },
+                        complete: function (xhr) {
+                            el.trigger('ajax:complete', xhr);
+                        },
+                        error: function (xhr, status, error) {
+                            el.trigger('ajax:failure', [xhr, status, error]);
+                        }
+                    });
+                }
+
+                el.trigger('ajax:after');
+            }
+        }
+    });
+
+    /**
+     *  confirmation handler
+     */
+    var jqueryVersion = $().jquery;
+
+    if ( (jqueryVersion === '1.4') || (jqueryVersion === '1.4.1') || (jqueryVersion === '1.4.2')){
+      $('a[data-confirm],input[data-confirm]').live('click', function () {
+          var el = $(this);
+          if (el.triggerAndReturn('confirm')) {
+              if (!confirm(el.attr('data-confirm'))) {
+                  return false;
+              }
+          }
+      });
+    } else {
+      $('body').delegate('a[data-confirm],input[data-confirm]', 'click', function () {
+          var el = $(this);
+          if (el.triggerAndReturn('confirm')) {
+              if (!confirm(el.attr('data-confirm'))) {
+                  return false;
+              }
+          }
+      });
+    }
+    
+
+
+    /**
+     * remote handlers
+     */
+    $('form[data-remote]').live('submit', function (e) {
+        $(this).callRemote();
+        e.preventDefault();
+    });
+
+    $('a[data-remote],input[data-remote]').live('click', function (e) {
+        $(this).callRemote();
+        e.preventDefault();
+    });
+
+    $('a[data-method]:not([data-remote])').live('click', function (e){
+        var link = $(this),
+            href = link.attr('href'),
+            method = link.attr('data-method'),
+            form = $('<form method="post" action="'+href+'"></form>'),
+            metadata_input = '<input name="_method" value="'+method+'" type="hidden" />';
+
+        if (csrf_param != null && csrf_token != null) {
+          metadata_input += '<input name="'+csrf_param+'" value="'+csrf_token+'" type="hidden" />';
+        }
+
+        form.hide()
+            .append(metadata_input)
+            .appendTo('body');
+
+        e.preventDefault();
+        form.submit();
+    });
+
+    /**
+     * disable-with handlers
+     */
+    var disable_with_input_selector           = 'input[data-disable-with]';
+    var disable_with_form_remote_selector     = 'form[data-remote]:has('       + disable_with_input_selector + ')';
+    var disable_with_form_not_remote_selector = 'form:not([data-remote]):has(' + disable_with_input_selector + ')';
+
+    var disable_with_input_function = function () {
+        $(this).find(disable_with_input_selector).each(function () {
+            var input = $(this);
+            input.data('enable-with', input.val())
+                .attr('value', input.attr('data-disable-with'))
+                .attr('disabled', 'disabled');
+        });
+    };
+
+    $(disable_with_form_remote_selector).live('ajax:before', disable_with_input_function);
+    $(disable_with_form_not_remote_selector).live('submit', disable_with_input_function);
+
+    $(disable_with_form_remote_selector).live('ajax:complete', function () {
+        $(this).find(disable_with_input_selector).each(function () {
+            var input = $(this);
+            input.removeAttr('disabled')
+                 .val(input.data('enable-with'));
+        });
+    });
+
+});