objectiveflickr 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,13 @@
+2007-01-08 (0.9.4):
+    * Fixed a serious defect where API parameters, such as search text, 
+      must be URL-escaped. There's a catch if you tried previously to use 
+      CGI.escape to work around, though: Flickr's API signature string must
+      not be *escaped* before the string is MD5-checksummed.
+      
+      Now everything should work fine. Pass a few CJKV or HTML entity 
+      characters to see how it goes!
+
+
 2007-01-04 (0.9.3):
     * These methods from FlickrPhoto are deprecated:
     

data/lib/objectiveflickr/flickr_invocation.rb

@@ -11,6 +11,7 @@ require 'rubygems'
 require 'net/http'
 require 'jcode'
 require 'digest/md5'
+require 'cgi'
 
 $KCODE = 'UTF8'
 
@@ -117,7 +118,7 @@ class FlickrInvocation
       p["api_sig"] = api_sig(sigp)
     end
     
-    p.keys.each { |k| url += "&#{k.to_s}=#{p[k]}" }
+    p.keys.each { |k| url += "&#{k.to_s}=#{CGI.escape(p[k].to_s)}" }
     url
   end
   

data/lib/objectiveflickr/version.rb

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

data/test/objectiveflickr_test.rb

@@ -3,7 +3,10 @@ require 'yaml'
 
 class ObjectiveFlickrTest < Test::Unit::TestCase
 
+  TEST_API_KEY = 'bf67a649fffb210651334a09b92df02e'
+
   def setup
+    @f = FlickrInvocation.new(TEST_API_KEY)
   end
   
   def test_truth
@@ -12,12 +15,18 @@ class ObjectiveFlickrTest < Test::Unit::TestCase
   
   # we use a unit test API key for this purpose
   def test_echo
-    f = FlickrInvocation.new('bf67a649fffb210651334a09b92df02e')
-    r = f.call("flickr.test.echo")
+    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_echo_escaped_characters
+    r = @f.call("flickr.test.echo", :text=>"漢字 @ < > lorem ipsum")
+    assert(r.ok?, "response should be ok")
+    assert_equal(r["text"]["_content"], "漢字 @ < > lorem ipsum", "CJKV, HTML entities and other characters should be properly URL-escaped")
+  end
+  
+  
   def test_default_settings
     FlickrInvocation.default_api_key 'bf67a649fffb210651334a09b92df02e'
     f = FlickrInvocation.new
@@ -41,10 +50,9 @@ class ObjectiveFlickrTest < Test::Unit::TestCase
   end
   
   def test_deprecated_photo_helpers    
-    f = FlickrInvocation.new
     params = {:server=>1234, :id=>5678, :secret=>90, :farm=>321}
-    assert_equal(f.photo_url(params), "http://farm321.static.flickr.com/1234/5678_90.jpg", "URL helper failed")
-    uid = f.photo_div_id(params)
+    assert_equal(@f.photo_url(params), "http://farm321.static.flickr.com/1234/5678_90.jpg", "URL helper failed")
+    uid = @f.photo_div_id(params)
     assert_equal(uid, "photo-1234-5678-90-321--jpg", "UID failed")
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: objectiveflickr
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2007-01-05 00:00:00 +08:00
+  version: 0.9.4
+date: 2007-01-09 00:00:00 +08: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