anaconda 0.0.3 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1607eb100c23426c78fc3be127fcea5ff7062510
-  data.tar.gz: 1a50a5e1fea15bb4055e1ef3f8b16806d2526527
+  metadata.gz: 7fdbbf12ffefec5c116f99be38fc11d908ba60a9
+  data.tar.gz: 9320e3c6cdef34e2e968c668b357dba366d37914
 SHA512:
-  metadata.gz: 319a37f584909a3187783e83b064bcc6a3a624b497a23cbfc7e25340dd512223515509783414756d5c848ef143d9de283689a72f2796d8ffcb72dc4c376b5f13
-  data.tar.gz: b3398c2a3895086e72ea43acc9face25564403f39d5724ed6a1afd57c49b1dad16b46a2dfa7ab253ebaba8806cee0fa6ddd17d85bde19c032d0379e665db7cfe
+  metadata.gz: 36c1eb4ac4d6597b285edcee1a5502af3f95b4bb24dbc00c8a2143afe6f20547641c4798246a238e6fcf9afece4f4c37f5a26e99258039eb49d1b85a3e85e7b0
+  data.tar.gz: 12ace30c835230a065e6ea66fee390d79f37e8533bba47c2bf2817e48f8f3b49619ea8c57c62bad1aa568965325ce90a673d63e43698477480c28ccea49c55ae

data/README.markdown

@@ -10,20 +10,98 @@ If you require stability before that time, you are strongly encouraged to specif
 
 ## Installation
 
-Add to your `Gemfile`
+1.  Add to your `Gemfile`
 
-    gem 'anaconda'
+        gem 'anaconda'
 
-Then `bundle install`
+2.  `bundle install`
 
-* Asset updates
-* AWS setup
+3.  Add the following to your `application.js`
+
+        //= require anaconda
+
+4.  Finally, run the installer to install the configuration initializer into `config/initializers/anaconda.rb`
+
+        $ rails g anaconda:install
+
+## Configuration
+
+### AWS S3 Setup
+
+### AWS S3 Setup
+
+#### IAM
+
+Sample IAM Policy (be sure to replace 'your.bucketname'):
+
+    {
+        "Statement": [
+	            {
+                "Effect": "Allow",
+                "Action": "s3:*",
+                "Resource": [
+                    "arn:aws:s3:::[your.bucketname]",
+                    "arn:aws:s3:::[your.bucketname]/*"
+	                ]
+	            }
+	        ]
+	    }
+
+#### CORS
+
+Sample CORS configuration:
+
+    <?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>
+
+
+### Initializer
+
+The initializer installed into `config/initializers/anaconda.rb` contains the settings you need to get anaconda working.
+
+**You must set these to your S3 credentials/settings in order for anaconda to work.**
+
+We highly recommend the `figaro` gem [https://github.com/laserlemon/figaro](https://github.com/laserlemon/figaro) to manage your environment variables in development and production.
 
 ## Usage
 
-* Controller changes (if any)
-* Form setup
-* Options
+*  Controller changes (if any)
+
+*  Migrations
+
+        $ rails g migration anaconda:migration PostMedia asset
+
+*  Model setup
+
+        class PostMedia < ActiveRecord::Base
+          belongs_to :post
+
+          anaconda_for :asset, base_key: :asset_key
+
+          def asset_key
+			  o = [('a'..'z'), ('A'..'Z')].map { |i| i.to_a }.flatten
+			  s = (0...24).map { o[rand(o.length)] }.join
+			  "post_media/#{s}"
+			end
+
+
+
+*  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
 
 ## Contributing to anaconda
 

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

@@ -8,6 +8,7 @@ class @AnacondaUploader
 
 
   constructor: (options = {}) ->
+    @element_id = options.element_id ? ""
     @limits = options.limits ? {}
     @allowed_types = options.allowed_types ? []
     @upload_details_container = $("##{options.upload_details_container}") ? $("#files")
@@ -19,13 +20,12 @@ class @AnacondaUploader
     @attribute = options.attribute ? null
 
     @files_for_upload = []
-    @base_key = $("#fileupload").data("base-key")
+    @base_key = options.base_key ? ""
     @setup_fileupload()
-    @setup_upload_button_handler()
 
   setup_fileupload: ->
     self = this
-    $('#fileupload').fileupload
+    $( @element_id ).fileupload
       dropZone: $("#dropzone")
       add: (e, data) ->
         self.add_file data
@@ -41,20 +41,34 @@ class @AnacondaUploader
       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 )
 
     $(document).bind 'drop dragover', (e) ->
       e.preventDefault()
 
   setup_upload_button_handler: ->
-    self = this
-    @upload_button.off("click").click (e) ->
-      e.preventDefault()
-      self.upload_files()
+    #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 = []
@@ -91,9 +105,11 @@ class @AnacondaUploader
         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
+        if @upload_automatically == true
+          DLog( "Upload Automatically: #{@upload_automatically}")
           upload_file.submit()
-
+        else
+          @setup_upload_button_handler()
       else
         alert "Only #{@limits[upload_file.media_type]} #{upload_file.media_type} files are allowed"
     else
@@ -103,36 +119,36 @@ class @AnacondaUploader
     DLog "#{upload_file.file.name} completed uploading"
     DLog upload_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
-      })
-
-    if @upload_complete_form_to_fill? && @upload_complete_form_to_fill != ""
-      DLog "will now fill form #{@upload_complete_form_to_fill}"
-
-      DLog "#{@resource}_#{@attribute}_file_path"
-
-      $( @upload_complete_form_to_fill + ' ' + '#' + "#{@resource}_#{@attribute}_file_path" ).val( "#{@base_key}/#{upload_file.file.name}" )
-      $( @upload_complete_form_to_fill + ' ' + '#' + "#{@resource}_#{@attribute}_filename" ).val( upload_file.file.name )
-      $( @upload_complete_form_to_fill + ' ' + '#' + "#{@resource}_#{@attribute}_size" ).val( upload_file.file.size )
-      $( @upload_complete_form_to_fill + ' ' + '#' + "#{@resource}_#{@attribute}_type" ).val( upload_file.file.type )
-
+    # 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
+    #   })
+
+    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 ).closest( 'form' ).submit() unless ( @upload_automatically == true )
 
 class @AnacondaUploadFile
 

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

@@ -1,6 +1,4 @@
-= anaconda_uploader_form options
-
-%button#upload Upload
+/ Moved to form_builder_helpers.rb
 
 %strong Files:
 #files
@@ -15,7 +13,8 @@
           resource: 1,
           image: 1
         },
-        allowed_types: ["image"],
+        element_id: "#{option[:element_id]}"
+        allowed_types: [],
         upload_details_container: "files",
         upload_button_id: "upload",
         upload_complete_post_url: "#{options[:form_options][:post_url]}",

data/lib/anaconda.rb

@@ -1,3 +1,4 @@
+require 'rails'
 require 'anaconda/anaconda'
 require 'anaconda/anaconda_for'
 require 'anaconda/railtie'
@@ -7,3 +8,18 @@ require 'anaconda/version'
 ActiveSupport.on_load(:active_record) do
   include Anaconda::Model
 end
+
+module Anaconda
+  mattr_accessor :aws
+  @@aws = {
+    aws_access_key: "",
+    aws_secret_key: "",
+    aws_bucket:     ""
+  }
+
+  # 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
+end

data/lib/anaconda/anaconda_for.rb

@@ -6,20 +6,20 @@ module Anaconda
     end
 
     module ClassMethods
-      
+
       def anaconda_for( anaconda_columns, 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 }
         # Class.anaconda_columns is now an array of symbols
-        
+
         class_attribute :anaconda_options
         self.anaconda_options = options.reverse_merge(
-          aws_access_key_id: AWS[:aws_access_key],
-          aws_secret_access_key: AWS[:aws_secret_key],
-          bucket: AWS[:aws_bucket],
+          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}"
@@ -27,7 +27,7 @@ module Anaconda
       end
     end
     module InstanceMethods
-      def method_missing(method, *args, &block)  
+      def method_missing(method, *args, &block)
         checking_column = checking_method = nil
         if self.class.anaconda_columns.present? && self.class.anaconda_columns.any? do |column|
             checking_column = column
@@ -46,14 +46,16 @@ module Anaconda
           super
         end
       end
-      
+
       private
       def magic_url(column_name)
+        nil unless send("#{column_name}_file_path").present?
+
         if send("#{column_name}_stored_privately")
-          aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => AWS[:aws_access_key], :aws_secret_access_key => AWS[:aws_secret_key]})
-          aws.get_object_https_url(AWS[:aws_bucket], send("#{column_name}_file_path"), 1.hour.from_now)
+          aws = Fog::Storage.new({:provider => 'AWS', :aws_access_key_id => Anaconda.aws[:aws_access_key], :aws_secret_access_key => Anaconda.aws[:aws_secret_key]})
+          aws.get_object_https_url(Anaconda.aws[:aws_bucket], send("#{column_name}_file_path"), 1.hour.from_now)
         else
-          "https://s3.amazonaws.com/#{AWS[:aws_bucket]}/#{send("#{column_name}_file_path")}"
+          "https://s3.amazonaws.com/#{Anaconda.aws[:aws_bucket]}/#{send("#{column_name}_file_path")}"
         end
       end
     end

data/lib/anaconda/form_builder_helpers.rb

@@ -0,0 +1,147 @@
+module Anaconda
+  module FormBuilderHelpers
+
+    def anaconda( anaconda_field_name, form_options = {} )
+      output = ""
+      instance = nil
+      options = {}
+
+      element_id = "anaconda_file_#{anaconda_field_name}"
+
+      if self.class == SimpleForm::FormBuilder
+        instance = self.object
+        a_class = self.object.class unless self.object.kind_of? Class
+
+        options = a_class.anaconda_options.dup
+        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
+      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 += 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
+<strong>Files:</strong>
+
+<div id="files"></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]}"
+      });
+    });
+
+  }).call(this);
+</script>
+
+      END
+
+      output.html_safe
+    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/anaconda/railtie.rb

@@ -1,10 +1,13 @@
 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
   end
 end

data/lib/anaconda/upload_helper.rb

@@ -20,9 +20,9 @@ module Anaconda
       def initialize(options)
         @options = options.reverse_merge(
           id: "fileupload",
-          aws_access_key_id: AWS[:aws_access_key],
-          aws_secret_access_key: AWS[:aws_secret_key],
-          bucket: AWS[:aws_bucket],
+          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,
@@ -57,11 +57,11 @@ module Anaconda
       def key
         @key ||= "#{base_key}/${filename}"
       end
-      
+
       def base_key
         @options[:base_key]
       end
-    
+
       def url
         "https://s3.amazonaws.com/#{@options[:bucket]}/"
       end

data/lib/anaconda/version.rb

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

data/lib/generators/anaconda/USAGE

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

data/lib/generators/anaconda/install_generator.rb

@@ -0,0 +1,12 @@
+require 'rails/generators'
+
+module Anaconda
+  class InstallGenerator < ::Rails::Generators::Base
+    desc "Copy Anaconda default files"
+    source_root File.expand_path('../templates', __FILE__)
+
+    def copy_config
+      template "config/initializers/anaconda.rb"
+    end
+  end
+end

data/lib/generators/anaconda/migration_generator.rb

@@ -0,0 +1,25 @@
+require 'rails/generators'
+
+module Anaconda
+  class MigrationGenerator < ::Rails::Generators::NamedBase
+    desc "Create a migration for the given class name"
+    source_root File.expand_path('../templates', __FILE__)
+
+    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
+  def change
+    add_column :#{plural_name}, :#{field_name}_filename, :string
+    add_column :#{plural_name}, :#{field_name}_file_path, :text
+    add_column :#{plural_name}, :#{field_name}_size, :integer
+    add_column :#{plural_name}, :#{field_name}_original_filename, :text
+    add_column :#{plural_name}, :#{field_name}_stored_privately, :boolean
+    add_column :#{plural_name}, :#{field_name}_type, :string
+  end
+end
+FILE
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# Use this setup block to configure all options available in Anaconda.
+Anaconda.config do |config|
+  config.aws = {
+    aws_access_key: ENV["AWS_ACCESS_KEY"] || nil,
+    aws_secret_key: ENV["AWS_SECRET_KEY"] || nil,
+    aws_bucket:     ENV["AWS_BUCKET"]     || nil
+  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anaconda
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben McFadden
@@ -60,9 +60,14 @@ files:
 - lib/anaconda/anaconda.rb
 - lib/anaconda/anaconda_for.rb
 - lib/anaconda/engine.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
 - test/helper.rb
 - test/test_anaconda.rb
 - vendor/assets/javascripts/.gitkeep