nestling 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,7 @@
+script: "bundle exec rake test"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - ree

data/lib/nestling/client.rb

@@ -6,10 +6,10 @@ module Nestling
     USER_AGENT = "Nestling/#{Version::STRING}"
     DEFAULT_PARAMS = { :format => 'json' }
 
-    def initialize(api_key = Nestling.api_key)
+    def initialize(api_key = nil)
       @http = Net::HTTP.new(HOST)
-      @api_key = api_key
-      @default_params = { :api_key => api_key }.merge!(DEFAULT_PARAMS)
+      @api_key = api_key || Nestling.api_key
+      @default_params = { :api_key => @api_key }.merge!(DEFAULT_PARAMS)
     end
 
     def artist(id)
@@ -35,7 +35,7 @@ module Nestling
     def get(meth, params = {})
       path = "/api/v4/#{meth}?" << convert_params(params)
       response, data = @http.get(path, {'User-Agent' => USER_AGENT})
-      hash = JSON.parse(data)
+      hash = MultiJson.decode(data)
 
       if (code = hash["response"]["status"]["code"].to_i) != 0
         raise ERRNO[code], hash["response"]["status"]["message"]

data/lib/nestling/collection.rb

@@ -1,6 +1,8 @@
 module Nestling
   class Collection < Array
-    attr_accessor :results, :start, :session_id, :type
+    attr_reader :results, :start, :session_id, :type
+
+    alias :total :results
 
     def initialize(options = {}, *args)
       options = Nestling::Hash.new(options).symbolize_keys!

data/lib/nestling/version.rb

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

data/lib/nestling.rb

@@ -6,7 +6,7 @@ require 'cgi'
 require 'date'
 
 # gems
-require 'json'
+require 'multi_json'
 
 # internal
 require 'nestling/version'

data/nestling.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "json", "~> 1.5.4"
+  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"
 end
 

data/test/helper.rb

@@ -8,11 +8,11 @@ def stub_http_get(ret)
 end
 
 def expect_request(resp, req, opts = nil)
-  resp = JSON.parse(resp)
+  resp = MultiJson.decode(resp)
   if opts
-    Client.any_instance.expects(:get).with(req, opts).returns(resp)
+    Nestling::Client.any_instance.expects(:get).with(req, opts).returns(resp)
   else
-    Client.any_instance.expects(:get).with(req, anything).returns(resp)
+    Nestling::Client.any_instance.expects(:get).with(req, anything).returns(resp)
   end
 end
 

data/test/test_client.rb

@@ -22,13 +22,13 @@ class TestClient < MiniTest::Unit::TestCase
   def test_default_api_key
     Nestling.api_key = nil # sanity
     Nestling.api_key = 'bar'
-    assert_equal Client.new.api_key, 'bar'
+    assert_equal 'bar', Client.new.api_key
   end
 
   def test_default_api_key_through_namespace_module
     Nestling.api_key = nil # sanity
     Nestling.api_key = 'baz'
-    assert_equal Nestling.new.api_key, 'baz'
+    assert_equal 'baz', Nestling.new.api_key
   end
 
   def test_artist_returns_artist_object
@@ -68,12 +68,12 @@ class TestClient < MiniTest::Unit::TestCase
       }
     EOS
     stub_http_get response
-    assert_equal JSON.parse(response), Client.new('foo').get('bar')
+    assert_equal MultiJson.decode(response), Client.new('foo').get('bar')
   end
 
   def test_sends_user_agent
-    Net::HTTP.any_instance.expects(:get)
-      .with(anything, { 'User-Agent' => Client::USER_AGENT} )
+    Net::HTTP.any_instance.expects(:get) \
+      .with(anything, { 'User-Agent' => Client::USER_AGENT} ) \
       .returns([{}, <<-EOS
       {
         "response": {

data/test/test_collection.rb

@@ -45,6 +45,13 @@ class TestErrors < MiniTest::Unit::TestCase
     assert_equal 23, Collection.new(@sym_options_with_total).results
   end
 
+  def test_collection_has_total_accessor_for_results
+    assert_equal 10, Collection.new(@str_options).total
+    assert_equal 10, Collection.new(@sym_options).total
+    assert_equal 23, Collection.new(@str_options_with_total).total
+    assert_equal 23, Collection.new(@sym_options_with_total).total
+  end
+
   def test_collection_assigns_start
     assert_equal 2, Collection.new(@str_options).start
     assert_equal 2, Collection.new(@sym_options).start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestling
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,19 +12,41 @@ cert_chain: []
 date: 2011-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70365143049080 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &70331940832920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70365143049080
+  version_requirements: *70331940832920
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70331940832240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70331940832240
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70331940831560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *70331940831560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70365143048260 !ruby/object:Gem::Requirement
+  requirement: &70331940830800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +54,7 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70365143048260
+  version_requirements: *70331940830800
 description: Ruby wrapper for the EchoNest API
 email:
 - tob@tobiassvensson.co.uk
@@ -41,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md