musix_match 0.1.3 → 0.1.4

data/README.rdoc

@@ -71,6 +71,10 @@ Available options for the search_track methods are:
     puts "#{track.track_name} (#{track.artist_name})"
     puts "Lyrics id: #{track.lyrics_id}"
   end
+
+=== Are you feeling lucky?
+
+  puts MusixMatch.i_m_feeling_lucky("Guns'n'Roses - Welcome to the jungle")
     
 == Lyrics
 

data/lib/musix_match/instant_lyrics.rb

@@ -18,14 +18,14 @@ module MusixMatch
       end
 
       def start
-        lyrics_id = search_lyrics
+        lyrics_id = search_track
         lyrics    = find_lyrics(lyrics_id) if lyrics_id
         Result.new(lyrics)
       end
 
-      def search_lyrics
-        result = MusixMatch.search_lyrics(:q => @q)
-        if result.status_code == 200 && lyrics = result.lyrics_list.first      
+      def search_track
+        result = MusixMatch.search_track(:q => @q, :f_has_lyrics => 1)
+        if result.status_code == 200 && lyrics = result.track_list.first
           lyrics.lyrics_id
         end
       end

data/lib/musix_match/lyrics_find_result.rb

@@ -1,5 +1,5 @@
 module MusixMatch
-  class LyricsFindResult    
+  class LyricsFindResult
     attr_reader :status_code, :execute_time, :lyrics
     
     def initialize(response)
@@ -20,8 +20,8 @@ module MusixMatch
     end  
   
     def parse_response_body(response)
-      if status_code == 200
-        @lyrics = Models::Lyrics.new(response['message']['body']['lyrics_list']['lyrics'])
+      if status_code == 200        
+        @lyrics = Models::Lyrics.new(response['message']['body']['lyrics_list'].first['lyrics'])
       end
     end
   end

data/lib/musix_match/track_find_result.rb

@@ -21,7 +21,7 @@ module MusixMatch
   
     def parse_response_body(response)
       if status_code == 200
-        @track = Models::Track.new(response['message']['body']['track_list']['track'])
+        @track = Models::Track.new(response['message']['body']['track_list'].first['track'])
       end
     end
   end

data/spec/{api_base_spec.rb → api/base_spec.rb}

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe 'API::Base' do
+describe MusixMatch::API::Base do
   it "should always use JSON as format" do    
-    expected_url = MusixMatch::API::Base::API_URL + '/lyrics.get?apikey=&format=json'
+    expected_url = MusixMatch::API::Base::API_URL + '/lyrics.get?format=json&apikey='
     MusixMatch::API::Base.url_for('lyrics.get', :format => 'xml').should == expected_url
   end
   
   it "should use JSON as format even if the format key is a string" do    
-    expected_url = MusixMatch::API::Base::API_URL + '/lyrics.get?apikey=&format=json'
+    expected_url = MusixMatch::API::Base::API_URL + '/lyrics.get?format=json&apikey='
     MusixMatch::API::Base.url_for('lyrics.get', 'format' => 'xml').should == expected_url
   end
   

data/spec/{finder_spec.rb → api/finder_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe 'Finder' do
+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 }}}
+  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)

data/spec/{search_spec.rb → api/search_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Search' do
+describe MusixMatch::API::Search do
   
   lyrics_search_response  = {'message' => {'body' => {'lyrics_list' => []}, 'header' => { 'status_code' => 200, 'execute_time' => 1, 'available' => 10 }}}
   track_search_response   = {'message' => {'body' => {'track_list' => [] }, 'header' => { 'status_code' => 200, 'execute_time' => 1, 'available' => 10 }}}

data/spec/lyrics_find_result_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe MusixMatch::LyricsFindResult do
+  it 'should set status_code' do
+    response = load_fixture('lyrics.get')
+    result = MusixMatch::LyricsFindResult.new(response)
+    result.status_code.should == 200
+  end
+  
+  it 'should set execute_time' do
+    response = load_fixture('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')
+    MusixMatch::Models::Lyrics.should_receive(:new).with(response['message']['body']['lyrics_list'].first['lyrics'])
+    MusixMatch::LyricsFindResult.new(response)
+  end
+end

data/spec/{lyrics_spec.rb → models/lyrics_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Lyrics' do
+describe MusixMatch::Models::Lyrics do
   it 'should call search_lyrics on Search class' do
     params = { :q_artist => 'artist name' }
     MusixMatch::API::Search.should_receive(:search_lyrics).with(params)

data/spec/{track_spec.rb → models/track_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Track' do
+describe MusixMatch::Models::Track do
   it 'should call search_track on Search class' do
     params = { :q_artist => 'artist name' }
     MusixMatch::API::Search.should_receive(:search_track).with(params)

data/spec/musix_match_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'MusixMatch' do
+describe MusixMatch do
   it "should call get on Lyrics" do
     lyrics_id = 1
     MusixMatch::Models::Lyrics.should_receive(:get).with(lyrics_id)

data/spec/spec_helper.rb

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

data/spec/track_find_result_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe MusixMatch::TrackFindResult do
+  it 'should set status_code' do
+    response = load_fixture('track.get')
+    result = MusixMatch::TrackFindResult.new(response)
+    result.status_code.should == 200
+  end
+  
+  it 'should set execute_time' do
+    response = load_fixture('track.get')
+    result = MusixMatch::TrackFindResult.new(response)
+    result.execute_time.should == 0.0110709667206
+  end
+  
+  it 'should initialize a new track with the first track of track_list' do
+    response = load_fixture('track.get')
+    MusixMatch::Models::Track.should_receive(:new).with(response['message']['body']['track_list'].first['track'])
+    MusixMatch::TrackFindResult.new(response)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: musix_match
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Andrea Franz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +02:00
+date: 2010-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,13 +73,15 @@ files:
 - lib/musix_match/models/track.rb
 - lib/musix_match/track_find_result.rb
 - lib/musix_match/track_search_result.rb
-- spec/api_base_spec.rb
-- spec/finder_spec.rb
-- spec/lyrics_spec.rb
+- spec/api/base_spec.rb
+- spec/api/finder_spec.rb
+- spec/api/search_spec.rb
+- spec/lyrics_find_result_spec.rb
+- spec/models/lyrics_spec.rb
+- spec/models/track_spec.rb
 - spec/musix_match_spec.rb
-- spec/search_spec.rb
 - spec/spec_helper.rb
-- spec/track_spec.rb
+- spec/track_find_result_spec.rb
 has_rdoc: true
 homepage: http://github.com/pilu/musix_match
 licenses: []
@@ -116,10 +118,12 @@ signing_key:
 specification_version: 3
 summary: API wrapper for musixmatch.com API's
 test_files: 
-- spec/api_base_spec.rb
-- spec/finder_spec.rb
-- spec/lyrics_spec.rb
+- spec/api/base_spec.rb
+- spec/api/finder_spec.rb
+- spec/api/search_spec.rb
+- spec/lyrics_find_result_spec.rb
+- spec/models/lyrics_spec.rb
+- spec/models/track_spec.rb
 - spec/musix_match_spec.rb
-- spec/search_spec.rb
 - spec/spec_helper.rb
-- spec/track_spec.rb
+- spec/track_find_result_spec.rb