attache_rails 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 932312b847166dad18dae52549e4c073146459dd
-  data.tar.gz: 0fba6572f2b42e787e3bc233bff0c1d3f90e99b4
+  metadata.gz: 7c05f1c9700fcff236abe554ee5bff029d799dff
+  data.tar.gz: 688d2432bdb57cfa15cedafe56d0dec0deb461b5
 SHA512:
-  metadata.gz: 59b6a2f58079769e9672cc78ba92d18201a1bf5afbf88ae7f4b3e5ef8bd987f06a48aa6eb7002701cca70f26f21757d79a2b4d16c6c536b267b503372a1cca9e
-  data.tar.gz: e983776f2a327a6677c9c3f7a13373c0b1647974391274a606814cb2a8d241a7ec283c81199c1e61e8f327aa1813404ffbbeae219a0170b2118ca4a2c8f6096a
+  metadata.gz: 48a55b14c595316bd139959a225f6d5e9d93b5da87ca5fd95089c7b1b144f482af0143b6ff995e32d88fb4a30c2974b7f446c3845a783e25a080cbebf807eca6
+  data.tar.gz: 81d5d5005af6e89b301852a0af93a1aa3315d6f733ae64aa7bc6c7da323d8bb95dc5b894ef78799ef7da0b90ff44c87a0bc0e7491448022eb11e0b4360ad98b5

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

@@ -113,8 +113,9 @@ var AttacheFileInput = React.createClass({displayName: "AttacheFileInput",
         result.src = that.props['data-downloadurl'] + '/' + parts.join('/');
         result.filename = result.src.split('/').pop().split(/[#?]/).shift();
       }
+      var previewKey = "preview" + key;
       previews.push(
-        React.createElement("div", {className: "attache-file-input"}, 
+        React.createElement("div", {key: previewKey, className: "attache-file-input"}, 
           React.createElement("input", {type: "hidden", name: that.props.name, value: json, readOnly: "true"}), 
           React.createElement(Preview, React.__spread({},  result, {key: key, onRemove: that.onRemove.bind(that, key)}))
         )
@@ -124,14 +125,15 @@ var AttacheFileInput = React.createClass({displayName: "AttacheFileInput",
     var placeholders = [];
     if (previews.length == 0 && that.props['data-placeholder']) $.each(JSON.parse(that.props['data-placeholder']), function(uid, src) {
       placeholders.push(
-        React.createElement(Placeholder, React.__spread({},   that.props, {src: src}))
+        React.createElement(Placeholder, React.__spread({key: "placeholder"},  that.props, {src: src}))
       );
     });
 
     var discards = [];
     $.each(that.state.attaches_discarded, function(index, discard) {
+      var discardKey = "discard" + discard.path;
       discards.push(
-        React.createElement("input", {type: "hidden", name: discard.fieldname, value: discard.path})
+        React.createElement("input", {key: discardKey, type: "hidden", name: discard.fieldname, value: discard.path})
       );
     });
 

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

@@ -113,8 +113,9 @@ var AttacheFileInput = React.createClass({
         result.src = that.props['data-downloadurl'] + '/' + parts.join('/');
         result.filename = result.src.split('/').pop().split(/[#?]/).shift();
       }
+      var previewKey = "preview" + key;
       previews.push(
-        <div className="attache-file-input">
+        <div key={previewKey} className="attache-file-input">
           <input type="hidden" name={that.props.name} value={json} readOnly="true" />
           <Preview {...result} key={key} onRemove={that.onRemove.bind(that, key)}/>
         </div>
@@ -124,14 +125,15 @@ var AttacheFileInput = React.createClass({
     var placeholders = [];
     if (previews.length == 0 && that.props['data-placeholder']) $.each(JSON.parse(that.props['data-placeholder']), function(uid, src) {
       placeholders.push(
-        <Placeholder  {...that.props} src={src} />
+        <Placeholder key="placeholder" {...that.props} src={src} />
       );
     });
 
     var discards = [];
     $.each(that.state.attaches_discarded, function(index, discard) {
+      var discardKey = "discard" + discard.path;
       discards.push(
-        <input type="hidden" name={discard.fieldname} value={discard.path} />
+        <input key={discardKey} type="hidden" name={discard.fieldname} value={discard.path} />
       );
     });
 

data/lib/attache_rails/model.rb

@@ -21,7 +21,10 @@ module AttacheRails
 
       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|
+        original_filename = readable.try(:original_filename) ||
+                            readable.try(:path) && File.basename(readable.try(:path)) ||
+                            'noname'
+        uri.query = { file: original_filename, **attache_auth_options }.collect {|k,v|
           CGI.escape(k.to_s) + "=" + CGI.escape(v.to_s)
         }.join('&')
         attache_retry_doing(3) { HTTPClient.post(uri, readable, {'Content-Type' => 'binary/octet-stream'}).body }
@@ -30,7 +33,7 @@ module AttacheRails
       def attache_url_for(json_string, geometry)
         JSON.parse(json_string).tap do |attrs|
           prefix, basename = File.split(attrs['path'])
-          attrs['url'] = [ATTACHE_DOWNLOAD_URL, prefix, CGI.escape(geometry), basename].join('/')
+          attrs['url'] = [ATTACHE_DOWNLOAD_URL, prefix, CGI.escape(geometry), CGI.escape(basename)].join('/')
         end
       end
 

data/lib/attache_rails/version.rb

@@ -1,3 +1,3 @@
 module AttacheRails
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attache_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails