simple_form_attachments 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09c87859edd0551646ccb8392ab947fbc0847e7d'
-  data.tar.gz: 397579728ac16875829619f4f0aef70d0e972a86
+  metadata.gz: 412212d4fd609e4906ebdc757f94f7515ef94974
+  data.tar.gz: 6486cebcbfa4c1c2f0c72cb9256aa879b5c51597
 SHA512:
-  metadata.gz: 25d9431fe34ad7020c95fbb89d4e4d790b91aa60ac56964bb51e2131a973faf076dad247831693d535a4c6d5397db81883e6beb842a2b71e88f4ce3e615f6ec6
-  data.tar.gz: 2dcf8f4df947d7680e464b7f3a34d80c1e0c1034e4352caa815cb9ecc30c9f8868a7c74b073e948b7679c7f0b611f4a3da3632509ee5d1c7560dfb5d003f02a4
+  metadata.gz: 959f0e518a6ee4714fd1e28cdff54be3049bf501762ede196967c1fe6ba23e9a86629877fd28d1ce54d460f80b55dafa53f7aca7f4290171a61ae6266f5c6bcb
+  data.tar.gz: 64c0ce4ac7ae6ef7272041c919aad73ec7049cb7a0c55f8d4a613d2e5a779f19d9598e98e386e622c4abad5da9b92de80d8ee413d0f99581ce7c5cb9675e74ae

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.0
+
+* support jQuery UI `~> 6`, [PR #15](https://github.com/tomasc/simple_form_attachments/pull/15), thanks @asgerb
+
 ## 1.0.0
 
 * css classes scoped in the `simple_form_attachments` namespace

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    simple_form_attachments (1.0.1)
-      jquery-ui-rails
+    simple_form_attachments (1.1.0)
+      jquery-ui-rails (>= 5.0, < 7.0)
       mongoid (> 4.0)
       rails (>= 4.2)
       rails-assets-blueimp-file-upload (>= 9.6.0)
@@ -15,49 +15,49 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
-    bson (4.2.1)
+    bson (4.2.2)
     builder (3.2.3)
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     coveralls (0.8.21)
       json (>= 1.8, < 3)
@@ -71,7 +71,7 @@ GEM
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
-    erubi (1.6.0)
+    erubi (1.6.1)
     ffi (1.9.18)
     formatador (0.2.5)
     globalid (0.4.0)
@@ -89,7 +89,7 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    i18n (0.8.4)
+    i18n (0.8.6)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
     json (2.1.0)
@@ -107,16 +107,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     minitest-rails (3.0.0)
       minitest (~> 5.8)
       railties (~> 5.0)
-    mongo (2.4.2)
+    mongo (2.4.3)
       bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.2.0)
+    mongoid (6.2.1)
       activemodel (~> 5.1)
       mongo (>= 2.4.1, < 3.0.0)
-    multi_json (1.12.1)
+    multi_json (1.12.2)
     nenv (0.3.0)
     nio4r (2.1.0)
     nokogiri (1.8.0)
@@ -128,30 +128,30 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
       sprockets-rails (>= 2.0.0)
-    rails-assets-blueimp-canvas-to-blob (3.8.0)
-    rails-assets-blueimp-file-upload (9.18.0)
+    rails-assets-blueimp-canvas-to-blob (3.14.0)
+    rails-assets-blueimp-file-upload (9.19.1)
       rails-assets-blueimp-canvas-to-blob (>= 2.1.1)
       rails-assets-blueimp-load-image (>= 1.13.0)
       rails-assets-blueimp-tmpl (>= 2.5.4)
       rails-assets-jquery (>= 1.6)
-    rails-assets-blueimp-load-image (2.12.2)
-    rails-assets-blueimp-tmpl (3.8.0)
+    rails-assets-blueimp-load-image (2.17.0)
+    rails-assets-blueimp-tmpl (3.11.0)
     rails-assets-handlebars (4.0.10)
     rails-assets-jquery (3.2.1)
     rails-assets-numeraljs (2.0.6)
@@ -164,17 +164,17 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.9.8)
+    rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rb-readline (0.5.4)
+    rb-readline (0.5.5)
     ruby_dep (1.5.0)
     shellany (0.0.1)
     simple_form (3.5.0)
@@ -184,7 +184,7 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     slim (3.0.8)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
@@ -192,7 +192,7 @@ GEM
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -201,8 +201,8 @@ GEM
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.7)
-    tins (1.14.0)
+    tilt (2.0.8)
+    tins (1.15.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)

data/README.md

@@ -157,9 +157,9 @@ div class=SimpleFormAttachments.dom_class(:attachment, [:col, :file_info])
 
 ### Dom class and CSS
 
-The component is isolated in `simple_form_attachments` namespace. This gem comes with its own helper that geners corresponding class names – for example `SimpleFormAttachments.dom_class(:attachment, :file_info)` would generate `simple_form_attachments__file_info`.
+The component is isolated in the `simple_form_attachments` namespace. This gem comes with its own helper that generates corresponding class names – for example `SimpleFormAttachments.dom_class(:attachment, :file_info)` would generate `simple_form_attachments__file_info`.
 
-Basic styling can be achieved by including `simple_form_attachments.js` css in your app:
+Basic styling can be achieved by including `simple_form_attachments` css in your app:
 
 ```css
 /*
@@ -200,6 +200,8 @@ resources :attachments, only: [:create]
 Specify the route either app wide in an initializer:
 
 ```ruby
+# config/initializers/simple_form_attachments.rb
+
 require 'simple_form_attachments'
 # Configuration
 
@@ -217,7 +219,7 @@ Or per input:
 
 ## Testing
 
-Besides a `MiniTest` test suite, the gem has a dummy app located at `test/dummy`. Simply `cd` into the directory and run `bin rails s` to test the uploader.
+Besides a `MiniTest` test suite, the gem has a dummy app located at `test/dummy`. Simply `cd` into the directory and run `bin/rails s` to test the uploader.
 
 ## Contributing
 

data/lib/assets/javascripts/{simple_form_attachments.js → simple_form_attachments.js.erb}

@@ -1,4 +1,4 @@
-//= require jquery-ui/sortable
+//= require simple_form_attachments/jquery_ui
 
 //= require blueimp-file-upload/vendor/jquery.ui.widget.js
 //= require blueimp-file-upload/jquery.iframe-transport.js

data/lib/assets/javascripts/simple_form_attachments/jquery_ui.js.erb

@@ -0,0 +1 @@
+<% require_asset SimpleFormAttachments.jquery_ui_asset("sortable") %>

data/lib/simple_form_attachments.rb

@@ -7,6 +7,7 @@ require "simple_form_attachments/engine"
 require "simple_form_attachments/version"
 
 require "jquery-ui-rails"
+require "rails-assets-numeraljs"
 require "rails-assets-blueimp-file-upload"
 require "rails-assets-handlebars"
 
@@ -24,6 +25,15 @@ module SimpleFormAttachments
       prefix.compact.join('__')
     end
   end
+
+  def self.jquery_ui_asset(asset)
+    jquery_ui_version = Gem::Version.new(Jquery::Ui::Rails::JQUERY_UI_VERSION)
+    case
+    when Gem::Dependency.new('', '< 1.12').match?('', jquery_ui_version) then "jquery-ui/#{asset}"
+    when Gem::Dependency.new('', '>= 1.12').match?('', jquery_ui_version) then "jquery-ui/widgets/#{asset}"
+    else raise "This version of jQuery UI is not supported"
+    end
+  end
 end
 
 module SimpleForm

data/lib/simple_form_attachments/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormAttachments
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/simple_form_attachments.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'slim'
 
-  spec.add_dependency 'jquery-ui-rails'
+  spec.add_dependency 'jquery-ui-rails', ">= 5.0", "< 7.0"
   spec.add_dependency 'rails-assets-blueimp-file-upload', '>= 9.6.0'
   spec.add_dependency 'rails-assets-handlebars'
   spec.add_dependency 'rails-assets-numeraljs'

data/test/dummy/Gemfile

@@ -7,6 +7,10 @@ gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'jquery-rails'
 
+# NOTE: For testing purposes
+# gem 'jquery-ui-rails', '~> 6.0'
+# gem 'jquery-ui-rails', '~> 5.0'
+
 gem 'slim'
 
 gem 'mongoid'

data/test/dummy/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
-  remote: ../../../simple_form_attachments
+  remote: ../..
   specs:
-    simple_form_attachments (0.2.5)
-      jquery-ui-rails
+    simple_form_attachments (1.0.1)
+      jquery-ui-rails (>= 5.0, < 7.0)
       mongoid (> 4.0)
       rails (>= 4.2)
       rails-assets-blueimp-file-upload (>= 9.6.0)
       rails-assets-handlebars
