anaconda 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48af1f9503f065b652298a02de0fe6f0f22ead90
-  data.tar.gz: 91ba09bdb12f881ccd3b8612d482fe7681f41b82
+  metadata.gz: b215602192966e3b701912a7388182b37487bb93
+  data.tar.gz: c74e123f394996b4c3fddf73779c34cb02ad156c
 SHA512:
-  metadata.gz: 96ba09c1ba5ec0d753ebdeeecdad087ce928219729d1f8b568b40eee54714474ae1d82161dbe2d5a03e7113a4d0a96574f1fef542573c837f2145c9bb0597ec4
-  data.tar.gz: 3a14cc1ba75147fb24a87315e6f13a69596106afb0bc8c9d4d19d0b341a3be6deda93f915c5ade422a8ae3600442c317d763ca873742f6319e2c4602aa833b2d
+  metadata.gz: a314d5936a6c90df4cc3bdc69baa42d2a80a27472bc384a19a0c8425790e9e327495bbbe0de9889bc1611994e7d46e6f8517be0d2fbf7d810d2bbac6765e1feb
+  data.tar.gz: d43e7f37a75056d1fc11e7c0e153337924d8faacabdb68b74b88c696d4ff616d465c22fbacf0d5ed6b06c6f0e7ddb0a73fc04da089650ee5399097a50a3cce27

data/README.markdown

@@ -179,6 +179,12 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
     `asset_download_url` will return a signed S3 URL with content-disposition set to attachment so the file will be downloaded instead of opened in the browser.
 
 ## Changelog
+* 0.12.1
+  * Make progress bar go to 100% on upload complete
+  * Properly store ACL on file upload (`asset_stored_privately`)
+  * Properly store `original_filename` on upload
+  * Fix bug when dragging and dropping onto the file select button
+
 * 0.12.0
   * Delete files from S3 when a new one us uploaded, or the record is deleted.
   * Add options to disable deleting files from S3 when a new one is uploaded (`remove_previous_s3_files_on_change` and `remove_previous_s3_files_on_destroy`). These default to `true`

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

@@ -10,6 +10,7 @@ class @AnacondaUploadManager
     @upload_automatically = false
     @submit_automatically = false
     @setup_form_submit_handler()
+    @bind_dropzone_effects()
     self = this
     $(document).on "page:fetch", ->
       DLog "page:fetch"
@@ -70,6 +71,37 @@ class @AnacondaUploadManager
     @form.find("input[type='submit']").prop( "disabled", true );
   enable_submit_button: ->
     @form.find("input[type='submit']").prop( "disabled", false );
+    
+  bind_dropzone_effects: ->
+    $(document).bind 'drop dragover', (e) ->
+      e.preventDefault()
+      
+    $(document).bind 'dragover', (e) ->
+      dropZone = $('.anaconda_dropzone')
+      timeout = window.dropZoneTimeout
+      if !timeout
+        dropZone.addClass('in');
+      else
+        clearTimeout(timeout);
+        
+      found = false
+      node = e.target
+      
+      while node != null
+        if node in dropZone
+            found = true
+            break
+          node = node.parentNode;
+      
+      if found
+        dropZone.addClass('hover')
+      else
+        dropZone.removeClass('hover')
+
+      window.dropZoneTimeout = setTimeout ->
+        window.dropZoneTimeout = null
+        dropZone.removeClass('in hover')
+      , 100    
 
 class @AnacondaUploadField  
   constructor: (options = {}) ->
@@ -92,7 +124,7 @@ class @AnacondaUploadField
     @file = null
     @file_data = null
     @media_types = $(@element_id).data('media-types')
-    
+    @acl = $(@element_id).data('form-data').acl
     
     @base_key = options.base_key ? ""
     @key = options.key ? "#{@base_key}/${filename}"
@@ -118,7 +150,7 @@ class @AnacondaUploadField
   setup_fileupload: ->
     self = this
     $( @element_id ).fileupload
-      #dropZone: $("#dropzone")
+      dropZone: $( @element_id ).parent(".anaconda_dropzone"),
       add: (e, data) ->
         DLog data
         self.file_selected data
@@ -129,6 +161,7 @@ class @AnacondaUploadField
         self.update_progress_to(progress)
 
       done: (e, data) ->
+        self.update_progress_to(100)
         self.file_completed_upload data
 
       fail: (e, data) ->
@@ -145,9 +178,6 @@ class @AnacondaUploadField
         DLog("data.jqXHR:")
         DLog(data.jqXHR )
 
-    $(document).bind 'drop dragover', (e) ->
-      e.preventDefault()
-
   upload: ->
     return if @upload_completed
     if @file != null && @file_data != null
@@ -178,6 +208,12 @@ class @AnacondaUploadField
     
   reset: ->
     @upload_details_container.html ''
+    
+  stored_privately: ->
+    if @acl == "private"
+      true
+    else
+      false
 
   file_selected: (data) ->
     DLog data
@@ -237,16 +273,15 @@ class @AnacondaUploadField
     #   })
 
     # DLog "will now fill form #{@upload_complete_form_to_fill}"
-
-    DLog "#{@resource}_#{@attribute}_file_path"
     hyphenated_resource  = @resource.replace(/_/g, "-")
     hyphenated_attribute = @attribute.replace(/_/g, "-")
-    DLog "input[data-#{hyphenated_resource}-#{hyphenated_attribute}-file-path]"
     
     $( @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 )
+    $( @element_id ).siblings( "input[data-#{hyphenated_resource}-#{hyphenated_attribute}-original-filename]" ).val( @file.name )
+    $( @element_id ).siblings( "input[data-#{hyphenated_resource}-#{hyphenated_attribute}-stored-privately]" ).val( @stored_privately() )
 
     @upload_in_progress = false;
     @upload_completed = true;

data/lib/anaconda/form_builder_helpers.rb

@@ -24,8 +24,9 @@ module Anaconda
         end
         
         uploader = S3Uploader.new(options)
-
+        output += "<div class='anaconda_dropzone'>"
         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}
+        output += "</div>"
       end
 
       output += self.hidden_field "#{anaconda_field_name}_filename".to_sym, data: {"#{instance.class.to_s.underscore}_#{anaconda_field_name}_filename" => true}

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.12.0"
+    VERSION = "0.12.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Ben McFadden
@@ -15,28 +15,28 @@ dependencies:
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: javascript_dlog-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 description: Dead simple file uploading to S3
@@ -46,8 +46,8 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -83,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dead simple file uploading to S3