active_admin-sortable_tree 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14193c9d47cefbf3d0d4e5f8b7516cbcee6892fa
-  data.tar.gz: 31735e6f582782438eddfa77610e72e742f22e19
+  metadata.gz: 126d784b9ce06a5c29ba502eb96104ef3108d7f0
+  data.tar.gz: 50aa4cbe40c74b9c19354da0444456130c283569
 SHA512:
-  metadata.gz: e1c81ec8ea138a8820231d3d943d3c7ad023a1bf9e022e113fe76bbef46493ac1340ed843df7df6837f2f01bdbd4d991aa53c36ebd67a827cab2be6f0145c2b1
-  data.tar.gz: fabab663a38ed21d7ec87e08f90cc19b8f756363d94efdf8d02f86ccaf5c0d5cc3ed4783d1d918f43a82689650b724ef5ff1b76fa98449a01399325ca3de65cd
+  metadata.gz: d2755222fb58155f57c43ba3bf257eb0d7ef0aac652d2f8243af10d2c23c0c8f0ec972f5b4d77c18e530a2d2a9a49c596ef0accc1e808734d0bb7615b39f47c7
+  data.tar.gz: a3732fc8fe9ec410f7d1ab94e28aa8676f29ef1837f27db0d16950d5efc06d8c6230d8b5d4e0f7001c6a2a984f1aa338b62d4023fcaae34e7566545e4f04a031

data/Changelog.md

@@ -2,7 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
-## [Unreleased]
+## [1.0.0] - 2017-06-01
+
+### Added
+
+- Support for Rails 5.0 and 5.1 by conditionally invoking `parameterize` with its
+  expected parameters.
+
+### Changed
+
+- Relax dependency on `jquery-ui-rails` to be `>= 5.0` (previously `~> 5.0`).
+
+### Removed
+
+- Ruby 1.9.3, 2.1, and 2.2 are no longer explicitly supported.
 
 ## [0.3.0] - 2016-09-08
 
@@ -32,8 +45,9 @@ All notable changes to this project will be documented in this file.
 - Published to Rubygems.
 
 
