flickraw 0.4.5 → 0.5

data/lib/flickraw.rb

@@ -22,11 +22,11 @@
 
 require 'net/http'
 require 'md5'
-require 'yaml'
+require 'json'
 require 'cgi'
 
 module FlickRaw
-  VERSION='0.4.5'
+  VERSION='0.5'
 
   FLICKR_HOST='api.flickr.com'.freeze
 
@@ -58,15 +58,12 @@ module FlickRaw
     def self.structify(obj, name = '')
       if obj.is_a? Hash
         if name =~ /s$/ and obj[$`].is_a? Array
-          list = structify obj[$`]
+          list = structify obj.delete($`)
           list.extend SimpleOStruct
           list.instance_eval { obj.each {|kv, vv| __attr_define kv, vv } }
           list
-        elsif obj['_content']
-          content = obj['_content'].to_s
-          content.extend SimpleOStruct
-          content.instance_eval { obj.each {|kv, vv| __attr_define kv, vv } }
-          content
+        elsif obj.keys == ['_content']
+          obj['_content'].to_s
         else
           Response.new obj
         end
@@ -76,6 +73,8 @@ module FlickRaw
         obj
       end
     end
+
+    def to_s; @_content || super end
   end
 
   class FailedResponse < StandardError
@@ -183,16 +182,16 @@ module FlickRaw
         code = xml[/code="([^"]+)"/, 1]
         raise FailedResponse.new(msg, code, 'flickr.upload')
       end
-      Response.structify( {:stat => 'ok', :photoid => xml[/<photoid>(\w+)<\/photoid>/, 1], :ticketid => xml[/<ticketid>(\w+)<\/ticketid>/, 1]})
+      Response.structify( {:stat => 'ok', :photoid => xml[/<photoid>(\w+)<\/photoid>/, 1], :ticketid => xml[/<ticketid>([^<]+)<\/ticketid>/, 1]})
     end
 
     private
     def parse_response(response, req = nil)
-      yaml = YAML.load(response.body.gsub(/:([^\s])/, ': \1'))
-      raise FailedResponse.new(yaml['message'], yaml['code'], req) if yaml.delete('stat') == 'fail'
-      name, yaml = yaml.to_a.first if yaml.size == 1
+      json = JSON.load(response.body.gsub(/:([^\s])/, ': \1'))
+      raise FailedResponse.new(json['message'], json['code'], req) if json.delete('stat') == 'fail'
+      name, json = json.to_a.first if json.size == 1
 
-      res = Response.structify yaml, name
+      res = Response.structify json, name
       lookup_token(req, res)
       res
     end
@@ -244,4 +243,5 @@ end
 #
 #  recent_photos = flickr.photos.getRecent
 #  puts recent_photos[0].title
-def flickr; $flickr ||= FlickRaw::Flickr.new end
+def flickr; $flickraw ||= FlickRaw::Flickr.new end
+

data/rakefile

@@ -11,13 +11,14 @@ PKG_FILES = FileList["lib/flickraw.rb", "flickraw_rdoc.rb", "copying.txt", "READ
 spec = Gem::Specification.new do |s|
   s.summary = "Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api"
   s.name = "flickraw"
-  s.author = "Hank Lords"
+  s.author = "Mael Clerambault"
   s.email =  "maelclerambault@yahoo.fr"
   s.homepage = "http://flickraw.rubyforge.org"
   s.rubyforge_project = "flickraw"
   s.version = FlickRaw::VERSION
   s.files = PKG_FILES
   s.test_files = FileList["test/*.rb"].to_a
+  s.add_dependency 'json'
 end
 
 Rake::RDocTask.new do |rd|

metadata

@@ -1,26 +1,33 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: flickraw
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
-platform: ruby
-authors: 
-- Hank Lords
+  version: "0.5"
+date: 2008-11-10 00:00:00 +01:00
+summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
+require_paths: 
+- lib
+email: maelclerambault@yahoo.fr
+homepage: http://flickraw.rubyforge.org
+rubyforge_project: flickraw
+description: 
 autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-04-24 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
-description: 
-email: maelclerambault@yahoo.fr
-executables: []
-
-extensions: []
-
-extra_rdoc_files: []
-
+bindir: bin
+has_rdoc: false
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
+- Mael Clerambault
 files: 
 - lib/flickraw.rb
 - flickraw_rdoc.rb
@@ -28,36 +35,30 @@ files:
 - README
 - TODO
 - rakefile
-- examples/flickr_KDE.rb
+- examples/interestingness.rb
 - examples/upload.rb
+- examples/flickr_KDE.rb
 - examples/auth.rb
-- examples/interestingness.rb
 - test/test.rb
-has_rdoc: false
-homepage: http://flickraw.rubyforge.org
-post_install_message: 
+test_files: 
+- test/test.rb
 rdoc_options: []
 
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+extra_rdoc_files: []
+
+executables: []
+
+extensions: []
+
 requirements: []
 
-rubyforge_project: flickraw
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api
-test_files: 
-- test/test.rb
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: