flickrrb 1.1 → 2.0

data/README.rdoc

@@ -24,4 +24,4 @@ It tries to map the methods described in {the official api documentation}[http:/
 
 == Todo
 *  Maybe use JSON instead of xml responses.
-*  Auth.
+*  OAuth.

data/Rakefile

@@ -1,16 +1,13 @@
 require 'rake/testtask'
 require 'rake/rdoctask'
-#require 'rake/packagetask'
-require 'rake/gempackagetask'
 
 
-Rake::TestTask.new 'test' do |t|
+Rake::TestTask.new do |t|
     t.pattern = 'test/*.rb'
 end
 
-Rake::RDocTask.new do |rd|
+RDoc::Task.new do |rd|
   rd.rdoc_files.include "README.rdoc", "lib/flickrrb.rb"
-  rd.options << "--inline-source"
 end
 
 task 'default' => ['test']

data/lib/flickrrb.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 require 'net/http'
 require 'cgi'
 require 'rexml/document'
@@ -15,9 +17,11 @@ class Flickr
     @method = []
   end
 
+  private
+
   def method_missing name, *args
-    unless args.first.nil? || args.first.respond_to?(:merge)
-       @method = []
+    unless args.empty? || args.first.class == Hash
+       @method.clear
        raise APIException, "Args must be a hash" 
     end
     
@@ -27,10 +31,10 @@ class Flickr
       p @method if @debug
       begin
         command = build_command
-        @method = []
-        @flickr_client.send(command)
+        @method.clear
+        @flickr_client.request(command)
       rescue
-        @method = []
+        @method.clear
         raise
       end
     else
@@ -53,6 +57,7 @@ class Flickr
     
     @method.each do |m|
       method << ".#{m.name.to_s}"
+      # Make no args = {} not nil
       args.merge!(m.args) unless m.args.nil?
     end
 
@@ -64,121 +69,115 @@ class Flickr
     "?method=#{method}&api_key=#{@api_key}&#{a}"
   end
   
-  class Group
-    attr :id
-    attr :name
-    attr :description
-    attr :members
-    
-    def initialize xml
-      if xml.elements['name'].nil?
-        init_from_attributes xml
-      else
-        init_from_elements xml
-      end
-    end
-    
-    private
+  
+  class Base
+    attr_accessor :id
     
-    def init_from_attributes xml
-      @id = xml.attributes['nsid']
-      @name = xml.attributes['name']
-    end
+    alias_method :nsid=, :id=
     
-    def init_from_elements xml
-      @id = xml.attributes['id']
-      @name = xml.elements['name'].text
-      @description = xml.elements['description'].text
-      @members = xml.elements['members'].text
+    def initialize params
+      params.each do |k,v|
+        if v.class == Hash
+          unless params[k]['_content'].nil?
+            v = params[k]['_content']
+          end
+        end
+      
+        send "#{k.gsub('?', '')}=", v
+      end
     end
-  end
 
-  class Photo
-    attr :id
-    attr :owner_real_name
-    attr :owner_user_name
-    attr :owner
-    attr :title
-    attr :candownload
-    attr :description
-    attr :tags
-    attr :date
+  end
+  
+  class Group < Base
+    [:name, 
+     :description, 
+     :members, 
+     :admin, 
+     :eighteenplus, 
+     :invitation_only, 
+     :iconserver,
+     :iconfarm, 
+     :privacy, 
+     :lang, 
+     :ispoolmoderated, 
+     :blast, 
+     :throttle, 
+     :restrictions].each {|a| attr_accessor a}
     
-    def initialize xml
-      @id = xml.attributes['id']
-      @owner_user_name = xml.attributes['ownername']
-      @owner = xml.attributes['owner']
-      @title = xml.attributes['title']
-       
-       if @title.nil?
-         @owner_real_name = xml.elements['owner'].attributes['realname']
-         @owner_user_name = xml.elements['owner'].attributes['username']
-         @owner = xml.elements['owner'].attributes['nsid']
-         @title = xml.elements['title'].text
-         @description = xml.elements['description'].text
-         @date = xml.elements['dates'].attributes['taken']
-
-         @tags = []
-         xml.elements.each('tags/tag') do |t|
-           @tags << t.text
-         end
-       end
+    # {"nsid"=>"34427469792@N01", "name"=>"FlickrCentral", "admin"=>0, "eighteenplus"=>0, "invitation_only"=>0}
+  end
 
-      # <usage candownload='1' canblog='0' canprint='0'/>
-    end
+  class Photo < Base
+    [:owner,
+     :title,
+     :candownload,
+     :description,
+     :tags,
+     :date,
+     :secret,
+     :server,
+     :farm,
+     :ispublic,
+     :isfriend,
+     :isfamily,
+     :ownername,
+     :dateadded,
+     :dateuploaded,
+     :isfavorite,
+     :license,
+     :safety_level,
+     :rotation,
+     :originalsecret,
+     :originalformat,
+     :visibility,
+     :dates,
+     :views,
+     :editability,
+     :publiceditability,
+     :usage,
+     :comments,
+     :notes,
+     :location,
+     :geoperms,
+     :urls,
+     :media].each {|a| attr_accessor a}
     
-    def inspect
-      "id; #{@id}\n \
-      title; #{@title}\n \
-      description; #{@description}\n \
-      user name; #{@owner_user_name}\n \
-      real name; #{@owner_real_name}\n \
-      date; #{@date}\n \
-      tags; #{@tags.inspect}"
+    def initialize data
+      super
+      @owner = Person.new(data['owner']) if data['owner'].class == Hash
+      @tags = data['tags']['tag'].collect {|t| t['raw']} unless data['tags'].nil?
     end
   end
   
-  class Size
-    attr :label
-    attr :width
-    attr :height
-    attr :source
-    attr :url
-    
-    def initialize xml
-      @label  = xml.attributes['label']
-      @width  = xml.attributes['width']
-      @height = xml.attributes['height']
-      @source = xml.attributes['source']
-      @url    = xml.attributes['url']
-    end
+  # {"label"=>"Square", "width"=>75, "height"=>75, "source"=>"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_s.jpg", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/sq/", "media"=>"photo"}
+  class Size < Base
+    [:label,
+     :width,
+     :height,
+     :source,
+     :url,
+     :media].each {|a| attr_accessor a}
   end
   
-  class Person
-    attr :id
-    attr :username
-    attr :realname
-    attr :ispro
-    attr :location
-    attr :photosurl
-    attr :profileurl
-    attr :photos_count
-        
-    def initialize xml
-      @id = xml.attributes['id']
-      @ispro = xml.attributes['ispro']
-      @username = xml.elements['username'].text
-      unless xml.elements['realname'].nil?
-        @realname = xml.elements['realname'].text
-        @location = xml.elements['location'].text
-        @photosurl = xml.elements['photosurl'].text
-        @profileurl = xml.elements['profileurl'].text
-        @photos_count = xml.elements['photos'].elements['count'].text
-      end
-    end
+  class Person < Base
+    [:id,
+     :username,
+     :realname,
+     :ispro,
+     :location,
+     :photosurl,
+     :profileurl,
+     :photos_count,
+     :iconserver,
+     :iconfarm,
+     :path_alias,
+     :mobileurl,
+     :photos].each {|a| attr_accessor a}
+            
   end
   
-  class FlickrClient
+  class FlickrClient # :nodoc:
     def initialize http = nil, debug = false
       flickr_url = URI.parse "http://api.flickr.com/"
       
@@ -190,28 +189,33 @@ class Flickr
       @debug = debug
     end
     
-    def send command
-      p "/services/rest/#{command}" if @debug
-      build_response(@flickr_client.get("/services/rest/#{command}").body)
+    def request command
+      p "/services/rest/#{command}&format=json" if @debug
+      build_response(@flickr_client.get("/services/rest/#{command}&format=json").body)
     end
     
-    def build_response xml
-      p xml if @debug
-      doc = REXML::Document.new(xml, { 'ForceArray' => false })
-      
-      raise APIException, "Invalid response from Flickr" if doc.root.nil?
+  #####   "hello".capitalize Build class to call
+    def build_response j
+      p j if @debug
+      m = j.match(/^jsonFlickrApi\((.+)\)$/)
       
-      resp = []
+      raise APIException, "Invalid response from Flickr" if m.nil?
       
-      if doc.root.attributes["stat"] == "ok"
-        doc.root.elements.each {|e| resp << self.__send__(e.name.to_sym, e)}
+      data = JSON.parse m[1]
+
+      resp = nil
+      if !m.nil? && data['stat'] == 'ok'
+        data.keys.each do |k|
+          next if k == 'stat'
+          resp = self.send(k, data)
+        end
       else
-        handle_error doc
+        raise APIException, "#{data['code']}: #{data['message']}"
       end
-
-      resp.first
+      
+      resp
     end
-    
+
     def handle_error xml
       # This is a bit ugly!
       code = xml.elements['rsp'].elements['err'].attributes['code']
@@ -219,48 +223,58 @@ class Flickr
       raise APIException, "#{code}: #{message}"
     end
     
-    def groups xml
-      xml.elements.collect do |g|
-        group g
+    def stat data
+    end    
+    
+    def groups data
+      data['groups']['group'].collect do |g|
+        group(g)
       end
     end
 
-    def group xml
-      Group.new xml
+    def group data
+      Group.new data
     end
     
-    def photos xml
-      pages = xml.attributes['pages']
-      total = xml.attributes['total']
-      photos = xml.elements.collect do |p|
-        Photo.new p
-      end
+    # {"page"=>1, "pages"=>1, "perpage"=>100, "total"=>"15", "photo"=>[{"id"=>"1848463798", "owner"=>"12656878@N06", "secret"=>"d9fcbdedb5", "server"=>"2103", "farm"=>3, "title"=>"IMG_5628_29_30", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1250311066"}, {"id"=>"1847616297", "owner"=>"12656878@N06", "secret"=>"71461d1f9a", "server"=>"2042", "farm"=>3, "title"=>"IMG_5547_8_9", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1250311040"}, {"id"=>"1847623411", "owner"=>"12656878@N06", "secret"=>"13dc200ffe", "server"=>"2007", "farm"=>3, "title"=>"IMG_5571_2_3", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1250311001"}, {"id"=>"2359596024", "owner"=>"12656878@N06", "secret"=>"2d8fde31d1", "server"=>"2267", "farm"=>3, "title"=>"Criss Cross Castle", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1206397646"}, {"id"=>"2356865849", "owner"=>"12656878@N06", "secret"=>"69697c85d3", "server"=>"3282", "farm"=>4, "title"=>"Alexander Library", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1206353910"}, {"id"=>"2150832683", "owner"=>"12656878@N06", "secret"=>"e97dfa334f", "server"=>"2122", "farm"=>3, "title"=>"IMG_0716_7_8", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1199095628"}, {"id"=>"2151623192", "owner"=>"12656878@N06", "secret"=>"81b8bdcc39", "server"=>"2099", "farm"=>3, "title"=>"IMG_0695_6_7", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1199095610"}, {"id"=>"2150834129", "owner"=>"12656878@N06", "secret"=>"19fb55ffdd", "server"=>"2156", "farm"=>3, "title"=>"IMG_0643_4_5", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1199095592"}, {"id"=>"2150812929", "owner"=>"12656878@N06", "secret"=>"f87fe0ba85", "server"=>"2252", "farm"=>3, "title"=>"IMG_0506_7_8", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1199095509"}, {"id"=>"2150812919", "owner"=>"12656878@N06", "secret"=>"ae39c7e214", "server"=>"2099", "farm"=>3, "title"=>"IMG_0494_5_6", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1199095483"}, {"id"=>"2150812917", "owner"=>"12656878@N06", "secret"=>"ca858d0646", "server"=>"2019", "farm"=>3, "title"=>"IMG_0491_2_3", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1199095461"}, {"id"=>"1848466274", "owner"=>"12656878@N06", "secret"=>"cec90f64ba", "server"=>"2402", "farm"=>3, "title"=>"IMG_5631_2_3", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1194217745"}, {"id"=>"1847626991", "owner"=>"12656878@N06", "secret"=>"a4d0774b17", "server"=>"2022", "farm"=>3, "title"=>"IMG_5574_5_6", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1194128771"}, {"id"=>"1847633163", "owner"=>"12656878@N06", "secret"=>"5089075c7a", "server"=>"2008", "farm"=>3, "title"=>"IMG_5598_599_600", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1194128720"}, {"id"=>"1848469604", "owner"=>"12656878@N06", "secret"=>"e0f8cfeab2", "server"=>"2140", "farm"=>3, "title"=>"IMG_5646_7_8", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0, "ownername"=>"Henry Maddocks", "dateadded"=>"1194128674"}]}
+    def photos data
+      pages = data['photos']['pages']
+      total = data['photos']['total']
+      
+      photo_list = data['photos']['photo']
       
+      photos = photo_list.collect do |p|
+        self.photo p
+      end
+            
       return photos, pages.to_i, total.to_i
     end
 
-    def photo xml
-      Photo.new xml
+    def photo data
+      data = data['photo'] unless data['photo'].nil?
+      Photo.new data
     end
     
-    def sizes xml
+    # {"canblog"=>0, "canprint"=>0, "candownload"=>1, "size"=>[{"label"=>"Square", "width"=>75, "height"=>75, "source"=>"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_s.jpg", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/sq/", "media"=>"photo"}, {"label"=>"Thumbnail", "width"=>"100", "height"=>"75", "source"=>"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_t.jpg", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/t/", "media"=>"photo"}, {"label"=>"Small", "width"=>"240", "height"=>"180", "source"=>"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_m.jpg", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/s/", "media"=>"photo"}, {"label"=>"Medium", "width"=>"500", "height"=>"375", "source"=>"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba.jpg", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/m/", "media"=>"photo"}, {"label"=>"Medium 640", "width"=>"640", "height"=>480, "source"=>"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_z.jpg?zz=1", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/z/", "media"=>"photo"}, {"label"=>"Original", "width"=>"1280", "height"=>"960", "source"=>"http://farm3.static.flickr.com/2402/1848466274_b76775879a_o.jpg", "url"=>"http://www.flickr.com/photos/acute-distress/1848466274/sizes/o/", "media"=>"photo"}]}
+    def sizes data
       sizes = []
-      xml.elements.each do |p|
+      data['sizes']['size'].each do |p|
         s = Size.new(p)
         sizes << s
         (class << sizes; self;end).class_eval do
-          define_method(s.label.downcase.gsub(" ", "").to_sym) { s }
-        end      
+          define_method(s.label.downcase.gsub(" ", "_").to_sym) { s }
+        end    
       end
+      
       sizes
     end
 
-    def user xml
-      Person.new xml
+    def user data
+      Person.new data['user']
     end
     
-    def person xml
-      Person.new xml
+    def person data
+      Person.new data['person']
     end
   end
   

data/test/flickrrb_test.rb

@@ -8,9 +8,9 @@ class Test_Flickr < MiniTest::Unit::TestCase
   end
   
   def test_api_key_exception
-    flickr = Flickr.new :api_key => "bad_key", :http => @http_client
+    flickr = Flickr.new :api_key => "bad_key", :http => @http_client, :debug => false
     @http_client.expect :get, flickr_responses[:bad_api_key], flickr_commands[:bad_api_key]
-    
+
     assert_raises APIException do
       flickr.photos.getInfo(:photo_id => '1848466274')
     end
@@ -19,24 +19,15 @@ class Test_Flickr < MiniTest::Unit::TestCase
   end
 
   def test_create_objects
-    xml = <<EOS
-    <?xml version="1.0" encoding="utf-8" ?> \
-            <rsp stat="ok"> \
-              <photos page="1" pages="1" perpage="100" total="4"> \
-                <photo id="1848466274" owner="12656878@N06" secret="cec90f64ba" server="2402" farm="3" title="IMG_5631_2_3" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194217745" /> \
-                <photo id="1847626991" owner="12656878@N06" secret="a4d0774b17" server="2022" farm="3" title="IMG_5574_5_6" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194128771" /> \
-                <photo id="1847633163" owner="12656878@N06" secret="5089075c7a" server="2008" farm="3" title="IMG_5598_599_600" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194128720" /> \
-                <photo id="1848469604" owner="12656878@N06" secret="e0f8cfeab2" server="2140" farm="3" title="IMG_5646_7_8" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194128674" /> \
-              </photos> \
-            </rsp>
-EOS
+    data = "jsonFlickrApi({\"photos\":{\"page\":1, \"pages\":1, \"perpage\":100, \"total\":\"15\", \"photo\":[{\"id\":\"1848463798\", \"owner\":\"12656878@N06\", \"secret\":\"d9fcbdedb5\", \"server\":\"2103\", \"farm\":3, \"title\":\"IMG_5628_29_30\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1250311066\"}, {\"id\":\"1847616297\", \"owner\":\"12656878@N06\", \"secret\":\"71461d1f9a\", \"server\":\"2042\", \"farm\":3, \"title\":\"IMG_5547_8_9\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1250311040\"}, {\"id\":\"1847623411\", \"owner\":\"12656878@N06\", \"secret\":\"13dc200ffe\", \"server\":\"2007\", \"farm\":3, \"title\":\"IMG_5571_2_3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1250311001\"}, {\"id\":\"2359596024\", \"owner\":\"12656878@N06\", \"secret\":\"2d8fde31d1\", \"server\":\"2267\", \"farm\":3, \"title\":\"Criss Cross Castle\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1206397646\"}, {\"id\":\"2356865849\", \"owner\":\"12656878@N06\", \"secret\":\"69697c85d3\", \"server\":\"3282\", \"farm\":4, \"title\":\"Alexander Library\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1206353910\"}, {\"id\":\"2150832683\", \"owner\":\"12656878@N06\", \"secret\":\"e97dfa334f\", \"server\":\"2122\", \"farm\":3, \"title\":\"IMG_0716_7_8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095628\"}, {\"id\":\"2151623192\", \"owner\":\"12656878@N06\", \"secret\":\"81b8bdcc39\", \"server\":\"2099\", \"farm\":3, \"title\":\"IMG_0695_6_7\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095610\"}, {\"id\":\"2150834129\", \"owner\":\"12656878@N06\", \"secret\":\"19fb55ffdd\", \"server\":\"2156\", \"farm\":3, \"title\":\"IMG_0643_4_5\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095592\"}, {\"id\":\"2150812929\", \"owner\":\"12656878@N06\", \"secret\":\"f87fe0ba85\", \"server\":\"2252\", \"farm\":3, \"title\":\"IMG_0506_7_8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095509\"}, {\"id\":\"2150812919\", \"owner\":\"12656878@N06\", \"secret\":\"ae39c7e214\", \"server\":\"2099\", \"farm\":3, \"title\":\"IMG_0494_5_6\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095483\"}, {\"id\":\"2150812917\", \"owner\":\"12656878@N06\", \"secret\":\"ca858d0646\", \"server\":\"2019\", \"farm\":3, \"title\":\"IMG_0491_2_3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095461\"}, {\"id\":\"1848466274\", \"owner\":\"12656878@N06\", \"secret\":\"cec90f64ba\", \"server\":\"2402\", \"farm\":3, \"title\":\"IMG_5631_2_3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194217745\"}, {\"id\":\"1847626991\", \"owner\":\"12656878@N06\", \"secret\":\"a4d0774b17\", \"server\":\"2022\", \"farm\":3, \"title\":\"IMG_5574_5_6\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194128771\"}, {\"id\":\"1847633163\", \"owner\":\"12656878@N06\", \"secret\":\"5089075c7a\", \"server\":\"2008\", \"farm\":3, \"title\":\"IMG_5598_599_600\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194128720\"}, {\"id\":\"1848469604\", \"owner\":\"12656878@N06\", \"secret\":\"e0f8cfeab2\", \"server\":\"2140\", \"farm\":3, \"title\":\"IMG_5646_7_8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194128674\"}]}, \"stat\":\"ok\"})"
     
     flickr = Flickr::FlickrClient.new
     
-    photos, pages, total = flickr.build_response xml
+    photos, pages, total = flickr.build_response data
 
-    assert_equal 4, photos.length
-    assert_equal "IMG_5598_599_600", photos[2].title
+    assert_equal 15, photos.length
+    assert_equal "IMG_5571_2_3", photos[2].title
+    assert_equal "12656878@N06", photos[2].owner
   end
   
   def test_all_together
@@ -56,6 +47,7 @@ EOS
   end
   
   def test_argument_format
+  @http_client.expect :get, flickr_responses[:people_get_info], flickr_commands[:people_get_info]
     @flickr.people.getInfo
 
     assert_raises APIException do
@@ -95,12 +87,9 @@ EOS
   def test_nice_ids
     @http_client.expect :get, flickr_responses[:photos_get_sizes], flickr_commands[:photos_get_sizes]
 
-    data = <<EOS
-          <photo id="1848466274" owner="12656878@N06" secret="cec90f64ba" server="2402" farm="3" title="IMG_5631_2_3" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194217745" />
-EOS
+    data = "{\"id\":\"6043998263\", \"owner\":\"12656878@N06\", \"secret\":\"4993702a27\", \"server\":\"6073\", \"farm\":7, \"title\":\"Netball\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}"
 
-    xml = REXML::Document.new data
-    photo = Flickr::Photo.new xml.root
+    photo = Flickr::Photo.new JSON.parse(data)
 
     assert @flickr.photos.getSizes(:photo_id => photo.id)
     assert @flickr.photos.getSizes(:photo_id => photo)

data/test/groups_test.rb

@@ -8,46 +8,26 @@ class GroupsTest < MiniTest::Unit::TestCase
   end
   
   def test_group
-    data = <<EOS    
-    <group id="34427465497@N01" iconserver="1" lang="en-us" ispoolmoderated="0">
-    	<name>GNEverybody</name>
-    	<description>The group for GNE players</description>
-    	<members>69</members>
-    	<privacy>3</privacy>
-    	<throttle count="10" mode="month" remaining="3"/>
-    </group>
-EOS
+    # @flickr.groups.getInfo :group_id => "34427465497@N01"
+    data = "{\"id\":\"34427465497@N01\", \"iconserver\":\"1\", \"iconfarm\":1, \"name\":{\"_content\":\"GNEverybody\"}, \"description\":{\"_content\":\"GNE is short for &quot;Game Neverending&quot; and this is a group started by GNE players. But it's open to everybody!!\\n\\nGame NeverEnding was the precursor to Flickr and so this group also contains most of Flickr's earliest members.\\n\\n<a href=\\\"http:\\/\\/en.wikipedia.org\\/wiki\\/Game_Neverending\\\">en.wikipedia.org\\/wiki\\/Game_Neverending<\\/a>\\n\\nWhat was Game NeverEnding like? The best overview is here:\\n\\n<a href=\\\"http:\\/\\/www.gnespy.com\\/museum\\/\\\">www.gnespy.com\\/museum\\/<\\/a>\"}, \"members\":{\"_content\":\"244\"}, \"privacy\":{\"_content\":\"3\"}, \"lang\":null, \"ispoolmoderated\":0, \"blast\":{\"_content\":\"<a href=\\\"http:\\/\\/alpha.glitch.com\\\" rel=\\\"nofollow\\\">Glitch<\\/a> <a href=\\\"http:\\/\\/alpha.glitch.com\\\" rel=\\\"nofollow\\\">Glitch<\\/a> <a href=\\\"http:\\/\\/alpha.glitch.com\\\" rel=\\\"nofollow\\\">Glitch<\\/a> <a href=\\\"http:\\/\\/alpha.glitch.com\\\" rel=\\\"nofollow\\\">Glitch<\\/a>\", \"date_blast_added\":\"1268277847\", \"user_id\":\"5649\"}, \"throttle\":{\"mode\":\"none\"}, \"restrictions\":{\"photos_ok\":1, \"videos_ok\":1, \"images_ok\":1, \"screens_ok\":1, \"art_ok\":1, \"safe_ok\":1, \"moderate_ok\":0, \"restricted_ok\":0, \"has_geo\":0}}"
     
-    xml = REXML::Document.new data
-    group = Flickr::Group.new xml.root
+    group = Flickr::Group.new JSON.parse(data)
 
     assert_equal "34427465497@N01", group.id
     assert_equal "GNEverybody", group.name
-    assert_equal "The group for GNE players", group.description
-    assert_equal "69", group.members
+    assert_equal "244", group.members
+    assert ! group.admin
 
   end
   
   def test_groups
-    xml = <<EOS
-    <?xml version="1.0" encoding="utf-8" ?>
-    <rsp stat="ok">
-      <groups>
-        <group nsid="34427469792@N01" name="FlickrCentral" admin="0" eighteenplus="0" />
-        <group nsid="37996584485@N01" name="Motorcycles" admin="0" eighteenplus="0" />
-        <group nsid="41894169203@N01" name="Wellington, New Zealand" admin="0" eighteenplus="0" />
-        <group nsid="51035612836@N01" name="Flickr API" admin="0" eighteenplus="0" />
-        <group nsid="52240148330@N01" name="BEER" admin="0" eighteenplus="0" />
-        <group nsid="52241691728@N01" name="Glitch Art" admin="0" eighteenplus="0" />
-        <group nsid="55475894@N00" name="* Vanishing Points *" admin="0" eighteenplus="0" />
-      </groups>
-    </rsp>
-EOS
+    # @flickr.people.getPublicGroups :user_id => "12656878@N06"
+    data = "jsonFlickrApi({\"groups\":{\"group\":[{\"nsid\":\"34427469792@N01\", \"name\":\"FlickrCentral\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"37996584485@N01\", \"name\":\"Motorcycles\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"41894169203@N01\", \"name\":\"Wellington, New Zealand\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"51035612836@N01\", \"name\":\"Flickr API\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"52240148330@N01\", \"name\":\"BEER\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"52241691728@N01\", \"name\":\"Glitch Art\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"55475894@N00\", \"name\":\"* Vanishing Points *\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"66639191@N00\", \"name\":\"Triumph Motorcycles\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"88412962@N00\", \"name\":\"What's that in your fridge?\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"90587578@N00\", \"name\":\"Twins\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"34246345@N00\", \"name\":\"DoF\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"42239651@N00\", \"name\":\"Manawatu, New Zealand\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"58146428@N00\", \"name\":\"Portrait\\u2605Faces\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"20023350@N00\", \"name\":\"Zen and the Art of Motorcycle Photography\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"89888984@N00\", \"name\":\"HDR\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"53283318@N00\", \"name\":\"Wairarapa, New Zealand\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"89438260@N00\", \"name\":\"Self-Portraits!\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"51988071@N00\", \"name\":\"SportBikes\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"99404851@N00\", \"name\":\"Wanganui, New Zealand-\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"16582005@N00\", \"name\":\"Guess Where Wellington\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"38343303@N00\", \"name\":\"Bokeh: Smooth & Silky\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"72468951@N00\", \"name\":\"TTHDR (True Tone High Dynamic Range)\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"38072161@N00\", \"name\":\"Quality HDR\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"23374016@N00\", \"name\":\"italia in HDR\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"81187335@N00\", \"name\":\"HDR Skies (please read the rules!!!!)\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"65141193@N00\", \"name\":\"My First HDR - beginners group\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"20421382@N00\", \"name\":\"The Portrait Group\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"91672167@N00\", \"name\":\"Gummistiefel, Wellies, Rubberboots, Gumboots\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"29592336@N00\", \"name\":\"Stuck in Customs' Brilliant Cabal - My Cool and Clever Friends\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"59755016@N00\", \"name\":\"Triumph Daytona\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"62454704@N00\", \"name\":\"HDR Unlimited\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"66357807@N00\", \"name\":\"MOTO GUZZI\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"24208866@N00\", \"name\":\"iPhone\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"85243584@N00\", \"name\":\"My Flailing Limbs: a faceless self portrait (feet, arms, legs, h\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"288449@N25\", \"name\":\"This is New Zealand too... (life as we live it) - GROUP CLOSED\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"317731@N24\", \"name\":\"secret New Zealand\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"369386@N21\", \"name\":\"Boatsheds\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"423524@N23\", \"name\":\"Girls in Wellies\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"435980@N21\", \"name\":\"Wellington NZ - Abandoned\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"492041@N22\", \"name\":\"Kiwibiker\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"442819@N24\", \"name\":\"Gandang Pinay(Beautiful Filipina)\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"467839@N20\", \"name\":\"Flickr Fine Art Portrait Gallery\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"499909@N21\", \"name\":\"Weather Photography\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"501290@N25\", \"name\":\"Hyosung Comet Riders (250, 650, GT, R)\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"555892@N21\", \"name\":\"Te Ara - the Encyclopedia of New Zealand\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"587967@N20\", \"name\":\"HDReal\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"623089@N23\", \"name\":\"IN YOUR FACE - the illustrated portrait\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"627001@N23\", \"name\":\"500x500\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"610198@N20\", \"name\":\"Ponoko\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"688206@N23\", \"name\":\"Wellington Boots\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"688798@N23\", \"name\":\"[HDR B&W and Sepia Photos] [HDR ONLY]\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"695165@N21\", \"name\":\"Epic Beer\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"811645@N22\", \"name\":\"Panasonic Micro and Four Thirds Photographers\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"799767@N23\", \"name\":\"Motorcycle On The Road - (Only bike with landscape, no racing)\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"798116@N21\", \"name\":\"Flickr 888\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"836323@N21\", \"name\":\"Galoshes!\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"895739@N23\", \"name\":\"The Official Pano Panorama Group\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"866118@N20\", \"name\":\"[CameraBag]\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"955385@N22\", \"name\":\"Iphone Camera Art\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"926286@N25\", \"name\":\"HDR - The Way It's Supposed To Look\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1013977@N22\", \"name\":\"Brushes Gallery \\u2013 iPhone\\/iPad Art\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"946087@N25\", \"name\":\"Hunter Wellingtons\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1049385@N24\", \"name\":\"Iphone \\/ Ipad art\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1079681@N20\", \"name\":\"TiltShift Generator\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1081745@N24\", \"name\":\"Cosina Voigtlander Nokton 50\\/1.1\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1083518@N25\", \"name\":\"Mill Colour Image Gallery\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1151932@N21\", \"name\":\"PetaPixel.com\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1222142@N22\", \"name\":\"Panasonic Lumix DMC-GF1\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1244767@N22\", \"name\":\"Micro Four Thirds (Micro 4\\/3)\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1254640@N22\", \"name\":\"SketchBook\\u00ae\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1251121@N24\", \"name\":\"The Daily Shoot\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1292122@N21\", \"name\":\"TrueHDR\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1303089@N20\", \"name\":\"Voigtl\\u00e4nder lenses on FourThirds (FT) & \\u00b5FourThirds (\\u00b5FT) \", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1505867@N20\", \"name\":\"Voigtl\\u00e4nder Nokton 25mm f\\/0.95 for micro four thirds\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1533591@N20\", \"name\":\"Voigtlander Nokton 25mm\\/f0.95\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1590379@N23\", \"name\":\"Wanderlust Cameras\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1560583@N20\", \"name\":\"Pinwide\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}, {\"nsid\":\"1590200@N25\", \"name\":\"Inkpad Art - iPad Vector Drawings\", \"admin\":0, \"eighteenplus\":0, \"invitation_only\":0}]}, \"stat\":\"ok\"})"
 
     flickr = Flickr::FlickrClient.new
+    groups = flickr.build_response data
 
-    groups = flickr.build_response xml
-    assert_equal 7, groups.length
+    assert_equal 78, groups.length
     assert_equal 'Wellington, New Zealand', groups[2].name
     assert_equal '41894169203@N01', groups[2].id
 
@@ -59,14 +39,14 @@ EOS
     groups_photos, pages, total = @flickr.groups.pools.getPhotos :user_id => "12656878@N06", :group_id => "99404851@N00"
 
     @http_client.verify
-    assert_equal 15, groups_photos.length
     assert_equal 1, pages
     assert_equal 15, total
+    assert_equal 15, groups_photos.length
     
     groups_photos.each do |photo|
-      assert_equal 'Henry Maddocks', photo.owner_user_name
+      assert_equal '12656878@N06', photo.owner
     end
   end
 
   
-end
+end

data/test/people_test.rb

@@ -16,33 +16,28 @@ class PeopleTest < MiniTest::Unit::TestCase
   end
   
   def test_person
-    data = <<EOS
-     <person nsid='12656878@N06' iconfarm='2' id='12656878@N06' ispro='0' isadmin='0' iconserver='1011'>
-        <username>henry.maddocks</username>
-        <realname>Henry Maddocks</realname>
-        <mbox_sha1sum>4e20b6c8b0fade15dcb37181c65de45b6205cecc</mbox_sha1sum>
-        <location>Wellington, New Zealand</location>
-        <photosurl>http://www.flickr.com/photos/12656878@N06/</photosurl>
-        <profileurl>http://www.flickr.com/people/12656878@N06/</profileurl>
-        <mobileurl>http://m.flickr.com/photostream.gne?id=12611556</mobileurl>
-        <photos>
-            <firstdatetaken>2005-09-24 16:20:11</firstdatetaken>
-            <firstdate>1188878270</firstdate>
-            <count>57</count>
-        </photos>
-    </person>    
-EOS
+    # @flickr.people.getInfo :user_id => '12656878@N06'
+    data = "{\"id\":\"12656878@N06\", \"nsid\":\"12656878@N06\", \"ispro\":1, \"iconserver\":\"1011\", \"iconfarm\":2, \"path_alias\":\"acute-distress\", \"username\":{\"_content\":\"Henry Maddocks\"}, \"realname\":{\"_content\":\"Henry Maddocks\"}, \"location\":{\"_content\":\"Wellington, New Zealand\"}, \"photosurl\":{\"_content\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/\"}, \"profileurl\":{\"_content\":\"http:\\/\\/www.flickr.com\\/people\\/acute-distress\\/\"}, \"mobileurl\":{\"_content\":\"http:\\/\\/m.flickr.com\\/photostream.gne?id=12611556\"}, \"photos\":{\"firstdatetaken\":{\"_content\":\"1970-01-01 15:08:34\"}, \"firstdate\":{\"_content\":\"1188878270\"}, \"count\":{\"_content\":1803}}}"
     
-    xml = REXML::Document.new data
-    me = Flickr::Person.new xml.root
+    me = Flickr::Person.new JSON.parse(data)
     
     assert_equal '12656878@N06', me.id
-    assert_equal 'henry.maddocks', me.username
+    assert_equal 'Henry Maddocks', me.username
     assert_equal 'Henry Maddocks', me.realname
     assert_equal 'Wellington, New Zealand', me.location
-    
   end
   
+  def test_short_person
+    data = "{\"nsid\":\"12656878@N06\", \"username\":\"Henry Maddocks\", \"realname\":\"Henry Maddocks\", \"location\":\"Wellington, New Zealand\", \"iconserver\":\"1011\", \"iconfarm\":2}"
+    
+    me = Flickr::Person.new JSON.parse(data)
+
+    assert_equal '12656878@N06', me.id
+    assert_equal 'Henry Maddocks', me.username
+    assert_equal 'Henry Maddocks', me.realname
+    assert_equal 'Wellington, New Zealand', me.location
+  end
+
   def test_find_by_user_name
     @http_client.expect :get, flickr_responses[:people_by_user_name], flickr_commands[:people_by_user_name]
 
@@ -52,4 +47,4 @@ EOS
     assert_equal '12656878@N06', me.id
   end
   
-end
+end

data/test/photo_gne_test.rb

@@ -7,19 +7,19 @@ require 'photo_gne.rb'
 
 class Test_Parse_ID < MiniTest::Unit::TestCase
   def test_url
-    assert_equal 4254104021, parse_id("http://farm5.static.flickr.com/4024/4254104021_4a69ed0cc0_b.jpg")
-    assert_equal 4254104021, parse_id("http://farm5.static.flickr.com/4024/4254104021_4a69ed0cc0.jpg")
+    assert_equal 4254104021, parse_id("http://farm5.static.flickr.com/4024/4254104021_4a69ed0cc0_b.jpg").to_i
+    assert_equal 4254104021, parse_id("http://farm5.static.flickr.com/4024/4254104021_4a69ed0cc0.jpg").to_i
   end
   
   def test_integer
-    assert_equal 4254104021, parse_id("4254104021")
+    assert_equal 4254104021, parse_id("4254104021").to_i
   end
   
   def test_partial
-    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0.jpg")
-    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0_b.jpg")
-    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0_b")
-    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0")
+    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0.jpg").to_i
+    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0_b.jpg").to_i
+    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0_b").to_i
+    assert_equal 4254104021, parse_id("4254104021_4a69ed0cc0").to_i
   end
   
 end

data/test/photos_test.rb

@@ -8,62 +8,40 @@ class PhotosTest < MiniTest::Unit::TestCase
   end
   
   def test_photo
-    data = <<EOS
-    <photo id="2733" secret="123456" server="12" isfavorite="0" license="3" rotation="90" originalsecret="1bc09ce34a" originalformat="png">
-    	<owner nsid="12037949754@N01" username="Bees" realname="Cal Henderson" location="Bedford, UK" />
-    	<title>orford_castle_taster</title>
-    	<description>hello!</description>
-    	<visibility ispublic="1" isfriend="0" isfamily="0" />
-    	<dates posted="1100897479" taken="2004-11-19 12:51:19" takengranularity="0" lastupdate="1093022469" />
-    	<permissions permcomment="3" permaddmeta="2" />
-    	<editability cancomment="1" canaddmeta="1" />
-    	<comments>1</comments>
-    	<notes>
-    		<note id="313" author="12037949754@N01" authorname="Bees" x="10" y="10" w="50" h="50">foo</note>
-    	</notes>
-    	<tags>
-    		<tag id="1234" author="12037949754@N01" raw="woo yay">wooyay</tag>
-    		<tag id="1235" author="12037949754@N01" raw="hoopla">hoopla</tag>
-    	</tags>
-    	<urls>
-    		<url type="photopage">http://www.flickr.com/photos/bees/2733/</url> 
-    	</urls>
-    </photo>
-EOS
+    # @flickr.photos.getInfo :photo_id => '1848466274'
+    data = "{\"id\":\"1848466274\", \"secret\":\"cec90f64ba\", \"server\":\"2402\", \"farm\":3, \"dateuploaded\":\"1194128038\", \"isfavorite\":0, \"license\":\"0\", \"safety_level\":\"0\", \"rotation\":0, \"originalsecret\":\"b76775879a\", \"originalformat\":\"jpg\", \"owner\":{\"nsid\":\"12656878@N06\", \"username\":\"Henry Maddocks\", \"realname\":\"Henry Maddocks\", \"location\":\"Wellington, New Zealand\", \"iconserver\":\"1011\", \"iconfarm\":2}, \"title\":{\"_content\":\"IMG_5631_2_3\"}, \"description\":{\"_content\":\"\"}, \"visibility\":{\"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, \"dates\":{\"posted\":\"1194128038\", \"taken\":\"2007-11-03 16:40:18\", \"takengranularity\":\"0\", \"lastupdate\":\"1213597658\"}, \"views\":\"135\", \"editability\":{\"cancomment\":0, \"canaddmeta\":0}, \"publiceditability\":{\"cancomment\":1, \"canaddmeta\":0}, \"usage\":{\"candownload\":1, \"canblog\":0, \"canprint\":0, \"canshare\":1}, \"comments\":{\"_content\":\"3\"}, \"notes\":{\"note\":[]}, \"tags\":{\"tag\":[{\"id\":\"12611556-1848466274-56210\", \"author\":\"12656878@N06\", \"raw\":\"hdr\", \"_content\":\"hdr\", \"machine_tag\":0}, {\"id\":\"12611556-1848466274-14457506\", \"author\":\"12656878@N06\", \"raw\":\"ourspacenz\", \"_content\":\"ourspacenz\", \"machine_tag\":0}, {\"id\":\"12611556-1848466274-84127\", \"author\":\"12656878@N06\", \"raw\":\"wanganui\", \"_content\":\"wanganui\", \"machine_tag\":0}]}, \"location\":{\"latitude\":-39.937053, \"longitude\":175.060958, \"accuracy\":\"12\", \"context\":\"0\", \"neighbourhood\":{\"_content\":\"Durie Hill\", \"place_id\":\"foJpCUJTWryLnUq.Cw\", \"woeid\":\"28643814\"}, \"locality\":{\"_content\":\"Wanganui\", \"place_id\":\"Vf_Kh5tTUb.xbRMu\", \"woeid\":\"2351278\"}, \"county\":{\"_content\":\"Wanganui District\", \"place_id\":\"SVoeVI9UV7JmcyEsqw\", \"woeid\":\"55875908\"}, \"region\":{\"_content\":\"Manawatu Wanganui\", \"place_id\":\"Tg1YbTpQV7ojP9xVsw\", \"woeid\":\"15021764\"}, \"country\":{\"_content\":\"New Zealand\", \"place_id\":\"X_2zAGVTUb5..jhXDw\", \"woeid\":\"23424916\"}, \"place_id\":\"foJpCUJTWryLnUq.Cw\", \"woeid\":\"28643814\"}, \"geoperms\":{\"ispublic\":1, \"iscontact\":0, \"isfriend\":0, \"isfamily\":0}, \"urls\":{\"url\":[{\"type\":\"photopage\", \"_content\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/\"}]}, \"media\":\"photo\"}"
+
+    photo = Flickr::Photo.new JSON.parse(data)
     
-    xml = REXML::Document.new data
-    photo = Flickr::Photo.new xml.root
+    assert_equal '1848466274', photo.id
+    assert_equal 'IMG_5631_2_3', photo.title
+    assert_equal ["hdr", "ourspacenz", "wanganui"], photo.tags
+    assert_equal '12656878@N06', photo.owner.id
+    assert_equal 'Henry Maddocks', photo.owner.username
     
-    assert_equal 'orford_castle_taster', photo.title
-    assert_equal 'hello!', photo.description
-    assert_equal ['wooyay', 'hoopla'], photo.tags
-    assert_equal 'Cal Henderson', photo.owner_real_name
-    assert_equal 'Bees', photo.owner_user_name
-    assert_equal '12037949754@N01', photo.owner
-    assert_equal '2733', photo.id
+  end
+  
+  def test_photo_short
+    data = {"id"=>"6043998263", "owner"=>"12656878@N06", "secret"=>"4993702a27", "server"=>"6073", "farm"=>7, "title"=>"Netball", "ispublic"=>1, "isfriend"=>0, "isfamily"=>0}
+
+    photo = Flickr::Photo.new data
+
+    assert_equal '6043998263', photo.id
+    assert_equal 'Netball', photo.title
+    assert_equal '12656878@N06', photo.owner
   end
   
   def test_many_photos
-    xml = <<EOS
-    <?xml version="1.0" encoding="utf-8" ?> \
-            <rsp stat="ok"> \
-              <photos page="1" pages="1" perpage="100" total="4"> \
-                <photo id="1848466274" owner="12656878@N06" secret="cec90f64ba" server="2402" farm="3" title="IMG_5631_2_3" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194217745" /> \
-                <photo id="1847626991" owner="12656878@N06" secret="a4d0774b17" server="2022" farm="3" title="IMG_5574_5_6" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194128771" /> \
-                <photo id="1847633163" owner="12656878@N06" secret="5089075c7a" server="2008" farm="3" title="IMG_5598_599_600" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194128720" /> \
-                <photo id="1848469604" owner="12656878@N06" secret="e0f8cfeab2" server="2140" farm="3" title="IMG_5646_7_8" ispublic="1" isfriend="0" isfamily="0" ownername="henry.maddocks" dateadded="1194128674" /> \
-              </photos> \
-            </rsp>
-EOS
+    # @flickr.people.getPublicPhotos :user_id => '12656878@N06'
+    data = "jsonFlickrApi({\"photos\":{\"page\":1, \"pages\":19, \"perpage\":100, \"total\":\"1803\", \"photo\":[{\"id\":\"6043998263\", \"owner\":\"12656878@N06\", \"secret\":\"4993702a27\", \"server\":\"6073\", \"farm\":7, \"title\":\"Netball\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6039881555\", \"owner\":\"12656878@N06\", \"secret\":\"e110689e6f\", \"server\":\"6147\", \"farm\":7, \"title\":\"P1110831\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6039881007\", \"owner\":\"12656878@N06\", \"secret\":\"01b9f6a815\", \"server\":\"6186\", \"farm\":7, \"title\":\"P1110833\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6039880561\", \"owner\":\"12656878@N06\", \"secret\":\"d0f1109f97\", \"server\":\"6131\", \"farm\":7, \"title\":\"P1110834\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6039879949\", \"owner\":\"12656878@N06\", \"secret\":\"5daed14d3d\", \"server\":\"6139\", \"farm\":7, \"title\":\"P1110835\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6039879049\", \"owner\":\"12656878@N06\", \"secret\":\"6ba2edb2e8\", \"server\":\"6088\", \"farm\":7, \"title\":\"P1110837\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6039877809\", \"owner\":\"12656878@N06\", \"secret\":\"16fa13551d\", \"server\":\"6182\", \"farm\":7, \"title\":\"P1110865\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6040426266\", \"owner\":\"12656878@N06\", \"secret\":\"db65675df8\", \"server\":\"6135\", \"farm\":7, \"title\":\"P1110858\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6011194820\", \"owner\":\"12656878@N06\", \"secret\":\"963673407e\", \"server\":\"6002\", \"farm\":7, \"title\":\"Hoody\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"6010633399\", \"owner\":\"12656878@N06\", \"secret\":\"8b79f23416\", \"server\":\"6003\", \"farm\":7, \"title\":\"Grey Power\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5924542676\", \"owner\":\"12656878@N06\", \"secret\":\"19bf326b09\", \"server\":\"6131\", \"farm\":7, \"title\":\"P1110557\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5715732170\", \"owner\":\"12656878@N06\", \"secret\":\"b1d11711d2\", \"server\":\"3473\", \"farm\":4, \"title\":\"P1110528\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5706047089\", \"owner\":\"12656878@N06\", \"secret\":\"1b5fc62710\", \"server\":\"2621\", \"farm\":3, \"title\":\"New Boots\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5671138246\", \"owner\":\"12656878@N06\", \"secret\":\"4cfdc3d629\", \"server\":\"5187\", \"farm\":6, \"title\":\"P1110321\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5652562601\", \"owner\":\"12656878@N06\", \"secret\":\"5820efe190\", \"server\":\"5150\", \"farm\":6, \"title\":\"P1110310\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5652558997\", \"owner\":\"12656878@N06\", \"secret\":\"4dd0215b54\", \"server\":\"5261\", \"farm\":6, \"title\":\"P1110308\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5615402001\", \"owner\":\"12656878@N06\", \"secret\":\"333a784df4\", \"server\":\"5309\", \"farm\":6, \"title\":\"P1110192\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612296653\", \"owner\":\"12656878@N06\", \"secret\":\"588e280cb1\", \"server\":\"5230\", \"farm\":6, \"title\":\"P1110157\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612856042\", \"owner\":\"12656878@N06\", \"secret\":\"e122fe78e1\", \"server\":\"5307\", \"farm\":6, \"title\":\"Thomas\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612275491\", \"owner\":\"12656878@N06\", \"secret\":\"ee908bcd2a\", \"server\":\"5185\", \"farm\":6, \"title\":\"Samuel\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612251775\", \"owner\":\"12656878@N06\", \"secret\":\"5fda4a0652\", \"server\":\"5146\", \"farm\":6, \"title\":\"Naomi & Alysssa\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612227731\", \"owner\":\"12656878@N06\", \"secret\":\"e3c0d7375f\", \"server\":\"5022\", \"farm\":6, \"title\":\"P1110111\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612227493\", \"owner\":\"12656878@N06\", \"secret\":\"83369deea3\", \"server\":\"5110\", \"farm\":6, \"title\":\"P1110219\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612807156\", \"owner\":\"12656878@N06\", \"secret\":\"d3f00a66cb\", \"server\":\"5270\", \"farm\":6, \"title\":\"P1110217\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612806882\", \"owner\":\"12656878@N06\", \"secret\":\"4a9d11cc54\", \"server\":\"5061\", \"farm\":6, \"title\":\"P1110214\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612226625\", \"owner\":\"12656878@N06\", \"secret\":\"196a8ae4d6\", \"server\":\"5185\", \"farm\":6, \"title\":\"P1110212\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612806162\", \"owner\":\"12656878@N06\", \"secret\":\"ef69193ab6\", \"server\":\"5223\", \"farm\":6, \"title\":\"P1110211\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612805826\", \"owner\":\"12656878@N06\", \"secret\":\"b9a031cd60\", \"server\":\"5268\", \"farm\":6, \"title\":\"P1110197\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612805380\", \"owner\":\"12656878@N06\", \"secret\":\"4df3a1a6a4\", \"server\":\"5307\", \"farm\":6, \"title\":\"P1110194\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612225257\", \"owner\":\"12656878@N06\", \"secret\":\"7b68e25a42\", \"server\":\"5145\", \"farm\":6, \"title\":\"P1110181\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612224919\", \"owner\":\"12656878@N06\", \"secret\":\"f1f8d6ee53\", \"server\":\"5310\", \"farm\":6, \"title\":\"P1110165\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612224487\", \"owner\":\"12656878@N06\", \"secret\":\"0995df2f09\", \"server\":\"5301\", \"farm\":6, \"title\":\"P1110169\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612224067\", \"owner\":\"12656878@N06\", \"secret\":\"86e1f5688f\", \"server\":\"5026\", \"farm\":6, \"title\":\"P1110168\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612223727\", \"owner\":\"12656878@N06\", \"secret\":\"a6b55b1eea\", \"server\":\"5067\", \"farm\":6, \"title\":\"P1110163\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612803132\", \"owner\":\"12656878@N06\", \"secret\":\"5febbf8f15\", \"server\":\"5145\", \"farm\":6, \"title\":\"P1110159\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5612223049\", \"owner\":\"12656878@N06\", \"secret\":\"4229a24640\", \"server\":\"5222\", \"farm\":6, \"title\":\"P1110099\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5605836628\", \"owner\":\"12656878@N06\", \"secret\":\"d39e63248b\", \"server\":\"5266\", \"farm\":6, \"title\":\"P1110136\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5604373475\", \"owner\":\"12656878@N06\", \"secret\":\"de42e2789a\", \"server\":\"4108\", \"farm\":5, \"title\":\"P1110153\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5587056928\", \"owner\":\"12656878@N06\", \"secret\":\"3f4ccf452d\", \"server\":\"5094\", \"farm\":6, \"title\":\"Hollywood\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5565812680\", \"owner\":\"12656878@N06\", \"secret\":\"b395edd006\", \"server\":\"5056\", \"farm\":6, \"title\":\"P1110044\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5565443808\", \"owner\":\"12656878@N06\", \"secret\":\"67e0fcc4e8\", \"server\":\"5267\", \"farm\":6, \"title\":\"Junk Mail\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5557083066\", \"owner\":\"12656878@N06\", \"secret\":\"50985eee5d\", \"server\":\"5229\", \"farm\":6, \"title\":\"Pinhole\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5549156415\", \"owner\":\"12656878@N06\", \"secret\":\"22907da003\", \"server\":\"5023\", \"farm\":6, \"title\":\"P1100938\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5519213816\", \"owner\":\"12656878@N06\", \"secret\":\"731fcdd3bd\", \"server\":\"5258\", \"farm\":6, \"title\":\"Furniture Shopping\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5516089666\", \"owner\":\"12656878@N06\", \"secret\":\"aed4c193c6\", \"server\":\"5256\", \"farm\":6, \"title\":\"Furniture Shopping\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5513491035\", \"owner\":\"12656878@N06\", \"secret\":\"3331e3278c\", \"server\":\"5259\", \"farm\":6, \"title\":\"Furniture Shopping\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5507277399\", \"owner\":\"12656878@N06\", \"secret\":\"720805359a\", \"server\":\"5213\", \"farm\":6, \"title\":\"Furniture Shopping\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5507106564\", \"owner\":\"12656878@N06\", \"secret\":\"4006b299a3\", \"server\":\"5217\", \"farm\":6, \"title\":\"Edna\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5489989991\", \"owner\":\"12656878@N06\", \"secret\":\"ddb9a128f6\", \"server\":\"5180\", \"farm\":6, \"title\":\"IMG_4656\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5472869207\", \"owner\":\"12656878@N06\", \"secret\":\"3be36ddd5f\", \"server\":\"5060\", \"farm\":6, \"title\":\"15\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5472868849\", \"owner\":\"12656878@N06\", \"secret\":\"8a4787ae6c\", \"server\":\"5291\", \"farm\":6, \"title\":\"13\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5467913630\", \"owner\":\"12656878@N06\", \"secret\":\"b1e2a0591c\", \"server\":\"5215\", \"farm\":6, \"title\":\"IMG_4635\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5467913336\", \"owner\":\"12656878@N06\", \"secret\":\"1274239c37\", \"server\":\"5212\", \"farm\":6, \"title\":\"IMG_4634\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5467315601\", \"owner\":\"12656878@N06\", \"secret\":\"26855385fd\", \"server\":\"5053\", \"farm\":6, \"title\":\"IMG_4628\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5464362666\", \"owner\":\"12656878@N06\", \"secret\":\"120a37d770\", \"server\":\"5178\", \"farm\":6, \"title\":\"Fireball\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5435771886\", \"owner\":\"12656878@N06\", \"secret\":\"34af1c114f\", \"server\":\"5292\", \"farm\":6, \"title\":\"\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5435161697\", \"owner\":\"12656878@N06\", \"secret\":\"5a28b047ed\", \"server\":\"5012\", \"farm\":6, \"title\":\"\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5435770682\", \"owner\":\"12656878@N06\", \"secret\":\"532c97124c\", \"server\":\"5052\", \"farm\":6, \"title\":\"\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5435770212\", \"owner\":\"12656878@N06\", \"secret\":\"46e4df7149\", \"server\":\"5136\", \"farm\":6, \"title\":\"\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5435749152\", \"owner\":\"12656878@N06\", \"secret\":\"ab3a4dd32a\", \"server\":\"4118\", \"farm\":5, \"title\":\"Evening\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5433123146\", \"owner\":\"12656878@N06\", \"secret\":\"c64d68c2d3\", \"server\":\"4153\", \"farm\":5, \"title\":\"\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5368273911\", \"owner\":\"12656878@N06\", \"secret\":\"806f050f9f\", \"server\":\"5162\", \"farm\":6, \"title\":\"Clouds\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5331529833\", \"owner\":\"12656878@N06\", \"secret\":\"84a1403522\", \"server\":\"5203\", \"farm\":6, \"title\":\"P1090771\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5332141266\", \"owner\":\"12656878@N06\", \"secret\":\"1a3055141d\", \"server\":\"5083\", \"farm\":6, \"title\":\"P1090772\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5332140330\", \"owner\":\"12656878@N06\", \"secret\":\"637ee6ae2e\", \"server\":\"5043\", \"farm\":6, \"title\":\"P1090783\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5332139604\", \"owner\":\"12656878@N06\", \"secret\":\"353cbd0059\", \"server\":\"5161\", \"farm\":6, \"title\":\"P1090786\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5311462024\", \"owner\":\"12656878@N06\", \"secret\":\"9615d729c9\", \"server\":\"5008\", \"farm\":6, \"title\":\"P1090961\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5308595947\", \"owner\":\"12656878@N06\", \"secret\":\"53cb7f9242\", \"server\":\"5009\", \"farm\":6, \"title\":\"Edna\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5272369364\", \"owner\":\"12656878@N06\", \"secret\":\"6c9eacdaed\", \"server\":\"5162\", \"farm\":6, \"title\":\"IMG_4169\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5244899827\", \"owner\":\"12656878@N06\", \"secret\":\"71c85a850e\", \"server\":\"5084\", \"farm\":6, \"title\":\"Me\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5239935503\", \"owner\":\"12656878@N06\", \"secret\":\"12392c860e\", \"server\":\"5166\", \"farm\":6, \"title\":\"NZiDev\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5221832763\", \"owner\":\"12656878@N06\", \"secret\":\"1047d4f3c5\", \"server\":\"5283\", \"farm\":6, \"title\":\"Edna 9\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5216571403\", \"owner\":\"12656878@N06\", \"secret\":\"e5ee01a83a\", \"server\":\"4091\", \"farm\":5, \"title\":\"Edna 8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5216570959\", \"owner\":\"12656878@N06\", \"secret\":\"3206446cbb\", \"server\":\"5245\", \"farm\":6, \"title\":\"Edna 7\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5207629170\", \"owner\":\"12656878@N06\", \"secret\":\"68f966d5f8\", \"server\":\"5088\", \"farm\":6, \"title\":\"P1090407\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5207591586\", \"owner\":\"12656878@N06\", \"secret\":\"e62ac1de2d\", \"server\":\"4127\", \"farm\":5, \"title\":\"P1090303\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5204977137\", \"owner\":\"12656878@N06\", \"secret\":\"889ed7f228\", \"server\":\"5204\", \"farm\":6, \"title\":\"P1090398\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5205567526\", \"owner\":\"12656878@N06\", \"secret\":\"6eece7166c\", \"server\":\"4152\", \"farm\":5, \"title\":\"P1090291\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5201063008\", \"owner\":\"12656878@N06\", \"secret\":\"63efcd9ff8\", \"server\":\"4129\", \"farm\":5, \"title\":\"P1090405\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5201062386\", \"owner\":\"12656878@N06\", \"secret\":\"162f3108c1\", \"server\":\"4124\", \"farm\":5, \"title\":\"P1090404\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5201061778\", \"owner\":\"12656878@N06\", \"secret\":\"abc3731401\", \"server\":\"4148\", \"farm\":5, \"title\":\"P1090403\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5199302083\", \"owner\":\"12656878@N06\", \"secret\":\"05bee86169\", \"server\":\"4154\", \"farm\":5, \"title\":\"Edna 6\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5189965911\", \"owner\":\"12656878@N06\", \"secret\":\"bb3a7ac056\", \"server\":\"4147\", \"farm\":5, \"title\":\"Edna 5\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5186899792\", \"owner\":\"12656878@N06\", \"secret\":\"dfeb083388\", \"server\":\"4107\", \"farm\":5, \"title\":\"Samuel 2\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5186756172\", \"owner\":\"12656878@N06\", \"secret\":\"4f233d3c81\", \"server\":\"1010\", \"farm\":2, \"title\":\"Edna 4\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5167493645\", \"owner\":\"12656878@N06\", \"secret\":\"ab4622fa61\", \"server\":\"4089\", \"farm\":5, \"title\":\"Edna 3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5164708197\", \"owner\":\"12656878@N06\", \"secret\":\"d6b2c9b53e\", \"server\":\"4036\", \"farm\":5, \"title\":\"Alan\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5155821845\", \"owner\":\"12656878@N06\", \"secret\":\"05cd9aae48\", \"server\":\"1063\", \"farm\":2, \"title\":\"Edna 2\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5148249418\", \"owner\":\"12656878@N06\", \"secret\":\"9eee72437c\", \"server\":\"4059\", \"farm\":5, \"title\":\"P1090165\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5147645767\", \"owner\":\"12656878@N06\", \"secret\":\"0632521150\", \"server\":\"1188\", \"farm\":2, \"title\":\"P1090193\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5144169185\", \"owner\":\"12656878@N06\", \"secret\":\"b958c697a1\", \"server\":\"1400\", \"farm\":2, \"title\":\"Yospyn\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5143234755\", \"owner\":\"12656878@N06\", \"secret\":\"f1991c215d\", \"server\":\"1105\", \"farm\":2, \"title\":\"Thomas\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5135312942\", \"owner\":\"12656878@N06\", \"secret\":\"c8a9efc15b\", \"server\":\"4036\", \"farm\":5, \"title\":\"P1090113\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5133416233\", \"owner\":\"12656878@N06\", \"secret\":\"071de8b6f4\", \"server\":\"4006\", \"farm\":5, \"title\":\"P1090124\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5133414919\", \"owner\":\"12656878@N06\", \"secret\":\"45c88688a0\", \"server\":\"1206\", \"farm\":2, \"title\":\"P1090122\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5134013190\", \"owner\":\"12656878@N06\", \"secret\":\"1a772371ae\", \"server\":\"1425\", \"farm\":2, \"title\":\"P1090121\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5133412383\", \"owner\":\"12656878@N06\", \"secret\":\"54c1d1e306\", \"server\":\"4041\", \"farm\":5, \"title\":\"P1090083\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5134010446\", \"owner\":\"12656878@N06\", \"secret\":\"16cb9ef220\", \"server\":\"4005\", \"farm\":5, \"title\":\"P1090093\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5133409681\", \"owner\":\"12656878@N06\", \"secret\":\"045d29c331\", \"server\":\"1224\", \"farm\":2, \"title\":\"P1090090\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, {\"id\":\"5133408627\", \"owner\":\"12656878@N06\", \"secret\":\"8becca39a7\", \"server\":\"1198\", \"farm\":2, \"title\":\"P1090129\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0}]}, \"stat\":\"ok\"})"
     
     flickr = Flickr::FlickrClient.new
-    
-    photos, pages, total = flickr.build_response xml
+    photos, pages, total = flickr.build_response data
 
-    assert_equal 4, photos.length
-    assert_equal 1, pages
-    assert_equal 4, total
-    assert_equal "IMG_5598_599_600", photos[2].title
+    assert_equal 100, photos.length
+    assert_equal 19, pages
+    assert_equal 1803, total
+    assert_equal "P1110833", photos[2].title
   end
   
   def test_get_info
@@ -98,8 +76,16 @@ EOS
     assert sizes.thumbnail
     assert sizes.small
     assert sizes.medium
-    assert sizes.medium640
+    assert sizes.medium_640
     assert sizes.original
+    
+    assert_raises NoMethodError do
+      sizes.not_a_size
+    end
   end
   
-end
+  def test_missing_size_method
+    skip "Return nil for a missing size"
+    assert false
+  end
+end

data/test/test_helper.rb

@@ -19,33 +19,33 @@ FakeHTTPResponse = Struct.new(:code, :body)
 class MiniTest::Unit::TestCase
   def flickr_commands
     {
-      :bad_api_key => ["/services/rest/?method=flickr.photos.getInfo&api_key=bad_key&photo_id=1848466274"],
-      :bad_args => ["/services/rest/?method=flickr.people.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&xxxx=12656878%40N06"],
+      :bad_api_key => ["/services/rest/?method=flickr.photos.getInfo&api_key=bad_key&photo_id=1848466274&format=json"],
+      :bad_args => ["/services/rest/?method=flickr.people.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&xxxx=12656878%40N06&format=json"],
 
-      :photos_get_info => ["/services/rest/?method=flickr.photos.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&photo_id=1848466274"],
-      :photos_get_sizes => ["/services/rest/?method=flickr.photos.getSizes&api_key=9d96d3ae6145f12660896ae23b33f949&photo_id=1848466274"],
+      :photos_get_info => ["/services/rest/?method=flickr.photos.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&photo_id=1848466274&format=json"],
+      :photos_get_sizes => ["/services/rest/?method=flickr.photos.getSizes&api_key=9d96d3ae6145f12660896ae23b33f949&photo_id=1848466274&format=json"],
       
-      :people_get_info => ["/services/rest/?method=flickr.people.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&user_id=12656878%40N06"],
-      :people_get_info_not_found => ["/services/rest/?method=flickr.people.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&user_id=xxxx"],
-      :people_by_user_name => ["/services/rest/?method=flickr.people.findByUsername&api_key=9d96d3ae6145f12660896ae23b33f949&username=Henry+Maddocks"],
+      :people_get_info => ["/services/rest/?method=flickr.people.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&user_id=12656878%40N06&format=json"],
+      :people_get_info_not_found => ["/services/rest/?method=flickr.people.getInfo&api_key=9d96d3ae6145f12660896ae23b33f949&user_id=xxxx&format=json"],
+      :people_by_user_name => ["/services/rest/?method=flickr.people.findByUsername&api_key=9d96d3ae6145f12660896ae23b33f949&username=Henry+Maddocks&format=json"],
       
-      :groups_pools_get_photos => ["/services/rest/?method=flickr.groups.pools.getPhotos&api_key=9d96d3ae6145f12660896ae23b33f949&user_id=12656878%40N06&group_id=99404851%40N00"]
+      :groups_pools_get_photos => ["/services/rest/?method=flickr.groups.pools.getPhotos&api_key=9d96d3ae6145f12660896ae23b33f949&user_id=12656878%40N06&group_id=99404851%40N00&format=json"]
     }
   end
   
   def flickr_responses
     {
-      :bad_api_key => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"fail\">\n\t<err code=\"100\" msg=\"Invalid API Key (Key has invalid format)\" />\n</rsp>\n"),
-      :bad_args => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"fail\">\n\t<err code=\"1\" msg=\"User not found\" />\n</rsp>\n"),
+      :bad_api_key => FakeHTTPResponse.new(200, "jsonFlickrApi({\"stat\":\"fail\", \"code\":100, \"message\":\"Invalid API Key (Key has invalid format)\"})"),
+      :bad_args => FakeHTTPResponse.new(200, "jsonFlickrApi({\"stat\":\"fail\", \"code\":1, \"message\":\"User not found\"})"),
       
-      :photos_get_info => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"ok\">\n<photo id=\"1848466274\" secret=\"cec90f64ba\" server=\"2402\" farm=\"3\" dateuploaded=\"1194128038\" isfavorite=\"0\" license=\"0\" safety_level=\"0\" rotation=\"0\" originalsecret=\"b76775879a\" originalformat=\"jpg\" views=\"134\" media=\"photo\">\n\t<owner nsid=\"12656878@N06\" username=\"Henry Maddocks\" realname=\"Henry Maddocks\" location=\"Wellington, New Zealand\" iconserver=\"1011\" iconfarm=\"2\" />\n\t<title>IMG_5631_2_3</title>\n\t<description />\n\t<visibility ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" />\n\t<dates posted=\"1194128038\" taken=\"2007-11-03 16:40:18\" takengranularity=\"0\" lastupdate=\"1213597658\" />\n\t<editability cancomment=\"0\" canaddmeta=\"0\" />\n\t<publiceditability cancomment=\"1\" canaddmeta=\"0\" />\n\t<usage candownload=\"1\" canblog=\"0\" canprint=\"0\" canshare=\"1\" />\n\t<comments>3</comments>\n\t<notes />\n\t<tags>\n\t\t<tag id=\"12611556-1848466274-56210\" author=\"12656878@N06\" raw=\"hdr\" machine_tag=\"0\">hdr</tag>\n\t\t<tag id=\"12611556-1848466274-14457506\" author=\"12656878@N06\" raw=\"ourspacenz\" machine_tag=\"0\">ourspacenz</tag>\n\t\t<tag id=\"12611556-1848466274-84127\" author=\"12656878@N06\" raw=\"wanganui\" machine_tag=\"0\">wanganui</tag>\n\t</tags>\n\t<location latitude=\"-39.937053\" longitude=\"175.060958\" accuracy=\"12\" context=\"0\" place_id=\"foJpCUJTWryLnUq.Cw\" woeid=\"28643814\">\n\t\t<neighbourhood place_id=\"foJpCUJTWryLnUq.Cw\" woeid=\"28643814\">Durie Hill</neighbourhood>\n\t\t<locality place_id=\"Vf_Kh5tTUb.xbRMu\" woeid=\"2351278\">Wanganui</locality>\n\t\t<county place_id=\"SVoeVI9UV7JmcyEsqw\" woeid=\"55875908\">Wanganui District</county>\n\t\t<region place_id=\"Tg1YbTpQV7ojP9xVsw\" woeid=\"15021764\">Manawatu Wanganui</region>\n\t\t<country place_id=\"X_2zAGVTUb5..jhXDw\" woeid=\"23424916\">New Zealand</country>\n\t</location>\n\t<geoperms ispublic=\"1\" iscontact=\"0\" isfriend=\"0\" isfamily=\"0\" />\n\t<urls>\n\t\t<url type=\"photopage\">http://www.flickr.com/photos/acute-distress/1848466274/</url>\n\t</urls>\n</photo>\n</rsp>\n"),
-      :photos_get_sizes => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"ok\">\n<sizes canblog=\"0\" canprint=\"0\" candownload=\"1\">\n\t<size label=\"Square\" width=\"75\" height=\"75\" source=\"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_s.jpg\" url=\"http://www.flickr.com/photos/acute-distress/1848466274/sizes/sq/\" media=\"photo\" />\n\t<size label=\"Thumbnail\" width=\"100\" height=\"75\" source=\"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_t.jpg\" url=\"http://www.flickr.com/photos/acute-distress/1848466274/sizes/t/\" media=\"photo\" />\n\t<size label=\"Small\" width=\"240\" height=\"180\" source=\"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_m.jpg\" url=\"http://www.flickr.com/photos/acute-distress/1848466274/sizes/s/\" media=\"photo\" />\n\t<size label=\"Medium\" width=\"500\" height=\"375\" source=\"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba.jpg\" url=\"http://www.flickr.com/photos/acute-distress/1848466274/sizes/m/\" media=\"photo\" />\n\t<size label=\"Medium 640\" width=\"640\" height=\"480\" source=\"http://farm3.static.flickr.com/2402/1848466274_cec90f64ba_z.jpg?zz=1\" url=\"http://www.flickr.com/photos/acute-distress/1848466274/sizes/z/\" media=\"photo\" />\n\t<size label=\"Original\" width=\"1280\" height=\"960\" source=\"http://farm3.static.flickr.com/2402/1848466274_b76775879a_o.jpg\" url=\"http://www.flickr.com/photos/acute-distress/1848466274/sizes/o/\" media=\"photo\" />\n</sizes>\n</rsp>\n"),
+      :photos_get_info => FakeHTTPResponse.new(200, "jsonFlickrApi({\"photo\":{\"id\":\"1848466274\", \"secret\":\"cec90f64ba\", \"server\":\"2402\", \"farm\":3, \"dateuploaded\":\"1194128038\", \"isfavorite\":0, \"license\":\"0\", \"safety_level\":\"0\", \"rotation\":0, \"originalsecret\":\"b76775879a\", \"originalformat\":\"jpg\", \"owner\":{\"nsid\":\"12656878@N06\", \"username\":\"Henry Maddocks\", \"realname\":\"Henry Maddocks\", \"location\":\"Wellington, New Zealand\", \"iconserver\":\"1011\", \"iconfarm\":2}, \"title\":{\"_content\":\"IMG_5631_2_3\"}, \"description\":{\"_content\":\"\"}, \"visibility\":{\"ispublic\":1, \"isfriend\":0, \"isfamily\":0}, \"dates\":{\"posted\":\"1194128038\", \"taken\":\"2007-11-03 16:40:18\", \"takengranularity\":\"0\", \"lastupdate\":\"1213597658\"}, \"views\":\"135\", \"editability\":{\"cancomment\":0, \"canaddmeta\":0}, \"publiceditability\":{\"cancomment\":1, \"canaddmeta\":0}, \"usage\":{\"candownload\":1, \"canblog\":0, \"canprint\":0, \"canshare\":1}, \"comments\":{\"_content\":\"3\"}, \"notes\":{\"note\":[]}, \"tags\":{\"tag\":[{\"id\":\"12611556-1848466274-56210\", \"author\":\"12656878@N06\", \"raw\":\"hdr\", \"_content\":\"hdr\", \"machine_tag\":0}, {\"id\":\"12611556-1848466274-14457506\", \"author\":\"12656878@N06\", \"raw\":\"ourspacenz\", \"_content\":\"ourspacenz\", \"machine_tag\":0}, {\"id\":\"12611556-1848466274-84127\", \"author\":\"12656878@N06\", \"raw\":\"wanganui\", \"_content\":\"wanganui\", \"machine_tag\":0}]}, \"location\":{\"latitude\":-39.937053, \"longitude\":175.060958, \"accuracy\":\"12\", \"context\":\"0\", \"neighbourhood\":{\"_content\":\"Durie Hill\", \"place_id\":\"foJpCUJTWryLnUq.Cw\", \"woeid\":\"28643814\"}, \"locality\":{\"_content\":\"Wanganui\", \"place_id\":\"Vf_Kh5tTUb.xbRMu\", \"woeid\":\"2351278\"}, \"county\":{\"_content\":\"Wanganui District\", \"place_id\":\"SVoeVI9UV7JmcyEsqw\", \"woeid\":\"55875908\"}, \"region\":{\"_content\":\"Manawatu Wanganui\", \"place_id\":\"Tg1YbTpQV7ojP9xVsw\", \"woeid\":\"15021764\"}, \"country\":{\"_content\":\"New Zealand\", \"place_id\":\"X_2zAGVTUb5..jhXDw\", \"woeid\":\"23424916\"}, \"place_id\":\"foJpCUJTWryLnUq.Cw\", \"woeid\":\"28643814\"}, \"geoperms\":{\"ispublic\":1, \"iscontact\":0, \"isfriend\":0, \"isfamily\":0}, \"urls\":{\"url\":[{\"type\":\"photopage\", \"_content\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/\"}]}, \"media\":\"photo\"}, \"stat\":\"ok\"})"),
+      :photos_get_sizes => FakeHTTPResponse.new(200, "jsonFlickrApi({\"sizes\":{\"canblog\":0, \"canprint\":0, \"candownload\":1, \"size\":[{\"label\":\"Square\", \"width\":75, \"height\":75, \"source\":\"http:\\/\\/farm3.static.flickr.com\\/2402\\/1848466274_cec90f64ba_s.jpg\", \"url\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/sizes\\/sq\\/\", \"media\":\"photo\"}, {\"label\":\"Thumbnail\", \"width\":\"100\", \"height\":\"75\", \"source\":\"http:\\/\\/farm3.static.flickr.com\\/2402\\/1848466274_cec90f64ba_t.jpg\", \"url\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/sizes\\/t\\/\", \"media\":\"photo\"}, {\"label\":\"Small\", \"width\":\"240\", \"height\":\"180\", \"source\":\"http:\\/\\/farm3.static.flickr.com\\/2402\\/1848466274_cec90f64ba_m.jpg\", \"url\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/sizes\\/s\\/\", \"media\":\"photo\"}, {\"label\":\"Medium\", \"width\":\"500\", \"height\":\"375\", \"source\":\"http:\\/\\/farm3.static.flickr.com\\/2402\\/1848466274_cec90f64ba.jpg\", \"url\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/sizes\\/m\\/\", \"media\":\"photo\"}, {\"label\":\"Medium 640\", \"width\":\"640\", \"height\":480, \"source\":\"http:\\/\\/farm3.static.flickr.com\\/2402\\/1848466274_cec90f64ba_z.jpg?zz=1\", \"url\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/sizes\\/z\\/\", \"media\":\"photo\"}, {\"label\":\"Original\", \"width\":\"1280\", \"height\":\"960\", \"source\":\"http:\\/\\/farm3.static.flickr.com\\/2402\\/1848466274_b76775879a_o.jpg\", \"url\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/1848466274\\/sizes\\/o\\/\", \"media\":\"photo\"}]}, \"stat\":\"ok\"})"),
       
