flickraw 0.4.3 → 0.4.4

data/lib/flickraw.rb

@@ -26,7 +26,7 @@ require 'yaml'
 require 'cgi'
 
 module FlickRaw
-  VERSION='0.4.3'
+  VERSION='0.4.4'
 
   FLICKR_HOST='api.flickr.com'.freeze
 
@@ -201,8 +201,9 @@ module FlickRaw
       full_args = {:api_key => FlickRaw.api_key, :format => 'json', :nojsoncallback => 1}
       full_args[:method] = req if req
       full_args[:auth_token] = @token if @token
-      args.each {|k, v| full_args[k.to_sym] = CGI.escape(v.to_s) }
+      args.each {|k, v| full_args[k.to_sym] = v.to_s }
       full_args[:api_sig] = FlickRaw.api_sig(full_args) if FlickRaw.shared_secret
+      args.each {|k, v| full_args[k.to_sym] = CGI.escape(v.to_s) }
       full_args
     end
 
@@ -243,4 +244,4 @@ end
 #
 #  recent_photos = flickr.photos.getRecent
 #  puts recent_photos[0].title
-def flickr; @flickr ||= FlickRaw::Flickr.new end
+def flickr; $flickr ||= FlickRaw::Flickr.new end

data/test/test.rb

@@ -1,6 +1,11 @@
 require 'test/unit'
 require 'lib/flickraw'
 
+# utf8 hack
+def u(str)
+  str.gsub(/\\+u([0-9a-fA-F]{4,4})/u){["#$1".hex ].pack('U*')}
+end
+
 class Basic < Test::Unit::TestCase
   def test_known
     known_methods = ["flickr.activity.userComments", "flickr.activity.userPhotos", "flickr.auth.checkToken", "flickr.auth.getFrob", "flickr.auth.getFullToken", "flickr.auth.getToken", "flickr.blogs.getList", "flickr.blogs.postPhoto", "flickr.contacts.getList", "flickr.contacts.getPublicList", "flickr.favorites.add", "flickr.favorites.getList", "flickr.favorites.getPublicList", "flickr.favorites.remove", "flickr.groups.browse", "flickr.groups.getInfo", "flickr.groups.pools.add", "flickr.groups.pools.getContext", "flickr.groups.pools.getGroups", "flickr.groups.pools.getPhotos", "flickr.groups.pools.remove", "flickr.groups.search", "flickr.interestingness.getList", "flickr.people.findByEmail", "flickr.people.findByUsername", "flickr.people.getInfo", "flickr.people.getPublicGroups", "flickr.people.getPublicPhotos", "flickr.people.getUploadStatus", "flickr.photos.addTags", "flickr.photos.comments.addComment", "flickr.photos.comments.deleteComment", "flickr.photos.comments.editComment", "flickr.photos.comments.getList", "flickr.photos.delete", "flickr.photos.geo.getLocation", "flickr.photos.geo.getPerms", "flickr.photos.geo.removeLocation", "flickr.photos.geo.setLocation", "flickr.photos.geo.setPerms", "flickr.photos.getAllContexts", "flickr.photos.getContactsPhotos", "flickr.photos.getContactsPublicPhotos", "flickr.photos.getContext", "flickr.photos.getCounts", "flickr.photos.getExif", "flickr.photos.getFavorites", "flickr.photos.getInfo", "flickr.photos.getNotInSet", "flickr.photos.getPerms", "flickr.photos.getRecent", "flickr.photos.getSizes", "flickr.photos.getUntagged", "flickr.photos.getWithGeoData", "flickr.photos.getWithoutGeoData", "flickr.photos.licenses.getInfo", "flickr.photos.licenses.setLicense", "flickr.photos.notes.add", "flickr.photos.notes.delete", "flickr.photos.notes.edit", "flickr.photos.recentlyUpdated", "flickr.photos.removeTag", "flickr.photos.search", "flickr.photos.setDates", "flickr.photos.setMeta", "flickr.photos.setPerms", "flickr.photos.setTags", "flickr.photos.transform.rotate", "flickr.photos.upload.checkTickets", "flickr.photosets.addPhoto", "flickr.photosets.comments.addComment", "flickr.photosets.comments.deleteComment", "flickr.photosets.comments.editComment", "flickr.photosets.comments.getList", "flickr.photosets.create", "flickr.photosets.delete", "flickr.photosets.editMeta", "flickr.photosets.editPhotos", "flickr.photosets.getContext", "flickr.photosets.getInfo", "flickr.photosets.getList", "flickr.photosets.getPhotos", "flickr.photosets.orderSets", "flickr.photosets.removePhoto", "flickr.reflection.getMethodInfo", "flickr.reflection.getMethods", "flickr.tags.getHotList", "flickr.tags.getListPhoto", "flickr.tags.getListUser", "flickr.tags.getListUserPopular", "flickr.tags.getListUserRaw", "flickr.tags.getRelated", "flickr.test.echo", "flickr.test.login", "flickr.test.null", "flickr.urls.getGroup", "flickr.urls.getUserPhotos", "flickr.urls.getUserProfile", "flickr.urls.lookupGroup", "flickr.urls.lookupUser"]
@@ -50,5 +55,13 @@ class Basic < Test::Unit::TestCase
       result_set = flickr.photos.search :text => "family vacation"
     }
     assert_operator result_set.total.to_i, :>=, 0
+
+    # Unicode tests
+    echo = nil
+    utf8_text = "Hélène François, €uro"
+    assert_nothing_raised {
+      echo = flickr.test.echo :utf8_text => utf8_text
+    }
+    assert_equal u(echo.utf8_text), utf8_text
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
-date: 2007-08-04 00:00:00 +02:00
+  version: 0.4.4
+date: 2007-09-17 00:00:00 +02:00
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
 require_paths: 
 - lib