attache_rails 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8234de5aefd56b79098a8a169d480630f225e280
-  data.tar.gz: 9b737e9282765e17251242eed4d48ebcc7ed3746
+  metadata.gz: 07bb6c168bed2d516774523756dd125d86ca0729
+  data.tar.gz: b788a5d74a9b1d51c7c6981a6f57d98da62ba060
 SHA512:
-  metadata.gz: 2ab9a10a5ba8e91e57a9689f9368b979977ada2c787f906b8acbb9d39056bbc4758c0d3d25e86d0c0144f75c7ce49b6f7f6d94cba4d4149d091c6a92c7a7daa4
-  data.tar.gz: 123707d54c09d6406924ae1b9c2b791c9b70eeae26f7a3737990d1fd367007bb017a4c22cf5c166faa54fc17c1456626f5c716053a7e8f53569ff77dbc50c0bf
+  metadata.gz: 3c8e22d8e34a7a2464af773442eee64f857ccb274e3ea53f9f58732f422b583c2d3b0cca7b32778d5f1d1f407cd166729f68381eff3401358e296bd169d9b65d
+  data.tar.gz: 1bb4fc71ecfbfa8301ed12eba825dd541ae508b184ebdf62e2c4948033463a025711af00feccde92478e5ae69aca32cee370915dd9535c27bb85a06233546a73

data/README.md

@@ -33,6 +33,12 @@ If you want to customize the file upload look and feel, define your own react `<
 //= require attache
 ```
 
+The `AttacheRails.upgrade_fileinputs` idempotent function is setup to find all the elements with `enable-attache` css class and upgrade them to use the direct upload & preview javascript. If you wish to re-run this function any other time, e.g. hookup the `cocoon:after-insert` event, you may
+
+``` javascript
+$(document).on('cocoon:after-insert', AttacheRails.upgrade_fileinputs);
+```
+
 
 ## Usage
 

data/app/assets/javascripts/attache/ujs.js

@@ -1,5 +1,5 @@
-(function() {
-  function attacheFileInputs() {
+window.AttacheRails = {
+  upgrade_fileinputs: function() {
     var safeWords = { 'class': 'className', 'for': 'htmlFor' };
     var sel = document.getElementsByClassName('enable-attache');
     var ele, attrs, name, value;
@@ -18,6 +18,6 @@
       React.render(React.createElement(AttacheFileInput, React.__spread({},  attrs)), wrap);
     }
   }
+};
 
-  $(document).on('page:change', attacheFileInputs);
-})();
+$(document).on('page:change', AttacheRails.upgrade_fileinputs);

data/lib/attache_rails/model.rb

@@ -5,6 +5,10 @@ require "httpclient"
 module AttacheRails
   module Utils
     class << self
+      def array(value)
+        Array.wrap(value).reject(&:blank?)
+      end
+
       def attache_retry_doing(max_retries, retries = 0)
         yield
       rescue Exception
@@ -66,7 +70,7 @@ module AttacheRails
     end
 
     def attaches_discard!(files = attaches_discarded)
-      files.reject! &:blank?
+      files.reject!(&:blank?)
       files.uniq!
       if files.present?
         logger.info "DELETE #{files.inspect}"
@@ -83,17 +87,17 @@ module AttacheRails
     module ClassMethods
       def has_one_attache(name)
         serialize name, JSON
-        define_method "#{name}_options",    -> (geometry, options = {}) { Utils.attache_options(geometry, [self.send("#{name}_attributes", geometry)], multiple: false, **options) }
+        define_method "#{name}_options",    -> (geometry, options = {}) { Utils.attache_options(geometry, Utils.array(self.send("#{name}_attributes", geometry)), multiple: false, **options) }
         define_method "#{name}_url",        -> (geometry) {               self.send("#{name}_attributes", geometry).try(:[], 'url') }
         define_method "#{name}_attributes", -> (geometry) {               str = self.send(name); Utils.attache_url_for(str, geometry) if str; }
         define_method "#{name}=",           -> (value)    {
           new_value = (value.respond_to?(:read) ? Utils.attache_upload_and_get_json(value) : value)
-          super(new_value)
+          super(Utils.array(new_value).first)
         }
         define_method "#{name}_discard_was",-> do
           new_value = self.send("#{name}")
           old_value = self.send("#{name}_was")
-          obsoleted = [*old_value].collect {|x| JSON.parse(x)['path'] } - [*new_value].collect {|x| JSON.parse(x)['path'] }
+          obsoleted = Utils.array(old_value).collect {|x| JSON.parse(x)['path'] } - Utils.array(new_value).collect {|x| JSON.parse(x)['path'] }
           self.attaches_discarded ||= []
           self.attaches_discarded.push(*obsoleted)
         end
@@ -113,12 +117,12 @@ module AttacheRails
         define_method "#{name}_urls",       -> (geometry) {               self.send("#{name}_attributes", geometry).collect {|attrs| attrs['url'] } }
         define_method "#{name}_attributes", -> (geometry) {
           (self.send(name) || []).inject([]) do |sum, str|
-            sum + (str.blank? ? [] : [Utils.attache_url_for(str, geometry)])
+            sum + Utils.array(str.present? && Utils.attache_url_for(str, geometry))
           end
         }
         define_method "#{name}=",           -> (array)    {
-          new_value = ((array || []).reject(&:blank?).collect {|value| value.respond_to?(:read) ? Utils.attache_upload_and_get_json(value) : value })
-          super(new_value)
+          new_value = Utils.array(array).collect {|value| value.respond_to?(:read) ? Utils.attache_upload_and_get_json(value) : value }
+          super(Utils.array new_value)
         }
         define_method "#{name}_discard_was",-> do
           new_value = [*self.send("#{name}")]

data/lib/attache_rails/version.rb

@@ -1,3 +1,3 @@
 module AttacheRails
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: attache_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - choonkeat@gmail.com