active_admin-sortable_tree 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 126d784b9ce06a5c29ba502eb96104ef3108d7f0
-  data.tar.gz: 50aa4cbe40c74b9c19354da0444456130c283569
+SHA256:
+  metadata.gz: e0e22264b733cb656adcdd397fe186a6e4de1fbfe06e55d7e45f361f66022cf3
+  data.tar.gz: f83027613f9891cbabe4e9ba39e52380811f753a51b0f787750a36459d82b386
 SHA512:
-  metadata.gz: d2755222fb58155f57c43ba3bf257eb0d7ef0aac652d2f8243af10d2c23c0c8f0ec972f5b4d77c18e530a2d2a9a49c596ef0accc1e808734d0bb7615b39f47c7
-  data.tar.gz: a3732fc8fe9ec410f7d1ab94e28aa8676f29ef1837f27db0d16950d5efc06d8c6230d8b5d4e0f7001c6a2a984f1aa338b62d4023fcaae34e7566545e4f04a031
+  metadata.gz: e8d5e6495c061de3bbde7dccc1252bb6df52d7a2179f24b26dfd7383f150d04b64dec6b8effe4b74fb546986566c33bb80d1903f1eb1925354f3a923e0819d2e
+  data.tar.gz: f0057f2bbbc9e978c043f4ee815f1b8de90006d0d8f29b9ee5789168ab282f32b7fa08c1c99e244df7082861c3895145698b0a3d55cb8184ffc0bbef084988c5

data/Changelog.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.0.0] - 2018-01-22
+
+### Changed
+
+- Depend on same version of `jquery-ui-rails` as ActiveAdmin
+- Update dependencies to only support ActiveAdmin `< 1.1.0` because `v1.1.0`
+  [dropped its dependency on `jquery-ui-rails`](https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md).
+- Remove usage of bourbon mixin; instead rely on ActiveAdmin's utilities mixin
+  (fixes #73)
+
+### Removed
+
+- Remove support for Rails 3.2
+- Remove support for ActiveAdmin 0.6.6
+
+### Upgrading from 1.0.0
+
+It is suggested (but not required) to manually include the JavaScript and
+stylesheet to your manifest files in preparation for ActiveAdmin v2.0. See the
+Installation section of the [README.md](README.md#installation) for instructions.
+
 ## [1.0.0] - 2017-06-01
 
 ### Added
@@ -51,3 +72,4 @@ All notable changes to this project will be documented in this file.
 [0.2.1]: https://github.com/zorab47/active_admin-sortable_tree/compare/v0.2.0...v0.2.1
 [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
+[1.1.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v1.0.0...v1.1.0

data/README.md

@@ -10,17 +10,22 @@ sortable via drag'n'drop.
 
 ## Installation
 
-```ruby
-# Gemfile
-gem "active_admin-sortable_tree"
-```
+1. Add SortableTree to your Gemfile; then `bundle install`
+    ```ruby
+    gem "active_admin-sortable_tree", "~> 2.0.0"
+    ```
 
-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.
+2. Add a require to your JavaScript manifest `app/assets/javascripts/active_admin.js`
 
-```ruby
-# Gemfile
-gem 'activeadmin', github: 'activeadmin', ref: 'b3a9f4b'
-```
+    ```javascript
+    //= require active_admin/sortable
+    ```
+
+3. Add an import in your stylesheet manifest `app/assets/javascripts/active_admin.js`
+
+    ```sass
+    @import "active_admin/sortable";
+    ```
 
 ## Usage (Tree)
 
@@ -152,12 +157,11 @@ In `IndexAsSortable` you can add custom actions (with or without the defaults):
 ```ruby
 index :as => :sortable do
   actions defaults: false do |page|
-    link_to "Custom action", my_custon_path(page)
+    link_to "Custom action", my_custom_path(page)
   end
 end
 ```
 
-
 ### Ajax Callback Config
 
 It exposes three Ajax Events: ajaxDone, ajaxFail and ajaxAlways, which
@@ -171,6 +175,29 @@ ActiveAdminSortableEvent.add('ajaxDone', function (){
 })
 ```
 
+### Upgrading to SortableTree 2.0 from 1.0
+
+Upgrading from SortableTree 1.x requires manually specifying assets in your
+`app/assets/javascripts/active_admin.js` and `app/assets/stylesheets/active_admin.scss`
+files.
+
+
+### Dependencies
+
+ActiveAdmin::SortableTree 2.0 supports ActiveAdmin 1.0.0+. For previous versions
+of ActiveAdmin use older SortableTree versions from the 1.x branch.
+
+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'
+```
+
 ## Semantic Versioning
 
 ActiveAdmin::SortableTree follows [semantic versioning](http://semver.org).

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

@@ -1,2 +1,72 @@
 #= require jquery-ui/widgets/sortable
-#= require active_admin/sortable_core
+#= 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/stylesheets/active_admin/sortable.sass

@@ -3,7 +3,7 @@ $cRowBorder: #e8e8e8
 $cRowSelected: #d9e4ec
 $cRowError: rgb(255,87,87)
 
-@import bourbon
+@import "active_admin/mixins/utilities"
 
 body.active_admin
   .disclose

data/lib/active_admin/sortable_tree/engine.rb

@@ -1,32 +1,20 @@
-require 'activeadmin'
-require "rubygems"
+require "activeadmin"
 
 module ActiveAdmin
   module SortableTree
     class Engine < ::Rails::Engine
-      engine_name 'active_admin-sortable_tree'
+      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?
+      initializer "active_admin-sortable_tree.precompile", group: :all do |app|
+        app.config.assets.precompile += [
+          "active_admin/sortable.css",
           "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",
-                                          sortable_js ]
+        ]
       end
 
-      initializer "add assets" do
+      initializer "active_admin-sortable_tree.register_assets" do
         ActiveAdmin.application.register_stylesheet "active_admin/sortable.css"
-        ActiveAdmin.application.register_javascript sortable_js
+        ActiveAdmin.application.register_javascript "active_admin/sortable.js"
       end
     end
   end

data/lib/active_admin/sortable_tree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin-sortable_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Francesco Disperati
@@ -9,50 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activeadmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: activeadmin
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -136,8 +150,6 @@ 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
@@ -168,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Add drag and drop sorting to ActiveAdmin resources

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

@@ -1,71 +0,0 @@
-#= 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

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