songdrop 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3fdc60db02c8bbfa36023b732257ff4ae00065
-  data.tar.gz: 941b8112fe6a9344ddfe55f9d12c21b241662437
+  metadata.gz: 043920c658cc312bec4202618892106d3be596b8
+  data.tar.gz: 42d9d244baaf31ae58b3dc2af50deddea4774363
 SHA512:
-  metadata.gz: 235593bdfb705801839aeae291eb10099d587001a44a03355c03c29f3d3c0fcd12ed93b9d3188e85f73dbbabea2eccfa40c81dc78fe2fdb674448ce50f21088a
-  data.tar.gz: d6386baee0d822ec72f8d58cf1c6aad21871bb64f26e307a00c2b1c9409b855451f326034ef1f9e08d319fbd3e0c275f4c5128423be5d7420f56c07ab47f6d8d
+  metadata.gz: c709964286027646fa394e024d25e4856db28efd5073215e7fd084b5dfaf4d518b58087a0cc246cfd9c1356aee0b56b7578b677c6eb903870f6e77cfe3c5b2c9
+  data.tar.gz: 01390ffa64aff696d8a6565580cad23a52e33f8cc805c74d5c938f048ba4571796314051abacc226cb8dd35a180b16eee5d6904ce7a91c2cd401dc736fe5e325

data/lib/songdrop/client.rb

@@ -11,32 +11,32 @@ module Songdrop
     def get(path, params={}, &block)
       puts "[Songdrop::Client] GET #{path} with #{params.inspect} block? #{block_given?}"
       params.merge!(:client => @token, :token => @auth_token)
-      HTTP.get(full_url(path), params) do |response, error|
-        handle_response(response, error, &block)
+      HTTP.get(full_url(path), params) do |response, headers, error|
+        handle_response(response, headers, error, &block)
       end
     end
 
     def put(path, params={}, &block)
       puts "[Songdrop::Client] PUT #{path} with #{params.inspect} block? #{block_given?}"
       params.merge!(:client => @token, :token => @auth_token)
-      HTTP.put(full_url(path), params) do |response, error|
-        handle_response(response, error, &block)
+      HTTP.put(full_url(path), params) do |response, headers, error|
+        handle_response(response, headers, error, &block)
       end
     end
 
     def post(path, params={}, &block)
       puts "[Songdrop::Client] POST #{path} with #{params.inspect} block? #{block_given?}"
       params.merge!(:client => @token, :token => @auth_token)
-      HTTP.post(full_url(path), params) do |response, error|
-        handle_response(response, error, &block)
+      HTTP.post(full_url(path), params) do |response, headers, error|
+        handle_response(response, headers, error, &block)
       end
     end
 
     def delete(path, params={}, &block)
       puts "[Songdrop::Client] DELETE #{path} with #{params.inspect} block? #{block_given?}"
       params.merge!(:client => @token, :token => @auth_token)
-      HTTP.delete(full_url(path), params) do |response, error|
-        handle_response(response, error, &block)
+      HTTP.delete(full_url(path), params) do |response, headers, error|
+        handle_response(response, headers, error, &block)
       end
     end
 
@@ -45,11 +45,11 @@ module Songdrop
         "#{@endpoint}#{path}"
       end
 
-      def handle_response(response, error, &block)
+      def handle_response(response, headers, error, &block)
         target = response || error
         res = nil
         JSON.parse(target) do |obj|
-          res = Parser.parse(obj)
+          res = Parser.parse(obj, headers)
           res = res.first if res.is_a? Array and res.size == 1
           block.call res if block
           res

data/lib/songdrop/http/rest-client.rb

@@ -3,37 +3,41 @@ module Songdrop
 
     def self.get(url, params={}, &block)
       begin
-        block.call(RestClient.get(url, :params => params), nil)
+        response = RestClient.get(url, :params => params)
+        block.call response, response.headers, nil
       rescue => e
         puts "[Songdrop::HTTP] Error: #{e.inspect}"
