active_scaffold_sortable 3.2.12 → 3.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e864193528c8155624de24f0f7dde67410ba0d8
-  data.tar.gz: d8fe87a567fc065fef9e62011bc7b2069de4c372
+  metadata.gz: bd9c9467a359a3f696bb77c77620edcd43e79a71
+  data.tar.gz: eeb731b0be39818643fe49b8a770a9815d258ef2
 SHA512:
-  metadata.gz: ae255ffa2331ea264259a56e811a37c25079ce4acde317ec74bf99cff7a77bec83cdfa8e8eca09573b1342f909dfb94652aaa171ea9cf23b9b3db7d0771b2bca
-  data.tar.gz: d9d6316aa7fd6b20e85f9adbaf85f6e08e938ad1c81ccfaa33f4e22d6e54f81227d6972e52ace01b3c2bab8096c13660cc9e106c2a47ac235dd214680cd2c50f
+  metadata.gz: d8e8f17c2497b2411298c259e4f018f3b85b6a7095994a90b8360eceefe0b943ef3bbb2f13dc69e906009c544e2836ddf127c50d35fa9f7c90024311216fdd73
+  data.tar.gz: 343a79b6ebe39e2bef4eb8ea39d4313bffb434597d13cd815b492415c7a9d94784789e08edf07beae607cc93a8a82af610bfb33c432b93abdfe24864bac22b18

data/app/assets/stylesheets/active_scaffold_sortable.css.scss

@@ -1,5 +1,5 @@
 .sortable-handle { cursor: move; }
-.active-scaffold .sub-form table td.sortable-handle { display: table-cell; }
+.active-scaffold .sub-form table td.sortable-handle { display: table-cell; visibility: visible; }
 .active-scaffold .sub-form tbody.sortable-highlight { display: table-row; }
 td.sortable-handle, .active-scaffold .sub-form table td.sortable-handle {
   background: image-url('active_scaffold/sortable.png') no-repeat center center;

data/lib/active_scaffold_sortable/attribute_params.rb

@@ -6,7 +6,7 @@ module ActiveScaffoldSortable
 
     def update_column_from_params_with_sortable(parent_record, column, attribute, avoid_changes = false)
       update_column_from_params_without_sortable(parent_record, column, attribute, avoid_changes).tap do |value|
-        if column.plural_association?
+        if column.association.try(:collection?)
           config = active_scaffold_config_for(column.association.klass)
           if config.actions.include?(:sortable)
             parent_record.association(column.association.name).target = value.sort_by(&config.sortable.column.name)
@@ -15,4 +15,4 @@ module ActiveScaffoldSortable
       end
     end
   end
-end
+end

data/lib/active_scaffold_sortable/version.rb

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

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 ENV["RAILS_ENV"] = "test"
 
-require 'test/unit'
+require 'minitest/autorun'
 # You can use "rake test AR_VERSION=2.0.5" to test against 2.0.5, for example.
 # The default is to use the latest installed ActiveRecord.
 if ENV["AR_VERSION"]
@@ -15,24 +15,16 @@ require 'action_controller'
 require 'action_view/test_case'
 require 'action_mailer'
 require 'active_support'
-require 'initializer'
-ActionController::Base::logger = ActiveSupport::BufferedLogger.new(Tempfile.new('log').path)
+require 'rails'
+require 'active_scaffold'
+require 'active_scaffold_sortable'
 
-RAILS_ROOT = File.join(File.dirname(__FILE__), '../../../..')
-Rails.configuration = Rails::Configuration.new
+require 'mocha/setup'
 
-require 'shoulda'
-require 'shoulda/rails'
-require 'mocha'
-begin
-  require 'redgreen'
-rescue LoadError
-end
-
-ActiveSupport::Dependencies.load_paths = %w(test/models test/controllers lib ../active_scaffold/lib).map {|dir| File.dirname(__FILE__) + "/../#{dir}"}
-$:.unshift *ActiveSupport::Dependencies.load_paths
+#ActiveSupport::Dependencies.load_paths = %w(test/models test/controllers lib ../active_scaffold/lib).map {|dir| File.dirname(__FILE__) + "/../#{dir}"}
+#$:.unshift *ActiveSupport::Dependencies.load_paths
 
-require File.join(File.dirname(__FILE__), '../../active_scaffold/environment')
+require File.join(File.dirname(__FILE__), '../../active_scaffold/lib/active_scaffold')
 require 'sortable'
 
 ActionController::Routing::Routes.draw do |map|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version
-  version: 3.2.12
+  version: 3.2.13
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0.rc3
 description: Sort Tree or List Structures by Drag n Drop
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Drag n Drop Sorting for Activescaffold