flickrie 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Flickrie changelog
 
+## Version 0.5.2
+
+- the gem now also works with Faraday 0.7 (I apologize for not
+  making Faraday >= 0.8 a dependency before)
+
 ## Version 0.5.1
 
 - fixed a documentation error

data/Gemfile

@@ -2,6 +2,8 @@ source :rubygems
 
 gemspec
 
+gem "faraday", "~> 0.7.6"
+
 group :development, :test do
   gem "activesupport"
   gem "flickrie", :path => "~/Projects/flickrie"

data/flickrie.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_dependency "faraday_middleware"
-  gem.add_dependency "simple_oauth"
-  gem.add_dependency "multi_xml"
+  gem.add_dependency "simple_oauth", '~> 0.1'
+  gem.add_dependency "multi_xml", '~> 0.4'
 
   gem.add_development_dependency "activesupport"
 end

data/lib/flickrie/client.rb

@@ -18,14 +18,14 @@ module Flickrie
 
     def client(access_token_hash = {})
       @client ||= Client.new(params) do |conn|
-        conn.request :oauth,
+        conn.use FaradayMiddleware::OAuth,
           :consumer_key => api_key,
           :consumer_secret => shared_secret,
           :token => access_token_hash[:token] || access_token,
           :token_secret => access_token_hash[:secret] || access_secret
 
         conn.use StatusCheck
-        conn.response :json, :content_type => /(text\/plain)|(json)$/
+        conn.use FaradayMiddleware::ParseJson, :content_type => /(text\/plain)|(json)$/
         conn.use OAuthStatusCheck
 
         conn.adapter Faraday.default_adapter

data/lib/flickrie/oauth.rb

@@ -12,14 +12,14 @@ module Flickrie
         :consumer_secret => Flickrie.shared_secret
       }.merge(additional_oauth_params)
 
-      Faraday.new(URL) do |connection|
-        connection.request :oauth, oauth_params
-        connection.use ParseResponseParams
-        connection.adapter Faraday.default_adapter
-      end.
-        tap do |connection|
-          connection.builder.insert_before ParseResponseParams, StatusCheck
-        end
+      Faraday.new(URL) do |conn|
+        conn.use FaradayMiddleware::OAuth, oauth_params
+
+        conn.use StatusCheck
+        conn.use ParseResponseParams
+
+        conn.adapter Faraday.default_adapter
+      end
     end
 
     class StatusCheck < Faraday::Response::Middleware

data/lib/flickrie/upload_client.rb

@@ -2,7 +2,7 @@ module Flickrie
   class << self
     def upload_client(access_token_hash = {})
       @upload_client ||= UploadClient.new(upload_params) do |conn|
-        conn.request :oauth,
+        conn.use FaradayMiddleware::OAuth,
           :consumer_key => api_key,
           :consumer_secret => shared_secret,
           :token => access_token_hash[:token] || access_token,
@@ -10,7 +10,7 @@ module Flickrie
         conn.request :multipart
 
         conn.use UploadStatusCheck
-        conn.response :xml
+        conn.use FaradayMiddleware::ParseXml
 
         conn.adapter Faraday.default_adapter
       end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70100275626120 !ruby/object:Gem::Requirement
+  requirement: &70275161967080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100275626120
+  version_requirements: *70275161967080
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70100275625500 !ruby/object:Gem::Requirement
+  requirement: &70275161964780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70100275625500
+  version_requirements: *70275161964780
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70100275625040 !ruby/object:Gem::Requirement
+  requirement: &70275161961880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70100275625040
+  version_requirements: *70275161961880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70100275624620 !ruby/object:Gem::Requirement
+  requirement: &70275161959640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100275624620
+  version_requirements: *70275161959640
 description: This gem is a nice wrapper for the Flickr API with an intuitive interface.
 email: janko.marohnic@gmail.com
 executables: []