flickraw 0.9.6 → 0.9.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 851e439d2bb948eb0ecbd3a6b2804fe830ead230
+  data.tar.gz: 377698252b1f918e76e2f5872828e5d19e0d3f90
+SHA512:
+  metadata.gz: acb89952f574296b48e1e1e6415a47baa21c4ec7ebcfbe00a3a96b54ba5a3c2acc326f23f78cd426a1f5f01df6fbd1e7960c8c0966b71e98b2fc622e2f50f752
+  data.tar.gz: 3a21201017f86c5a626bdb0d843e1f0005972c137495f9ce8ef622890c955b531f96d303497e8f3230b2c72f469e9757090ef533a634a49ef44d0428a250fb9c

data/examples/upload.rb

@@ -6,7 +6,7 @@ require 'flickraw'
 API_KEY=''
 SHARED_SECRET=''
 ACCESS_TOKEN=''
-ACCESS _SECRET=''
+ACCESS_SECRET=''
 PHOTO_PATH='photo.jpg'
 
 FlickRaw.api_key = API_KEY

data/examples/web_oauth.rb

@@ -30,11 +30,11 @@ end
 def callback
   flickr = FlickRaw::Flickr.new
 
-  token = # Retrieve from cache or session etc - see above
+  request_token = # Retrieve from cache or session etc - see above
   oauth_token = params[:oauth_token]
   oauth_verifier = params[:oauth_verifier]
 
-  raw_token = flickr.get_oauth_token(request_token['oauth_token'], request_token['oauth_token_secret'], oauth_verifier)
+  raw_token = flickr.get_access_token(request_token['oauth_token'], request_token['oauth_token_secret'], oauth_verifier)
   # raw_token is a hash like this {"user_nsid"=>"92023420%40N00", "oauth_token_secret"=>"XXXXXX", "username"=>"boncey", "fullname"=>"Darren%20Greaves", "oauth_token"=>"XXXXXX"}
   # Use URI.unescape on the nsid and name parameters
 

data/lib/flickraw.rb

@@ -1,11 +1,12 @@
 require 'json'
+require 'flickraw/error'
 require 'flickraw/oauth'
 require 'flickraw/request'
 require 'flickraw/response'
 require 'flickraw/api'
 
 module FlickRaw
-  VERSION='0.9.6'
+  VERSION='0.9.7'
   USER_AGENT = "FlickRaw/#{VERSION}"
 end
 

data/lib/flickraw/api.rb

@@ -24,6 +24,8 @@ module FlickRaw
   URL_PHOTOSTREAM='http://www.flickr.com/photos/'.freeze
   URL_SHORT='http://flic.kr/p/'.freeze
 
+  class FlickrAppNotConfigured < Error; end
+
   # Root class of the flickr api hierarchy.
   class Flickr < Request
     # Authenticated access token
@@ -35,7 +37,9 @@ module FlickRaw
     def self.build(methods); methods.each { |m| build_request m } end
 
     def initialize # :nodoc:
-      raise "No API key or secret defined !" if FlickRaw.api_key.nil? or FlickRaw.shared_secret.nil?
+      if FlickRaw.api_key.nil? or FlickRaw.shared_secret.nil?
+        raise FlickrAppNotConfigured.new("No API key or secret defined!")
+      end
       @oauth_consumer = OAuthClient.new(FlickRaw.api_key, FlickRaw.shared_secret)
       @oauth_consumer.proxy = FlickRaw.proxy
       @oauth_consumer.user_agent = USER_AGENT
@@ -49,8 +53,9 @@ module FlickRaw
     #
     # Raises FailedResponse if the response status is _failed_.
     def call(req, args={}, &block)
+      oauth_args = args.delete(:oauth) || {}
       rest_path = FlickRaw.secure ? REST_PATH_SECURE :  REST_PATH
-      http_response = @oauth_consumer.post_form(rest_path, @access_secret, {:oauth_token => @access_token}, build_args(args, req))
+      http_response = @oauth_consumer.post_form(rest_path, @access_secret, {:oauth_token => @access_token}.merge(oauth_args), build_args(args, req))
       process_response(req, http_response.body)
     end
 
@@ -132,10 +137,17 @@ module FlickRaw
     end
 
     def upload_flickr(method, file, args={})
+      oauth_args = args.delete(:oauth) || {}
       args = build_args(args)
-      args['photo'] = open(file, 'rb')
+      if file.respond_to? :read
+        args['photo'] = file
+      else
+        args['photo'] = open(file, 'rb')
+        close_after = true
+      end
       
-      http_response = @oauth_consumer.post_multipart(method, @access_secret, {:oauth_token => @access_token}, args)
+      http_response = @oauth_consumer.post_multipart(method, @access_secret, {:oauth_token => @access_token}.merge(oauth_args), args)
+      args['photo'].close if close_after
       process_response(method, http_response.body)
     end
   end

data/lib/flickraw/error.rb

@@ -0,0 +1,3 @@
+module FlickRaw
+  class Error < StandardError; end
+end

data/lib/flickraw/oauth.rb

