refile 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6797e0c960a77817f75d9f5a6c5b48e7e4f3b363
-  data.tar.gz: 430f42e462d044897740dad2fb9dd21db6b707d9
+  metadata.gz: 0ed6f4d41c3ec2500ea5d08db74368eb77847e74
+  data.tar.gz: fe6d09eac8253dbaffd1e2f528bd958ea6d81304
 SHA512:
-  metadata.gz: 7e1560a7e9a3ff8e13e628f1e77c1d135e0828dd1eb451b8702092122bf90575c4f11d77dc6f526787a6d7eeeb6818ae602007a5276acfccc51dc7f88d3e770e
-  data.tar.gz: d99149310b57a8a766f448361cb46bf9e7d5d4699ed624422985d418cd3bc8529a86c425e87b8b367f5f5371ce2398241d90cbdac9065d3e504e7a7258429549
+  metadata.gz: acb99bf3123f2e1863631d45ba072cdacb5c7b0041430199128a66c35d889f3e6a6820066d11189f7cd759254ab6b75920f8d7468d965862605ddf6161303c5c
+  data.tar.gz: 9d32e98f724a2f23760d2081c5628203516d5b5f3e20406244529d102699f2709328ff54a5931b17fd6b36de41d70cd97bd21beaa2c16bb9305b20ad034b828c

data/lib/refile.rb

@@ -1,6 +1,7 @@
 require "uri"
 require "fileutils"
 require "tempfile"
+require "rest_client"
 require "logger"
 require "mime/types"
 

data/lib/refile/attacher.rb

@@ -1,5 +1,3 @@
-require "open-uri"
-
 module Refile
   # @api private
   class Attacher
@@ -97,21 +95,20 @@ module Refile
 
     def download(url)
       unless url.to_s.empty?
-        file = open(url)
+        response = RestClient::Request.new(method: :get, url: url, raw_response: true).execute
         @metadata = {
-          size: file.meta["content-length"].to_i,
-          filename: ::File.basename(file.base_uri.path),
-          content_type: file.meta["content-type"]
+          size: response.file.size,
+          filename: ::File.basename(url),
+          content_type: response.headers[:content_type]
         }
         if valid?
-          @metadata[:id] = cache.upload(file).id
+          @metadata[:id] = cache.upload(response.file).id
           write_metadata
         elsif @raise_errors
           raise Refile::Invalid, @errors.join(", ")
         end
       end
-    rescue OpenURI::HTTPError, RuntimeError => error
-      raise if error.is_a?(RuntimeError) and error.message !~ /redirection loop/
+    rescue RestClient::Exception
       @errors = [:download_failed]
       raise if @raise_errors
     end

data/lib/refile/version.rb

@@ -1,3 +1,3 @@
 module Refile
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/refile.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.1.0"
 
+  spec.add_dependency "rest-client", "~> 1.7.2"
   spec.add_dependency "sinatra", "~> 1.4.5"
   spec.add_dependency "mime-types"
 

data/spec/refile/attachment_spec.rb

@@ -111,7 +111,6 @@ describe Refile::Attachment do
 
       it "follows redirects and fetches the file, caches it and sets the _id parameter" do
         instance.remote_document_url = "http://www.example.com/1"
-        expect(instance.document_filename).to eq("2")
         expect(instance.document.read).to eq("woop")
         expect(Refile.cache.get(instance.document.id).read).to eq("woop")
       end
@@ -121,7 +120,7 @@ describe Refile::Attachment do
         it "handles redirect loops by trowing errors" do
           expect do
             instance.remote_document_url = "http://www.example.com/loop"
-          end.to raise_error(RuntimeError, /redirection loop/)
+          end.to raise_error(RestClient::MaxRedirectsReached)
         end
       end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: refile
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Jonas Nicklas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement