nestling 0.1.1 → 0.1.2

data/lib/nestling/artist.rb

@@ -4,7 +4,7 @@ module Nestling
 
     METHOD_PREFIX = "artist/"
 
-    METHODS = {
+    define_api_methods({
       :biographies => { :collection => true },
       :blogs       => { :collection => true },
       :familiarity => { :collection => false, :key => "artist" },
@@ -24,9 +24,7 @@ module Nestling
       :top_terms   => { :collection => true, :key => "terms" },
       :urls        => { :collection => false },
       :video       => { :collection => true }
-    }
-
-    define_api_methods METHODS
+    })
 
     def initialize(name, client)
       name.kind_of?(::Hash) ? @id = name[:id] : @name = name

data/lib/nestling/base.rb

@@ -3,7 +3,6 @@ module Nestling
     attr_reader :client
 
     METHOD_PREFIX = ""
-    METHODS       = {}
 
     class << self
       def define_api_methods(methods)

data/lib/nestling/client.rb

@@ -34,8 +34,8 @@ module Nestling
 
     def get(meth, params = {})
       path = "/api/v4/#{meth}?" << convert_params(params)
-      response, data = @http.get(path, {'User-Agent' => USER_AGENT})
-      hash = MultiJson.decode(data)
+      response = @http.get(path, {'User-Agent' => USER_AGENT})
+      hash = MultiJson.decode(response.body)
 
       if (code = hash["response"]["status"]["code"].to_i) != 0
         raise ERRNO[code], hash["response"]["status"]["message"]

data/lib/nestling/playlist.rb

@@ -2,13 +2,12 @@ module Nestling
   class Playlist < Base
     METHOD_PREFIX = "playlist/"
 
-    METHODS = {
+    define_api_methods({
       :static       => { :collection => true,  :key => "songs" },
       :dynamic      => { :collection => true,  :key => "songs" },
       :session_info => { :collection => false, :key => "terms" }
-    }
+    })
 
-    define_api_methods METHODS
   end
 end
 

data/lib/nestling/song.rb

@@ -2,13 +2,12 @@ module Nestling
   class Song < Base
     METHOD_PREFIX = "song/"
 
-    METHODS = {
+    define_api_methods({
       :search   => { :collection => true, :key => "songs" },
       :profile  => { :collection => true, :key => "songs" },
       :identify => { :collection => true, :key => "songs" }
-    }
+    })
 
-    define_api_methods METHODS
   end
 end
 

data/lib/nestling/track.rb

@@ -2,11 +2,10 @@ module Nestling
   class Track < Base
     METHOD_PREFIX = "track/"
 
-    METHODS = {
+    define_api_methods({
       :profile  => { :collection => false, :key => "track" },
-    }
+    })
 
-    define_api_methods METHODS
   end
 end
 

data/lib/nestling/version.rb

@@ -2,7 +2,7 @@ module Nestling
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/helper.rb

@@ -2,9 +2,11 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'nestling')
 
 require 'minitest/autorun'
 require 'mocha'
+require 'ostruct'
 
 def stub_http_get(ret)
-  Net::HTTP.any_instance.stubs(:get).returns([{}, ret])
+  response = OpenStruct.new({:body => ret})
+  Net::HTTP.any_instance.stubs(:get).returns(response)
 end
 
 def expect_request(resp, req, opts = nil)