@@ -3,8 +3,8 @@ require 'net/https'
 
 module FlickRaw
   class OAuthClient
-    class UnknownSignatureMethod < StandardError; end
-    class FailedResponse < StandardError
+    class UnknownSignatureMethod < Error; end
+    class FailedResponse < Error
       def initialize(str)
         @response = OAuthClient.parse_response(str)
         super(@response['oauth_problem'])
@@ -18,8 +18,8 @@ module FlickRaw
       end
 
       def escape(s)
-        encode_value(s).gsub(/[^a-zA-Z0-9\-\.\_\~]/) {
-          $&.unpack("C*").map{|i| sprintf("%%%02X", i) }.join
+        encode_value(s).gsub(/[^a-zA-Z0-9\-\.\_\~]/) { |special|
+          special.unpack("C*").map{|i| sprintf("%%%02X", i) }.join
         }
       end
 
@@ -100,8 +100,8 @@ module FlickRaw
         request.body = ''
         params.each { |k, v|
           if v.respond_to? :read
-            basename = File.basename(v.path).to_s if v.respond_to? :path
-            basename ||= File.basename(v.base_uri).to_s if v.respond_to? :base_uri
+            basename = File.basename(v.path.to_s) if v.respond_to? :path
+            basename ||= File.basename(v.base_uri.to_s) if v.respond_to? :base_uri
             basename ||= "unknown"
             request.body << "--#{boundary}\r\n" <<
               "Content-Disposition: form-data; name=\"#{OAuthClient.encode_value(k)}\"; filename=\"#{OAuthClient.encode_value(basename)}\"\r\n" <<

data/lib/flickraw/response.rb

@@ -46,7 +46,7 @@ class ResponseList < Response
   alias length size
 end
 
-class FailedResponse < StandardError
+class FailedResponse < Error
   attr_reader :code
   alias :msg :message
   def initialize(msg, code, req)

data/test/test.rb

@@ -8,7 +8,7 @@ require 'helper'
 
 class Basic < Test::Unit::TestCase
   def test_request
-    flickr_objects = %w{activity auth blogs collections commons contacts
+    flickr_objects = %w{activity auth blogs cameras collections commons contacts
        favorites galleries groups interestingness machinetags panda
        people photos photosets places prefs push reflection stats tags
        test urls
@@ -33,6 +33,8 @@ class Basic < Test::Unit::TestCase
       flickr.blogs.getList
       flickr.blogs.getServices
       flickr.blogs.postPhoto
+      flickr.cameras.getBrandModels
+      flickr.cameras.getBrands
       flickr.collections.getInfo
       flickr.collections.getTree
       flickr.commons.getInstitutions
@@ -55,7 +57,18 @@ class Basic < Test::Unit::TestCase
       flickr.galleries.getListForPhoto
       flickr.galleries.getPhotos
       flickr.groups.browse
+      flickr.groups.discuss.replies.add
+      flickr.groups.discuss.replies.delete
+      flickr.groups.discuss.replies.edit
+      flickr.groups.discuss.replies.getInfo
+      flickr.groups.discuss.replies.getList
+      flickr.groups.discuss.topics.add
+      flickr.groups.discuss.topics.getInfo
+      flickr.groups.discuss.topics.getList
       flickr.groups.getInfo
+      flickr.groups.join
+      flickr.groups.joinRequest
+      flickr.groups.leave
       flickr.groups.members.getList
       flickr.groups.pools.add
       flickr.groups.pools.getContext
@@ -262,18 +275,6 @@ class Basic < Test::Unit::TestCase
     assert list.any? {|g| g.nsid == "51035612836@N01"}
   end
   
-  # panda
-  def test_panda_getList
-    pandas = flickr.panda.getList
-    assert_equal ["ling ling", "hsing hsing", "wang wang"], pandas.to_a
-  end
-  
-  def test_panda_getPhotos
-    pandas = flickr.panda.getPhotos :panda_name => "wang wang"
-    assert_equal "wang wang", pandas.panda
-    assert_respond_to pandas[0], :title
-  end
-  
   # people
   def test_people_findByEmail
     user = flickr.people.findByEmail :find_email => "flickraw@yahoo.com"

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: flickraw
 version: !ruby/object:Gem::Version
-  version: 0.9.6
-  prerelease: 
+  version: 0.9.7
 platform: ruby
 authors:
 - Mael Clerambault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies: []
 description: 
-email: maelclerambault@yahoo.fr
+email: mael@clerambault.fr
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -24,39 +23,40 @@ files:
 - examples/upload.rb
 - examples/web_oauth.rb
 - test/helper.rb
-- test/test.rb
 - test/test_upload.rb
-- lib/flickraw.rb
+- test/test.rb
+- lib/flickraw/request.rb
 - lib/flickraw/api.rb
+- lib/flickraw/error.rb
 - lib/flickraw/oauth.rb
-- lib/flickraw/request.rb
 - lib/flickraw/response.rb
+- lib/flickraw.rb
 - flickraw_rdoc.rb
 - LICENSE
 - README.rdoc
 - rakefile
 homepage: http://hanklords.github.com/flickraw/
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
 test_files: []