anaconda 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663eda1a92d9c737c550bb80b4dbe0635be9c76f
-  data.tar.gz: f84f4bb950d328fc9de359ca67e5089cd5659c3b
+  metadata.gz: eced0a901d48850eb806a212759556c4f4ffc0dc
+  data.tar.gz: fd53ac40c05633eeb002b0de82709216847c4806
 SHA512:
-  metadata.gz: f94bcab3e2bbcd472e26c273d9da195727fac3f8c58ad69b41650048b50fd617fe7665f1fe7d1cba8f08cba101a8e6c92a9d930c8676a8345379a7036ecc0445
-  data.tar.gz: 8b32f114820d488f6bb1d5953dbff223b702c2d40a729180af1df2ac3033e0bcaf61be8451d7bc3c096dacf9369b34d5085a83fde3944dc64090f900999be89d
+  metadata.gz: 610eb68af269acc79b22a43b90782968c86585c582e3c648142176da8bf64820baacb99c40d3eb735738aefd0e3672bc1d8325f7a34e268b14fc9a5a6f43bd04
+  data.tar.gz: 9156173ec7fb018e8f4bac93495151f2804ee5c93717db1ca2b5d7840bc3083e663376acb5f0dfc29b443c4457d93ed4056a0e784187a777decba33b0bbf4149

data/README.markdown

@@ -136,6 +136,7 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 	* `upload_details_container` - An element id you would like the upload details located in. Defaults to `<resource>_<attribtue>_details`  ex: `post_media_asset_details`
 	* `auto_upload` - If set to true, upload will begin as soon as a file is selected. Default: *false*
 	* `auto_submit` - If set to true, form will submit automatically when upload is completed. Useful when mixed with `auto_upload: true`, especially if the file field is the only field on the form. Default: *true* when auto_upload is false; *false* when auto_upload is true.
+  * `base_key` - If supplied, this will be the base_key used for this upload
 
 *  Fields
 	
@@ -151,8 +152,13 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
     The magic method is asset_url which will return a signed S3 URL if the file is stored with an ACL of `private` and will return a non-signed URL if the file is stored with public access.
 
 ## Changelog
+* 0.9.8
+  * Add `base_key` option
+  * Change the way we identify hidden elements to work when we're using this in a nested form.
+  
 * 0.9.7
   * Add percent sign to progress-percent div
+  
 * 0.9.6
   * Fix `auto_upload` and `auto_submit` options.
   

data/app/assets/javascripts/anaconda_uploader.js.coffee

@@ -239,11 +239,13 @@ class @AnacondaUploadField
     # DLog "will now fill form #{@upload_complete_form_to_fill}"
 
     DLog "#{@resource}_#{@attribute}_file_path"
-
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_file_path" ).val( @key.replace("${filename}", @file.name) )
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_filename" ).val( @file.name )
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_size" ).val( @file.size )
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_type" ).val( @file.type )
+    hyphenated_resource  = @resource.replace("_", "-")
+    hyphenated_attribute = @attribute.replace("_", "-")
+    
+    $( @element_id ).siblings( "input[data-#{hyphenated_resource}-#{hyphenated_attribute}-file-path]" ).val( @key.replace("${filename}", @file.name) )
+    $( @element_id ).siblings( "input[data#{hyphenated_resource}-#{hyphenated_attribute}-filename]" ).val( @file.name )
+    $( @element_id ).siblings( "input[data#{hyphenated_resource}-#{hyphenated_attribute}-size]" ).val( @file.size )
+    $( @element_id ).siblings( "input[data#{hyphenated_resource}-#{hyphenated_attribute}-type]" ).val( @file.type )
 
     @upload_in_progress = false;
     @upload_completed = true;

data/lib/anaconda/form_builder_helpers.rb

@@ -17,24 +17,26 @@ module Anaconda
         rescue
           raise AnacondaError, "attribute options not set for column #{anaconda_field_name}. Did you add `anaconda_for :#{anaconda_field_name}` to the model?"
         end
-        options[:base_key] = instance.send(options[:base_key].to_s) if options[:base_key].kind_of? Symbol
+        if form_options[:base_key]
+          options[:base_key] = form_options[:base_key]
+        else
+          options[:base_key] = instance.send(options[:base_key].to_s) if options[:base_key].kind_of? Symbol
+        end
         
         uploader = S3Uploader.new(options)
 
         output += self.input_field "file", name: "file", id: element_id, as: :file, data: {url: uploader.url, form_data: uploader.fields.to_json, media_types: Anaconda.js_file_types}
       end
 
-      output += self.hidden_field "#{anaconda_field_name}_filename".to_sym
-      output += self.hidden_field "#{anaconda_field_name}_file_path".to_sym
-      output += self.hidden_field "#{anaconda_field_name}_size".to_sym
-      output += self.hidden_field "#{anaconda_field_name}_original_filename".to_sym
-      output += self.hidden_field "#{anaconda_field_name}_stored_privately".to_sym
-      output += self.hidden_field "#{anaconda_field_name}_type".to_sym
-
+      output += self.hidden_field "#{anaconda_field_name}_filename".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_filename" => true}
+      output += self.hidden_field "#{anaconda_field_name}_file_path".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_file_path" => true}
+      output += self.hidden_field "#{anaconda_field_name}_size".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_size" => true}
+      output += self.hidden_field "#{anaconda_field_name}_original_filename".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_original_filename" => true}
+      output += self.hidden_field "#{anaconda_field_name}_stored_privately".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_stored_privately" => true}
+      output += self.hidden_field "#{anaconda_field_name}_type".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_type" => true}
       # output += render(:template =>"anaconda/_uploader_form_for.html.haml", :locals => {resource: instance, options: options.merge(as: anaconda_field_name, form_options: form_options, element_id: element_id )}, layout: false).to_s
 
       options = options.merge(as: anaconda_field_name, form_options: form_options, element_id: element_id )
-
       output += <<-END
 <div id="#{instance.class.to_s.underscore}_#{anaconda_field_name}_details"></div>
 

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.9.7"
+    VERSION = "0.9.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Ben McFadden