anaconda 0.14.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e43e86824ee752934096b93a75dec0677d7c25
-  data.tar.gz: 53fb76dfe71116cec739ce274896a5bf4bc04a3f
+  metadata.gz: 794e8b8942312082f80eaba9d5026be051931c6a
+  data.tar.gz: 787aad09d8fb4ca31d4e4af477e735f6e330d8bd
 SHA512:
-  metadata.gz: 6c4f6a74a9c8ea7b1721d6265021082e38d1309d5177733bc740e117448b41fe3e5e1e4ba21f4f2b648eeb6d9437bb7b2b809f3100e6edfa46b7b734b59a2b3f
-  data.tar.gz: c5187169a46d096c765eaf784d319002684c37a8d6b213be4b37f020952974b2d5e82fe99cab7da56a299612de7c4987517799d4df561e62029cce5462830424
+  metadata.gz: f6ca32198af10e738589304a3e5158c4c9560198ea04d2f6ba88090422a0c7a75bc55f90d468ac83bd916a2f81bf1fb5c8b5b67162ec980789593c38b8244d36
+  data.tar.gz: 7af5d7b85c26f3ec0baa6c5d7b5e4b8a6de4383d9af0b359fafd317edfb56e1ed4091820760893605ef3335475ee3765c206e4c3649e1ffb5a867a460c879018

data/CHANGELOG.md

@@ -0,0 +1,82 @@
+* 0.14.0
+  * Add ability to specify protocol in the magic `asset_url` method
+
+* 0.13.1
+  * Use UTC for timestamp in migration files.
+  
+* 0.13.0
+  * Set Content-Type for S3 file to match that of the uploaded source file.
+  
+* 0.12.2
+  * Fix bug introduced in 0.12.1
+  * Wrap hidden fields in the anaconda_dropzone div (to fix bug)
+  
+* 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`
+  * Add `Model.anaconda_fields_for_all_columns` and `Model.anaconda_fields_for(column_name)` methods to make strong parameters cleaner
+  
+* 0.11.0
+  * Change aws URLs to use path style URLs
+  
+* 0.10.0
+  * Add `download_url` magic method that uses content-disposition to force the browser to download the URL. This is a signed AWS url that is only valid for 1 hour
+
+* 0.9.10
+  * Fix bug when attribute had more than one underscore
+  
+* 0.9.9
+  * Fix bug untroduced in previous version
+* 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.
+  
+* 0.9.5
+  * add `host` and `protocol` options to `anaconda_for`
+
+* 0.9.4
+	* 	Fix uploads. Previous version broke them completely.
+	
+* 0.9.3
+	* If no files have been selected, let form submit as normal
+
+* 0.9.2
+  * Always use UTC for policy expiration date, even if Time.zone is set to something else.
+
+* 0.9.1
+  
+  * Fix for anaconda:migration when the field name has an underscore in it
+
+* 0.9.0
+
+  * Add support for multiple anaconda uploaders per form
+  
+  * Completely refactor JavaScript file to support multiple uploaders
+  
+  * Add auto_submit option
+  
+  * Fix support for allowed_types
+  
+  * Add file_types to anaconda config
+  
+  * Add fix for sites using Turbolinks
+
+* 0.2.0
+	
+	* Add support for multiple `anaconda_for` calls per model. Currently limited to one per form, however.
+
+	* Improve migration generation file and class naming to include field name
+
+	* `post_media.asset_url` will now return nil if the file_path is nil

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Ben McFadden
+Copyright (c) 2014 Forge Apps, LLC.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,12 +1,8 @@
-# anaconda
+# Anaconda
 
 Dead simple direct-to-s3 file uploading for your rails app.
 
-## Alpha Warning
-
-We intend to follow semantic versioning as of 1.0. Before that time breaking changes may occur, as development is very active.
-
-If you require stability before that time, you are strongly encouraged to specify an exact version in your `Gemfile` to avoid updating to a version that breaks things for you.
+Current Version: 1.0.0
 
 ## Installation
 
@@ -180,89 +176,38 @@ 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.14.0
-  * Add ability to specify protocol in the magic `asset_url` method
+### Advanced Usage
 
-* 0.13.1
-  * Use UTC for timestamp in migration files.
-  
-* 0.13.0
-  * Set Content-Type for S3 file to match that of the uploaded source file.
-  
-* 0.12.2
-  * Fix bug introduced in 0.12.1
-  * Wrap hidden fields in the anaconda_dropzone div (to fix bug)
-  
-* 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`
-  * Add `Model.anaconda_fields_for_all_columns` and `Model.anaconda_fields_for(column_name)` methods to make strong parameters cleaner
-  
-* 0.11.0
-  * Change aws URLs to use path style URLs
-  
-* 0.10.0
-  * Add `download_url` magic method that uses content-disposition to force the browser to download the URL. This is a signed AWS url that is only valid for 1 hour
+#### Events
+There are several events fired throughout the upload process that you can subscribe to. Many of them contain useful data along with the event. The documentation needs expanding here.
 
