anaconda 0.1.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdbbf12ffefec5c116f99be38fc11d908ba60a9
-  data.tar.gz: 9320e3c6cdef34e2e968c668b357dba366d37914
+  metadata.gz: 2138f5230105240fc5af85833f84cb47628397f9
+  data.tar.gz: e4a8dcd9108b21d577f9802222966a0ac29d6f3d
 SHA512:
-  metadata.gz: 36c1eb4ac4d6597b285edcee1a5502af3f95b4bb24dbc00c8a2143afe6f20547641c4798246a238e6fcf9afece4f4c37f5a26e99258039eb49d1b85a3e85e7b0
-  data.tar.gz: 12ace30c835230a065e6ea66fee390d79f37e8533bba47c2bf2817e48f8f3b49619ea8c57c62bad1aa568965325ce90a673d63e43698477480c28ccea49c55ae
+  metadata.gz: c42b5fa24d72da81a1ef9ce3ae2d64df9e15e22bd176138640d585a538d9c1f23915940687e0d7242446010a041e6e3f364f66c0e0773da09805b9c13499b21d
+  data.tar.gz: a8a9589fe6d7809653f25dc657839088d08fec908d0d11b6acfe80afbb2198bedb1c8f34e78f0b8fa91f8d75ca1549d50fc0b0d8d0e381ef7e097946cb38e283

data/README.markdown

@@ -27,41 +27,40 @@ If you require stability before that time, you are strongly encouraged to specif
 ## Configuration
 
 ### AWS S3 Setup
-
-### AWS S3 Setup
+Create a bucket where you want your uploads to go. If you already have a bucket in place, you can certainly use it.
 
 #### IAM
-
-Sample IAM Policy (be sure to replace 'your.bucketname'):
+For best security we recommend creating a user in IAM that will just be used for file uploading. Once you create that user you can apply a security policy to it so they can only access the specified resources. Here is an example IAM policy that will restrict this user to only have access to the one bucket specified (be sure to replace 'your.bucketname'). Be sure to generate security credentials for this user. These are the S3 credentials you will use.
 
     {
-        "Statement": [
-	            {
-                "Effect": "Allow",
-                "Action": "s3:*",
-                "Resource": [
-                    "arn:aws:s3:::[your.bucketname]",
-                    "arn:aws:s3:::[your.bucketname]/*"
-	                ]
-	            }
-	        ]
-	    }
+      "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": "s3:*",
+              "Resource": [
+                  "arn:aws:s3:::[your.bucketname]",
+                  "arn:aws:s3:::[your.bucketname]/*"
+                ]
+            }
+        ]
+    }
 
 #### CORS
+You will need to set up CORS permissions on the bucket so users can upload to it from your website. Below is a sample CORS configuration.
 
-Sample CORS configuration:
+If users will only upload from one domain, you can put that in your AllowedOrigin. If they will upload from multiple domains you may either add an AllowedOrigin for each of them, or use a wildcard `*` origin as in our example below.
 
     <?xml version="1.0" encoding="UTF-8"?>
-	 <CORSConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
-	    <CORSRule>
-	        <AllowedOrigin>*</AllowedOrigin>
-	        <AllowedMethod>GET</AllowedMethod>
-	        <AllowedMethod>POST</AllowedMethod>
-	        <AllowedMethod>PUT</AllowedMethod>
-	        <MaxAgeSeconds>3000</MaxAgeSeconds>
-	        <AllowedHeader>*</AllowedHeader>
-	    </CORSRule>
-	 </CORSConfiguration>
+      <CORSConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+      <CORSRule>
+        <AllowedOrigin>*</AllowedOrigin>
+        <AllowedMethod>GET</AllowedMethod>
+        <AllowedMethod>POST</AllowedMethod>
+        <AllowedMethod>PUT</AllowedMethod>
+        <MaxAgeSeconds>3000</MaxAgeSeconds>
+        <AllowedHeader>*</AllowedHeader>
+      </CORSRule>
+    </CORSConfiguration>
 
 
 ### Initializer
@@ -74,9 +73,23 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 
 ## Usage
 
-*  Controller changes (if any)
+*  Controller changes
+  	
+  	You must add these parameters to your permitted parameters. In Rails 4 this is done via strong parameters in the controller. In Rails 3 this is done in the model via attr_accessible.
+
+  	For each `anaconda_for` (assuming `anaconda_for :asset`):
+  	
+  	* :asset_filename
+  	* :asset_file_path
+  	* :asset_size
+    * :asset_original_filename
+    * :asset_stored_privately
+    * :asset_type
+
 
 *  Migrations
+	
+	We provide a migration generator. Assuming `anaconda_for :asset` inside of PostMedia model:
 
         $ rails g migration anaconda:migration PostMedia asset
 
@@ -97,12 +110,57 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 
 *  Form setup
 
-        #anaconda_upload_form_wrapper
-        = anaconda_uploader_form_for post_media, :asset, form_el: '#new_post_media', limits: { images: 9999 }, auto_upload: true
-
-
-*  Options
-
+	At this time we only support anaconda fields inside of a [simple_form](https://github.com/plataformatec/simple_form). We plan to expand and add a rails form helper in the future.
+	
+		= simple_form_for post_media do |f|
+			= f.anaconda :asset
+			= f.name
+			= f.other_field
+			= f.submit
+			
+	**Form helper options**
+	
+	There are a variety of options available on the form helper. At this time they are:
+	
+	* `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.
+
+*  Fields
+	
+	At this point you will have these methods available on a post_media instance:
+  	* :asset_filename
+  	* :asset_file_path
+  	* :asset_size
+    * :asset_original_filename
+    * :asset_stored_privately
+    * :asset_type
+    * :asset_url
+    
+    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.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
+
+* 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
+  
 ## Contributing to anaconda
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
@@ -116,19 +174,4 @@ We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](http
 ## Copyright
 
 Copyright (c) 2014 Forge Apps, LLC. See LICENSE.txt for
-further details.
-
-
-
-
-Columns we're expecting (in the case of `anaconda_for :image`)
-image_file_path
-image_size
-image_original_filename
-
-Magic Columns we'll make
-image_url
-
-
-You'll have to make and run a migration for the columns you want:
-`rails g migration AddAnacondaToUsers image_file_path:text image_size:integer image_original_filename:text`
+further details.

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

@@ -1,39 +1,124 @@
-class @AnacondaUploader
-  @debug_enabled: false
-  @upload_started: false
-  @audio_types = /(\.|\/)(wav|mp3|m4a|aiff|ogg|flac)$/i
-  @video_types = /(\.|\/)(mp[e]?g|mov|avi|mp4|m4v)$/i
-  @image_types = /(\.|\/)(jp[e]?g|png|bmp)$/i
-  @resource_types = /(\.|\/)(pdf|ppt[x]?|doc[x]?)$/i
+# 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.
+class @AnacondaUploadManager
+  constructor: (options = {}) ->
+    @anaconda_upload_fields = []
+    DLog options
+    @form = $("##{options.form_id}")
+    @upload_automatically = false
+    @submit_automatically = false
+    @setup_form_submit_handler()
+    self = this
+    $(document).on "page:fetch", ->
+      DLog "page:fetch"
+      self.reset()
+    
+  register_upload_field: (anaconda_upload_field)->
+    DLog "Registering Upload Field"
+    @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
+      @upload_automatically = true
+    if anaconda_upload_field.submit_automatically
+      # If _any_ of them have auto submit enabled, we will submit automatically
+      @submit_automatically = true
+      
+  setup_form_submit_handler: ->
+    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 if self.upload_automatically
+    e.preventDefault()
+    $(this).off( 'submit', self.form_submit_handler )
+
+    for upload_field, i in self.anaconda_upload_fields
+      upload_field.upload()
+    false
+  reset: ->
+    for upload_field, i in @anaconda_upload_fields
+      upload_field.reset()
+    @anaconda_upload_fields = []
+      
+  upload_completed: ->
+    all_completed = true
+    for upload_field, i in @anaconda_upload_fields
+      if upload_field.upload_in_progress
+        all_completed = false
+        break
+    if all_completed
+      @all_uploads_completed()
+      
+  all_uploads_completed: ->
+    if !@upload_automatically || @submit_automatically
+      @form.submit()
+    else
+      @enable_submit_button()  
+      
+  disable_submit_button: ->
+    @form.find("input[type='submit']").prop( "disabled", true );
+  enable_submit_button: ->
+    @form.find("input[type='submit']").prop( "disabled", false );
 
+class @AnacondaUploadField  
   constructor: (options = {}) ->
+    @upload_in_progress = false
+    @upload_completed = false
+    DLog "options:"
+    DLog options
     @element_id = options.element_id ? ""
-    @limits = options.limits ? {}
     @allowed_types = options.allowed_types ? []
-    @upload_details_container = $("##{options.upload_details_container}") ? $("#files")
+    DLog @allowed_types
+    @resource = options.resource
+    @attribute = options.attribute
+    if options.upload_details_container != null && options.upload_details_container != ""
+      @upload_details_container = $("##{options.upload_details_container}")
+    else
+      @upload_details_container = $("##{@resource}_#{@attribute}_details")
     @upload_button = $("##{options.upload_button_id}") ? $("#upload")
-    @upload_complete_post_url = options.upload_complete_post_url ? null
-    @upload_complete_form_to_fill = options.upload_complete_form_to_fill ? null
     @upload_automatically = options.upload_automatically ? false
-    @resource = options.resource ? null
-    @attribute = options.attribute ? null
-
-    @files_for_upload = []
+    @submit_automatically = options.submit_automatically ? false
+    @file = null
+    @file_data = null
+    @media_types = $(@element_id).data('media-types')
+    
+    
     @base_key = options.base_key ? ""
+    @key = options.key ? "#{@base_key}/${filename}"
+    
+    @register_with_upload_manager()
+    
     @setup_fileupload()
 
+  register_with_upload_manager: ->
+    if (@closest_form().length == 0 || @closest_form().attr('id') == 'undefined')
+      throw "Anaconda Error: form element not found or missing id attribtue."
+    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')}"
+      window.anacondaUploadManagers[@closest_form().attr('id')] = new AnacondaUploadManager({form_id: @closest_form().attr('id')})
+    @upload_manager().register_upload_field(this)  
+  upload_manager: ->
+    window.anacondaUploadManagers[@closest_form().attr('id')]
+  closest_form: ->
+    $(@element_id).closest("form")
+  
   setup_fileupload: ->
     self = this
     $( @element_id ).fileupload
-      dropZone: $("#dropzone")
+      #dropZone: $("#dropzone")
       add: (e, data) ->
-        self.add_file data
+        DLog data
+        self.file_selected data
       progress: (e, data) ->
         DLog data
         progress = parseInt(data.loaded / data.total * 100, 10)
-        DLog( "Progress: " + progress )
-        data.context.update_progress_to(progress)
+        DLog( "Progress for #{self.file.name}: " + progress )
+        self.update_progress_to(progress)
 
       done: (e, data) ->
         self.file_completed_upload data
@@ -55,69 +140,73 @@ class @AnacondaUploader
     $(document).bind 'drop dragover', (e) ->
       e.preventDefault()
 
-  setup_upload_button_handler: ->
-    #alert( "setup_upload_button_handler for #{@element_id}" )
-    unless ( @upload_automatically == true )
-      DLog( "Setting up submit handler for element #{@element_id}")
-      $(@element_id).closest( 'form' ).on( 'submit', { self: this }, this.form_submit_handler )
-
-  form_submit_handler: (e) ->
-    # alert( 'form_submit_handler' )
-    e.preventDefault()
-    self = e.data.self
-    $(this).off( 'submit', self.form_submit_handler )
-
-    self.files_for_upload[0].submit()
-    false
-
-  files_by_type: (type) ->
-    matches = []
-    for v,i in @files_for_upload
-      if v.media_type == type
-        matches.push v
-    return matches
-
-  upload_files: ->
-    media_type = null
-    for v,i in @files_for_upload
-      $("input#key").val "#{@base_key}/${filename}"
-      v.submit()
-
-  is_allowed_type: (upload_file) ->
-    if 0 == @allowed_types.length || 0 <= @allowed_types.indexOf upload_file.media_type
-      return true
-    return false
+  upload: ->
+    return if @upload_completed
+    if @file != null && @file_data != null
+      $("input#key").val @key
+      @file_data.submit()
+      @upload_in_progress = true
+      @upload_manager().uploads_started = true
+      @upload_manager().disable_submit_button()
+      @hide_file_field()
 
-  is_within_limits: (upload_file) ->
-    if !@limits[upload_file.media_type]? || @limits[upload_file.media_type] > @files_by_type(upload_file.media_type).length
+  hide_file_field: ->
+    $(@element_id).hide()
+  
+  is_allowed_type: (file_obj) ->
+    
+    if 0 == @allowed_types.length || 0 <= @allowed_types.indexOf @get_media_type(file_obj)
       return true
     return false
-
+  
+  get_media_type: (file_obj) ->
+    media_type = "unknown"
+    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)
+        media_type = k
+    return media_type
+    
   reset: ->
-    @files_for_upload = []
     @upload_details_container.html ''
 
-  add_file: (data) ->
-    upload_file = new AnacondaUploadFile data
-    if @is_allowed_type(upload_file)
-      if @is_within_limits(upload_file)
-        @files_for_upload.push upload_file
-        DLog(upload_file)
-        @upload_details_container.append "<div id='upload_file_#{upload_file.id}' class='upload-file #{upload_file.media_type}'><span class='file-name'>#{upload_file.file.name}</span><span class='size'>#{upload_file.file.size}</span><span class='progress-percent'></span><div class='progress'><span class='progress-bar'></span></div></div>"
-
-        if @upload_automatically == true
-          DLog( "Upload Automatically: #{@upload_automatically}")
-          upload_file.submit()
-        else
-          @setup_upload_button_handler()
+  file_selected: (data) ->
+    DLog data
+    if @is_allowed_type(data.files[0])
+      @file = data.files[0]
+      @file_data = data
+      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"
+        @upload()
       else
-        alert "Only #{@limits[upload_file.media_type]} #{upload_file.media_type} files are allowed"
+        DLog "Not auto upload"
     else
-      alert "#{upload_file.file.name} is a #{upload_file.media_type} file. Only #{@allowed_types.join(", ")} files are allowed."
+      alert "#{data.files[0].name} is a #{@get_media_type(data.files[0])} file. Only #{@allowed_types.join(", ")} files are allowed."
+  get_id: ->
+    hex_md5( "#{@file.name} #{@file.size}" )
+  
+  readable_size: ->
+    i = -1;
+    byteUnits = [' kB', ' MB', ' GB', ' TB', 'PB', 'EB', 'ZB', 'YB'];
+    fileSizeInBytes = @file.size
+    loop
+      fileSizeInBytes = fileSizeInBytes / 1024
+      i++
+      break unless fileSizeInBytes > 1024
+
+    Math.max(fileSizeInBytes, 0.1).toFixed(1) + byteUnits[i];
+  
+  update_progress_to: (progress) ->
+    @upload_details_container.find(".progress-percent").html progress
+    @upload_details_container.find('.progress-bar').css('width', progress + '%')
+  
   file_completed_upload: (data) ->
-    upload_file = data.context
-    DLog "#{upload_file.file.name} completed uploading"
-    DLog upload_file
+    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}"
@@ -139,43 +228,35 @@ class @AnacondaUploader
     #     #TODO: handle a failure on this POST
     #   })
 
-    DLog "will now fill form #{@upload_complete_form_to_fill}"
+    # DLog "will now fill form #{@upload_complete_form_to_fill}"
 
     DLog "#{@resource}_#{@attribute}_file_path"
 
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_file_path" ).val( "#{@base_key}/#{upload_file.file.name}" )
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_filename" ).val( upload_file.file.name )
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_size" ).val( upload_file.file.size )
-    $( @element_id ).siblings( '#' + "#{@resource}_#{@attribute}_type" ).val( upload_file.file.type )
+    $( @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 )
 
-    $( @element_id ).closest( 'form' ).submit() unless ( @upload_automatically == true )
+    @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_id: ->
-    hex_md5( "#{@file.name} #{@file.size}" )
-  get_media_type: ->
-    if AnacondaUploader.audio_types.test(@file.type) || AnacondaUploader.audio_types.test(@file.name)
-      media_type = "audio"
-    else if AnacondaUploader.video_types.test(@file.type) || AnacondaUploader.video_types.test(@file.name)
-      media_type = "video"
-    else if AnacondaUploader.image_types.test(@file.type) || AnacondaUploader.image_types.test(@file.name)
-      media_type = "image"
-    else if AnacondaUploader.resource_types.test(@file.type) || AnacondaUploader.resource_types.test(@file.name)
-      media_type = "resource"
-    else
-      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 + '%')
+# 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 + '%')

data/lib/anaconda.rb

@@ -1,5 +1,6 @@
 require 'rails'
 require 'anaconda/anaconda'
+require 'anaconda/errors'
 require 'anaconda/anaconda_for'
 require 'anaconda/railtie'
 require 'anaconda/engine'
@@ -10,16 +11,42 @@ ActiveSupport.on_load(:active_record) do
 end
 
 module Anaconda
-  mattr_accessor :aws
+  mattr_accessor :aws, :file_types
   @@aws = {
     aws_access_key: "",
     aws_secret_key: "",
     aws_bucket:     ""
   }
+  
+  @@file_types = {
+    audio:    /(\.|\/)(wav|mp3|m4a|aiff|ogg|flac)$/,
+    video:    /(\.|\/)(mp[e]?g|mov|avi|mp4|m4v)$/,
+    image:    /(\.|\/)(jp[e]?g|png|bmp)$/,
+    resource: /(\.|\/)(pdf|ppt[x]?|doc[x]?|xls[x]?)$/,
+  }
 
   # Default way to setup Anaconda. Run rails generate anaconda:install
   # to create a fresh initializer with all configuration values.
   def self.config
     yield self
   end
+  
+  def self.js_file_types
+    # http://stackoverflow.com/questions/4854714/how-to-translate-ruby-regex-to-javascript-i-mx-and-rails-3-0-3
+    js_file_types = {}
+    file_types.each do |group_name, regexp|
+      str = regexp.inspect.
+              sub('\\A' , '^').
+              sub('\\Z' , '$').
+              sub('\\z' , '$').
+              sub(/^\// , '').
+              sub(/\/[a-z]*$/ , '').
+              gsub(/\(\?#.+\)/ , '').
+              gsub(/\(\?-\w+:/ , '(').
+              gsub(/\s/ , '')
+        regexp_str = Regexp.new(str).source
+      js_file_types[group_name.to_s] = regexp_str
+    end
+    return js_file_types
+  end
 end

data/lib/anaconda/anaconda_for.rb

@@ -7,22 +7,36 @@ module Anaconda
 
     module ClassMethods
 
-      def anaconda_for( anaconda_columns, options = {})
+      def anaconda_for( anaconda_column, options = {})
         send :include, InstanceMethods
-
-        anaconda_columns = [anaconda_columns] if anaconda_columns.kind_of?(Symbol) || anaconda_columns.kind_of?(String)
-        class_attribute :anaconda_columns
-        self.anaconda_columns = anaconda_columns.collect{ |c| c.to_sym }
+        
+        begin
+          self.anaconda_columns.present?
+        rescue NoMethodError
+          class_attribute :anaconda_columns
+        end
+        self.anaconda_columns = Array.new unless self.anaconda_columns.kind_of? Array
+        if self.anaconda_columns.include? anaconda_column.to_sym
+          raise AnacondaError, "anaconda_for cannot be called multiple times for the same field"
+        end
+        self.anaconda_columns << anaconda_column.to_sym
         # Class.anaconda_columns is now an array of symbols
 
-        class_attribute :anaconda_options
-        self.anaconda_options = options.reverse_merge(
+        class_attribute 
+        begin
+          self.anaconda_options.present?
+        rescue NoMethodError
+          class_attribute :anaconda_options
+        end
+        self.anaconda_options = Hash.new unless self.anaconda_options.kind_of? Hash
+        self.anaconda_options[anaconda_column.to_sym] = options.reverse_merge(
           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",
           max_file_size: 500.megabytes,
-          base_key: "#{self.to_s.pluralize.downcase}/#{anaconda_columns.first.to_s.pluralize}/#{(0...32).map{(65+rand(26)).chr}.join.downcase}"
+          allowed_file_types: [],
+          base_key: "#{self.to_s.pluralize.downcase}/#{anaconda_column.to_s.pluralize}/#{(0...32).map{(65+rand(26)).chr}.join.downcase}"
         )
       end
     end
@@ -49,7 +63,7 @@ module Anaconda
 
       private
       def magic_url(column_name)
-        nil unless send("#{column_name}_file_path").present?
+        return nil unless send("#{column_name}_file_path").present?
 
         if send("#{column_name}_stored_privately")
           aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => Anaconda.aws[:aws_access_key], :aws_secret_access_key => Anaconda.aws[:aws_secret_key]})

data/lib/anaconda/errors.rb

@@ -0,0 +1,7 @@
+module Anaconda
+  class Error < RuntimeError
+  end
+
+  class AnacondaError < Error
+  end
+end

data/lib/anaconda/form_builder_helpers.rb

@@ -12,12 +12,16 @@ module Anaconda
         instance = self.object
         a_class = self.object.class unless self.object.kind_of? Class
 
-        options = a_class.anaconda_options.dup
+        begin
+          options = a_class.anaconda_options[anaconda_field_name.to_sym].dup
+        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
-
+        
         uploader = S3Uploader.new(options)
 
-        output += self.input_field "file", name: "file", id: element_id, as: :file, "data-url" => uploader.url, "data-form-data" => uploader.fields.to_json
+        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
@@ -32,33 +36,20 @@ module Anaconda
       options = options.merge(as: anaconda_field_name, form_options: form_options, element_id: element_id )
 
       output += <<-END
-<strong>Files:</strong>
-
-<div id="files"></div>
+<div id="#{instance.class.to_s.underscore}_#{anaconda_field_name}_details"></div>
 
 <script>
   (function() {
-    jQuery(function() {
-      return window.uploader = new AnacondaUploader({
-        limits: {
-          audio: 1,
-          video: 1,
-          resource: 1,
-          image: 1
-        },
-        element_id: "##{options[:element_id]}",
-        base_key: "#{options[:base_key]}",
-        allowed_types: [],
-        upload_details_container: "files",
-        upload_button_id: "upload",
-        upload_complete_post_url: "#{options[:form_options][:post_url]}",
-        upload_complete_form_to_fill: "#{options[:form_options][:form_el]}",
-        upload_automatically: "#{options[:form_options][:auto_upload]}",
-        resource: "#{instance.class.to_s.underscore}",
-        attribute: "#{options[:as]}"
-      });
+    window.uploader = new AnacondaUploadField({
+      element_id: "##{options[:element_id]}",
+      base_key: "#{options[:base_key]}",
+      allowed_types: #{options[:allowed_file_types].collect{ |i| i.to_s }},
+      upload_details_container: "#{options[:form_options][:upload_details_container]}",
+      upload_automatically: "#{options[:form_options][:auto_upload]}",
+      submit_automatically: "#{options[:form_options][:auto_submit]}",
+      resource: "#{instance.class.to_s.underscore}",
+      attribute: "#{options[:as]}"
     });
-
   }).call(this);
 </script>
 

data/lib/anaconda/upload_helper.rb

@@ -1,9 +1,13 @@
 module Anaconda
-  # Vastly inspired by http://railscasts.com/episodes/383-uploading-to-amazon-s3
+  # 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
-      options = a_class.anaconda_options.dup
+      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

data/lib/anaconda/version.rb

@@ -1,5 +1,5 @@
 module Anaconda
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.9.0"
   end
 end

data/lib/generators/anaconda/migration_generator.rb

@@ -8,8 +8,18 @@ module Anaconda
     argument :field_name, :type => :string, :default => "asset"
 
     def create_migration_file
-      create_file "db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_anaconda_migration_for_#{file_name}.rb", <<-FILE
-class AnacondaMigrationFor#{file_name.titlecase} < ActiveRecord::Migration
+      destination = "db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_anaconda_migration_for_#{file_name}_#{field_name}.rb"
+      migration_name = "AnacondaMigrationFor#{file_name.titlecase}#{field_name.titlecase}"
+      count = nil
+      i = 1
+      while !Dir.glob("db/migrate/*_anaconda_migration_for_#{file_name}_#{field_name}#{count}.rb").empty?
+        i += 1
+        count = "_#{i}"
+        destination = "db/migrate/#{Time.now.strftime('%Y%m%d%H%M%S')}_anaconda_migration_for_#{file_name}_#{field_name}#{count}.rb"
+        migration_name = "AnacondaMigrationFor#{file_name.titlecase}#{field_name.titlecase}#{i}"
+      end
+      create_file destination, <<-FILE
+class #{migration_name} < ActiveRecord::Migration
   def change
     add_column :#{plural_name}, :#{field_name}_filename, :string
     add_column :#{plural_name}, :#{field_name}_file_path, :text

data/lib/generators/anaconda/templates/config/initializers/anaconda.rb

@@ -5,4 +5,10 @@ Anaconda.config do |config|
     aws_secret_key: ENV["AWS_SECRET_KEY"] || nil,
     aws_bucket:     ENV["AWS_BUCKET"]     || nil
   }
+  config.file_types = {
+    audio:    /(\.|\/)(wav|mp3|m4a|aiff|ogg|flac)$/,
+    video:    /(\.|\/)(mp[e]?g|mov|avi|mp4|m4v)$/,
+    image:    /(\.|\/)(jp[e]?g|png|bmp)$/,
+    resource: /(\.|\/)(pdf|ppt[x]?|doc[x]?|xls[x]?)$/,
+  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Ben McFadden
@@ -55,11 +55,11 @@ files:
 - anaconda.gemspec
 - app/assets/javascripts/anaconda.js
 - app/assets/javascripts/anaconda_uploader.js.coffee
-- app/views/anaconda/_uploader_form_for.html.haml
 - lib/anaconda.rb
 - lib/anaconda/anaconda.rb
 - lib/anaconda/anaconda_for.rb
 - lib/anaconda/engine.rb
+- lib/anaconda/errors.rb
 - lib/anaconda/form_builder_helpers.rb
 - lib/anaconda/railtie.rb
 - lib/anaconda/upload_helper.rb

data/app/views/anaconda/_uploader_form_for.html.haml

@@ -1,28 +0,0 @@
-/ Moved to form_builder_helpers.rb
-
-%strong Files:
-#files
-
-:javascript
-  (function() {
-    jQuery(function() {
-      return window.uploader = new AnacondaUploader({
-        limits: {
-          audio: 1,
-          video: 1,
-          resource: 1,
-          image: 1
-        },
-        element_id: "#{option[:element_id]}"
-        allowed_types: [],
-        upload_details_container: "files",
-        upload_button_id: "upload",
-        upload_complete_post_url: "#{options[:form_options][:post_url]}",
-        upload_complete_form_to_fill: "#{options[:form_options][:form_el]}",
-        upload_automatically: "#{options[:form_options][:auto_upload]}",
-        resource: "#{resource.class.to_s.underscore}",
-        attribute: "#{options[:as]}"
-      });
-    });
-
-  }).call(this);