objectiveflickr 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +0,0 @@
-2006-12-10:
-Initial release.
-

data/Rakefile

@@ -16,7 +16,6 @@ EMAIL = "lukhnos@gmail.com"
 DESCRIPTION = "objectiveflickr is a minimalistic Flickr API library that uses REST-style calls and receives JSON response blocks, resulting in very concise code. Named so in order to echo another Flickr library of mine, under the same name, developed for Objective-C."
 GEM_NAME = "objectiveflickr" # what ppl will type to install your gem
 RUBYFORGE_PROJECT = "objectiveflickr" # The unix name for your project
-RUBYFORGE_GROUP_ID = "2698"
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 RELEASE_TYPES = %w( gem ) # can use: gem, tar, zip
 

data/lib/objectiveflickr/flickr_invocation.rb

@@ -18,7 +18,10 @@ $KCODE = 'UTF8'
 
 # FlickrInvocation
 class FlickrInvocation
-  API_KEY = ''
+  @@default_api_key = ''
+  @@default_shared_secret = ''
+  @@default_options = {}
+  
   SHARED_SECRET = ''
   AUTH_ENDPOINT = 'http://flickr.com/services/auth/'
   REST_ENDPOINT = 'http://api.flickr.com/services/rest/'
@@ -27,16 +30,14 @@ class FlickrInvocation
   # Initializes the instance with the api_key (required) and an 
   # optional shared_secret (required only if you need to make 
   # authenticated call). Current available option is:
-  # * :exception_on_error: set this key to true if you want the
+  # * :raise_exception_on_error: set this key to true if you want the
   #   call method to raise an error if Flickr returns one
-  def initialize(api_key = nil, shared_secret = nil, options = {})
-    @api_key = api_key || API_KEY
-    @shared_secret = shared_secret || SHARED_SECRET
-    
-    # options
-    @option_exception_on_error = options[:exception_on_error] ? true : false
+  def initialize(api_key = nil, shared_secret = nil, options = nil)
+    @api_key = api_key || @@default_api_key
+    @shared_secret = shared_secret || @@default_shared_secret
+    @options = options || @@default_options    
   end
-  
+    
   # Invoke a Flickr method, pass :auth=>true in the param hash
   # if you want the method call to be signed (required when you
   # make authenticaed calls, e.g. flickr.auth.getFrob or 
@@ -45,8 +46,8 @@ class FlickrInvocation
     url = method_url(method, params)
     rsp = FlickrResponse.new Net::HTTP.get(URI.parse(url))
     
-    if @option_exception_on_error && rsp.error?
-      raise rsp.error_message
+    if @options[:raise_exception_on_error] && rsp.error?
+      raise RuntimeError, rsp
     end
     
     rsp
@@ -87,6 +88,20 @@ class FlickrInvocation
     p = params.split("-")
     { :server_id=>p[1], :id=>p[2], :secret=>p[3], :size=>p[4], :type=>p[5] }
   end
+
+  # set the default API key
+  def self.default_api_key(k)
+    @@default_api_key=k
+  end
+  
+  # set the default shared secret
+  def self.default_shared_secret(s)
+    @@default_shared_secret=s
+  end
+  
+  def self.default_options(o)
+    @@default_options = o
+  end
   
   private
   def method_url(method, params=nil)

data/lib/objectiveflickr/version.rb

@@ -2,7 +2,7 @@ module ObjectiveFlickr #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/objectiveflickr_test.rb

@@ -16,4 +16,26 @@ class ObjectiveFlickrTest < Test::Unit::TestCase
     assert(r.ok?, "response should be ok")
     assert_equal(r["method"]["_content"], "flickr.test.echo", "method name should echo")
   end
+  
+  def test_default_settings
+    FlickrInvocation.default_api_key 'bf67a649fffb210651334a09b92df02e'
+    f = FlickrInvocation.new
+
+    r = f.call("flickr.test.echo")
+    assert(r.ok?, "response should be ok")
+    assert_equal(r["method"]["_content"], "flickr.test.echo", "method name should echo")
+  end
+  
+  def test_corrupt_key
+    # try a corrupt key
+    FlickrInvocation.default_api_key 'bf67a649fffb210651334a09b92df02f'
+    FlickrInvocation.default_options :raise_exception_on_error => true
+
+    f = FlickrInvocation.new
+    r = f.call("flickr.test.echo")
+
+  rescue => e
+    assert(e.message.error?, "response should be an error")
+    assert_equal(e.message.error_message, "Invalid API Key (Key not found)", "error message should be 'invalid API key'")
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: objectiveflickr
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2006-12-10 00:00:00 -05:00
+  version: 0.9.1
+date: 2006-12-12 00:00:00 -05:00
 summary: objectiveflickr is a minimalistic Flickr API library that uses REST-style calls and receives JSON response blocks, resulting in very concise code. Named so in order to echo another Flickr library of mine, under the same name, developed for Objective-C.
 require_paths: 
 - lib