-[unreleased]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.0...HEAD
+[unreleased]: https://github.com/zorab47/active_admin-sortable_tree/compare/v1.0.0...HEAD
 [0.1.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.0.1...v0.1.0
 [0.2.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.1.0...v0.2.0
 [0.2.1]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.0...v0.2.1
-[0.2.1]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.1...v0.3.0
+[0.3.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.1...v0.3.0
+[1.0.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.3.0...v1.0.0

data/README.md

@@ -15,6 +15,13 @@ sortable via drag'n'drop.
 gem "active_admin-sortable_tree"
 ```
 
+Note: If you experience issues with drag and drop capability, you may need to specify the version for your ActiveAdmin installation. It is reported working using v0.6.6, or if you are using v1.0.0.pre, it is reported working on this commit [b3a9f4b](https://github.com/activeadmin/activeadmin/commit/b3a9f4b3e4051447d011c59649a73f876989a199) or later.
+
+```ruby
+# Gemfile
+gem 'activeadmin', github: 'activeadmin', ref: 'b3a9f4b'
+```
+
 ## Usage (Tree)
 
 **Admin**:

data/app/assets/javascripts/active_admin/sortable.js.coffee

@@ -1,72 +1,2 @@
-#= require jquery-ui/sortable
-#= require jquery.mjs.nestedSortable
-
-window.ActiveAdminSortableEvent = do ->
-  eventToListeners = {}
-
-  return {
-    add: (event, callback) ->
-      if not eventToListeners.hasOwnProperty(event)
-        eventToListeners[event] = []
-      eventToListeners[event].push(callback)
-
-    trigger: (event, args) ->
-      if eventToListeners.hasOwnProperty(event)
-        for callback in eventToListeners[event]
-          try
-            callback.call(null, args)
-          catch e
-            console.error(e) if console and console.error
-  }
-
-$ ->
-  $('.disclose').bind 'click', (event) ->
-    $(this).closest('li').toggleClass('mjs-nestedSortable-collapsed').toggleClass('mjs-nestedSortable-expanded')
-
-  $(".index_as_sortable [data-sortable-type]").each ->
-    $this = $(@)
-
-    if $this.data('sortable-type') == "tree"
-      max_levels = $this.data('max-levels')
-      tab_hack = 20 # nestedSortable default
-    else
-      max_levels = 1
-      tab_hack = 99999
-
-    $this.nestedSortable
-      forcePlaceholderSize: true
-      forceHelperSizeType: true
-      errorClass: 'cantdoit'
-      disableNesting: 'cantdoit'
-      handle: '> .item'
-      listType: 'ol'
-      items: 'li'
-      opacity: .6
-      placeholder: 'placeholder'
-      revert: 250
-      maxLevels: max_levels,
-      tabSize: tab_hack
-      protectRoot: $this.data('protect-root')
-      # prevent drag flickers
-      tolerance: 'pointer'
-      toleranceElement: '> div'
-      isTree: true
-      startCollapsed: $this.data("start-collapsed")
-      update: ->
-        $this.nestedSortable("disable")
-        $.ajax
-          url: $this.data("sortable-url")
-          type: "post"
-          data: $this.nestedSortable("serialize")
-        .always ->
-          $this.find('.item').each (index) ->
-            if index % 2
-              $(this).removeClass('odd').addClass('even')
-            else
-              $(this).removeClass('even').addClass('odd')
-          $this.nestedSortable("enable")
-          ActiveAdminSortableEvent.trigger('ajaxAlways')
-        .done ->
-          ActiveAdminSortableEvent.trigger('ajaxDone')
-        .fail ->
-          ActiveAdminSortableEvent.trigger('ajaxFail')
+#= require jquery-ui/widgets/sortable
+#= require active_admin/sortable_core

data/app/assets/javascripts/active_admin/sortable_core.js.coffee

@@ -0,0 +1,71 @@
+#= require jquery.mjs.nestedSortable
+
+window.ActiveAdminSortableEvent = do ->
+  eventToListeners = {}
+
+  return {
+    add: (event, callback) ->
+      if not eventToListeners.hasOwnProperty(event)
+        eventToListeners[event] = []
+      eventToListeners[event].push(callback)
+
+    trigger: (event, args) ->
+      if eventToListeners.hasOwnProperty(event)
+        for callback in eventToListeners[event]
+          try
+            callback.call(null, args)
+          catch e
+            console.error(e) if console and console.error
+  }
+
+$ ->
+  $('.disclose').bind 'click', (event) ->
+    $(this).closest('li').toggleClass('mjs-nestedSortable-collapsed').toggleClass('mjs-nestedSortable-expanded')
+
+  $(".index_as_sortable [data-sortable-type]").each ->
+    $this = $(@)
+
+    if $this.data('sortable-type') == "tree"
+      max_levels = $this.data('max-levels')
+      tab_hack = 20 # nestedSortable default
+    else
+      max_levels = 1
+      tab_hack = 99999
+
+    $this.nestedSortable
+      forcePlaceholderSize: true
+      forceHelperSizeType: true
+      errorClass: 'cantdoit'
+      disableNesting: 'cantdoit'
+      handle: '> .item'
+      listType: 'ol'
+      items: 'li'
+      opacity: .6
+      placeholder: 'placeholder'
+      revert: 250
+      maxLevels: max_levels,
+      tabSize: tab_hack
+      protectRoot: $this.data('protect-root')
+      # prevent drag flickers
+      tolerance: 'pointer'
+      toleranceElement: '> div'
+      isTree: true
+      startCollapsed: $this.data("start-collapsed")
+      update: ->
+        $this.nestedSortable("disable")
+        $.ajax
+          url: $this.data("sortable-url")
+          type: "post"
+          data: $this.nestedSortable("serialize")
+        .always ->
+          $this.find('.item').each (index) ->
+            if index % 2
+              $(this).removeClass('odd').addClass('even')
+            else
+              $(this).removeClass('even').addClass('odd')
+          $this.nestedSortable("enable")
+          ActiveAdminSortableEvent.trigger('ajaxAlways')
+        .done ->
+          ActiveAdminSortableEvent.trigger('ajaxDone')
+        .fail ->
+          ActiveAdminSortableEvent.trigger('ajaxFail')

data/app/assets/javascripts/active_admin/sortable_ui5.js.coffee

@@ -0,0 +1,2 @@
+#= require jquery-ui/sortable
+#= require active_admin/sortable_core

data/lib/active_admin/sortable_tree.rb

@@ -1,3 +1,4 @@
+require 'active_admin/sortable_tree/compatibility'
 require 'active_admin/sortable_tree/engine'
 require 'active_admin/sortable_tree/controller_actions'
 require 'active_admin/views/index_as_sortable'

data/lib/active_admin/sortable_tree/compatibility.rb

@@ -0,0 +1,11 @@
+module ActiveAdmin::SortableTree
+  class Compatibility
+    def self.normalized_resource_name(resource_name)
+      if Rails::VERSION::MAJOR >= 5
+        resource_name.to_s.underscore.parameterize(separator: "_".freeze)
+      else
+        resource_name.to_s.underscore.parameterize("_".freeze)
+      end
+    end
+  end
+end

data/lib/active_admin/sortable_tree/controller_actions.rb

@@ -22,12 +22,14 @@ module ActiveAdmin::SortableTree
       config.paginate = false
 
       collection_action :sort, :method => :post do
-        resource_name = active_admin_config.resource_name.to_s.underscore.parameterize('_')
+        resource_name = ActiveAdmin::SortableTree::Compatibility.normalized_resource_name(active_admin_config.resource_name)
 
-        records = params[resource_name].inject({}) do |res, (resource, parent_resource)|
-          res[resource_class.find(resource)] = resource_class.find(parent_resource) rescue nil
-          res
+        records = []
+        params[resource_name].each_pair do |resource, parent_resource|
+          parent_resource = resource_class.find(parent_resource) rescue nil
+          records << [resource_class.find(resource), parent_resource]
         end
+
         errors = []
         ActiveRecord::Base.transaction do
           records.each_with_index do |(record, parent_record), position|

data/lib/active_admin/sortable_tree/engine.rb

@@ -1,18 +1,32 @@
 require 'activeadmin'
+require "rubygems"
 
 module ActiveAdmin
   module SortableTree
     class Engine < ::Rails::Engine
       engine_name 'active_admin-sortable_tree'
 
+
+      def jquery_ui_six?
+        Gem::Version.new(Jquery::Ui::Rails::VERSION) >= Gem::Version.new("6.0.0")
+      end
+
+      def sortable_js
+        if jquery_ui_six?
+          "active_admin/sortable.js"
+        else
+          "active_admin/sortable_ui5.js"
+        end
+      end
+
       initializer "Rails precompile hook", group: :all do |app|
         app.config.assets.precompile += [ "active_admin/sortable.css",
-                                          "active_admin/sortable.js" ]
+                                          sortable_js ]
       end
 
       initializer "add assets" do
         ActiveAdmin.application.register_stylesheet "active_admin/sortable.css"
-        ActiveAdmin.application.register_javascript "active_admin/sortable.js"
+        ActiveAdmin.application.register_javascript sortable_js
       end
     end
   end

data/lib/active_admin/sortable_tree/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module SortableTree
-    VERSION = "0.3.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/active_admin/views/index_as_sortable.rb

@@ -13,7 +13,8 @@ module ActiveAdmin
         @collection = @collection.sort_by do |a|
           a.send(options[:sorting_attribute]) || 1
         end
-        @resource_name = active_admin_config.resource_name.to_s.underscore.parameterize('_')
+
+        @resource_name = ActiveAdmin::SortableTree::Compatibility.normalized_resource_name(active_admin_config.resource_name)
 
         # Call the block passed in. This will set the
         # title and body methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin-sortable_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Francesco Disperati
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,14 +43,14 @@ dependencies:
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -136,8 +136,11 @@ files:
 - MIT-LICENSE
 - README.md
 - app/assets/javascripts/active_admin/sortable.js.coffee
+- app/assets/javascripts/active_admin/sortable_core.js.coffee
+- app/assets/javascripts/active_admin/sortable_ui5.js.coffee
 - app/assets/stylesheets/active_admin/sortable.sass
 - lib/active_admin/sortable_tree.rb
+- lib/active_admin/sortable_tree/compatibility.rb
 - lib/active_admin/sortable_tree/controller_actions.rb
 - lib/active_admin/sortable_tree/engine.rb
 - lib/active_admin/sortable_tree/version.rb
@@ -165,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Add drag and drop sorting to ActiveAdmin resources