tinymce_aws_file_upload 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9be785292bfb80e02f63626119a0b7b971aff1
-  data.tar.gz: 32fadf6a9d75f5fab6b1b2a86fc0375ad824af75
+  metadata.gz: 2585e4b33084210d913ed9f4a5d04218cb8316a2
+  data.tar.gz: 83e11b6e84b5255f8cd7f63db8dca99f018041f4
 SHA512:
-  metadata.gz: 716859928f5653a83b2ddf984a8f5bea9a175dec7ae75c91015a0edb65f8f55c6579003888287947eae7e879e918d487600f1377865a1881a5feb45c0b1b266d
-  data.tar.gz: ba5b217008e6c55b39e30e7c2ce9b39eb3f325feea919dd88e7d09975d61956664398cf6f8ccf4ce20b10a2ba960ad078c026e3a4a49dc183ffead3eb4eaf6f9
+  metadata.gz: 0cc7653749db32c0d897c8f182ab258642535dfb155b735059c9f2987b1c06efb7b961cc4c5ba39d1176e61a273e3f2c7347898edfe11ea351262c1038fc1c66
+  data.tar.gz: b44d1ef8a274ed5ddfd5694e44f37d88e51c1e63dbd40254b88150f3c6544800d9bad897107be6fb56fed83216d136e8349daacd9210c80033c357d09846df0f

data/README.md

@@ -21,11 +21,13 @@ Or install it yourself as:
 ### On your application.js add the line:
     //= require tinymce-aws-file-upload
 
-### Add these 3 environment variables:
+### Add these environment variables:
 
 1. AWS_ACCESS_KEY_ID
 2. AWS_SECRET_ACCESS_KEY
 3. AWS_BUCKET
+4. AWS_AREA
+5. HOST (development will be http://localhost:3000/)
 
 To get this values, go to AWS and create an Amazon S3 account. (http://aws.amazon.com/s3/)
 

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

@@ -18,7 +18,7 @@ root.set_amazon_direct_upload = (elem) ->
           title: $file.name
       success: (data) ->
         fd = create_form_data(data, 'public-read', $file)
-        $url = "https://#{data.bucket}.s3.amazonaws.com/"
+        $url = "https://#{data.bucket}.#{data.s3_area}.amazonaws.com/"
         $full_url = $url + data.key
         create_cors_request(fd, $url, $full_url, elem)
 
@@ -49,6 +49,8 @@ create_cors_request = (form_data, url, full_url, elem) ->
 
 uploadComplete = (full_url, elem) ->
   elem.val full_url
+  root.stop_loading ?= ->
+    return null
   root.stop_loading()
 
 uploadProgress = (evt) ->

data/app/controllers/tinymce_aws_file_upload/signed_urls_controller.rb

@@ -7,9 +7,10 @@ module TinymceAwsFileUpload
             policy: s3_upload_policy_document,
             signature: s3_upload_signature,
             key: "uploads/#{SecureRandom.uuid}/#{params[:doc][:title]}",
-            success_action_redirect: "http://localhost:3000/",
+            success_action_redirect: ENV['HOST'],
             access_key_id: ENV['AWS_ACCESS_KEY_ID'],
-            bucket: ENV['AWS_BUCKET']
+            bucket: ENV['AWS_BUCKET'],
+            s3_area: ENV['AWS_AREA']
           }
         end
       end

data/lib/tinymce_aws_file_upload/version.rb

@@ -1,3 +1,3 @@
 module TinymceAwsFileUpload
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinymce_aws_file_upload
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ariel Schvartz