+      rails-assets-numeraljs
       simple_form (>= 3.0.2)
       slim
 
@@ -48,24 +49,24 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    arel (6.0.3)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (6.0.4)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bson (4.1.1)
-    builder (3.2.2)
-    byebug (9.0.6)
+    bson (4.2.2)
+    builder (3.2.3)
+    byebug (9.1.0)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.1.x)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
-    debug_inspector (0.0.2)
-    dragonfly (1.1.1)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    debug_inspector (0.0.3)
+    dragonfly (1.1.3)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
@@ -75,41 +76,42 @@ GEM
       mongoid-grid_fs
     erubis (2.7.0)
     execjs (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    jquery-rails (4.2.1)
+    ffi (1.9.18)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.6)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
+    jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (1.8.3)
+    json (1.8.6)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.9.1)
-    mongo (2.3.1)
-      bson (~> 4.1)
-    mongoid (5.1.5)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    mongo (2.4.3)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (5.2.1)
       activemodel (~> 4.0)
-      mongo (~> 2.1)
-      origin (~> 2.2)
+      mongo (>= 2.4.1, < 3.0.0)
+      origin (~> 2.3)
       tzinfo (>= 0.3.37)
     mongoid-grid_fs (2.3.0)
       mime-types (>= 1.0, < 4.0)
       mongoid (>= 3.0, < 7.0)
-    multi_json (1.12.1)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    origin (2.2.2)
-    public_suffix (2.0.4)
-    rack (1.6.4)
+    multi_json (1.12.2)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    origin (2.3.1)
+    public_suffix (3.0.0)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
@@ -123,21 +125,22 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.0)
       sprockets-rails
-    rails-assets-blueimp-canvas-to-blob (3.5.0)
-    rails-assets-blueimp-file-upload (9.14.0)
+    rails-assets-blueimp-canvas-to-blob (3.14.0)
+    rails-assets-blueimp-file-upload (9.19.1)
       rails-assets-blueimp-canvas-to-blob (>= 2.1.1)
       rails-assets-blueimp-load-image (>= 1.13.0)
       rails-assets-blueimp-tmpl (>= 2.5.4)
       rails-assets-jquery (>= 1.6)
-    rails-assets-blueimp-load-image (2.9.0)
-    rails-assets-blueimp-tmpl (3.6.0)
-    rails-assets-handlebars (4.0.5)
-    rails-assets-jquery (3.1.1)
+    rails-assets-blueimp-load-image (2.17.0)
+    rails-assets-blueimp-tmpl (3.11.0)
+    rails-assets-handlebars (4.0.10)
+    rails-assets-jquery (3.2.1)
+    rails-assets-numeraljs (2.0.6)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -146,37 +149,44 @@ GEM
       activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    rb-readline (0.5.3)
-    sass (3.4.22)
+    rake (12.1.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rb-readline (0.5.5)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    simple_form (3.3.1)
-      actionpack (> 4, < 5.1)
-      activemodel (> 4, < 5.1)
-    slim (3.0.7)
-      temple (~> 0.7.6)
+    simple_form (3.5.0)
+      actionpack (> 4, < 5.2)
+      activemodel (> 4, < 5.2)
+    slim (3.0.8)
+      temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
-    spring (2.0.0)
+    spring (2.0.2)
       activesupport (>= 4.2)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.7.7)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    tzinfo (1.2.2)
+    temple (0.8.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.0.3)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     web-console (2.3.0)
       activemodel (>= 4.0)
@@ -204,4 +214,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_attachments
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-25 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,14 +73,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails-assets-blueimp-file-upload
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +298,8 @@ files:
 - app/views/simple_form_attachments/attachments/_attachment.html.slim
 - config/locales/simple_form_attachments/simple_form_attachments.en.yml
 - config/routes.rb
-- lib/assets/javascripts/simple_form_attachments.js
+- lib/assets/javascripts/simple_form_attachments.js.erb
+- lib/assets/javascripts/simple_form_attachments/jquery_ui.js.erb
 - lib/assets/javascripts/simple_form_attachments/simple_form_attachments.coffee.erb
 - lib/assets/stylesheets/simple_form_attachments.css
 - lib/assets/stylesheets/simple_form_attachments/__attachment.scss.erb