-      :people_get_info => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"ok\">\n<person id=\"12656878@N06\" nsid=\"12656878@N06\" ispro=\"1\" iconserver=\"1011\" iconfarm=\"2\" path_alias=\"acute-distress\">\n\t<username>Henry Maddocks</username>\n\t<realname>Henry Maddocks</realname>\n\t<location>Wellington, New Zealand</location>\n\t<photosurl>http://www.flickr.com/photos/acute-distress/</photosurl>\n\t<profileurl>http://www.flickr.com/people/acute-distress/</profileurl>\n\t<mobileurl>http://m.flickr.com/photostream.gne?id=12611556</mobileurl>\n\t<photos>\n\t\t<firstdatetaken>1970-01-01 15:08:34</firstdatetaken>\n\t\t<firstdate>1188878270</firstdate>\n\t\t<count>1803</count>\n\t</photos>\n</person>\n</rsp>\n"),
-      :people_get_info_not_found => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"fail\">\n\t<err code=\"1\" msg=\"User not found\" />\n</rsp>\n"),
-      :people_by_user_name => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"ok\">\n<user id=\"12656878@N06\" nsid=\"12656878@N06\">\n\t<username>Henry Maddocks</username>\n</user>\n</rsp>\n"),
+      :people_get_info => FakeHTTPResponse.new(200, "jsonFlickrApi({\"person\":{\"id\":\"12656878@N06\", \"nsid\":\"12656878@N06\", \"ispro\":1, \"iconserver\":\"1011\", \"iconfarm\":2, \"path_alias\":\"acute-distress\", \"username\":{\"_content\":\"Henry Maddocks\"}, \"realname\":{\"_content\":\"Henry Maddocks\"}, \"location\":{\"_content\":\"Wellington, New Zealand\"}, \"photosurl\":{\"_content\":\"http:\\/\\/www.flickr.com\\/photos\\/acute-distress\\/\"}, \"profileurl\":{\"_content\":\"http:\\/\\/www.flickr.com\\/people\\/acute-distress\\/\"}, \"mobileurl\":{\"_content\":\"http:\\/\\/m.flickr.com\\/photostream.gne?id=12611556\"}, \"photos\":{\"firstdatetaken\":{\"_content\":\"1970-01-01 15:08:34\"}, \"firstdate\":{\"_content\":\"1188878270\"}, \"count\":{\"_content\":1803}}}, \"stat\":\"ok\"})"),
+      :people_get_info_not_found => FakeHTTPResponse.new(200, "jsonFlickrApi({\"stat\":\"fail\", \"code\":1, \"message\":\"User not found\"})"),
+      :people_by_user_name => FakeHTTPResponse.new(200, "jsonFlickrApi({\"user\":{\"id\":\"12656878@N06\", \"nsid\":\"12656878@N06\", \"username\":{\"_content\":\"Henry Maddocks\"}}, \"stat\":\"ok\"})"),
       
