echowrap 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788bd27b6b2046898456e19218694052ade712a7
-  data.tar.gz: e813c4e8d7626cb0144a20bb6de2b2fefca0e339
+  metadata.gz: 0634ed5d2d365c11f726dc460204ddb5ccfe267b
+  data.tar.gz: e024bd59e708f57435a1ff3d38ee00398714e4ff
 SHA512:
-  metadata.gz: 1eeca991459d386db4b0d6616795fde13a30c72d1f8e71a47d76a05c7f89a5d658d19eae43bef06ebd6df711e30f5fd1c4fddd512bf3f50b7b3bd18030d69e7f
-  data.tar.gz: 050df1d7be4d74527f3e05e0bc247e531fc0e31cfaea819e3df282e2442cdab1480abbfd01464722d58338dc01e1fb8d33e5d0fe57c564e014cb15570ec059b5
+  metadata.gz: 0bfdcd37bc277bf7e508372e8581d1bad7a3e368ee48e424186640ac98fd9897775bb114eb84b9120ae3fbac865e5a897442421f2f60b2c1aca8df35a759cbb4
+  data.tar.gz: 626c6b8c235a1b8326d4c24c7b35046eb3fda02e65d0e5a93f90b6a38ca83553fbb32eb4a5eedb8bed7fa00c5e7189010c5f94e53ccb05d20158f127acd2d753

data/lib/echowrap/error/client_error.rb

@@ -16,18 +16,7 @@ module Echowrap
     private
 
       def self.parse_error(body)
-        if body.nil?
-          ''
-        elsif body[:error]
-          body[:error]
-        elsif body[:errors]
-          first = Array(body[:errors]).first
-          if first.is_a?(Hash)
-            first[:message].chomp
-          else
-            first.chomp
-          end
-        end
+        body[:response][:status][:message]
       end
 
     end

data/lib/echowrap/version.rb

@@ -2,7 +2,7 @@ module Echowrap
   class Version
     MAJOR = 0 unless defined? Echowrap::Version::MAJOR
     MINOR = 1 unless defined? Echowrap::Version::MINOR
-    PATCH = 1 unless defined? Echowrap::Version::PATCH
+    PATCH = 2 unless defined? Echowrap::Version::PATCH
     PRE = nil unless defined? Echowrap::Version::PRE
 
     class << self

data/spec/echonest/client_spec.rb

@@ -67,46 +67,6 @@ describe Echowrap::Client do
     end
   end
 
-  # it "does not cache the screen name across clients" do
-  #   stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-  #   client1 = Echowrap::Client.new
-  #   expect(client1.verify_credentials.id).to eq 7505382
-  #   stub_get("/1.1/account/verify_credentials.json").to_return(:body => fixture("pengwynn.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-  #   client2 = Echowrap::Client.new
-  #   expect(client2.verify_credentials.id).to eq 14100886
-  # end
-  #
-  # describe "#delete" do
-  #   before do
-  #     stub_delete("/custom/delete").with(:query => {:deleted => "object"})
-  #   end
-  #   it "allows custom delete requests" do
-  #     subject.delete("/custom/delete", {:deleted => "object"})
-  #     expect(a_delete("/custom/delete").with(:query => {:deleted => "object"})).to have_been_made
-  #   end
-  # end
-  #
-  # describe "#put" do
-  #   before do
-  #     stub_put("/custom/put").with(:body => {:updated => "object"})
-  #   end
-  #   it "allows custom put requests" do
-  #     subject.put("/custom/put", {:updated => "object"})
-  #     expect(a_put("/custom/put").with(:body => {:updated => "object"})).to have_been_made
-  #   end
-  # end
-  #
-  # describe "#credentials?" do
-  #   it "returns true if all credentials are present" do
-  #     client = Echowrap::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :oauth_token => 'OT', :oauth_token_secret => 'OS')
-  #     expect(client.credentials?).to be_true
-  #   end
-  #   it "returns false if any credentials are missing" do
-  #     client = Echowrap::Client.new(:consumer_key => 'CK', :consumer_secret => 'CS', :oauth_token => 'OT')
-  #     expect(client.credentials?).to be_false
-  #   end
-  # end
-  #
   describe "#connection" do
     it "looks like Faraday connection" do
       expect(subject.send(:connection)).to respond_to(:run_request)
@@ -117,58 +77,5 @@ describe Echowrap::Client do
     end
   end
 
-  # describe "#request" do
-  #   it "encodes the entire body when no uploaded media is present" do
-  #     stub_post("/1.1/statuses/update.json").with(:body => {:status => "Update"}).to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
-  #     subject.update("Update")
-  #     expect(a_post("/1.1/statuses/update.json").with(:body => {:status => "Update"})).to have_been_made
-  #   end
-  #   it "encodes none of the body when uploaded media is present" do
-  #     stub_post("/1.1/statuses/update_with_media.json")
-  #     subject.update_with_media("Update", fixture("pbjt.gif"))
-  #     expect(a_post("/1.1/statuses/update_with_media.json")).to have_been_made
-  #   end
-  #   it "catches Faraday errors" do
-  #     subject.stub!(:connection).and_raise(Faraday::Error::ClientError.new("Oops"))
-  #     expect{subject.send(:request, :get, "/path")}.to raise_error Echowrap::Error::ClientError
-  #   end
-  #   it "catches MultiJson::DecodeError errors" do
-  #     subject.stub!(:connection).and_raise(MultiJson::DecodeError.new("unexpected token", [], "<!DOCTYPE html>"))
-  #     expect{subject.send(:request, :get, "/path")}.to raise_error Echowrap::Error::DecodeError
-  #   end
-  # end
-
-  # describe "#oauth_auth_header" do
-  #   it "creates the correct auth headers" do
-  #     uri = "/1.1/direct_messages.json"
-  #     authorization = subject.send(:oauth_auth_header, :get, uri)
-  #     expect(authorization.options[:signature_method]).to eq "HMAC-SHA1"
-  #     expect(authorization.options[:version]).to eq "1.0"
-  #     expect(authorization.options[:consumer_key]).to eq "CK"
-  #     expect(authorization.options[:consumer_secret]).to eq "CS"
-  #     expect(authorization.options[:token]).to eq "OT"
-  #     expect(authorization.options[:token_secret]).to eq "OS"
-  #   end
-  # end
-  #
-  # describe "#bearer_auth_header" do
-  #   subject do
-  #     Echowrap::Client.new(:bearer_token => "BT")
-  #   end
-  #
-  #   it "creates the correct auth headers with supplied bearer_token" do
-  #     uri = "/1.1/direct_messages.json"
-  #     authorization = subject.send(:bearer_auth_header)
-  #     expect(authorization).to eq "Bearer BT"
-  #   end
-  # end
-  #
-  # describe "#bearer_token_credentials_auth_header" do
-  #   it "creates the correct auth header with supplied consumer_key and consumer_secret" do
-  #     uri = "/1.1/direct_messages.json"
-  #     authorization = subject.send(:bearer_token_credentials_auth_header)
-  #     expect(authorization).to eq "Basic #{Base64.strict_encode64("CK:CS")}"
-  #   end
-  # end
 end
 

data/spec/echonest/error_spec.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 describe Echowrap::Error do
+  before do
+    @client = new_test_client
+  end
 
   describe "#initialize" do
     it "wraps another error class" do
@@ -17,4 +20,39 @@ describe Echowrap::Error do
     end
   end
 
+  describe "#from_response" do
+
+    before do
+      stub_get("/api/v4/song/search").
+      with(:query => {
+            :results => 1,
+            :artist => 'radiohead',
+            :title => 'karma police',
+            :bucket => ['fakebucket']}).
+        to_return(:status => 400,
+                  :body => fixture('error_response.json'))
+    end
+
+    it "should return echowrap badrequest when 400 is returned" do
+     expect{@client.song_search(:results => 1,
+                          :artist => 'radiohead',
+                          :title => 'karma police',
+                          :bucket => ['fakebucket'])}.to raise_error(Echowrap::Error::BadRequest)
+
+    end
+
+    it "returns an error with the echonest message parsed correctly" do
+      begin
+       @client.song_search(:results => 1,
+                            :artist => 'radiohead',
+                            :title => 'karma police',
+                            :bucket => ['fakebucket'])
+      rescue Echowrap::Error::BadRequest => error
+        expect(error.message).to match(/bucket - Invalid parameter: bucket/)
+      end
+    end
+  end
+
+
+
 end

data/spec/fixtures/error_response.json

@@ -0,0 +1 @@
+{"response": {"status": {"version": "4.2", "code": 5, "message": "bucket - Invalid parameter: bucket \"fakebucket\" is not one of \"song_hotttnesss\", \"song_hotttnesss_rank\", \"artist_familiarity\", \"artist_familiarity_rank\", \"artist_hotttnesss\", \"artist_hotttnesss_rank\", \"artist_discovery\", \"artist_discovery_rank\", \"audio_summary\", \"artist_location\", \"tracks\", \"scores\", \"song_type\", \"song_discovery\", \"song_discovery_rank\", \"song_currency\", \"song_currency_rank\", \"id:7digital-US\", \"id:7digital-AU\", \"id:7digital-UK\", \"id:facebook\", \"id:fma\", \"id:emi_open_collection\", \"id:emi_bluenote\", \"id:emi_artists\", \"id:twitter\", \"id:spotify-WW\", \"id:seatwave\", \"id:lyricfind-US\", \"id:jambase\", \"id:musixmatch-WW\", \"id:rdio-US\", \"id:rdio-AT\", \"id:rdio-AU\", \"id:rdio-BR\", \"id:rdio-CA\", \"id:rdio-CH\", \"id:rdio-DE\", \"id:rdio-DK\", \"id:rdio-ES\", \"id:rdio-FI\", \"id:rdio-FR\", \"id:rdio-IE\", \"id:rdio-IT\", \"id:rdio-NL\", \"id:rdio-NO\", \"id:rdio-NZ\", \"id:rdio-PT\", \"id:rdio-SE\", \"id:emi_electrospective\", \"id:rdio-WW\", \"id:rdio-EE\", \"id:rdio-LT\", \"id:rdio-LV\", \"id:rdio-IS\", \"id:rdio-BE\", \"id:rdio-MX\", \"id:seatgeek\", \"id:rdio-GB\", \"id:rdio-CZ\", \"id:rdio-CO\", \"id:rdio-PL\", \"id:rdio-MY\", \"id:rdio-HK\", \"id:rdio-CL\", \"id:twitter_numeric\", \"id:7digital-ES\", or \"id:<CATALOG ID>\""}}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echowrap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tim Case
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -182,6 +182,7 @@ files:
 - spec/fixtures/artist/video.json
 - spec/fixtures/billie_jean_fingerprint.txt
 - spec/fixtures/billie_jean_query.json
+- spec/fixtures/error_response.json
 - spec/fixtures/oauth/timestamp.json
 - spec/fixtures/playlist/basic.json
 - spec/fixtures/playlist/dynamic/create.json
@@ -280,6 +281,7 @@ test_files:
 - spec/fixtures/artist/video.json
 - spec/fixtures/billie_jean_fingerprint.txt
 - spec/fixtures/billie_jean_query.json
+- spec/fixtures/error_response.json
 - spec/fixtures/oauth/timestamp.json
 - spec/fixtures/playlist/basic.json
 - spec/fixtures/playlist/dynamic/create.json