s3-upnow 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 731e98ac15afe2b0944cb3b6669f03a4a7771538
-  data.tar.gz: 56b0c073f0b216026c4fe532d8febd26639fea5a
+  metadata.gz: c130dadc4b2ed0be86811b4b029c7539a3265cd8
+  data.tar.gz: a8c1aba09a3f422360bbe1abdc5b58f151a7dab4
 SHA512:
-  metadata.gz: b9f9d5f7769adbec1d986daa9d3713ef6addd2d217791a63b449ecd6e2898f36849d60415d5b306eaabafb2367b8169577859687c29116be26d1ab4b510fc206
-  data.tar.gz: ed9c53695746ca26102c18185583d201ff9c00bb93ffe6a7c9802e50c20f82d53fc42a670b870dc7552690df611cb30170cdf5b9f24ba2e994531b684da58d55
+  metadata.gz: f3936e913d8dbeb45fea532dc0c1dbb7d6ce2871b404acfb8b685f8920a473b8bb336f87b525bca0fd18971af5b73c290a75b5bdab9791c8c9e0cf57904fbde0
+  data.tar.gz: 136f94792ef3951b6e58212b6a42f460e42fca936bb6efc6c8a7c44c06797aebafefb422be88bf35f4a9adcba794d308bdce7e8d2de42b6cd542b70e136e9165

data/app/assets/javascripts/s3-upnow.js.coffee

@@ -0,0 +1,50 @@
+$(document).on 'change', (e) ->
+  input = $(e.target)
+  if (input.prop('tagName') == "INPUT" && input.prop('type') == "file" && input.data('upnow'))
+    return if (!input.prop('files'))
+    file = input.prop('files')[0]
+    file.unique_id = Math.random().toString(36).substr(2,16)
+
+    dispatchEvent = (name, detail) ->
+      ev = document.createEvent('CustomEvent')
+      ev.initCustomEvent(name, true, false, detail)
+      input[0].dispatchEvent(ev)
+
+    if (file)
+      url = input.data('url')
+      fields = input.data('fields')
+
+      data = new FormData()
+
+      if (fields)
+        Object.keys(fields).forEach (key) ->
+          if key == 'key'
+            fields[key] = fields[key]
+              .replace('{timestamp}', new Date().getTime())
+              .replace('{unique_id}', file.unique_id)
+          data.append(key, fields[key])
+      data.append('content-type', file.type)
+      data.append('file', file)
+
+      xhr = new XMLHttpRequest()
+      xhr.addEventListener('load', (e) ->
+        input.removeClass('uploading')
+        dispatchEvent('upload:complete', xhr.response)
+        if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304)
+          key = input.data('key') || $(xhr.response).find('Key').text()
+          input.prev().val(key)
+          input.removeAttr('name')
+          dispatchEvent('upload:success', xhr.response)
+        else
+          dispatchEvent('upload:failure', xhr.response)
+      )
+
+      xhr.upload.addEventListener('progress', (e) ->
+        dispatchEvent('upload:progress', e) if (e.lengthComputable)
+      )
+
+      xhr.open('POST', url, true)
+      xhr.send(data)
+
+      input.addClass('uploading')
+      dispatchEvent('upload:start')

data/lib/s3-upnow.rb

@@ -10,4 +10,6 @@ require 's3-upnow/form_helper'
 require 's3-upnow/engine' if defined?(Rails)
 require 's3-upnow/railtie' if defined?(Rails)
 
-ActionView::Base.send(:include, S3UpNow::UploadHelper) if defined?(ActionView::Base)
+module S3UpNow
+  autoload :Paperclip, 's3-upnow/paperclip'
+end

data/lib/s3-upnow/engine.rb

@@ -1,4 +1,8 @@
 module S3UpNow
   class Engine < ::Rails::Engine 
+    initializer "s3-upnow.setup", before: :load_environment_config do
+      ActionView::Base.send(:include, S3UpNow::S3UpNowHelper) if defined?(ActionView::Base)
+      ActionView::Helpers::FormBuilder.send(:include, S3UpNow::S3UpNowFieldHelper)
+    end
   end
 end

data/lib/s3-upnow/form_helper.rb

@@ -1,97 +1,22 @@
+require 's3-upnow/generator'
+
 module S3UpNow
-  module UploadHelper
-    def s3_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 + capture(&block)
-      end
+  module S3UpNowHelper
+    def s3_upnow_field(object_name, method, options = {})
+      generator = S3UpNow::Generator.new(options)
+      options[:data] ||= {}
+      options[:data][:upnow] = true
+      options[:data][:url] = generator.url
+      options[:data][:fields] = generator.fields
+      hidden_field(object_name, :"#{method}_s3_key", options.slice(:object)) +
+      file_field(object_name, method, options)
     end
+  end
 
-    class S3Uploader
-      def initialize(options)
-        @key_starts_with = options[:key_starts_with] || "uploads/"
-        @options = options.reverse_merge(
-          aws_access_key_id: S3UpNow.config.access_key_id,
-          aws_secret_access_key: S3UpNow.config.secret_access_key,
-          bucket: options[:bucket] || S3UpNow.config.bucket,
-          region: S3UpNow.config.region || "s3",
-          url: S3UpNow.config.url,
-          ssl: true,
-          acl: "public-read",
-          expiration: 10.hours.from_now.utc.iso8601,
-          max_file_size: 500.megabytes,
-          callback_method: "POST",
-          callback_param: "file",
-          key_starts_with: @key_starts_with,
-          key: key
-        )
-      end
-
-      def form_options
-        {
-          id: @options[:id],
-          class: @options[:class],
-          method: "post",
-          authenticity_token: false,
-          multipart: true,
-          data: {
-            callback_url: @options[:callback_url],
-            callback_method: @options[:callback_method],
-            callback_param: @options[:callback_param]
-          }.reverse_merge(@options[:data] || {})
-        }
-      end
-
-      def fields
-        {
-          :key => @options[:key] || key,
-          :acl => @options[:acl],
-          "AWSAccessKeyId" => @options[:aws_access_key_id],
-          :policy => policy,
-          :signature => signature,
-          :success_action_status => "201",
-          'X-Requested-With' => 'xhr'
-        }
-      end
-
-      def key
-        @key ||= "#{@key_starts_with}{timestamp}-{unique_id}-#{SecureRandom.hex}/${filename}"
-      end
-
-      def url
-        @options[:url] || "http#{@options[:ssl] ? 's' : ''}://#{@options[:region]}.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", @options[:key_starts_with]],
-            ["starts-with", "$x-requested-with", ""],
-            ["content-length-range", 0, @options[:max_file_size]],
-            ["starts-with","$content-type", @options[:content_type_starts_with] ||""],
-            {bucket: @options[:bucket]},
-            {acl: @options[:acl]},
-            {success_action_status: "201"}
-          ] + (@options[:conditions] || [])
-        }
-      end
-
-      def signature
-        Base64.encode64(
-          OpenSSL::HMAC.digest(
-            OpenSSL::Digest.new('sha1'),
-            @options[:aws_secret_access_key], policy
-          )
-        ).gsub("\n", "")
-      end
+  module S3UpNowFieldHelper
+    def s3_upnow_field(method, options = {})
+      self.multipart = true
+      @template.s3_upnow_field(@object_name, method, objectify_options(options))
     end
   end
 end

data/lib/s3-upnow/generator.rb

@@ -0,0 +1,74 @@
+# encoding: utf-8
+
+module S3UpNow
+  class Generator
+    def initialize(options)
+      @key_starts_with = options[:key_starts_with] || "uploads/"
+      @options = options.reverse_merge(
+        aws_access_key_id: S3UpNow.config.access_key_id,
+        aws_secret_access_key: S3UpNow.config.secret_access_key,
+        bucket: options[:bucket] || S3UpNow.config.bucket,
+        region: S3UpNow.config.region || "s3",
+        url: S3UpNow.config.url,
+        ssl: true,
+        acl: "public-read",
+        expiration: 10.hours.from_now.utc.iso8601,
+        max_file_size: 500.megabytes,
+        callback_method: "POST",
+        callback_param: "file",
+        key_starts_with: @key_starts_with,
+        key: key
+      )
+    end
+
+    def fields
+      {
+        :utf8 => '✓',
+        :key => @options[:key] || key,
+        :acl => @options[:acl],
+        "AWSAccessKeyId" => @options[:aws_access_key_id],
+        :policy => policy,
+        :signature => signature,
+        :success_action_status => "201",
+        'X-Requested-With' => 'xhr'
+      }
+    end
+
+    def key
+      @key ||= "#{@key_starts_with}{timestamp}-{unique_id}-#{SecureRandom.hex}/${filename}"
+    end
+
+    def url
+      @options[:url] || "http#{@options[:ssl] ? 's' : ''}://#{@options[:region]}.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", @options[:key_starts_with]],
+          ["starts-with", "$x-requested-with", ""],
+          ["content-length-range", 0, @options[:max_file_size]],
+          ["starts-with","$content-type", @options[:content_type_starts_with] ||""],
+          {bucket: @options[:bucket]},
+          {acl: @options[:acl]},
+          {success_action_status: "201"}
+        ] + (@options[:conditions] || [])
+      }
+    end
+
+    def signature
+      Base64.encode64(
+        OpenSSL::HMAC.digest(
+          OpenSSL::Digest.new('sha1'),
+          @options[:aws_secret_access_key], policy
+        )
+      ).gsub("\n", "")
+    end
+  end
+end

data/lib/s3-upnow/paperclip.rb

@@ -0,0 +1,61 @@
+module S3UpNow
+  module Paperclip
+    def self.included(base)
+      base.extend ClassMethods
+      base.class_eval do
+        private
+
+        def s3_upnow_attachment(name)
+          send(name)
+        end
+
+        def s3_upnow_destination_bucket(name)
+          s3_upnow_attachment(name).options[:bucket].call
+        end
+
+        def s3_upnow_destination_path(name)
+          s3_upnow_attachment(name).path[1..-1]
+        end
+
+        def s3_upnow_destination_permissions(name)
+          s3_upnow_attachment(name).s3_permissions
+        end
+      end
+    end
+  end
+
+  module ClassMethods
+    def has_attached_file(name, options = {})
+      puts "here"
+      self.class_eval do
+        attr_accessor "#{name}_s3_key"
+
+        before_validation "s3_upnow_copy_metadata_from_#{name}".to_sym, unless: "#{name}_s3_key.blank?"
+        after_save "s3_upnow_copy_file_from_#{name}".to_sym, unless: "#{name}_s3_key.blank?"
+
+        private
+
+        define_method "s3_upnow_copy_metadata_from_#{name}" do
+          s3 = AWS::S3.new
+          s3_head = s3.buckets[S3UpNow.config.bucket].objects[instance_variable_get("@#{name}_s3_key")].head
+
+          s3_upnow_attachment(name).clear
+          self.send "#{name}_file_name=", File.basename(instance_variable_get("@#{name}_s3_key"))
+          self.send "#{name}_file_size=", s3_head.content_length
+          self.send "#{name}_content_type=", s3_head.content_type
+          self.send "#{name}_updated_at=", s3_head.last_modified 
+        end
+
+        define_method "s3_upnow_copy_file_from_#{name}" do
+          s3 = AWS::S3.new
+          orig_bucket = s3.buckets[S3UpNow.config.bucket]
+          orig_object = orig_bucket.objects[instance_variable_get("@#{name}_s3_key")]
+          dest_bucket = s3.buckets[s3_upnow_destination_bucket(name)]
+          dest_object = dest_bucket.objects[s3_upnow_destination_path(name)]
+          dest_object.copy_from(orig_object, acl: s3_upnow_destination_permissions(name))
+        end
+      end
+      super(name, options)
+    end
+  end
+end

data/lib/s3-upnow/railtie.rb

@@ -1,6 +1,9 @@
 module S3UpNow
   class Railtie < Rails::Railtie
-    initializer "railtie.configure_rails_initialization" do |app|
+    initializer "railtie.configure_rails_initialization", after: "paperclip.insert_into_active_record" do |app|
+      if defined?(ActiveRecord) and defined?(Paperclip)
+        ActiveRecord::Base.send(:include, S3UpNow::Paperclip)
+      end
       app.middleware.use JQuery::FileUpload::Rails::Middleware
     end
   end

data/lib/s3-upnow/version.rb

@@ -1,3 +1,3 @@
 module S3UpNow
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3-upnow
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Carlos Eduardo Rodrigues Diógenes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -75,12 +75,14 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- app/assets/javascripts/s3_direct_upload.js.coffee
-- app/assets/stylesheets/s3_direct_upload_progress_bars.css.scss
+- app/assets/javascripts/s3-upnow.js.coffee
+- app/assets/stylesheets/s3-upnow-progress-bar.css.scss
 - lib/s3-upnow.rb
 - lib/s3-upnow/config_aws.rb
 - lib/s3-upnow/engine.rb
 - lib/s3-upnow/form_helper.rb
+- lib/s3-upnow/generator.rb
+- lib/s3-upnow/paperclip.rb
 - lib/s3-upnow/railtie.rb
 - lib/s3-upnow/version.rb
 - lib/tasks/s3_upnow.rake
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Gives a form helper for Rails which allows direct uploads to s3. Based on

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

@@ -1,173 +0,0 @@
-#= require jquery-fileupload/basic
-#= require jquery-fileupload/vendor/tmpl
-
-$ = jQuery
-
-$.fn.S3Uploader = (options) ->
-
-  # support multiple elements
-  if @length > 1
-    @each ->
-      $(this).S3Uploader options
-
-    return this
-
-  $uploadForm = this
-
-  settings =
-    path: ''
-    additional_data: null
-    before_add: null
-    remove_completed_progress_bar: true
-    remove_failed_progress_bar: false
-    progress_bar_target: null
-    click_submit_target: null
-    allow_multiple_files: true
-
-  $.extend settings, options
-
-  current_files = []
-  forms_for_submit = []
-  if settings.click_submit_target
-    settings.click_submit_target.click ->
-      form.submit() for form in forms_for_submit
-      false
-
-  setUploadForm = ->
-    $uploadForm.fileupload
-
-      add: (e, data) ->
-        file = data.files[0]
-        file.unique_id = Math.random().toString(36).substr(2,16)
-
-        unless settings.before_add and not settings.before_add(file)
-          current_files.push data
-          if $('#template-upload').length > 0
-            data.context = $($.trim(tmpl("template-upload", file)))
-            $(data.context).appendTo(settings.progress_bar_target || $uploadForm)
-          else if !settings.allow_multiple_files
-            data.context = settings.progress_bar_target
-          if settings.click_submit_target
-            if settings.allow_multiple_files
-              forms_for_submit.push data
-            else
-              forms_for_submit = [data]
-          else
-            data.submit()
-
-      start: (e) ->
-        $uploadForm.trigger("s3_uploads_start", [e])
-
-      progress: (e, data) ->
-        if data.context
-          progress = parseInt(data.loaded / data.total * 100, 10)
-          data.context.find('.bar').css('width', progress + '%')
-
-      done: (e, data) ->
-        content = build_content_object $uploadForm, data.files[0], data.result
-
-        callback_url = $uploadForm.data('callback-url')
-        if callback_url
-          content[$uploadForm.data('callback-param')] = content.url
-
-          $.ajax
-            type: $uploadForm.data('callback-method')
-            url: callback_url
-            data: content
-            beforeSend: ( xhr, settings )       ->
-              event = $.Event('ajax:beforeSend')
-              $uploadForm.trigger(event, [xhr, settings])
-              return event.result
-            complete:   ( xhr, status )         ->
-              event = $.Event('ajax:complete')
-              $uploadForm.trigger(event, [xhr, status])
-              return event.result
-            success:    ( data, status, xhr )   ->
-              event = $.Event('ajax:success')
-              $uploadForm.trigger(event, [data, status, xhr])
-              return event.result
-            error:      ( xhr, status, error )  ->
-              event = $.Event('ajax:error')
-              $uploadForm.trigger(event, [xhr, status, error])
-              return event.result
-
-        data.context.remove() if data.context && settings.remove_completed_progress_bar # remove progress bar
-        $uploadForm.trigger("s3_upload_complete", [content])
-
-        current_files.splice($.inArray(data, current_files), 1) # remove that element from the array
-        $uploadForm.trigger("s3_uploads_complete", [content]) unless current_files.length
-
-      fail: (e, data) ->
-        content = build_content_object $uploadForm, data.files[0], data.result
-        content.error_thrown = data.errorThrown
-
-        data.context.remove() if data.context && settings.remove_failed_progress_bar # remove progress bar
-        $uploadForm.trigger("s3_upload_failed", [content])
-
-      formData: (form) ->
-        data = form.serializeArray()
-        fileType = ""
-        if "type" of @files[0]
-          fileType = @files[0].type
-        data.push
-          name: "content-type"
-          value: fileType
-
-        key = $uploadForm.data("key")
-          .replace('{timestamp}', new Date().getTime())
-          .replace('{unique_id}', @files[0].unique_id)
-          .replace('{extension}', @files[0].name.split('.').pop())
-
-        # substitute upload timestamp and unique_id into key
-        key_field = $.grep data, (n) ->
-          n if n.name == "key"
-
-        if key_field.length > 0
-          key_field[0].value = settings.path + key
-
-        # IE <= 9 doesn't have XHR2 hence it can't use formData
-        # replace 'key' field to submit form
-        unless 'FormData' of window
-          $uploadForm.find("input[name='key']").val(settings.path + key)
-        data
-
-  build_content_object = ($uploadForm, file, result) ->
-    content = {}
-    if result # Use the S3 response to set the URL to avoid character encodings bugs
-      content.url            = $(result).find("Location").text()
-      content.filepath       = $('<a />').attr('href', content.url)[0].pathname
-    else # IE <= 9 retu      rn a null result object so we use the file object instead
-      domain                 = $uploadForm.attr('action')
-      content.filepath       = $uploadForm.find('input[name=key]').val().replace('/${filename}', '')
-      content.url            = domain + content.filepath + '/' + encodeURIComponent(file.name)
-
-    content.filename         = file.name
-    content.filesize         = file.size if 'size' of file
-    content.lastModifiedDate = file.lastModifiedDate if 'lastModifiedDate' of file
-    content.filetype         = file.type if 'type' of file
-    content.unique_id        = file.unique_id if 'unique_id' of file
-    content.relativePath     = build_relativePath(file) if has_relativePath(file)
-    content = $.extend content, settings.additional_data if settings.additional_data
-    content
-
-  has_relativePath = (file) ->
-    file.relativePath || file.webkitRelativePath
-
-  build_relativePath = (file) ->
-    file.relativePath || (file.webkitRelativePath.split("/")[0..-2].join("/") + "/" if file.webkitRelativePath)
-
-  #public methods
-  @initialize = ->
-    # Save key for IE9 Fix
-    $uploadForm.data("key", $uploadForm.find("input[name='key']").val())
-
-    setUploadForm()
-    this
-
-  @path = (new_path) ->
-    settings.path = new_path
-
-  @additional_data = (new_data) ->
-    settings.additional_data = new_data
-
-  @initialize()