shrine 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b8acff9f68f0cc11cbadc0eeb39a5bdcf839d1
-  data.tar.gz: 666390819abcf036b20f46ecf04b1a30fef68a28
+  metadata.gz: 2a35f41e1e5941af4a9f726f6ff2057a3a65203f
+  data.tar.gz: 17d53c374878d16e8d20f5c5e6819fb90bb45888
 SHA512:
-  metadata.gz: be25b88ca4629b8a1e052ed442b5530d1661a0f23a4d3d7cb0cb2e6f6538379c1a46a22e921091a3a718755e1f4378bd97a25312bde436134cdd3ac0ba487194
-  data.tar.gz: cf90025e05a3f0790bde9ba0763a66e75c6aba48a1b5586a4a814947693154d1a345ae90c447341f349cf9e3abf29a62e2fe6ab211993fc1685ad38cef479b33
+  metadata.gz: 0ba8c4a7b7e65caa42e101a3197aa18fc9039c0b72abe82dc7d77641935ccfa5aa7f906d1ad6d1e1cad63aeb017d471d48df8646c5ead787ecea9ca2730cd2fd
+  data.tar.gz: accad9b2d8743585c20ec36dac4f9d73b664bd6ab63687caf2ceb13c1536f4b185165d74c45e79ad43a5aee08cdc251240f8bed9f6e8567a92fc505f8a917279

data/lib/shrine.rb

@@ -127,8 +127,8 @@ class Shrine
         def plugin(plugin, *args, &block)
           plugin = Plugins.load_plugin(plugin) if plugin.is_a?(Symbol)
           plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
-          include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
-          extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
+          self.include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
+          self.extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
           self::UploadedFile.include(plugin::FileMethods) if defined?(plugin::FileMethods)
           self::UploadedFile.extend(plugin::FileClassMethods) if defined?(plugin::FileClassMethods)
           self::Attachment.include(plugin::AttachmentMethods) if defined?(plugin::AttachmentMethods)

data/lib/shrine/plugins/default_url.rb

@@ -16,7 +16,7 @@ class Shrine
     # Any additional URL options will be present in the `context` hash.
     module DefaultUrl
       def self.configure(uploader, &block)
-        uploader.opts[:default_url] = block
+        uploader.opts[:default_url] = block if block
       end
 
       module AttacherMethods

data/lib/shrine/plugins/default_url_options.rb

@@ -8,7 +8,7 @@ class Shrine
     # The default options are merged with options passed to `UploadedFile#url`,
     # and the latter will always have precedence over default options.
     module DefaultUrlOptions
-      def self.configure(uploader, **options)
+      def self.configure(uploader, options = {})
         uploader.opts[:default_url_options] = (uploader.opts[:default_url_options] || {}).merge(options)
       end
 

data/lib/shrine/plugins/upload_options.rb

@@ -17,8 +17,7 @@ class Shrine
     #     end
     module UploadOptions
       def self.configure(uploader, options = {})
-        uploader.opts[:upload_options] ||= {}
-        options.each { |key, value| uploader.opts[:upload_options][key] = value }
+        uploader.opts[:upload_options] = (uploader.opts[:upload_options] || {}).merge(options)
       end
 
       module InstanceMethods

data/lib/shrine/version.rb

@@ -6,7 +6,7 @@ class Shrine
   module VERSION
     MAJOR = 2
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/shrine.gemspec

@@ -34,7 +34,7 @@ column, and tying them to record's lifecycle.
   gem.add_development_dependency "webmock"
   gem.add_development_dependency "rack-test_app"
   gem.add_development_dependency "dotenv"
-  gem.add_development_dependency "shrine-memory"
+  gem.add_development_dependency "shrine-memory", "~> 0.2.0"
 
   gem.add_development_dependency "roda"
   gem.add_development_dependency "mimemagic"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down
@@ -126,16 +126,16 @@ dependencies:
   name: shrine-memory
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement