active_admin-sortable_tree 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e22264b733cb656adcdd397fe186a6e4de1fbfe06e55d7e45f361f66022cf3
-  data.tar.gz: f83027613f9891cbabe4e9ba39e52380811f753a51b0f787750a36459d82b386
+  metadata.gz: 6347bcf5f4c693e94967a6967a0d470a90416d266553451530ea2957a6269e12
+  data.tar.gz: 6b41d0490c2a9dfff755b1e2a7713a7e4b7b5ca846e92aa45dd890fd5f172b85
 SHA512:
-  metadata.gz: e8d5e6495c061de3bbde7dccc1252bb6df52d7a2179f24b26dfd7383f150d04b64dec6b8effe4b74fb546986566c33bb80d1903f1eb1925354f3a923e0819d2e
-  data.tar.gz: f0057f2bbbc9e978c043f4ee815f1b8de90006d0d8f29b9ee5789168ab282f32b7fa08c1c99e244df7082861c3895145698b0a3d55cb8184ffc0bbef084988c5
+  metadata.gz: 0f7a1956d45b3e8ef9ff1a00aad02be83d925992adabc79a84fca245ff6fda881b3120dafa4697baf07cb1c41b03e48e222cbd0a56fa898ccb488e2d01af1b44
+  data.tar.gz: ab37314d2cabc08afabc745edbb4a2fca4b7d3ed349d31e01a79d96164d759adf82aa49da1902ac94dc938a37ecdbeaa529a9d307a0ddd00d2035a8023afc8f7

data/Changelog.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.1.0] - 2020-03-11
+
+### Added
+
+- A config to opt out of registering assets (see #81)
+- Support for UUID primary keys (see #85)
+
 ## [2.0.0] - 2018-01-22
 
 ### Changed
@@ -73,3 +80,5 @@ Installation section of the [README.md](README.md#installation) for instructions
 [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
+[2.0.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v1.1.0...v2.0.0
+[2.1.0]: https://github.com/zorab47/active_admin-sortable_tree/compare/v2.0.0...v2.1.0

data/README.md

@@ -21,9 +21,9 @@ sortable via drag'n'drop.
     //= require active_admin/sortable
     ```
 
-3. Add an import in your stylesheet manifest `app/assets/javascripts/active_admin.js`
+3. Add an import in your stylesheet manifest `app/assets/stylesheets/active_admin.scss`
 
-    ```sass
+    ```scss
     @import "active_admin/sortable";
     ```
 
@@ -38,7 +38,7 @@ ActiveAdmin.register Page do
 
   index :as => :sortable do
     label :title # item content
-        actions
+    actions
   end
 end
 ```
@@ -198,6 +198,23 @@ or later.
 gem 'activeadmin', github: 'activeadmin', ref: 'b3a9f4b'
 ```
 
+### Suppressing warnings from Active Admin
+
+As of Active Admin 1.1.0, `config.register_stylesheet` and `config.register_javascript` have been deprecated. `ActiveAdmin::SortableTree` uses these interfaces to register required assets automatically. Because of this, you may see a deprecation warning:
+
+```
+DEPRECATION WARNING: Active Admin: The `register_javascript` config is deprecated and will be removed
+in v2. Import your "active_admin/sortable.js" javascript in the active_admin.js.
+ (called from <main> at config/environment.rb:5)
+```
+
+You could opt out of it by setting `config.aa_sortable_tree.register_assets` to `false`:
+
+```ruby
+# config/application.rb
+config.aa_sortable_tree.register_assets = false
+```
+
 ## Semantic Versioning
 
 ActiveAdmin::SortableTree follows [semantic versioning](http://semver.org).

data/lib/active_admin/sortable_tree/engine.rb

@@ -5,6 +5,9 @@ module ActiveAdmin
     class Engine < ::Rails::Engine
       engine_name "active_admin-sortable_tree"
 
+      config.aa_sortable_tree = ActiveSupport::OrderedOptions.new
+      config.aa_sortable_tree.register_assets = true
+
       initializer "active_admin-sortable_tree.precompile", group: :all do |app|
         app.config.assets.precompile += [
           "active_admin/sortable.css",
@@ -13,8 +16,10 @@ module ActiveAdmin
       end
 
       initializer "active_admin-sortable_tree.register_assets" do
-        ActiveAdmin.application.register_stylesheet "active_admin/sortable.css"
-        ActiveAdmin.application.register_javascript "active_admin/sortable.js"
+        if config.aa_sortable_tree.register_assets
+          ActiveAdmin.application.register_stylesheet "active_admin/sortable.css"
+          ActiveAdmin.application.register_javascript "active_admin/sortable.js"
+        end
       end
     end
   end

data/lib/active_admin/sortable_tree/version.rb

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

data/vendor/assets/javascripts/jquery.mjs.nestedSortable.js

@@ -426,11 +426,11 @@
 
 			$(items).each(function() {
 				var res = ($(o.item || this).attr(o.attribute || 'id') || '')
-						.match(o.expression || (/(.+)[-=_](.+)/)),
+						.match(o.expression || (/(.+)[=_](.+)/)),
 				    pid = ($(o.item || this).parent(o.listType)
 						.parent(o.items)
 						.attr(o.attribute || 'id') || '')
-						.match(o.expression || (/(.+)[-=_](.+)/));
+						.match(o.expression || (/(.+)[=_](.+)/));
 
 				if (res) {
 					str.push(((o.key || res[1]) + '[' + (o.key && o.expression ? res[1] : res[2]) + ']')
@@ -610,4 +610,4 @@
 	}));
 
 	$.mjs.nestedSortable.prototype.options = $.extend({}, $.ui.sortable.prototype.options, $.mjs.nestedSortable.prototype.options);
-})(jQuery);
+})(jQuery);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_admin-sortable_tree
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Francesco Disperati
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin