bg_s3uploadable 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 469f764198d65e5254d1d49e9606c4eb4d4773ad
-  data.tar.gz: c48b19767bacd8acd1a34835549f4a75a802e8c6
+  metadata.gz: 81589c98ab0e24b703716206be1c5f03afe5c1ce
+  data.tar.gz: 42f79d71406f566fac22be2495cd801f9394583e
 SHA512:
-  metadata.gz: 39782f5baa0f13f7ca921385441df0763649feca2c1db2b272946e645aa0a8bcd968beac50649a8f73e19a0e0ee7e0815ae3b4347a4bb3b307a236105dab3f7c
-  data.tar.gz: 9c9769692805656e64f1947a132201ecebd5e401aab3367cac54d18bc3ac92f03e978c8692fcc09af918bb0df80ab57b934632618973d4b911d9b6d61d379134
+  metadata.gz: 075c97accca583c0e8205bf1129616b53c03b83c7323d127b0e597027ff0e2180ac3b88b6a60f34a898b7e2f1d6134f4ef170b0966da5198a7903dd442241185
+  data.tar.gz: 8a9ba8b067d4323c584402f21f497d73755aa8df1234fd21d3155729b55aa3f4cca569bca8f92eda2cec38ecb168c81a4604663f3e82231d13b48e9ac2f4720c

data/app/assets/javascripts/bg_s3uploadable/s3uploader.js.coffee

@@ -7,6 +7,12 @@ draganddrop = () ->
   else
     @draggable
 
+window.s3uploaderMessages =
+  signed_url: {}
+
+window.s3uploaderCallbacks =
+  finished: (form, key) ->
+
 window.s3uploaderInstall = () ->
   $('.file-upload').each () ->
     form = $ this
@@ -51,6 +57,7 @@ window.s3uploaderInstall = () ->
           data:
             doc:
               title: data.files[0].name
+              size:  data.files[0].size
           success: (signature) ->
             data.formData =
               key: signature.key
@@ -63,6 +70,14 @@ window.s3uploaderInstall = () ->
 
             data.submit()
 
+          error: (jqXHR, textStatus, errorThrown) ->
+            response = jqXHR.responseJSON
+            reader.abort()
+            setImageURI()
+
+            alert window.s3uploaderMessages.signed_url[response.error_description]
+            document.location.reload()
+
       send: (e, data) ->
         form.find('.progress').fadeIn()
 
@@ -71,17 +86,16 @@ window.s3uploaderInstall = () ->
         setProgress percent
 
       fail: (e, data) ->
-        console.log "Failure."
+        alert "The upload failed for an unspecified reason. Please check that the image is less than 30 megabytes, then try again."
+        document.location.reload()
 
       success: (data) ->
         key = $(data).find('Key').text()
         $s3key_field.val key
 
-        # uri = "/s3/uploaded_image?key=#{key}"
-        # setImageURI uri
-
-        # form.parents('form').submit()
         form.hide()
+        window.s3uploaderCallbacks.finished form, key
+
       done: (e, data) ->
         form.find('.progress').fadeOut 300, () ->
           setProgress 0

data/app/controllers/bg_s3uploadable/signed_urls_controller.rb

@@ -6,7 +6,7 @@ module BgS3uploadable
       render json: {
         policy: policy,
         signature: s3_upload_signature(policy),
-        key: "uploads/#{SecureRandom.uuid}/#{params[:doc][:title]}",
+        key: "uploads/#{SecureRandom.uuid}/#{doc_params[:title]}",
         success_action_redirect: "/",
         upload_endpoint: "https://#{ENV['S3_BUCKET']}.s3.amazonaws.com",
         :AWSAccessKeyID => ENV['AWS_ACCESS_KEY_ID'],
@@ -28,6 +28,12 @@ module BgS3uploadable
       redirect_to presign.presign(:get, expires: 5.minutes.from_now.to_i, secure: true).to_s
     end
 
+    protected
+
+    def s3uploadable_controller?
+      true
+    end
+
     private
 
     # generate the policy document that amazon is expecting.
@@ -56,5 +62,9 @@ module BgS3uploadable
         )
       ).gsub(/\n/, '')
     end
+
+    def doc_params
+      params.require(:doc).permit :title, :size
+    end
   end
 end

data/lib/bg_s3uploadable/engine.rb

@@ -1,6 +1,8 @@
+require "bg_s3uploadable/rails/routes"
+
 module BgS3uploadable
   class Engine < ::Rails::Engine
-    isolate_namespace BgS3uploadable
+    engine_name "bg_s3uploadable"
 
     initializer "bg_s3uploadable.activerecord_ext" do
       ActiveSupport.on_load(:active_record) do

data/lib/bg_s3uploadable/rails/routes.rb

@@ -0,0 +1,14 @@
+module ActionDispatch::Routing
+  class Mapper
+    def bg_s3uploadable(options={})
+      controller = options[:controller] || "bg_s3uploadable/signed_urls"
+
+      scope path: "/s3", as: :s3 do
+        get '/signed_url', controller: controller, action: 'show'
+        get '/uploaded_image', controller: controller, action: 'uploaded_image'
+        get '/uploaded_image/*key', controller: controller, action: 'uploaded_image',
+          format: false, as: :uploaded_image_with_key
+      end
+    end
+  end
+end

data/lib/bg_s3uploadable/version.rb

@@ -1,3 +1,3 @@
 module BgS3uploadable
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bg_s3uploadable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Keitaroh Kobayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,9 +138,9 @@ files:
 - app/controllers/bg_s3uploadable/signed_urls_controller.rb
 - app/jobs/bg_s3uploadable/uploader_job.rb
 - bg_s3uploadable.gemspec
-- config/routes.rb
 - lib/bg_s3uploadable.rb
 - lib/bg_s3uploadable/engine.rb
+- lib/bg_s3uploadable/rails/routes.rb
 - lib/bg_s3uploadable/uploadable.rb
 - lib/bg_s3uploadable/version.rb
 homepage: https://github.com/keichan34/bg_s3uploadable

data/config/routes.rb

@@ -1,6 +0,0 @@
-BgS3uploadable::Engine.routes.draw do
-  get '/signed_url' => 'signed_urls#show'
-  get '/uploaded_image' => 'signed_urls#uploaded_image'
-  get '/uploaded_image/*key' => 'signed_urls#uploaded_image',
-    format: false, as: :uploaded_image_with_key
-end