musix_match 0.1.7 → 0.1.8

data/Rakefile

@@ -1,10 +1,8 @@
 require 'rubygems'
 require 'json'
-require 'spec/rake/spectask'
+require "rspec/core/rake_task"
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new
 
 task :default => :spec
 

data/lib/musix_match/api/base.rb

@@ -1,6 +1,7 @@
 module MusixMatch
   module API
     class AuthenticationFailedException < Exception; end
+    class APILimitReachedException < Exception; end
     class APIKeyNotSpecifiedException < Exception; end
     
     class Base
@@ -31,7 +32,10 @@ module MusixMatch
         when String
           JSON.parse(response.parsed_response)
         end
-        raise AuthenticationFailedException.new('Authentication failed, probably because of a bad API key') if parsed_response['message']['header']['status_code'] == 401
+        case  parsed_response['message']['header']['status_code']
+          when 401 then raise AuthenticationFailedException.new('Authentication failed, probably because of a bad API key')
+          when 402 then raise APILimitReachedException.new('A limit was reached, either you exceeded per hour requests limits or your balance is insufficient')
+        end
         parsed_response
       end
     

data/spec/api/base_spec.rb

@@ -30,7 +30,7 @@ describe MusixMatch::API::Base do
     result.should == parsed_response
   end
   
-  it "should raise an error" do
+  it "should raise an error AuthenticationFailedException" do
     lambda do
       MusixMatch::API::Base.api_key = 'API_KEY'
       method = 'lyrics.search'
@@ -43,5 +43,20 @@ describe MusixMatch::API::Base do
       result = MusixMatch::API::Base.get(method, params)
       result.should == parsed_response
     end.should raise_error(MusixMatch::API::AuthenticationFailedException)
-  end  
+  end
+  
+  it "should raise an error APIAccessLimitException" do
+    lambda do
+      MusixMatch::API::Base.api_key = 'API_KEY'
+      method = 'lyrics.search'
+      params = {:q_artist => 'artist name'}
+      url = MusixMatch::API::Base.url_for(method, params)
+      response = mock(HTTParty::Response)
+      parsed_response = {'message' => {'header' => {'status_code' => 402}}}
+      response.should_receive(:parsed_response).twice.and_return(parsed_response)
+      HTTParty.should_receive(:get).with(url).and_return(response)
+      result = MusixMatch::API::Base.get(method, params)
+      result.should == parsed_response
+    end.should raise_error(MusixMatch::API::APILimitReachedException)
+  end
 end

data/spec/api/finder_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe MusixMatch::API::Finder do
-  
-  lyrics_find_response  = {'message' => {'body' => {'lyrics_list' => [{'lyrics' => {}}]}, 'header' => { 'status_code' => 200, 'execute_time' => 1 }}}
-  track_find_response   = {'message' => {'body' => {'track_list'  => [{'track' => {}}] }, 'header' => { 'status_code' => 200, 'execute_time' => 1 }}}
-  
+    
   it "should initialize a new Finder object and call find_lyrics" do
     finder = mock(MusixMatch::API::Finder)
     MusixMatch::API::Finder.should_receive(:new).and_return(finder)
@@ -13,12 +10,13 @@ describe MusixMatch::API::Finder do
     MusixMatch::API::Finder.find_lyrics(lyrics_id)
   end
   
-  it "should call get with lyrics.get and initialize a LyricsFindResult object" do    
+  it "should call get with track.lyrics.get and initialize a LyricsFindResult object" do    
     finder = MusixMatch::API::Finder.new
-    lyrics_id = 1
-    finder.should_receive(:get).with('lyrics.get', :lyrics_id => lyrics_id).and_return(lyrics_find_response)
-    MusixMatch::LyricsFindResult.should_receive(:new).with(lyrics_find_response)
-    finder.find_lyrics(lyrics_id)
+    track_id = 1
+    track_lyrics_get_response = load_fixture('track.lyrics.get')
+    finder.should_receive(:get).with('track.lyrics.get', :track_id => track_id).and_return(track_lyrics_get_response)
+    MusixMatch::LyricsFindResult.should_receive(:new).with(track_lyrics_get_response)
+    finder.find_lyrics(track_id)
   end
   
   it "should initialize a new Finder object and call find_track" do
@@ -32,6 +30,7 @@ describe MusixMatch::API::Finder do
   it "should call get with track.get and initialize a TrackFinderResult" do
     finder = MusixMatch::API::Finder.new
     track_id = 1
+    track_find_response = load_fixture('track.get')
     finder.should_receive(:get).with('track.get', :track_id => track_id).and_return(track_find_response)
     MusixMatch::TrackFindResult.should_receive(:new).with(track_find_response)
     finder.find_track(track_id)

data/spec/lyrics_find_result_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 
 describe MusixMatch::LyricsFindResult do
   it 'should set status_code' do
-    response = load_fixture('lyrics.get')
+    response = load_fixture('track.lyrics.get')
     result = MusixMatch::LyricsFindResult.new(response)
     result.status_code.should == 200
   end
   
   it 'should set execute_time' do
-    response = load_fixture('lyrics.get')
+    response = load_fixture('track.lyrics.get')
     result = MusixMatch::LyricsFindResult.new(response)
     result.execute_time.should == 0.025208044052
   end
   
   it 'should initialize a new lyrics with the first lyrics of lyrics_list' do
-    response = load_fixture('lyrics.get')
+    response = load_fixture('track.lyrics.get')
     MusixMatch::Models::Lyrics.should_receive(:new).with(response['message']['body']['lyrics'])
     MusixMatch::LyricsFindResult.new(response)
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../lib/musix_match'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   def load_fixture(name)
     File.open(File.dirname(__FILE__) + "/fixtures/#{name}.json") do |file|
       JSON.parse(file.read)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: musix_match
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Andrea Franz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency