songdrop 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0bd465f684b3c3b09208e33344c8e68ed8d6a91
-  data.tar.gz: e8f950ada2237038cdaa55606661987044d678d8
+  metadata.gz: 24ca24af6310be5399a5ce9d2dd46354addf2d92
+  data.tar.gz: 8ac956ec193d3d1f417d397820ef518a23aebde0
 SHA512:
-  metadata.gz: e6b28352f219775f47a516d9f2cd6c6a2cfa3e874fd5f0845695d6bd86db93733aa471543f582facf431701a78bcca49635e17dc62b1ce7f72fdb37100e1c1ba
-  data.tar.gz: 113cd38dfb35db28da6ee9ccde51d251861c86f32745190c383860cb75b3315d9ebb9585dd80fd8d128dc894390ea15e7ae685e34566b9df64589b063f4d38e1
+  metadata.gz: d9ea82042009ba424e9632fe74488d8e7d2bce3eb502268e6335ec133f65d99790562c2b2bb3db5a9bb2a24d0d9025bc49d123613bf7f12f9befcf37b5465cb8
+  data.tar.gz: 1e19ff1b52301f906621252f7ce2769b1a431f19a2e16730b8624c0044c10a3d38d8f993da630e648fe67dd48da1adda6774d5c286a5656754baf149ed50fb60

data/lib/songdrop/parser.rb

@@ -6,20 +6,20 @@ module Songdrop
       if response.is_a?(Hash) and response['object']
 
         # we only got one object back
-        return objectize(response['object'], parse_object(response))
+        return objectize(response['object'], parse_object(response, headers))
 
       elsif response.is_a?(Hash)
 
         # we got a hash pointer to objects
         return response.keys.collect do |object|
-          objectize(object, parse_object(response[object]))
+          objectize(object, parse_object(response[object], headers))
         end
 
       elsif response.is_a? Array
 
         # we got an array of objects back
         result = response.collect do |object|
-          properties = parse_object(object)
+          properties = parse_object(object, headers)
           objectize(object['object'], properties)
         end
 
@@ -37,7 +37,7 @@ module Songdrop
       end
     end
 
-    def self.parse_object(hash)
+    def self.parse_object(hash, headers={})
       # puts "[Songdrop::Parser] PARSE #{hash.inspect}"
       properties = {}
 
@@ -49,6 +49,13 @@ module Songdrop
           hash[property].each do |el|
             objects << objectize(el['object'], parse_object(el))
           end
+
+          pagination = JSON.parse(headers[:x_pagination]) if headers[:x_pagination]
+          if pagination and pagination['element'] == property
+            collection = Collection.new(pagination)
+            objects = collection.replace(objects)
+          end
+
           properties[property.to_sym] = objects
         elsif hash[property].is_a?(Hash) and hash[property]['object']
           # puts "[Songdrop::Parser] parsing hash #{property} of type #{hash[property]['object']}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: songdrop
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Richard Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies: []
 description: songdrop is a Ruby & RubyMotion client for the Songdrop.com API.
 email: moomerman@gmail.com