shrine-transloadit 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109ddcc53c8f5fb6ab3ee67461ed619ffec34774
-  data.tar.gz: 12379b0d444076bbf9b651d03528e4469f6931d9
+  metadata.gz: 8f40ec5ac77cc70adcbccbe3dd19c37fea7eb515
+  data.tar.gz: f2dcde874d01e7edfdeccbafdc1913181b55e319
 SHA512:
-  metadata.gz: 75aec7f284c57b810adda9ab7c54511958d19310674e15f489cce979f034e76966362baedc2402d3f3873c71f27cb8a8a73ffcc45b5d5dfd2abead88105778a9
-  data.tar.gz: 2a338c8f79d6cf7312f15d6880c4d07fdf59f4a21cdc40a2ce653403ea0f7befb82a31b7c275f8e3ac3415ce837cbe0f55b504f5b96325fc7f4de688fda78e23
+  metadata.gz: f4da721d4c333e12d33683349b53d68086b79fd5902addc2ae21d99c85b98549b61094b0ac090f9bffd6f380f56f6726e0669148a6f60f72b55656b1de0bc0fc
+  data.tar.gz: d9b21d982ea502e0e612d808943cac381ad6644d23866f608cefccc5a5bc7a901d86abdeca9e760d145629c83c005f6ffdf70312ac7d3d87841475d4bd5a6e73

data/README.md

@@ -218,25 +218,10 @@ only want to do some light processing on direct uploads, and without any
 exporting, so that you have better control over your Transloadit bandwidth.
 
 When direct upload finishes, Transloadit returns information about the uploaded
-files, including a temporary URL and useful metadata. You'll want to store both
-to the database, URL you will need for additional processing after the record
-is saved. This is the JavaScript needed to convert Transloadit's data hash into
-Shrine's format:
-
-```js
-{
-  id: data['url'], // we save the URL
-  storage: 'cache',
-  metadata: {
-    size: data['size'],
-    filename: data['name'],
-    mime_type: data['mime'],
-    width: data['meta'] && data['meta']['width'],
-    height: data['meta'] && data['meta']['height'],
-    transloadit: data['meta'],
-  }
-}
-```
+file(s). You can just convert that data to a JSON string and pass it as attachment
+value (e.g. by assigning it to the hidden attachment field), and the plugin
+will automatically recognize it and convert it to Shrine's attachment
+representation.
 
 See the **[demo app]** for a complete implementation of direct uploads.
 

data/lib/shrine/plugins/transloadit.rb

@@ -1,7 +1,10 @@
 require "transloadit"
+require "down"
+
 require "uri"
 require "json"
 require "openssl"
+require "net/http"
 
 class Shrine
   module Plugins
@@ -58,7 +61,7 @@ class Shrine
           response = assembly.submit!
           raise Error, "#{response["error"]}: #{response["message"]}" if response["error"]
           cached_file.metadata["transloadit_response"] = response.body.to_json
-          swap(cached_file)
+          swap(cached_file) or _set(cached_file)
         end
 
         def transloadit_save(response, valid: true)
@@ -74,11 +77,24 @@ class Shrine
           end
 
           if valid
-            update(stored_file)
+            swap(stored_file)
           else
             _delete(stored_file, phase: :abort)
           end
         end
+
+        def uploaded_file(value)
+          if value.is_a?(String) || value.is_a?(Hash)
+            value = JSON.parse(value) if value.is_a?(String)
+            if value["url"].is_a?(String) # from direct upload
+              cache.transloadit_uploaded_file(value)
+            else
+              super
+            end
+          else
+            super
+          end
+        end
       end
 
       module ClassMethods
@@ -93,8 +109,9 @@ class Shrine
       module InstanceMethods
         def transloadit_uploaded_file(result)
           case url = result.fetch("url")
+          when /tmp\.transloadit\.com/
+            id = url
           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
           else
@@ -103,7 +120,7 @@ class Shrine
 
           self.class::UploadedFile.new(
             "id"       => id,
-            "storage"  => storage_key,
+            "storage"  => storage_key.to_s,
             "metadata" => {
               "filename"    => result.fetch("name"),
               "size"        => result.fetch("size"),
@@ -266,6 +283,21 @@ class Shrine
       end
 
       class UrlStorage
+        def download(id)
+          Down.download(id)
+        end
+
+        def open(id)
+          Down.open(id)
+        end
+
+        def exists?(id)
+          response = nil
+          uri = URI(id)
+          Net::HTTP.start(uri.host, uri.port) { |http| response = http.head(id) }
+          response.code.to_i == 200
+        end
+
         def url(id, **options)
           id
         end

data/shrine-transloadit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-transloadit"
-  gem.version       = "0.1.2"
+  gem.version       = "0.2.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "shrine", "~> 2.1"
   gem.add_dependency "transloadit", "~> 1.2"
+  gem.add_dependency "down", ">= 2.3.3"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shrine-transloadit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Janko Marohnić
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: down
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement