nestling 0.1.1 → 0.1.2

data/test/test_client.rb

@@ -74,7 +74,7 @@ class TestClient < MiniTest::Unit::TestCase
   def test_sends_user_agent
     Net::HTTP.any_instance.expects(:get) \
       .with(anything, { 'User-Agent' => Client::USER_AGENT} ) \
-      .returns([{}, <<-EOS
+      .returns( OpenStruct.new({:body =>  <<-EOS
       {
         "response": {
           "status": {
@@ -85,7 +85,7 @@ class TestClient < MiniTest::Unit::TestCase
         }
       }
       EOS
-      ])
+      }))
     Client.new('foo').get('bar')
   end
 

data/test/test_playlist.rb

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), 'helper')
 class TestPlaylist < MiniTest::Unit::TestCase
   include Nestling
 
-  METHODS = Playlist::METHODS
-
   def setup
     @playlist = Nestling.new('foo').playlist
   end
@@ -17,26 +15,124 @@ class TestPlaylist < MiniTest::Unit::TestCase
     assert_equal "playlist/", Playlist::METHOD_PREFIX
   end
 
-  def test_number_of_methods
-    assert_equal 3, METHODS.length
+  def test_static_method
+    assert_respond_to @playlist, :static
+  end
+
+  def test_static_returns_collection
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Playlist::METHOD_PREFIX}static"
+    response = @playlist.static
+    assert_kind_of Nestling::Collection, response
+    assert_equal 'bar', response[0][:foo]
+  end
+
+  def test_static_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Playlist::METHOD_PREFIX}static", { :foo => :bar }
+    @playlist.static :foo => :bar
+  end
+
+  def test_dynamic_method
+    assert_respond_to @playlist, :dynamic
+  end
+
+  def test_dynamic_returns_collection
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Playlist::METHOD_PREFIX}dynamic"
+    response = @playlist.dynamic
+    assert_kind_of Nestling::Collection, response
+    assert_equal 'bar', response[0][:foo]
+  end
+
+  def test_dynamic_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Playlist::METHOD_PREFIX}dynamic", { :foo => :bar }
+    @playlist.dynamic :foo => :bar
   end
 
-  def test_static
-    assert METHODS[:static][:collection]
-    assert_equal "songs", METHODS[:static][:key]
-    assert @playlist.respond_to?(:static)
+  def test_session_info_method
+    assert_respond_to @playlist, :session_info
   end
 
-  def test_dynamic
-    assert METHODS[:dynamic][:collection]
-    assert_equal "songs", METHODS[:dynamic][:key]
-    assert @playlist.respond_to?(:dynamic)
+  def test_session_info_returns_hash
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "terms": {
+          "foo": "bar"
+        }
+      }}
+    EOS
+    expect_request json, "#{Nestling::Playlist::METHOD_PREFIX}session_info"
+    response = @playlist.session_info
+    assert_kind_of Nestling::Hash, response
+    assert_equal 'bar', response[:foo]
   end
 
-  def test_session_info
-    refute METHODS[:session_info][:collection]
-    assert_equal "terms", METHODS[:session_info][:key]
-    assert @playlist.respond_to?(:session_info)
+  def test_session_info_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "terms": {
+          "foo": "bar"
+        }
+      }}
+    EOS
+    expect_request json, "#{Nestling::Playlist::METHOD_PREFIX}session_info", { :foo => :bar }
+    @playlist.session_info :foo => :bar
   end
 end
 

data/test/test_song.rb

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), 'helper')
 class TestSong < MiniTest::Unit::TestCase
   include Nestling
 
-  METHODS = Song::METHODS
-
   def setup
     @song = Nestling.new('foo').song
   end
@@ -17,26 +15,124 @@ class TestSong < MiniTest::Unit::TestCase
     assert_equal "song/", Song::METHOD_PREFIX
   end
 
-  def test_number_of_methods
-    assert_equal 3, METHODS.length
+  def test_search_method
+    assert_respond_to @song, :search
+  end
+
+  def test_search_returns_collection
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Song::METHOD_PREFIX}search"
+    response = @song.search
+    assert_kind_of Nestling::Collection, response
+    assert_equal 'bar', response[0][:foo]
+  end
+
+  def test_search_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Song::METHOD_PREFIX}search", { :foo => :bar }
+    @song.search :foo => :bar
+  end
+
+  def test_profile_method
+    assert_respond_to @song, :profile
+  end
+
+  def test_profile_returns_collection
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Song::METHOD_PREFIX}profile"
+    response = @song.profile
+    assert_kind_of Nestling::Collection, response
+    assert_equal 'bar', response[0][:foo]
+  end
+
+  def test_profile_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Song::METHOD_PREFIX}profile", { :foo => :bar }
+    @song.profile :foo => :bar
   end
 
-  def test_search
-    assert METHODS[:search][:collection]
-    assert_equal "songs", METHODS[:search][:key]
-    assert @song.respond_to?(:search)
+  def test_identify_method
+    assert_respond_to @song, :identify
   end
 
-  def test_profile
-    assert METHODS[:profile][:collection]
-    assert_equal "songs", METHODS[:profile][:key]
-    assert @song.respond_to?(:profile)
+  def test_identify_returns_collection
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Song::METHOD_PREFIX}identify"
+    response = @song.identify
+    assert_kind_of Nestling::Collection, response
+    assert_equal 'bar', response[0][:foo]
   end
 
-  def test_identify
-    assert METHODS[:identify][:collection]
-    assert_equal "songs", METHODS[:identify][:key]
-    assert @song.respond_to?(:identify)
+  def test_identify_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "songs": [{
+          "foo": "bar"
+        }]
+      }}
+    EOS
+    expect_request json, "#{Nestling::Song::METHOD_PREFIX}identify", { :foo => :bar }
+    @song.identify :foo => :bar
   end
 end
 

data/test/test_track.rb

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), 'helper')
 class TestTrack < MiniTest::Unit::TestCase
   include Nestling
 
-  METHODS = Track::METHODS
-
   def setup
     @track = Nestling.new('foo').track
   end
@@ -17,14 +15,44 @@ class TestTrack < MiniTest::Unit::TestCase
     assert_equal "track/", Track::METHOD_PREFIX
   end
 
-  def test_number_of_methods
-    assert_equal 1, METHODS.length
+  def test_profile_method
+    assert_respond_to @track, :profile
+  end
+
+  def test_profile_returns_hash
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "track": {
+          "foo": "bar"
+        }
+      }}
+    EOS
+    expect_request json, "#{Nestling::Track::METHOD_PREFIX}profile"
+    response = @track.profile
+    assert_kind_of Nestling::Hash, response
+    assert_equal 'bar', response[:foo]
   end
 
-  def test_profile
-    refute METHODS[:profile][:collection]
-    assert_equal "track", METHODS[:profile][:key]
-    assert @track.respond_to?(:profile)
+  def test_profile_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "track": {
+          "foo": "bar"
+        }
+      }}
+    EOS
+    expect_request json, "#{Nestling::Track::METHOD_PREFIX}profile", { :foo => :bar }
+    @track.profile :foo => :bar
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestling
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70331940832920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70331940832920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70331940832240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70331940832240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70331940831560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70331940831560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70331940830800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70331940830800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 description: Ruby wrapper for the EchoNest API
 email:
 - tob@tobiassvensson.co.uk
@@ -103,15 +123,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -362739744680810628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -362739744680810628
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the EchoNest API