active_scaffold_sortable 3.2.1 → 3.2.2

data/app/assets/javascripts/jquery/active_scaffold_sortable.js

@@ -23,14 +23,16 @@ ActiveScaffold.sortable = function(element) {
       ActiveScaffold.update_positions(content);
     };
   } else {
-    var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
     var url = element.data('reorder-url');
-    sortable_options.update = function(event, ui) {
-      var body = jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression: new RegExp(element.data('format'))});
-      var params = element.data('with');
-      if (params) body += '&' + params;
-      jQuery.post(url, body + '&' + csrf);
-    };
+    if (url) {
+      var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
+      sortable_options.update = function(event, ui) {
+        var body = jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression: new RegExp(element.data('format'))});
+        var params = element.data('with');
+        if (params) body += '&' + params;
+        jQuery.post(url, body + '&' + csrf);
+      };
+    }
   }
   sortable_options.handle = element.data('handle');
   sortable_options.items = element.data('tag');
@@ -40,7 +42,7 @@ ActiveScaffold.sortable = function(element) {
 jQuery(document).ready(function($) {
   $(document).on('as:action_success', 'a.as_action', function(e, action_link) {
     var sortable = $('.sortable-container', action_link.adapter);
-    if (sortable.length) $.each(sortable, function(i, s) { ActiveScaffold.sortable(s); });
+    if (sortable.length) $.each(sortable, function(i, s) { ActiveScaffold.sortable($(s)); });
   });
   var sortable = $('.sortable-container');
   if (sortable.length) ActiveScaffold.sortable(sortable);

data/app/assets/javascripts/jquery/active_scaffold_sortable.js~

@@ -0,0 +1,45 @@
+ActiveScaffold.update_positions = function(content) {
+  if (typeof(content) == 'string') content = jQuery('#' + content);
+  var element = content.closest('.sortable-container');
+  jQuery.each(content.find('.sub-form-record input[name$="[' + element.data('column') + ']"]'), function(i, field) {
+    jQuery(field).val(i);
+  });
+}
+ActiveScaffold.sortable = function(element) {
+  var form, content, sortable_options = {};
+  if (typeof(element) == 'string') {
+    content = jQuery('#' + element);
+    element = content.closest('.sortable-container');
+  } else {
+    var form = element.closest('form.as_form').length > 0;
+    if (form) content = element;
+    else content = element.find('.records:first');
+  }
+  
+  if (form) {
+    sortable_options.update = function(event, ui) {
+      ActiveScaffold.update_positions(content);
+    };
+  } else {
+    var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
+    var url = element.data('reorder-url');
+    sortable_options.update = function(event, ui) {
+      var body = jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression: new RegExp(element.data('format'))});
+      var params = element.data('with');
+      if (params) body += '&' + params;
+      jQuery.post(url, body + '&' + csrf);
+    };
+  }
+  sortable_options.handle = element.data('handle');
+  sortable_options.items = element.data('tag');
+  content.sortable(sortable_options);
+};
+
+jQuery(document).ready(function($) {
+  $(document).on('as:action_success', 'a.as_action', function(e, action_link) {
+    var sortable = $('.sortable-container', action_link.adapter);
+    if (sortable.length) $.each(sortable, function(i, s) { ActiveScaffold.sortable(s); });
+  });
+  var sortable = $('.sortable-container');
+  if (sortable.length) ActiveScaffold.sortable(sortable);
+});

data/app/assets/javascripts/prototype/active_scaffold_sortable.js~

@@ -0,0 +1,34 @@
+ActiveScaffold.sortable = function(element) {
+  var form, content, sortable_options = {};
+  if (typeof(element) == 'string') {
+    content = $(element);
+    element = content.up('.sortable-container');
+  } else {
+    var form = !!element.up('form.as_form');
+    if (form) content = element.down('.sub-form');
+    else content = element.down('.records');
+  }
+  
+  if (!form) {
+    var csrf = $$('meta[name=csrf-param]')[0].readAttribute('content') + '=' + $$('meta[name=csrf-token]')[0].readAttribute('content');
+    var url = element.readAttribute('data-reorder-url').append_params(csrf);
+    sortable_options.onUpdate = function() {
+      var body = Sortable.serialize(content);
+      var params = element.readAttribute('data-with');
+      if (params) body += '&' + params;
+      new Ajax.Request(url, {method: 'post', parameters: body + '&' + csrf});
+    }
+  }
+  sortable_options.handle = element.readAttribute('data-handle');
+  sortable_options.items = element.readAttribute('data-tag');
+  Sortable.create(content, sortable_options);
+};
+
+document.observe('dom:loaded', function(){
+  document.on('as:action_success', 'a.as_action', function(e, action_link) {
+    var sortable = $(action_link.adapter).find('.sortable-container');
+    if (sortable.length) sortable.invoke(function(s) { ActiveScaffold.sortable(s); });
+  });
+  var sortable = $$('.sortable-container');
+  if (sortable.length) ActiveScaffold.sortable(sortable[0]);
+});

data/app/views/active_scaffold_overrides/_form_association.html.erb~

@@ -0,0 +1,6 @@
+<% config = active_scaffold_config_for(column.association.klass) %>
+<% if config.actions.include? :sortable %>
+<%= content_tag :div, render(:super), :class => 'sortable-container', :data => sort_params(config).merge(:tag => 'tbody') %>
+<% else %>
+<%= render :super %>
+<% end %>

data/app/views/active_scaffold_overrides/edit_associated.js.erb~

@@ -0,0 +1,6 @@
+<%= render :super %>
+<% config = active_scaffold_config_for(@column.association.klass) %>
+<% if config.actions.include? :sortable %>
+ActiveScaffold.update_position('<%= sub_form_list_id(:association => @column.name) %>');
+ActiveScaffold.sortable('<%= sub_form_list_id(:association => @column.name) %>');
+<% end %>

data/frontends/default/active_scaffold_overrides/on_create.js.erb~

@@ -0,0 +1,4 @@
+<%= render(:super, :locals => {:insert_at => :bottom}) %>
+<% if controller.send(:successful?) && !nested_singular_association? %>
+  ActiveScaffold.sortable('<%= active_scaffold_tbody_id %>'); %>
+<% end %>

data/frontends/default/active_scaffold_overrides/on_update.js.erb~

@@ -0,0 +1,17 @@
+<%= render(:super) %>
+<%
+# if we are currently editing a nested belongs_to association do not do any sorting stuff
+unless nested_singular_association?
+  if ActiveScaffold.js_framework == :prototype
+%>
+    <%= sortable_element_js(*sort_params) %>
+<%
+  elsif ActiveScaffold.js_framework == :jquery
+    reorder_params = {}
+    reorder_params[:eid] = params[:eid] unless params[:eid].blank?
+%>
+    <%= "ActiveScaffold.sortable('#{sort_params[0]}', #{controller_name.to_json}, #{reorder_params.to_json});".html_safe %>
+<%
+  end if controller.send :successful?
+end
+%>

data/lib/active_scaffold/actions/sortable.rb

@@ -4,12 +4,12 @@ module ActiveScaffold::Actions
       base.helper ActiveScaffold::Helpers::SortableHelpers
       base.before_filter :sortable_authorized?, :only => :reorder
       base.active_scaffold_config.configure do |config|
-        config.list.pagination = false
+        config.list.pagination = false if config.actions.include? :list
       
         # turn sorting off
         sortable_column = config.sortable.column.name
         config.columns.each {|c| c.sort = false unless c.name == sortable_column }
-        config.list.sorting = { sortable_column => "asc" }
+        config.list.sorting = { sortable_column => "asc" } if config.actions.include? :list
       
         config.actions.each do |action_name|
           next if action_name == :subform

data/lib/active_scaffold/actions/sortable.rb~

@@ -0,0 +1,81 @@
+module ActiveScaffold::Actions
+  module Sortable
+    def self.included(base)
+      base.helper ActiveScaffold::Helpers::SortableHelpers
+      base.before_filter :sortable_authorized?, :only => :reorder
+      base.active_scaffold_config.configure do |config|
+        config.list.pagination = false
+      
+        # turn sorting off
+        sortable_column = config.sortable.column.name
+        config.columns.each {|c| c.sort = false unless c.name == sortable_column }
+        config.list.sorting = { sortable_column => "asc" }
+      
+        config.actions.each do |action_name|
+          next if action_name == :subform
+          action = config.send(action_name)
+          action.columns.exclude(sortable_column) if action.respond_to? :columns
+        end
+
+        base.add_active_scaffold_path File.join(ActiveScaffold::Config::Sortable.plugin_directory, 'frontends', 'default')
+      end
+    end
+    
+    def reorder
+      model = active_scaffold_config.model
+      
+      unless (model.instance_methods & [:nested_set_scope, 'nested_set_scope']).empty?
+        reorder_children_in_tree(model)
+      else
+        if model.respond_to? :ancestry_column
+          reorder_ancestry_tree(model) 
+        else
+          reorder_simple_list(model)
+        end
+      end
+      do_refresh_list if active_scaffold_config.sortable.refresh_list
+    end
+    
+    protected
+    def sortable_authorized?
+      authorized_for?(:action => :update)
+    end
+    
+    def reorder_ancestry_tree(model)
+      first_record = model.find(params[active_scaffold_tbody_id].first)
+      unless first_record.nil?
+        records = first_record.is_root? ? model.roots: first_record.parent.children
+        reorder_simple_list(model)
+      else
+        Rails.logger.info("Failed to find first record to reorder")
+      end
+    end
+    
+    def reorder_simple_list(model)
+      column_name = active_scaffold_config.sortable.column.name
+      debugger
+      params[active_scaffold_tbody_id].each_with_index do |id, index|
+        model.update_all({column_name => index + 1}, {model.primary_key => id})
+      end
+    end
+    
+    def reorder_children_in_tree(model)
+      current_order = model.find(params[active_scaffold_tbody_id].first).try(:self_and_siblings)
+      new_order = params[active_scaffold_tbody_id].collect {|item_id| item_id.to_i}
+      new_order.each_with_index do |record_id, new_position|
+        if record_id != current_order[new_position].id
+          current_order = move_child(current_order.find {|child| child.id == record_id}, new_position, current_order) 
+        end
+      end if new_order.length == current_order.length
+    end
+    
+    def move_child(child, new_position, children)
+      old_position = children.index(child)
+      (old_position - new_position).abs.times do |step|
+        child.send((old_position - new_position) > 0 ? :move_left : :move_right)
+      end
+      child.self_and_siblings
+    end
+
+  end
+end

data/lib/active_scaffold/config/sortable.rb

@@ -50,11 +50,13 @@ module ActiveScaffold::Config
         raise(ArgumentError, "Unknown handle column position: #{where}") unless [:first, :last].include?(where)
         @options[:handle] = 'td.sortable-handle'
         define_handle_column
-        if where == :first
-          @core.list.columns = [:active_scaffold_sortable] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :active_scaffold_sortable
-        else
-          @column.weight = 2**(0.size * 8 -2) -1
-          @core.list.columns.add :active_scaffold_sortable
+        @column.weight = 2**(0.size * 8 -2) -1 unless where == :first
+        if @core.actions.include? :list
+          if where == :first
+            @core.list.columns = [:active_scaffold_sortable] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :active_scaffold_sortable
+          else
+            @core.list.columns.add :active_scaffold_sortable 
+          end
         end
       else
         @options.delete(:handle)

data/lib/active_scaffold_sortable/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldSortable
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold_sortable/view_helpers.rb~

@@ -0,0 +1,16 @@
+module ActiveScaffoldSortable
+  module ViewHelpers
+    def sort_params(config = active_scaffold_config)
+      options = {
+        :tag => 'tr', 
+        :reorder_url => url_for(params_for(:action => :reorder, :controller => controller_name)),
+        :format => '^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$'
+      }
+      options.merge config.sortable.options
+    end
+
+    def active_scaffold_sortable_column(record, column)
+      ''
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 2
-  - 1
-  version: 3.2.1
+  - 2
+  version: 3.2.2
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -16,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-16 00:00:00 Z
+date: 2013-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id001
   prerelease: false
-  type: :development
-  requirement: *id001
   name: shoulda
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +45,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id002
   prerelease: false
-  type: :development
-  requirement: *id002
   name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,26 +59,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id003
   prerelease: false
-  type: :development
-  requirement: *id003
   name: rcov
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 2064438024
+        hash: 2371454695
         segments: 
         - 3
         - 3
         - 0
         - rc
-        version: 3.3.0.rc
+        - 3
+        version: 3.3.0.rc3
+  version_requirements: *id004
   prerelease: false
-  type: :runtime
-  requirement: *id004
   name: active_scaffold
 description: Sort Tree or List Structures by Drag n Drop
 email: activescaffold@googlegroups.com
@@ -89,38 +90,46 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.textile
 files: 
-- app/views/active_scaffold_overrides/_form_association.html.erb
-- app/views/active_scaffold_overrides/edit_associated.js.erb
-- app/assets/images/active_scaffold/sortable.png
 - app/assets/stylesheets/active_scaffold_sortable.css.scss
-- app/assets/javascripts/prototype/active_scaffold_sortable.js
+- app/assets/images/active_scaffold/sortable.png
 - app/assets/javascripts/active_scaffold_sortable.js.erb
 - app/assets/javascripts/jquery/active_scaffold_sortable.js
-- frontends/default/active_scaffold_overrides/on_create.js.erb
+- app/assets/javascripts/jquery/active_scaffold_sortable.js~
+- app/assets/javascripts/prototype/active_scaffold_sortable.js
+- app/assets/javascripts/prototype/active_scaffold_sortable.js~
+- app/views/active_scaffold_overrides/_form_association.html.erb
+- app/views/active_scaffold_overrides/edit_associated.js.erb
+- app/views/active_scaffold_overrides/_form_association.html.erb~
+- app/views/active_scaffold_overrides/edit_associated.js.erb~
 - frontends/default/active_scaffold_overrides/_list.html.erb
+- frontends/default/active_scaffold_overrides/on_create.js.erb
 - frontends/default/active_scaffold_overrides/on_update.js.erb
 - frontends/default/active_scaffold_overrides/reorder.js.erb
+- frontends/default/active_scaffold_overrides/on_create.js.erb~
+- frontends/default/active_scaffold_overrides/on_update.js.erb~
 - lib/active_scaffold/actions/sortable.rb
+- lib/active_scaffold/actions/sortable.rb~
 - lib/active_scaffold/config/sortable.rb
 - lib/active_scaffold/helpers/sortable_helpers.rb
-- lib/active_scaffold_sortable/engine.rb
-- lib/active_scaffold_sortable/core.rb
-- lib/active_scaffold_sortable/view_helpers.rb
+- lib/active_scaffold_sortable.rb
 - lib/active_scaffold_sortable/config/core.rb
+- lib/active_scaffold_sortable/core.rb
 - lib/active_scaffold_sortable/version.rb
-- lib/active_scaffold_sortable.rb
+- lib/active_scaffold_sortable/engine.rb
+- lib/active_scaffold_sortable/view_helpers.rb
+- lib/active_scaffold_sortable/view_helpers.rb~
 - LICENSE.txt
 - README.textile
-- test/router_test.rb
+- test/auto_models_controller_test.rb
+- test/config_test.rb
+- test/controllers/auto_models_controller.rb
+- test/controllers/models_controller.rb
+- test/controllers/sortable_models_controller.rb
 - test/models/auto_model.rb
 - test/models/model.rb
+- test/router_test.rb
 - test/schema.rb
 - test/test_helper.rb
-- test/controllers/auto_models_controller.rb
-- test/controllers/models_controller.rb
-- test/controllers/sortable_models_controller.rb
-- test/auto_models_controller_test.rb
-- test/config_test.rb
 homepage: http://github.com/activescaffold/active_scaffold_sortable
 licenses: 
 - MIT
@@ -150,18 +159,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Drag n Drop Sorting for Activescaffold
 test_files: 
-- test/router_test.rb
+- test/auto_models_controller_test.rb
+- test/config_test.rb
+- test/controllers/auto_models_controller.rb
+- test/controllers/models_controller.rb
+- test/controllers/sortable_models_controller.rb
 - test/models/auto_model.rb
 - test/models/model.rb
+- test/router_test.rb
 - test/schema.rb
 - test/test_helper.rb
-- test/controllers/auto_models_controller.rb
-- test/controllers/models_controller.rb
-- test/controllers/sortable_models_controller.rb
-- test/auto_models_controller_test.rb
-- test/config_test.rb