-* 0.9.10
-  * Fix bug when attribute had more than one underscore
-  
-* 0.9.9
-  * Fix bug untroduced in previous version
-* 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.
-  
-* 0.9.5
-  * add `host` and `protocol` options to `anaconda_for`
+* `anaconda:manager:upload-manager-constructor` fired when the first upload element constructs an upload manager for a form
+* `anaconda:manager:upload-field-registered` fired when an upload field registers itself with an upload manager
+* `anaconda:manager:uploads-starting` fired when the form is submitted and Anaconda starts uploading the selected files
+* `anaconda:manager:upload-completed` fired each time an upload is completed
+* `anaconda:manager:all-uploads-completed` fired once all uploads have completed
+* `anaconda:file-selected` fired when a file is selected
+* `anaconda:file-upload-failed` fired when an upload fails
+* `anaconda:file-upload-started` fired for each upload when it is started
+* `anaconda:invalid-file-type-selected` fired when a non-permitted file type is selected
+* `anaconda:file-upload-completed` fired when an upload is completed
 
-* 0.9.4
-	* 	Fix uploads. Previous version broke them completely.
-	
-* 0.9.3
-	* If no files have been selected, let form submit as normal
+If you return false to the following events it will prevent the default behavior:
 
-* 0.9.2
-  * Always use UTC for policy expiration date, even if Time.zone is set to something else.
+* `anaconda:invalid-file-type-selected` Default behavior is an alert with content `_filename_ is a _filetype_ file. Only _allowed file types_ files are allowed.`
+* `anaconda:file-upload-failed` Default behavior is an alert with content `_filename_ failed to upload.`
 
-* 0.9.1
-  
-  * Fix for anaconda:migration when the field name has an underscore in it
 
