nestling 0.1.2 → 0.1.3

data/Gemfile

@@ -1,3 +1,12 @@
 source "http://rubygems.org"
+
 gemspec
 
+group :development do
+  gem "rake"
+end
+
+group :test do
+  gem "minitest"
+  gem "mocha"
+end

data/lib/nestling/artist.rb

@@ -23,7 +23,8 @@ module Nestling
       :top_hottt   => { :collection => true, :key => "artists" },
       :top_terms   => { :collection => true, :key => "terms" },
       :urls        => { :collection => false },
-      :video       => { :collection => true }
+      :video       => { :collection => true },
+      :twitter     => { :collection => false, :key => 'artist' }
     })
 
     def initialize(name, client)

data/lib/nestling/client.rb

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

data/lib/nestling/version.rb

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

data/nestling.gemspec

@@ -10,16 +10,13 @@ Gem::Specification.new do |s|
   s.email       = ["tob@tobiassvensson.co.uk"]
   s.homepage    = "http://github.com/tobiassvn/nestling"
   s.summary     = %q{Ruby wrapper for the EchoNest API}
-  s.description = %q{Ruby wrapper for the EchoNest API}
+  s.description = s.summary
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "multi_json", "~> 1.0.3"
-  s.add_development_dependency "rake", "~> 0.9"
-  s.add_development_dependency "minitest", "~> 2.6.0"
-  s.add_development_dependency "mocha", "~> 0.9.12"
+  s.add_dependency "multi_json", "~> 1.3.7"
 end
 

data/test/helper.rb

@@ -10,7 +10,7 @@ def stub_http_get(ret)
 end
 
 def expect_request(resp, req, opts = nil)
-  resp = MultiJson.decode(resp)
+  resp = MultiJson.load(resp)
   if opts
     Nestling::Client.any_instance.expects(:get).with(req, opts).returns(resp)
   else

data/test/test_artist.rb

@@ -56,7 +56,7 @@ class TestArtist < MiniTest::Unit::TestCase
   def test_biographies_method
     assert_respond_to @artist, :biographies
   end
-  
+
   def test_biographies_returns_collection
     json = <<-EOS
       {"response": {
@@ -75,7 +75,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_biographies_passes_options
     json = <<-EOS
       {"response": {
@@ -92,11 +92,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}biographies", { :foo => :bar, :name => 'bar' }
     @artist.biographies :foo => :bar
   end
-  
+
   def test_blogs_method
     assert_respond_to @artist, :blogs
   end
-  
+
   def test_blogs_returns_collection
     json = <<-EOS
       {"response": {
@@ -115,7 +115,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_blogs_passes_options
     json = <<-EOS
       {"response": {
@@ -132,11 +132,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}blogs", { :foo => :bar, :name => 'bar' }
     @artist.blogs :foo => :bar
   end
-  
+
   def test_familiarity_method
     assert_respond_to @artist, :familiarity
   end
-  
+
   def test_familiarity_returns_hash
     json = <<-EOS
       {"response": {
@@ -155,7 +155,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Hash, response
     assert_equal 'bar', response[:foo]
   end
-  
+
   def test_familiarity_passes_options
     json = <<-EOS
       {"response": {
@@ -172,11 +172,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}familiarity", { :foo => :bar, :name => 'bar' }
     @artist.familiarity :foo => :bar
   end
-  
+
   def test_hotttnesss_method
     assert_respond_to @artist, :hotttnesss
   end
-  
+
   def test_hotttnesss_returns_hash
     json = <<-EOS
       {"response": {
@@ -195,7 +195,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Hash, response
     assert_equal 'bar', response[:foo]
   end
-  
+
   def test_hotttnesss_passes_options
     json = <<-EOS
       {"response": {
@@ -212,11 +212,51 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}hotttnesss", { :foo => :bar, :name => 'bar' }
     @artist.hotttnesss :foo => :bar
   end
-  
+
+  def test_twitter_method
+    assert_respond_to @artist, :twitter
+  end
+
+  def test_twitter_returns_hash
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "artist": {
+          "foo": "bar"
+        }
+      }}
+    EOS
+    expect_request json, "#{Nestling::Artist::METHOD_PREFIX}twitter"
+    response = @artist.twitter
+    assert_kind_of Nestling::Hash, response
+    assert_equal 'bar', response[:foo]
+  end
+
+  def test_twitter_passes_options
+    json = <<-EOS
+      {"response": {
+        "status": {
+          "code": "0",
+          "message": "Success",
+          "version": "4.2"
+        },
+        "artist": {
+          "foo": "bar"
+        }
+      }}
+    EOS
+    expect_request json, "#{Nestling::Artist::METHOD_PREFIX}twitter", { :foo => :bar, :name => 'bar' }
+    @artist.twitter :foo => :bar
+  end
+
   def test_images_method
     assert_respond_to @artist, :images
   end
-  
+
   def test_images_returns_collection
     json = <<-EOS
       {"response": {
@@ -235,7 +275,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_images_passes_options
     json = <<-EOS
       {"response": {
@@ -252,11 +292,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}images", { :foo => :bar, :name => 'bar' }
     @artist.images :foo => :bar
   end
-  
+
   def test_list_terms_method
     assert_respond_to @artist, :list_terms
   end
-  
+
   def test_list_terms_returns_collection
     json = <<-EOS
       {"response": {
@@ -275,7 +315,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_list_terms_passes_options
     json = <<-EOS
       {"response": {
@@ -292,11 +332,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}list_terms", { :foo => :bar, :name => 'bar' }
     @artist.list_terms :foo => :bar
   end
-  
+
   def test_news_method
     assert_respond_to @artist, :news
   end
-  
+
   def test_news_returns_collection
     json = <<-EOS
       {"response": {
@@ -315,7 +355,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_news_passes_options
     json = <<-EOS
       {"response": {
@@ -332,11 +372,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}news", { :foo => :bar, :name => 'bar' }
     @artist.news :foo => :bar
   end
-  
+
   def test_profile_method
     assert_respond_to @artist, :profile
   end
-  
+
   def test_profile_returns_hash
     json = <<-EOS
       {"response": {
@@ -355,7 +395,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Hash, response
     assert_equal 'bar', response[:foo]
   end
-  
+
   def test_profile_passes_options
     json = <<-EOS
       {"response": {
@@ -372,11 +412,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}profile", { :foo => :bar, :name => 'bar' }
     @artist.profile :foo => :bar
   end
-  
+
   def test_reviews_method
     assert_respond_to @artist, :reviews
   end
-  
+
   def test_reviews_returns_collection
     json = <<-EOS
       {"response": {
@@ -395,7 +435,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_reviews_passes_options
     json = <<-EOS
       {"response": {
@@ -412,11 +452,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}reviews", { :foo => :bar, :name => 'bar' }
     @artist.reviews :foo => :bar
   end
-  
+
   def test_search_method
     assert_respond_to @artist, :search
   end
-  
+
   def test_search_returns_collection
     json = <<-EOS
       {"response": {
@@ -435,7 +475,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_search_passes_options
     json = <<-EOS
       {"response": {
@@ -452,11 +492,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}search", { :foo => :bar, :name => 'bar' }
     @artist.search :foo => :bar
   end
-  
+
   def test_extract_method
     assert_respond_to @artist, :extract
   end
-  
+
   def test_extract_returns_collection
     json = <<-EOS
       {"response": {
@@ -475,7 +515,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_extract_passes_options
     json = <<-EOS
       {"response": {
@@ -492,11 +532,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}extract", { :foo => :bar, :name => 'bar' }
     @artist.extract :foo => :bar
   end
-  
+
   def test_songs_method
     assert_respond_to @artist, :songs
   end
-  
+
   def test_songs_returns_collection
     json = <<-EOS
       {"response": {
@@ -515,7 +555,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_songs_passes_options
     json = <<-EOS
       {"response": {
@@ -532,11 +572,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}songs", { :foo => :bar, :name => 'bar' }
     @artist.songs :foo => :bar
   end
-  
+
   def test_similar_method
     assert_respond_to @artist, :similar
   end
-  
+
   def test_similar_returns_collection
     json = <<-EOS
       {"response": {
@@ -555,7 +595,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_similar_passes_options
     json = <<-EOS
       {"response": {
@@ -572,11 +612,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}similar", { :foo => :bar, :name => 'bar' }
     @artist.similar :foo => :bar
   end
-  
+
   def test_suggest_method
     assert_respond_to @artist, :suggest
   end
-  
+
   def test_suggest_returns_collection
     json = <<-EOS
       {"response": {
@@ -595,7 +635,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_suggest_passes_options
     json = <<-EOS
       {"response": {
@@ -612,11 +652,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}suggest", { :foo => :bar, :name => 'bar' }
     @artist.suggest :foo => :bar
   end
-  
+
   def test_terms_method
     assert_respond_to @artist, :terms
   end
-  
+
   def test_terms_returns_collection
     json = <<-EOS
       {"response": {
@@ -635,7 +675,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_terms_passes_options
     json = <<-EOS
       {"response": {
@@ -652,11 +692,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}terms", { :foo => :bar, :name => 'bar' }
     @artist.terms :foo => :bar
   end
-  
+
   def test_top_hottt_method
     assert_respond_to @artist, :top_hottt
   end
-  
+
   def test_top_hottt_returns_collection
     json = <<-EOS
       {"response": {
@@ -675,7 +715,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_top_hottt_passes_options
     json = <<-EOS
       {"response": {
@@ -692,11 +732,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}top_hottt", { :foo => :bar, :name => 'bar' }
     @artist.top_hottt :foo => :bar
   end
-  
+
   def test_top_terms_method
     assert_respond_to @artist, :top_terms
   end
-  
+
   def test_top_terms_returns_collection
     json = <<-EOS
       {"response": {
@@ -715,7 +755,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_top_terms_passes_options
     json = <<-EOS
       {"response": {
@@ -732,11 +772,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}top_terms", { :foo => :bar, :name => 'bar' }
     @artist.top_terms :foo => :bar
   end
-  
+
   def test_urls_method
     assert_respond_to @artist, :urls
   end
-  
+
   def test_urls_returns_hash
     json = <<-EOS
       {"response": {
@@ -755,7 +795,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Hash, response
     assert_equal 'bar', response[:foo]
   end
-  
+
   def test_urls_passes_options
     json = <<-EOS
       {"response": {
@@ -772,11 +812,11 @@ class TestArtist < MiniTest::Unit::TestCase
     expect_request json, "#{Nestling::Artist::METHOD_PREFIX}urls", { :foo => :bar, :name => 'bar' }
     @artist.urls :foo => :bar
   end
-  
+
   def test_video_method
     assert_respond_to @artist, :video
   end
-  
+
   def test_video_returns_collection
     json = <<-EOS
       {"response": {
@@ -795,7 +835,7 @@ class TestArtist < MiniTest::Unit::TestCase
     assert_kind_of Nestling::Collection, response
     assert_equal 'bar', response[0][:foo]
   end
-  
+
   def test_video_passes_options
     json = <<-EOS
       {"response": {

data/test/test_client.rb

@@ -68,7 +68,7 @@ class TestClient < MiniTest::Unit::TestCase
       }
     EOS
     stub_http_get response
-    assert_equal MultiJson.decode(response), Client.new('foo').get('bar')
+    assert_equal MultiJson.load(response), Client.new('foo').get('bar')
   end
 
   def test_sends_user_agent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestling
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-21 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,55 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 1.3.7
 description: Ruby wrapper for the EchoNest API
 email:
 - tob@tobiassvensson.co.uk
@@ -125,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -362739744680810628
+      hash: 417120700315738069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,10 +86,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -362739744680810628
+      hash: 417120700315738069
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the EchoNest API