-        block.call(nil, e.response)
+        block.call nil, e.response.headers, e.response
       end
     end
 
     def self.put(url, params={}, &block)
       begin
-        block.call(RestClient.put(url, params), nil)
+        response = RestClient.put(url, params)
+        block.call response, response.headers, nil
       rescue => e
         puts "[Songdrop::HTTP] Error: #{e.inspect}"
-        block.call nil, e.response
+        block.call nil, e.response.headers, e.response
       end
     end
 
     def self.post(url, params={}, &block)
       begin
-        block.call(RestClient.post(url, params), nil)
+        response = RestClient.post(url, params)
+        block.call response, response.headers, nil
       rescue => e
         puts "[Songdrop::HTTP] Error: #{e.inspect}"
-        block.call(nil, e.response)
+        block.call nil, e.response.headers, e.response
       end
     end
 
     def self.delete(url, params={}, &block)
       begin
-        block.call(RestClient.delete(url, params), nil)
+        response = RestClient.delete(url, params)
+        block.call response, response.headers, nil
       rescue => e
         puts "[Songdrop::HTTP] Error: #{e.inspect}"
-        block.call(nil, e.response)
+        block.call nil, e.response.headers, e.response
       end
     end
 

data/lib/songdrop/objects/base.rb

@@ -1,13 +1,16 @@
 module Songdrop
   class Base
-    attr_reader :properties
+    attr_reader :_properties
 
     def initialize(properties={})
-      @properties = properties
+      @_properties = properties
     end
 
     def method_missing(method, *args, &block)
-      @properties[method.to_sym]
+      method = $1 if method =~ /(\S+)\?/
+      method = method.to_sym
+      return @_properties[method] if @_properties.has_key?(method)
+      super
     end
 
   end

data/lib/songdrop/objects/collection.rb

@@ -0,0 +1,18 @@
+module Songdrop
+  class Collection < Array
+    attr_reader :_properties
+
+    def initialize(properties={})
+      @_properties = properties
+    end
+
+    def method_missing(method, *args, &block)
+      method = $1 if method =~ /(\S+)\?/
+      method = method.to_s
+      return @_properties[method] if @_properties.has_key?(method)
+      method = method.to_sym # super requires a symbol
+      super
+    end
+
+  end
+end

data/lib/songdrop/parser.rb

@@ -1,7 +1,7 @@
 module Songdrop
   class Parser
 
-    def self.parse(response)
+    def self.parse(response, headers={})
 
       if response.is_a?(Hash) and response['object']
 
@@ -12,14 +12,23 @@ module Songdrop
 
         # 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]))
         end
 
       elsif response.is_a? Array
 
         # we got an array of objects back
-        return response.collect do |object|
-         objectize(object['object'], parse_object(object))
+        result = response.collect do |object|
+          properties = parse_object(object)
+          objectize(object['object'], properties)
+        end
+
+        if headers[:x_pagination]
+          collection = Collection.new(JSON.parse(headers[:x_pagination]))
+          collection.replace(result)
+          return collection
+        else
+          return result
         end
 
       else

data/lib/songdrop.rb

@@ -18,6 +18,7 @@ else
   require_relative './songdrop/client'
   require_relative './songdrop/client/methods'
   require_relative './songdrop/objects/base'
+  require_relative './songdrop/objects/collection'
   require_relative './songdrop/objects/image_helper'
   require_relative './songdrop/objects/user'
   require_relative './songdrop/objects/drop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: songdrop
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Richard Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies: []
 description: songdrop is a Ruby & RubyMotion client for the Songdrop.com API.
 email: moomerman@gmail.com
@@ -28,6 +28,7 @@ files:
 - lib/songdrop/json/json.rb
 - lib/songdrop/objects/artist.rb
 - lib/songdrop/objects/base.rb
+- lib/songdrop/objects/collection.rb
 - lib/songdrop/objects/drop.rb
 - lib/songdrop/objects/error.rb
 - lib/songdrop/objects/image_helper.rb