benschwarz-flickr-rest 0.2.1 → 0.2.2

data/flickr-rest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "flickr-rest"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
   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

@@ -4,7 +4,7 @@ require 'open-uri'
 
 module Flickr
   class Query
-    VERSION       = "0.2.1".freeze
+    VERSION       = "0.2.2".freeze
     API_BASE      = "http://api.flickr.com/services/rest/".freeze
     
     class Failure < StandardError; end
@@ -19,10 +19,9 @@ module Flickr
     
     def request(api_method, params = {})
       response = JSON.parse(open(build_query(api_method, params)).read)
-      raise Failure, response["message"] if response.delete("stat") == "fail"
-      name, response = response.to_a.first if response.size == 1
-      
-      unnest(response)
+      raise Failure, response["message"] if response.delete("stat") == "fail"      
+      r = mash(response)
+      unnest(r)
     end
     
     private
@@ -39,16 +38,29 @@ module Flickr
       return API_BASE + "?" + url.join("&")
     end
     
-    def unnest(h)
-      return h unless h.is_a? Hash
-      if h.keys == ["_content"]
-        h["_content"]
+    def mash(h)
+      if h.size == 1 and h.is_a? Hash
+        return mash(h.delete(h.keys.first))
       else
-        h.inject({}) do |h, kv|
-          k,v = *kv
-          h[k.to_sym] = unnest(v)
-          h
+        return h
+      end
+    end
+    
+    def unnest(h)      
+      if 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
+      elsif h.is_a? Array
+        h.collect{|i| unnest(i) }
+      else
+        h
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benschwarz-flickr-rest
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ben Schwarz