-* 0.9.0
+## Versioning
+From version 1.0.0 on we have used [Semantic Versioning](http://semver.org/).
 
-  * Add support for multiple anaconda uploaders per form
-  
-  * Completely refactor JavaScript file to support multiple uploaders
-  
-  * Add auto_submit option
-  
-  * Fix support for allowed_types
-  
-  * Add file_types to anaconda config
-  
-  * Add fix for sites using Turbolinks
-
-* 0.2.0
-	
-	* Add support for multiple `anaconda_for` calls per model. Currently limited to one per form, however.
-
-	* Improve migration generation file and class naming to include field name
+## Changelog
+* 1.0.0
+  * Fix incorrect return value from `all_uploads_are_complete` method in AnacondaUploadManager
+  * Remove unused `upload_helper.rb` and other old code.
+  * Add a bunch of JavaScript events
 
-	* `post_media.asset_url` will now return nil if the file_path is nil
+See [changelog](CHANGELOG.md) for previous changes
   
 ## Contributing to anaconda
 

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

@@ -1,23 +1,29 @@
-# Three possible configurations:
-# Upload automatically and submit form when upload is complete
-# Done: Upload automatically but do not submit form automatically
-# Done: Do not upload until submit is pressed. The upload and submit form when uploading is complete.
+triggerEvent = (name, data) ->
+  # Taken directly from Turbolinks with no shame.
+  # https://github.com/rails/turbolinks/blob/master/lib/assets/javascripts/turbolinks.js.coffee
+  event = document.createEvent 'Events'
+  event.data = data if data
+  event.initEvent name, true, true
+  document.dispatchEvent event
+
 class @AnacondaUploadManager
   constructor: (options = {}) ->
     @anaconda_upload_fields = []
-    DLog options
+    # DLog options
     @form = $("##{options.form_id}")
     @upload_automatically = false
     @submit_automatically = false
+    triggerEvent "anaconda:manager:upload-manager-constructor", { form: @form }
     @setup_form_submit_handler()
     @bind_dropzone_effects()
     self = this
     $(document).on "page:fetch", ->
-      DLog "page:fetch"
+      # DLog "page:fetch"
       self.reset()
     
   register_upload_field: (anaconda_upload_field)->
-    DLog "Registering Upload Field"
+    # DLog "Registering Upload Field"
+    triggerEvent "anaconda:manager:upload-field-registered", { uploadField: anaconda_upload_field, resource: "#{anaconda_upload_field.hyphenated_resource}-#{anaconda_upload_field.hyphenated_attribute}" }
     @anaconda_upload_fields.push anaconda_upload_field
     if anaconda_upload_field.upload_automatically
       # If _any_ of them have an auto upload, we want to know
@@ -27,13 +33,14 @@ class @AnacondaUploadManager
       @submit_automatically = true
       
   setup_form_submit_handler: ->
-    DLog( "Setting up submit handler for form #{@form.attr('id')}")
+    # DLog( "Setting up submit handler for form #{@form.attr('id')}")
     @form.on( 'submit', { self: this }, this.form_submit_handler )
 
   form_submit_handler: (e) ->
     self = e.data.self
     return true if self.upload_automatically || self.all_uploads_are_complete()
     e.preventDefault()
+    triggerEvent "anaconda:manager:uploads-starting", { form: @form }
     $(this).off( 'submit', self.form_submit_handler )
 
     for upload_field, i in self.anaconda_upload_fields
@@ -47,12 +54,13 @@ class @AnacondaUploadManager
   all_uploads_are_complete: ->
     all_completed = true
     for upload_field, i in @anaconda_upload_fields
-      if upload_field.upload_in_progress || (!upload_field.upload_in_progress && upload_field.file != null)
+      if upload_field.upload_in_progress || (!upload_field.upload_in_progress && upload_field.file != null && !upload_field.upload_completed)
         all_completed = false
         break
     return all_completed
   
   upload_completed: ->
+    triggerEvent "anaconda:manager:upload-completed", { form: @form }
     all_completed = true
     for upload_field, i in @anaconda_upload_fields
       if upload_field.upload_in_progress
@@ -62,6 +70,7 @@ class @AnacondaUploadManager
       @all_uploads_completed()
       
   all_uploads_completed: ->
+    triggerEvent "anaconda:manager:all-uploads-completed", { form: @form }
     if !@upload_automatically || @submit_automatically
       @form.submit()
     else
@@ -107,13 +116,15 @@ class @AnacondaUploadField
   constructor: (options = {}) ->
     @upload_in_progress = false
     @upload_completed = false
-    DLog "options:"
-    DLog options
+    # DLog "options:"
+    # DLog options
     @element_id = options.element_id ? ""
     @allowed_types = options.allowed_types ? []
-    DLog @allowed_types
+    # DLog @allowed_types
     @resource = options.resource
     @attribute = options.attribute
+    @hyphenated_resource  = @resource.replace(/_/g, "-")
+    @hyphenated_attribute = @attribute.replace(/_/g, "-")
     if options.upload_details_container != null && options.upload_details_container != ""
       @upload_details_container = $("##{options.upload_details_container}")
     else
@@ -132,6 +143,7 @@ class @AnacondaUploadField
     @register_with_upload_manager()
     
     @setup_fileupload()
+    @bind_remove_button()
 
   register_with_upload_manager: ->
     if (@closest_form().length == 0 || @closest_form().attr('id') == 'undefined')
@@ -139,7 +151,7 @@ class @AnacondaUploadField
     if (typeof( window.anacondaUploadManagers ) == "undefined")
       window.anacondaUploadManagers = []
     if (typeof( window.anacondaUploadManagers[@closest_form().attr('id')] ) == "undefined")
-      DLog "registering new upload manager for form #{@closest_form().attr('id')}"
+      # DLog "registering new upload manager for form #{@closest_form().attr('id')}"
       window.anacondaUploadManagers[@closest_form().attr('id')] = new AnacondaUploadManager({form_id: @closest_form().attr('id')})
     @upload_manager().register_upload_field(this)  
   upload_manager: ->
@@ -154,9 +166,9 @@ class @AnacondaUploadField
       add: (e, data) ->
         self.file_selected data
       progress: (e, data) ->
-        DLog data
+        # DLog data
         progress = parseInt(data.loaded / data.total * 100, 10)
-        DLog( "Progress for #{self.file.name}: " + progress )
+        # DLog( "Progress for #{self.file.name}: " + progress )
         self.update_progress_to(progress)
 
       done: (e, data) ->
@@ -164,22 +176,28 @@ class @AnacondaUploadField
         self.file_completed_upload data
 
       fail: (e, data) ->
-        alert("#{data.files[0].name} failed to upload.")
-        DLog("Upload failed:")
-        DLog("Error:")
-        DLog(e)
-        DLog("data:")
-        DLog(data)
-        DLog("data.errorThrown:")
-        DLog(data.errorThrown )
-        DLog("data.textStatus:")
-        DLog(data.textStatus )
-        DLog("data.jqXHR:")
-        DLog(data.jqXHR )
-
+        alert("#{data.files[0].name} failed to upload.") if triggerEvent "anaconda:file-upload-failed", { data: data, resource: "#{@hyphenated_resource}-#{@hyphenated_attribute}" }
+        # DLog("Upload failed:")
+        # DLog("Error:")
+        # DLog(e)
+        # DLog("data:")
+        # DLog(data)
+        # DLog("data.errorThrown:")
+        # DLog(data.errorThrown )
+        # DLog("data.textStatus:")
+        # DLog(data.textStatus )
+        # DLog("data.jqXHR:")
+        # DLog(data.jqXHR )
+  
+  bind_remove_button: ->
+    $("a[data-remove-#{@hyphenated_resource}-#{@hyphenated_attribute}]").click (e) =>
+      e.preventDefault()
+      @remove_file()
+  
   upload: ->
     return if @upload_completed
     if @file != null && @file_data != null
+      triggerEvent "anaconda:file-upload-started", { file: @file, resource: "#{@hyphenated_resource}-#{@hyphenated_attribute}" }
       $("input#key").val @key
       @file_data.submit()
       @upload_in_progress = true
@@ -198,7 +216,7 @@ class @AnacondaUploadField
   
   get_media_type: (file_obj) ->
     media_type = "unknown"
-    DLog "get_media_type"
+    # DLog "get_media_type"
     for k,v of @media_types
       regexp = new RegExp(v, "i")
       if regexp.test(file_obj.type) || regexp.test(file_obj.name)
@@ -215,23 +233,31 @@ class @AnacondaUploadField
       false
 
   file_selected: (data) ->
-    DLog "file_selected"
-    DLog data
+    # DLog "file_selected"
+    # DLog data
     if @is_allowed_type(data.files[0])
       @file = data.files[0]
       @file_data = data
       @set_content_type()
       
-      DLog @file
+      triggerEvent "anaconda:valid-file-selected", { file: data.files[0], resource: "#{@hyphenated_resource}-#{@hyphenated_attribute}" }
+      
+      # This remove button is for removing an already uploaded file,
+      # not removing the just selected file. Let's not confuse people.
+      $("a[data-remove-#{@hyphenated_resource}-#{@hyphenated_attribute}]").hide()
+      
+      
+      # DLog @file
       @upload_details_container.html "<div id='upload_file_#{@get_id()}' class='upload-file #{@get_media_type(@file)}'><span class='file-name'>#{@file.name}</span><span class='size'>#{@readable_size()}</span><span class='progress-percent'></span><div class='progress'><span class='progress-bar'></span></div></div>"
 
       if @upload_automatically
-        DLog "auto upload"
+        # DLog "auto upload"
         @upload()
       else
-        DLog "Not auto upload"
+        # DLog "Not auto upload"
     else
-      alert "#{data.files[0].name} is a #{@get_media_type(data.files[0])} file. Only #{@allowed_types.join(", ")} files are allowed."
+      if triggerEvent "anaconda:invalid-file-selected", { file: data.files[0], resource: "#{@hyphenated_resource}-#{@hyphenated_attribute}" }
+        alert "#{data.files[0].name} is a #{@get_media_type(data.files[0])} file. Only #{@allowed_types.join(", ")} files are allowed."
       
   set_content_type: ->
     form_data = $(@element_id).data('form-data')
@@ -260,60 +286,27 @@ class @AnacondaUploadField
     @upload_details_container.find('.progress-bar').css('width', progress + '%')
   
   file_completed_upload: (data) ->
-    DLog "#{@file.name} completed uploading"
-    DLog @file
-
-    # if @upload_complete_post_url? && @upload_complete_post_url != ""
-    #   DLog "will now post to #{@upload_complete_post_url}"
-    #
-    #   file_data = {}
-    #   file_data[@resource] = {}
-    #   file_data[@resource]["#{@attribute}_file_path"] = "#{@base_key}/#{upload_file.file.name}"
-    #   file_data[@resource]["#{@attribute}_filename"] = upload_file.file.name
-    #   file_data[@resource]["#{@attribute}_size"] = upload_file.file.size
-    #   file_data[@resource]["#{@attribute}_type"] = upload_file.file.media_type
-    #   upload_file = this
-    #   $.ajax({
-    #     type: 'PATCH',
-    #     url: @upload_complete_post_url,
-    #     data: $.param(file_data)
-    #     success: (data, textStatus, jqXHR) ->
-    #       DLog "file completed handler complete"
-    #       DLog data
-    #     #TODO: handle a failure on this POST
-    #   })
+    triggerEvent "anaconda:file-upload-completed", { file: @file, resource: "#{@hyphenated_resource}-#{@hyphenated_attribute}" }
+    # DLog "#{@file.name} completed uploading"
+    # DLog @file
 
-    # DLog "will now fill form #{@upload_complete_form_to_fill}"
-    hyphenated_resource  = @resource.replace(/_/g, "-")
-    hyphenated_attribute = @attribute.replace(/_/g, "-")
-    
-    $( @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() )
+    $( @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;
     @upload_manager().upload_completed()
-
-
-# class @AnacondaUploadFile
-# 
-#   constructor: (@data) ->
-#     @file = @data.files[0]
-#     @media_type = @get_media_type()
-#     @id = @get_id()
-# 
-#     @set_context()
-#   get_media_type: ->
-#     media_type = "unknown"
-#     return media_type
-#   set_context: ->
-#     @data.context = this
-#   submit: ->
-#     @data.submit()
-#   update_progress_to: (progress) ->
-#     $("#upload_file_#{@id} .progress-percent").html progress
-#     $("#upload_file_#{@id}").find('.progress-bar').css('width', progress + '%')
+    
+  remove_file: ->
+    triggerEvent "anaconda:remove-file", { resource: "#{@hyphenated_resource}-#{@hyphenated_attribute}" }
+    $("a[data-remove-#{@hyphenated_resource}-#{@hyphenated_attribute}]").hide()
+    $( @element_id ).siblings( "input[data-#{@hyphenated_resource}-#{@hyphenated_attribute}-file-path]" ).val("")
+    $( @element_id ).siblings( "input[data-#{@hyphenated_resource}-#{@hyphenated_attribute}-filename]" ).val("")
+    $( @element_id ).siblings( "input[data-#{@hyphenated_resource}-#{@hyphenated_attribute}-size]" ).val("")
+    $( @element_id ).siblings( "input[data-#{@hyphenated_resource}-#{@hyphenated_attribute}-type]" ).val("")
+    $( @element_id ).siblings( "input[data-#{@hyphenated_resource}-#{@hyphenated_attribute}-original-filename]" ).val("")
+    $( @element_id ).siblings( "input[data-#{@hyphenated_resource}-#{@hyphenated_attribute}-stored-privately]" ).val("")

data/lib/anaconda/form_builder_helpers.rb

@@ -35,12 +35,16 @@ module Anaconda
       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
       
+      if form_options[:remove_button] && self.object.send("#{anaconda_field_name}_file_path").present?
+        remove_button_text = form_options[:remove_button].kind_of?(String) ? form_options[:remove_button] : "Remove"
+        output += "<a href='#' data-#{"remove_#{instance.class.to_s.underscore}_#{anaconda_field_name}".gsub('_', '-')}>#{remove_button_text}</a>"
+      end
+      
       output += "</div>" #anaconda_dropzone
 
       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>
-
 <script>
   (function() {
     window.uploader = new AnacondaUploadField({

data/lib/anaconda/railtie.rb

@@ -1,11 +1,9 @@
 require 'rails/railtie'
-require 'anaconda/upload_helper'
 require 'anaconda/form_builder_helpers'
 
 module Anaconda
   class Railtie < ::Rails::Railtie
     initializer "anaconda.upload_helper" do
-      ActionView::Base.send :include, UploadHelper
       ActionView::Helpers::FormBuilder.send :include, FormBuilderHelpers
       SimpleForm::FormBuilder.send :include, FormBuilderHelpers if SimpleForm::FormBuilder
     end

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.14.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ben McFadden
@@ -48,6 +48,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -62,9 +63,7 @@ files:
 - lib/anaconda/errors.rb
 - lib/anaconda/form_builder_helpers.rb
 - lib/anaconda/railtie.rb
-- lib/anaconda/upload_helper.rb
 - lib/anaconda/version.rb
-- lib/generators/anaconda/USAGE
 - lib/generators/anaconda/install_generator.rb
 - lib/generators/anaconda/migration_generator.rb
 - lib/generators/anaconda/templates/config/initializers/anaconda.rb

data/lib/anaconda/upload_helper.rb

@@ -1,100 +0,0 @@
-module Anaconda
-  # Greatly inspired by http://railscasts.com/episodes/383-uploading-to-amazon-s3
-  module UploadHelper
-    def anaconda_uploader_form_for(instance, attribute, form_options = {})
-      a_class = instance.class unless instance.kind_of? Class
-      if a_class.anaconda_options[attribute].present
-        options = a_class.anaconda_options[attribute].dup
-      else
-        raise AnacondaError, "attribute options not set for column #{attribute}. Did you add `anaconda_for :#{attribute}` to the model?"
-      end
-      options[:base_key] = instance.send(options[:base_key].to_s) if options[:base_key].kind_of? Symbol
-      render(:template =>"anaconda/_uploader_form_for.html.haml", :locals => {resource: instance, options: options.merge(as: attribute, form_options: form_options)}, layout: false).to_s
-    end
-    def anaconda_uploader_form(options = {}, &block)
-      uploader = S3Uploader.new(options)
-      form_tag(uploader.url, uploader.form_options) do
-        uploader.fields.map do |name, value|
-          hidden_field_tag(name, value)
-        end.join.html_safe + file_field_tag("file").html_safe# + capture(&block)
-      end
-    end
-
-    class S3Uploader
-      def initialize(options)
-        @options = options.reverse_merge(
-          id: "fileupload",
-          aws_access_key_id: Anaconda.aws[:aws_access_key],
-          aws_secret_access_key: Anaconda.aws[:aws_secret_key],
-          bucket: Anaconda.aws[:aws_bucket],
-          acl: "public-read",
-          expiration: 10.hours.from_now,
-          max_file_size: 500.megabytes,
-          as: "file"
-        )
-      end
-
-      def form_options
-        {
-          id: @options[:id],
-          method: "post",
-          authenticity_token: false,
-          multipart: true,
-          data: {
-            post: @options[:post],
-            as: @options[:as],
-            base_key: base_key
-          }
-        }
-      end
-
-      def fields
-        {
-          :key => key,
-          :acl => @options[:acl],
-          :policy => policy,
-          :signature => signature,
-          "AWSAccessKeyId" => @options[:aws_access_key_id],
-        }
-      end
-
-      def key
-        @key ||= "#{base_key}/${filename}"
-      end
-
-      def base_key
-        @options[:base_key]
-      end
-
-      def url
-        "https://s3.amazonaws.com/#{@options[:bucket]}/"
-      end
-
-      def policy
-        Base64.encode64(policy_data.to_json).gsub("\n", "")
-      end
-
-      def policy_data
-        {
-          expiration: @options[:expiration],
-          conditions: [
-            ["starts-with", "$utf8", ""],
-            ["starts-with", "$key", base_key],
-            ["content-length-range", 1, @options[:max_file_size]],
-            {bucket: @options[:bucket]},
-            {acl: @options[:acl]}
-          ]
-        }
-      end
-
-      def signature
-        Base64.encode64(
-          OpenSSL::HMAC.digest(
-            OpenSSL::Digest::Digest.new('sha1'),
-            @options[:aws_secret_access_key], policy
-          )
-        ).gsub("\n", "")
-      end
-    end
-  end
-end

data/lib/generators/anaconda/USAGE

@@ -1,3 +0,0 @@
-To copy an Anaconda initializer to your Rails App, with some configuration values, just do:
-
-    rails generate anaconda:install