shrine-flickr 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93196d2074118c12e2a5c3e4ff0f4b08c6948b84
-  data.tar.gz: 9e1f351116746fc9868d10f6fffbbd15aefd7f29
+  metadata.gz: cc2d7fbc4c13c40d1387e6e41649f1a7f9be6902
+  data.tar.gz: 68441b4122dc2a1a12374bc776997a09de50073e
 SHA512:
-  metadata.gz: f66a38504f2b7687dc543cc0d02fa65c76454d88ceb7c2b6e4f60e74e2878ed7b064d08cb4edabb51f668daa7fb5b08d92f38d9a01bedc92aa42430732a41f30
-  data.tar.gz: 3b4cec25c7aa76b78cb883a5b0071d1ded09c3d6519e1e8bc8349519779cabad4a81984a0b341c51ea22096246da31ca6c4f775d5892fc9911321c977e173384
+  metadata.gz: 68e29fdc553bf82ebf3e010652d334e6e970bbfde15809e16beef3bcd72cb0faf9766dbba5cd0ebc230e622de2ac8d8013b396e4a6734379d1c3f91eda0100ef
+  data.tar.gz: 22da03e3228090cafe401210223e64d514649b06c9f81f42b7b26077a56a2d8601903f2051098992496a0faa03e1c1b767de10e634c4e11ca6975a3c98843a88

data/README.md

@@ -41,6 +41,7 @@ user.avatar.url(size: :medium_500) # alternative notation
 
 user.avatar.url(size: "Original")
 user.avatar.url(size: :original) # alternative notation
+```
 
 All possible sizes are: "Square 75", "Thumbnail", "Square 150", "Small 240",
 "Small 320", "Medium 500", "Medium 640", "Medium 800", "Large 1024", and
@@ -63,17 +64,15 @@ can pass in the `:upload_options` option:
 Shrine::Storage::Flickr.new(upload_options: {hidden: 1})
 ```
 
-Alternatively, if you would like to do it per-file, you can override
-`#extract_metadata` in your uploader, and add upload options under the "flickr"
-key:
+You can also add upload options per-upload using the `upload_options` plugin:
 
 ```rb
 class MyUploader < Shrine
-  def extract_metadata(io, context)
-    super.update("flickr" => {
+  plugin :upload_options, store: ->(io, context) do
+    {
       title: io.original_filename,
       description: context[:record].description,
-    })
+    }
   end
 end
 ```
@@ -92,7 +91,7 @@ flickr.clear!(:confirm)
 
 In Flickr's guidelines it states that if you're displaying photos from Flickr
 on another webiste, you should always link back to Flickr. This link will be
-generate when you don't pass any arguments to `#url`:
+generated when you don't pass any arguments to `#url`:
 
 ```erb
 <a href="<%= @user.avatar.url %>">

data/lib/shrine/storage/flickr.rb

@@ -53,7 +53,7 @@ class Shrine
         photo(photo_id(id)).delete
       end
 
-      def url(id, size: nil)
+      def url(id, size: nil, **options)
         if size
           size = size.to_s.tr("_", " ").capitalize if size.is_a?(Symbol)
           "https://farm%s.staticflickr.com/%s/%s_%s%s.%s" % size_data(size, id)

data/shrine-flickr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-flickr"
-  gem.version       = "1.0.0"
+  gem.version       = "1.0.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,11 +13,11 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine-flickr.gemspec"]
   gem.require_path = "lib"
 
+  gem.add_dependency "shrine", "~> 1.1"
   gem.add_dependency "flickr-objects", ">= 0.6.1"
-  gem.add_dependency "down", ">= 1.0.3"
+  gem.add_dependency "down", ">= 1.0.5"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "shrine"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "dotenv"
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: shrine-flickr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: flickr-objects
+  name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: down
+  name: flickr-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: shrine
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="