attache_rails 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7546fc76fade2bf70f9075fe87be7b71fffa6f
-  data.tar.gz: ee7f0526cbebe7292f685cb86ed501721d46f7b2
+  metadata.gz: 71bdf794a1a45cfb4a1c5a1f009a6b0986c2f036
+  data.tar.gz: aa0fd8c6977c2e78ae9114d3e53aa9a24ac3972e
 SHA512:
-  metadata.gz: 76d9c2a0aeec9e6de2980cd752bcf4e7fc83720426e073d60e85073e5d6a97e2ef4211733a0e415fd9af9280c49da0e7af52a8678bc72ce27548b6b442983290
-  data.tar.gz: 1b955d139c9fda1b3828e6f91a7ace1d8b213a92085cce02af4e0936c16b273558ee040082815dc93c391c1bc03530a5eed3a94ec9346d5b28e77999c488bf7d
+  metadata.gz: f83391852c79448f278812211b2fb9dbc9f61302da3049e3e9f1a80e346c515c0bcbe4ab4fd12e859f2d0df9c246c3692d296bd320268a3a613a36f3d3afcee0
+  data.tar.gz: d6a3d6c02e9d3aaf54beb9567da08238b91464270d4daf4edd8ce6602c4d279d8284e88f836e309b166135e221e22f67355190af8919356dfdb4deddc88fd194

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

@@ -24,7 +24,7 @@ var AttacheFileInput = React.createClass({displayName: "AttacheFileInput",
   onChange: function() {
     var file_element = this.getDOMNode().firstChild;
     // user cancelled file chooser dialog. ignore
-    if (file_element.files.length == 0) return;
+    if (! file_element || file_element.files.length == 0) return;
     if (! this.props.multiple) this.state.files = {};
 
     this.setState(this.state);

data/app/assets/javascripts/attache/file_input.js.jsx

@@ -24,7 +24,7 @@ var AttacheFileInput = React.createClass({
   onChange: function() {
     var file_element = this.getDOMNode().firstChild;
     // user cancelled file chooser dialog. ignore
-    if (file_element.files.length == 0) return;
+    if (! file_element || file_element.files.length == 0) return;
     if (! this.props.multiple) this.state.files = {};
 
     this.setState(this.state);

data/lib/attache_rails/model.rb

@@ -1,9 +1,18 @@
-require "net/http"
+require "cgi"
 require "uri"
+require "httpclient"
 
 module AttacheRails
   module Utils
     class << self
+      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
+      end
+
       def attache_url_for(json_string, geometry)
         JSON.parse(json_string).tap do |attrs|
           prefix, basename = File.split(attrs['path'])
@@ -47,13 +56,18 @@ module AttacheRails
     end
 
     def attaches_discard!(files = attaches_discarded)
+      files.reject! &:blank?
+      files.uniq!
       if files.present?
         logger.info "DELETE #{files.inspect}"
-        Net::HTTP.post_form(
+        HTTPClient.post_content(
           URI.parse(ATTACHE_DELETE_URL),
           Utils.attache_auth_options.merge(paths: files.join("\n"))
         )
       end
+    rescue Exception
+      raise if ENV['ATTACHE_DISCARD_FAILURE_RAISE_ERROR']
+      logger.warn [$!, $@]
     end
 
     module ClassMethods
@@ -62,6 +76,18 @@ module AttacheRails
         define_method "#{name}_options",    -> (geometry, options = {}) { Utils.attache_options(geometry, [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)
+        }
+        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'] }
+          self.attaches_discarded ||= []
+          self.attaches_discarded.push(*obsoleted)
+        end
+        after_update "#{name}_discard_was"
         define_method "#{name}_discard",    -> do
           self.attaches_discarded ||= []
           self.attaches_discarded.push(self.send("#{name}_attributes", 'original')['path'])
@@ -78,6 +104,18 @@ module AttacheRails
             sum + (str.blank? ? [] : [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)
+        }
+        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'] }
+          self.attaches_discarded ||= []
+          obsoleted.each {|path| self.attaches_discarded.push(path) }
+        end
+        after_update "#{name}_discard_was"
         define_method "#{name}_discard",    -> do
           self.attaches_discarded ||= []
           self.send("#{name}_attributes", 'original').each {|attrs| self.attaches_discarded.push(attrs['path']) }

data/lib/attache_rails/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: attache_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
-dependencies: []
+date: 2015-04-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - choonkeat@gmail.com