shrine-transloadit 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f6c9f75eb5ae136a186f42f8b3e255b37e75922
-  data.tar.gz: e25b2ed74f6e742c82539a86b8f9814497978947
+  metadata.gz: 598fedd796007106bdd2326f56bd2d7b1f4e56eb
+  data.tar.gz: 4b81b6377ac2fbe38d1ee87b77632791e2ddad2e
 SHA512:
-  metadata.gz: f0279efcd3b9de0a223f258e03cb1689490d9f84225ce43fce35b9b7f8e3cd78514577bdcfe09d40e252b50e69a3135cf0be575ec32e2d6a7dd2217933988598
-  data.tar.gz: bb661843d2b3886a66aaca015d98eb6caef0317b1a6171d3581b008c0d2fbec1f5249ec9671d36b6b8c0ce0447ab98e0bf29a0c912e2ded7014a164a41ae34d8
+  metadata.gz: e98531a56617650480632a49553633da208bac6f0a298f7b0106db7f9320c591e30020dfb52cd7dc48c23163d0ac1c7cbdc6303abdc09fc79c47d1e171a5c7e7
+  data.tar.gz: ae68d0319caefad44c01e5d73cb16a78fd7fa3343bca750a765a0ea68d00633ef5b611f65eed866655030517e82dddb77af3579570426d4023989d2be528e903

data/README.md

@@ -108,6 +108,33 @@ class MyUploader < Shrine
 end
 ```
 
+### Webhooks
+
+Transloadit performs its processing asynchronously, and you can provide a URL
+where you want Transloadit to POST results of processing once it's finished.
+
+```rb
+class MyUploader < Shrine
+  def transloadit_process(io, context)
+    # ...
+
+    transloadit_assembly(files, notify_url: "http://myapp.com/webhooks/transloadit")
+  end
+end
+```
+
+Then in your `POST /webhooks/transloadit` route you can call the plugin to
+automatically save the results to the attachment column in Shrine's format.
+
+```rb
+post "/webhooks/transloadit" do
+  Shrine::Attacher.transloadit_save(params)
+end
+```
+
+Note that if you have CSRF protection, make sure that you skip verifying the
+CSRF token for this route.
+
 ### Direct uploads
 
 Transloadit supports direct uploads, allowing you to do additional processing
@@ -182,30 +209,6 @@ class MyUploader < Shrine
 end
 ```
 
-### Webhooks
-
-Transloadit performs its processing asynchronously, and you can provide a URL
-where you want Transloadit to POST results of processing once it's finished.
-
-```rb
-class MyUploader < Shrine
-  def transloadit_process(io, context)
-    # ...
-
-    transloadit_assembly(files, notify_url: "http://myapp.com/webhooks/transloadit")
-  end
-end
-```
-
-Then in your `POST /webhooks/transloadit` route you can call the plugin to
-automatically save the results to the attachment column in Shrine's format.
-
-```rb
-post "/webhooks/transloadit" do
-  Shrine::Attacher.transloadit_save(params)
-end
-```
-
 ### Backgrounding
 
 Even though submitting a Transloadit assembly doesn't require any uploading, it

data/lib/shrine/plugins/transloadit.rb

@@ -109,7 +109,7 @@ class Shrine
           if valid
             swap(stored_file)
           else
-            _delete(stored_file, phase: :abort)
+            _delete(stored_file, action: :abort)
           end
         end
       end
@@ -139,7 +139,7 @@ class Shrine
           when /amazonaws\.com/
             raise Error, "Cannot save a processed file which wasn't exported: #{url.inspect}" if url.include?("tmp.transloadit.com")
             path = URI(url).path
-            id = path.match(/^\/#{storage.prefix}/).post_match
+            id = path.match(%r{^(/#{storage.prefix})?/}).post_match
           else
             raise Error, "The transloadit Shrine plugin doesn't support storage identified by #{url.inspect}"
           end
@@ -194,13 +194,16 @@ class Shrine
 
         # Generates an export step from the current (permanent) storage.
         # At the moment only Amazon S3 is supported.
-        def transloadit_export_step(name, **step_options)
+        def transloadit_export_step(name, path: nil, **step_options)
           if defined?(Storage::S3) && storage.is_a?(Storage::S3)
+            path ||= "${unique_prefix}/${file.url_name}" # Transloadit's default path
+
             step = transloadit.step(name, "/s3/store",
               key:           storage.s3.client.config.access_key_id,
               secret:        storage.s3.client.config.secret_access_key,
               bucket:        storage.bucket.name,
-              bucket_region: storage.s3.client.config.region
+              bucket_region: storage.s3.client.config.region,
+              path:          [*storage.prefix, path].join("/"),
             )
           else
             raise Error, "Cannot construct a transloadit export step from #{storage.inspect}"

data/shrine-transloadit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-transloadit"
-  gem.version       = "0.4.0"
+  gem.version       = "0.4.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "*.gemspec"]
   gem.require_path = "lib"
 
-  gem.add_dependency "shrine", "~> 2.1"
+  gem.add_dependency "shrine", "~> 2.2"
   gem.add_dependency "transloadit", "~> 1.2"
 
   gem.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-transloadit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: transloadit
   requirement: !ruby/object:Gem::Requirement
@@ -172,4 +172,3 @@ signing_key:
 specification_version: 4
 summary: Provides Transloadit integration for Shrine.
 test_files: []
-has_rdoc: