shrine 1.3.0 → 1.4.0

data/lib/shrine/storage/s3.rb

@@ -130,12 +130,13 @@ class Shrine
 
       # Downloads the file from S3, and returns a `Tempfile`.
       def download(id)
-        Down.download(url(id))
+        Down.download(url(id), ssl_ca_cert: Aws.config[:ssl_ca_bundle])
       end
 
       # Streams the object from S3, yielding downloaded chunks.
       def stream(id)
-        object(id).get { |chunk| yield chunk }
+        object = object(id)
+        object.get { |chunk| yield chunk, object.content_length }
       end
 
       # Alias for #download.
@@ -191,14 +192,14 @@ class Shrine
             object(id).public_url(**options)
           end
         else
-          URI.join(host, object(id).key).to_s
+          URI.join(host, URI.encode(object(id).key)).to_s
         end
       end
 
       # Deletes all files from the storage (requires confirmation).
       def clear!(confirm = nil)
         raise Shrine::Confirm unless confirm == :confirm
-        @bucket.object_versions(prefix: prefix).delete
+        bucket.object_versions(prefix: prefix).delete
       end
 
       # Returns a signature for direct uploads. Internally it calls
@@ -215,12 +216,12 @@ class Shrine
 
       # Returns the S3 object.
       def object(id)
-        @bucket.object([*prefix, id].join("/"))
+        bucket.object([*prefix, id].join("/"))
       end
 
       # This is used to check whether an S3 file is copyable.
       def access_key_id
-        @s3.client.config.credentials.credentials.access_key_id
+        s3.client.config.credentials.credentials.access_key_id
       end
 
       private
@@ -238,7 +239,7 @@ class Shrine
 
       # The file is copyable if it's on S3 and on the same Amazon account.
       def copyable?(io)
-        io.respond_to?(:storage) &&
+        io.is_a?(UploadedFile) &&
         io.storage.is_a?(Storage::S3) &&
         io.storage.access_key_id == access_key_id
       end

data/lib/shrine/version.rb

@@ -5,7 +5,7 @@ class Shrine
 
   module VERSION
     MAJOR = 1
-    MINOR = 3
+    MINOR = 4
     TINY  = 0
     PRE   = nil
 

data/lib/shrine.rb

@@ -516,6 +516,7 @@ class Shrine
         # be called after saving.
         def finalize
           replace
+          remove_instance_variable("@old")
           _promote
         end
 
@@ -526,8 +527,8 @@ class Shrine
 
         # Uploads the cached file to store, and updates the record with the
         # stored file.
-        def promote(cached_file)
-          stored_file = store!(cached_file, phase: :store)
+        def promote(cached_file, phase: :store)
+          stored_file = store!(cached_file, phase: phase)
           result = swap(stored_file) or delete!(stored_file, phase: :stored)
           result
         end
@@ -537,7 +538,6 @@ class Shrine
         # don't get called for the current attachment anymore.
         def replace
           delete!(@old, phase: :replaced) if @old && !cache.uploaded?(@old)
-          remove_instance_variable("@old")
         end
 
         # Deletes the attachment. Typically this should be called after
@@ -590,7 +590,7 @@ class Shrine
         # Calls #update, overriden in ORM plugins.
         def swap(uploaded_file)
           update(uploaded_file)
-          uploaded_file
+          uploaded_file if get == uploaded_file
         end
 
         # Sets and saves the uploaded file.

data/shrine.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "down", ">= 2.0.1"
 
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rake", "~> 11.1"
   gem.add_development_dependency "minitest", "~> 5.8"
   gem.add_development_dependency "minitest-hooks", "~> 1.3.0"
   gem.add_development_dependency "mocha"
@@ -30,7 +30,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "mimemagic"
   gem.add_development_dependency "mime-types"
   gem.add_development_dependency "fastimage"
-  gem.add_development_dependency "thread", "~> 0.2"
   gem.add_development_dependency "aws-sdk", "~> 2.1.30"
 
   unless RUBY_ENGINE == "jruby" || ENV["CI"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thread
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -291,6 +277,8 @@ files:
 - lib/shrine/plugins/default_storage.rb
 - lib/shrine/plugins/default_url.rb
 - lib/shrine/plugins/default_url_options.rb
+- lib/shrine/plugins/delete_promoted.rb
+- lib/shrine/plugins/delete_raw.rb
 - lib/shrine/plugins/delete_uploaded.rb
 - lib/shrine/plugins/determine_mime_type.rb
 - lib/shrine/plugins/direct_upload.rb
@@ -314,6 +302,7 @@ files:
 - lib/shrine/plugins/remove_attachment.rb
 - lib/shrine/plugins/remove_invalid.rb
 - lib/shrine/plugins/restore_cached.rb
+- lib/shrine/plugins/restore_cached_data.rb
 - lib/shrine/plugins/sequel.rb
 - lib/shrine/plugins/store_dimensions.rb
 - lib/shrine/plugins/upload_options.rb
@@ -349,3 +338,4 @@ signing_key:
 specification_version: 4
 summary: Toolkit for file uploads in Ruby
 test_files: []
+has_rdoc: