musix_match 0.1.15 → 0.1.16

data/README.rdoc

@@ -22,30 +22,6 @@
     
   MusixMatch::API::Base.api_key = 'YOUR_API_KEY'
 
-=== Lyrics search
-
-  response = MusixMatch.search_lyrics(:q_artist => 'Pantera')
-  if response.status_code == 200
-    response.each do |lyrics|
-      puts "#{lyrics.lyrics_id}: #{lyrics.track_name} (#{lyrics.artist_name})"
-    end
-  end
-    
-Available options for the search_lyrics methods are:
-
-* q: string to be searched in every data field
-* q_track: string to be searched among tracks titles
-* q_artist: string to be searched among artists names
-* page: requested page of results
-* page_size: desired number of items per result page
-    
-=== Getting lyrics
-
-  response = MusixMatch.get_lyrics(track_id)
-  if response.status_code == 200 && lyrics = response.lyrics
-    puts lyrics.lyrics_body
-  end
-
 === Track search
 
   response = MusixMatch.search_track(:q_artist => 'Pantera')
@@ -54,7 +30,7 @@ Available options for the search_lyrics methods are:
       puts "#{track.track_id}: #{track.track_name} (#{track.artist_name})"
     end
   end
-  
+
 Available options for the search_track methods are:
 
 * q: a string that will be searched in every data field
@@ -64,6 +40,13 @@ Available options for the search_track methods are:
 * page_size: desired number of items per result page
 * f_has_lyrics: exclude tracks without an available lyrics
     
+=== Getting lyrics
+
+  response = MusixMatch.get_lyrics(track_id)
+  if response.status_code == 200 && lyrics = response.lyrics
+    puts lyrics.lyrics_body
+  end
+    
 === Getting track
 
   response = MusixMatch.get_track(track_id)

data/lib/musix_match/api/search.rb

@@ -1,20 +1,11 @@
 module MusixMatch  
   module API
-    class Search < Base  
-      def search_lyrics(options={})
-        response = get('lyrics.search', options)
-        LyricsSearchResult.new(response)
-      end
-
+    class Search < Base
       def search_track(options={})
         response = get('track.search', options)
         TrackSearchResult.new(response)
       end
 
-      def self.search_lyrics(options={})
-        Search.new.search_lyrics(options)
-      end
-
       def self.search_track(options={})
         Search.new.search_track(options)
       end

data/lib/musix_match/models/model.rb

@@ -1,5 +1,5 @@
 module MusixMatch
-  module Models    
+  module Models   
     module Model
       def self.included(base)
         base.send(:extend, ClassMethods)
@@ -10,11 +10,7 @@ module MusixMatch
         def model_with_attributes(*attributes)
           attr_accessor(*attributes)
           ModelBuilder.build_constructor(self, *attributes)
-        end
-        
-        def search(options={})
-          API::Search.send("search_#{self.name.split('::').last.downcase}", options)
-        end
+        end    
         
         def get(item_id)
           API::Finder.send("find_#{self.name.split('::').last.downcase}", item_id)
@@ -22,6 +18,18 @@ module MusixMatch
       end
     end
     
+    module Searcher
+      def self.included(base)
+        base.send(:extend, ClassMethods)
+      end
+
+      module ClassMethods
+        def search(options={})
+          API::Search.send("search_#{self.name.split('::').last.downcase}", options)
+        end
+      end
+    end
+    
     module ModelBuilder            
       def self.build_constructor(base, *attributes)        
         initialize_method = Proc.new do |*params|

data/lib/musix_match/models/track.rb

@@ -2,6 +2,7 @@ module MusixMatch
   module Models
     class Track
       include Model
+      include Searcher
       
       model_with_attributes :track_id, :track_mbid, :track_name, :track_mbid, :track_length, :lyrics_id, :instrumental, :subtitle_id,
                             :artist_id, :artist_mbid, :artist_name, :artist_mbid,

data/spec/api/search_spec.rb

@@ -2,24 +2,7 @@ require 'spec_helper'
 
 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 }}}
-  
-  it "should initialize a new Search object and call search_lyrics" do
-    search = mock(MusixMatch::API::Search)
-    MusixMatch::API::Search.should_receive(:new).and_return(search)
-    options = { :q_artist => 'artist name' }
-    search.should_receive(:search_lyrics).with(options)
-    MusixMatch::API::Search.search_lyrics(options)
-  end
-  
-  it "should call get with lyrics.search and initialize a LyricsSearchResult object" do    
-    search = MusixMatch::API::Search.new
-    options = { :q_artist => 'artist name' }
-    search.should_receive(:get).with('lyrics.search', options).and_return(lyrics_search_response)
-    MusixMatch::LyricsSearchResult.should_receive(:new).with(lyrics_search_response)
-    search.search_lyrics(options)
-  end
+  track_search_response   = {'message' => {'body' => {'track_list' => [] }, 'header' => { 'status_code' => 200, 'execute_time' => 1, 'available' => 10 }}}        
   
   it "should initialize a new Search object and call search_track" do
     search = mock(MusixMatch::API::Search)

data/spec/models/lyrics_spec.rb

@@ -1,23 +1,13 @@
 require 'spec_helper'
 
-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)
-    MusixMatch::Models::Lyrics.search(params)
-  end
-  
+describe MusixMatch::Models::Lyrics do    
   it 'should call find_lyrics on Finder class' do
     lyrics_id = 1
     MusixMatch::API::Finder.should_receive(:find_lyrics).with(lyrics_id)
     MusixMatch::Models::Lyrics.get(lyrics_id)
   end
   
-  context 'when created' do
-    it 'should have the search class method' do
-      MusixMatch::Models::Lyrics.should respond_to(:search)
-    end
-    
+  context 'when created' do    
     it 'should have the get class method' do
       MusixMatch::Models::Lyrics.should respond_to(:get)
     end

metadata

@@ -2,7 +2,7 @@
 name: musix_match
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors: 
 - Andrea Franz