-      :groups_pools_get_photos => FakeHTTPResponse.new(200, "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<rsp stat=\"ok\">\n<photos page=\"1\" pages=\"1\" perpage=\"100\" total=\"15\">\n\t<photo id=\"1848463798\" owner=\"12656878@N06\" secret=\"d9fcbdedb5\" server=\"2103\" farm=\"3\" title=\"IMG_5628_29_30\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1250311066\" />\n\t<photo id=\"1847616297\" owner=\"12656878@N06\" secret=\"71461d1f9a\" server=\"2042\" farm=\"3\" title=\"IMG_5547_8_9\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1250311040\" />\n\t<photo id=\"1847623411\" owner=\"12656878@N06\" secret=\"13dc200ffe\" server=\"2007\" farm=\"3\" title=\"IMG_5571_2_3\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1250311001\" />\n\t<photo id=\"2359596024\" owner=\"12656878@N06\" secret=\"2d8fde31d1\" server=\"2267\" farm=\"3\" title=\"Criss Cross Castle\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1206397646\" />\n\t<photo id=\"2356865849\" owner=\"12656878@N06\" secret=\"69697c85d3\" server=\"3282\" farm=\"4\" title=\"Alexander Library\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1206353910\" />\n\t<photo id=\"2150832683\" owner=\"12656878@N06\" secret=\"e97dfa334f\" server=\"2122\" farm=\"3\" title=\"IMG_0716_7_8\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1199095628\" />\n\t<photo id=\"2151623192\" owner=\"12656878@N06\" secret=\"81b8bdcc39\" server=\"2099\" farm=\"3\" title=\"IMG_0695_6_7\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1199095610\" />\n\t<photo id=\"2150834129\" owner=\"12656878@N06\" secret=\"19fb55ffdd\" server=\"2156\" farm=\"3\" title=\"IMG_0643_4_5\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1199095592\" />\n\t<photo id=\"2150812929\" owner=\"12656878@N06\" secret=\"f87fe0ba85\" server=\"2252\" farm=\"3\" title=\"IMG_0506_7_8\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1199095509\" />\n\t<photo id=\"2150812919\" owner=\"12656878@N06\" secret=\"ae39c7e214\" server=\"2099\" farm=\"3\" title=\"IMG_0494_5_6\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1199095483\" />\n\t<photo id=\"2150812917\" owner=\"12656878@N06\" secret=\"ca858d0646\" server=\"2019\" farm=\"3\" title=\"IMG_0491_2_3\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1199095461\" />\n\t<photo id=\"1848466274\" owner=\"12656878@N06\" secret=\"cec90f64ba\" server=\"2402\" farm=\"3\" title=\"IMG_5631_2_3\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1194217745\" />\n\t<photo id=\"1847626991\" owner=\"12656878@N06\" secret=\"a4d0774b17\" server=\"2022\" farm=\"3\" title=\"IMG_5574_5_6\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1194128771\" />\n\t<photo id=\"1847633163\" owner=\"12656878@N06\" secret=\"5089075c7a\" server=\"2008\" farm=\"3\" title=\"IMG_5598_599_600\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1194128720\" />\n\t<photo id=\"1848469604\" owner=\"12656878@N06\" secret=\"e0f8cfeab2\" server=\"2140\" farm=\"3\" title=\"IMG_5646_7_8\" ispublic=\"1\" isfriend=\"0\" isfamily=\"0\" ownername=\"Henry Maddocks\" dateadded=\"1194128674\" />\n</photos>\n</rsp>\n")
+      :groups_pools_get_photos => FakeHTTPResponse.new(200, "jsonFlickrApi({\"photos\":{\"page\":1, \"pages\":1, \"perpage\":100, \"total\":\"15\", \"photo\":[{\"id\":\"1848463798\", \"owner\":\"12656878@N06\", \"secret\":\"d9fcbdedb5\", \"server\":\"2103\", \"farm\":3, \"title\":\"IMG_5628_29_30\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1250311066\"}, {\"id\":\"1847616297\", \"owner\":\"12656878@N06\", \"secret\":\"71461d1f9a\", \"server\":\"2042\", \"farm\":3, \"title\":\"IMG_5547_8_9\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1250311040\"}, {\"id\":\"1847623411\", \"owner\":\"12656878@N06\", \"secret\":\"13dc200ffe\", \"server\":\"2007\", \"farm\":3, \"title\":\"IMG_5571_2_3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1250311001\"}, {\"id\":\"2359596024\", \"owner\":\"12656878@N06\", \"secret\":\"2d8fde31d1\", \"server\":\"2267\", \"farm\":3, \"title\":\"Criss Cross Castle\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1206397646\"}, {\"id\":\"2356865849\", \"owner\":\"12656878@N06\", \"secret\":\"69697c85d3\", \"server\":\"3282\", \"farm\":4, \"title\":\"Alexander Library\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1206353910\"}, {\"id\":\"2150832683\", \"owner\":\"12656878@N06\", \"secret\":\"e97dfa334f\", \"server\":\"2122\", \"farm\":3, \"title\":\"IMG_0716_7_8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095628\"}, {\"id\":\"2151623192\", \"owner\":\"12656878@N06\", \"secret\":\"81b8bdcc39\", \"server\":\"2099\", \"farm\":3, \"title\":\"IMG_0695_6_7\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095610\"}, {\"id\":\"2150834129\", \"owner\":\"12656878@N06\", \"secret\":\"19fb55ffdd\", \"server\":\"2156\", \"farm\":3, \"title\":\"IMG_0643_4_5\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095592\"}, {\"id\":\"2150812929\", \"owner\":\"12656878@N06\", \"secret\":\"f87fe0ba85\", \"server\":\"2252\", \"farm\":3, \"title\":\"IMG_0506_7_8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095509\"}, {\"id\":\"2150812919\", \"owner\":\"12656878@N06\", \"secret\":\"ae39c7e214\", \"server\":\"2099\", \"farm\":3, \"title\":\"IMG_0494_5_6\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095483\"}, {\"id\":\"2150812917\", \"owner\":\"12656878@N06\", \"secret\":\"ca858d0646\", \"server\":\"2019\", \"farm\":3, \"title\":\"IMG_0491_2_3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1199095461\"}, {\"id\":\"1848466274\", \"owner\":\"12656878@N06\", \"secret\":\"cec90f64ba\", \"server\":\"2402\", \"farm\":3, \"title\":\"IMG_5631_2_3\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194217745\"}, {\"id\":\"1847626991\", \"owner\":\"12656878@N06\", \"secret\":\"a4d0774b17\", \"server\":\"2022\", \"farm\":3, \"title\":\"IMG_5574_5_6\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194128771\"}, {\"id\":\"1847633163\", \"owner\":\"12656878@N06\", \"secret\":\"5089075c7a\", \"server\":\"2008\", \"farm\":3, \"title\":\"IMG_5598_599_600\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194128720\"}, {\"id\":\"1848469604\", \"owner\":\"12656878@N06\", \"secret\":\"e0f8cfeab2\", \"server\":\"2140\", \"farm\":3, \"title\":\"IMG_5646_7_8\", \"ispublic\":1, \"isfriend\":0, \"isfamily\":0, \"ownername\":\"Henry Maddocks\", \"dateadded\":\"1194128674\"}]}, \"stat\":\"ok\"})")
     }
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrrb
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '2.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-18 00:00:00.000000000 +12:00
+date: 2011-08-22 00:00:00.000000000 +12:00
 default_executable: 
 dependencies: []
 description: A simple interface to the Flickr public API.