attache_rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71bdf794a1a45cfb4a1c5a1f009a6b0986c2f036
-  data.tar.gz: aa0fd8c6977c2e78ae9114d3e53aa9a24ac3972e
+  metadata.gz: b45396dadc577b1925f04594ce46dc4ceb68519b
+  data.tar.gz: 60b510c900392fa4eef41cdb56caefa94f8b27ec
 SHA512:
-  metadata.gz: f83391852c79448f278812211b2fb9dbc9f61302da3049e3e9f1a80e346c515c0bcbe4ab4fd12e859f2d0df9c246c3692d296bd320268a3a613a36f3d3afcee0
-  data.tar.gz: d6a3d6c02e9d3aaf54beb9567da08238b91464270d4daf4edd8ce6602c4d279d8284e88f836e309b166135e221e22f67355190af8919356dfdb4deddc88fd194
+  metadata.gz: d4bbcb652c6e56e0e62e903dccef99ed0a7510f4093b062a976dc800824c04062a4266c532cd14b00d1ffd71c8182bf1f2987ef055bad39120ec5e4efd1da44b
+  data.tar.gz: 43597a142f9a65c0a8a81964e9686a7c254c0cc07db6fd96f1ac2e56e2d459380812fc12a04b0caca0a3689f325ad1ed4ee2082fff3e47ae56163be1dd1db554

data/lib/attache_rails/model.rb

@@ -5,12 +5,22 @@ require "httpclient"
 module AttacheRails
   module Utils
     class << self
+      def attache_retry_doing(max_retries, retries = 0)
+        yield
+      rescue Exception
+        if (retries += 1) <= max_retries
+          sleep retries
+          retry
+        end
+        raise
+      end
+
       def attache_upload_and_get_json(readable)
         uri = URI.parse(ATTACHE_UPLOAD_URL)
         uri.query = { file: (readable.try(:original_filename) || 'noname'), **attache_auth_options }.collect {|k,v|
           CGI.escape(k.to_s) + "=" + CGI.escape(v.to_s)
         }.join('&')
-        HTTPClient.post(uri, readable, {'Content-Type' => 'binary/octet-stream'}).body
+        attache_retry_doing(3) { HTTPClient.post(uri, readable, {'Content-Type' => 'binary/octet-stream'}).body }
       end
 
       def attache_url_for(json_string, geometry)
@@ -41,7 +51,7 @@ module AttacheRails
             placeholder: [*options[:placeholder]],
             uploadurl: ATTACHE_UPLOAD_URL,
             downloadurl: ATTACHE_DOWNLOAD_URL,
-          }.merge(options[:data_attrs] || {}).merge(attache_auth_options),
+          }.merge(options[:data] || {}).merge(attache_auth_options),
         }
       end
     end
@@ -90,7 +100,9 @@ module AttacheRails
         after_update "#{name}_discard_was"
         define_method "#{name}_discard",    -> do
           self.attaches_discarded ||= []
-          self.attaches_discarded.push(self.send("#{name}_attributes", 'original')['path'])
+          if attrs = self.send("#{name}_attributes", 'original')
+            self.attaches_discarded.push(attrs['path'])
+          end
         end
         after_destroy "#{name}_discard"
       end
@@ -109,7 +121,7 @@ module AttacheRails
           super(new_value)
         }
         define_method "#{name}_discard_was",-> do
-          new_value = self.send("#{name}")
+          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'] }
           self.attaches_discarded ||= []

data/lib/attache_rails/version.rb

@@ -1,3 +1,3 @@
 module AttacheRails
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attache_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - choonkeat