benschwarz-flickr-rest 0.2 → 0.2.1

data/flickr-rest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "flickr-rest"
-  s.version = "0.2"
+  s.version = "0.2.1"
   s.date = "2008-11-17"
   s.summary = "A light interface to call flickr 'restful' api methods"
   s.email = "ben@germanforblack.com"

data/lib/flickr-rest.rb

@@ -1,9 +1,10 @@
+require 'rubygems'
 require 'json'
 require 'open-uri'
 
 module Flickr
   class Query
-    VERSION       = "0.2.0".freeze
+    VERSION       = "0.2.1".freeze
     API_BASE      = "http://api.flickr.com/services/rest/".freeze
     
     class Failure < StandardError; end
@@ -18,10 +19,13 @@ module Flickr
     
     def request(api_method, params = {})
       response = JSON.parse(open(build_query(api_method, params)).read)
-      raise Failure, response["message"] if response["stat"] == "fail"
-      return response
+      raise Failure, response["message"] if response.delete("stat") == "fail"
+      name, response = response.to_a.first if response.size == 1
+      
+      unnest(response)
     end
-  
+    
+    private
     def build_query(method, params={})
       url = []
       opts = {
@@ -34,5 +38,19 @@ module Flickr
 
       return API_BASE + "?" + url.join("&")
     end
+    
+    def unnest(h)
+      return h unless h.is_a? Hash
+      if h.keys == ["_content"]
+        h["_content"]
+      else
+        h.inject({}) do |h, kv|
+          k,v = *kv
+          h[k.to_sym] = unnest(v)
+          h
+        end
+      end
+    end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-flickr-rest
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: