musix_match 0.1.1 → 0.1.2

data/README.rdoc

@@ -36,7 +36,6 @@ 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
-* format: desired output format
 * page: requested page of results
 * page_size: desired number of items per result page
     
@@ -55,6 +54,15 @@ 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
+* 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
+* f_has_lyrics: exclude tracks without an available lyrics
     
 === Getting track
 

data/lib/musix_match/api/base.rb

@@ -13,8 +13,10 @@ module MusixMatch
         class_variable_defined?("@@api_key") ? @@api_key : nil
       end
     
-      def self.url_for(method, params={})      
-        params.merge!({ :apikey => api_key })
+      def self.url_for(method, params={})
+        params.delete('format')
+        params.delete('apikey')
+        params.merge!({ :apikey => api_key, :format => 'json' })
         url_params = params.collect{|k, v| "#{k}=#{v}"}.join('&')
         URI.escape("#{API_URL}/#{method}?#{url_params}")
       end

data/spec/base_model_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'Base Model' do
+  it "should always use JSON as format" do    
+    expected_url = MusixMatch::API::Base::API_URL + '/lyrics.get?apikey=&format=json'
+    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'
+    MusixMatch::API::Base.url_for('lyrics.get', 'format' => 'xml').should == expected_url
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: musix_match
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andrea Franz
@@ -72,6 +72,7 @@ files:
 - lib/musix_match/models/track.rb
 - lib/musix_match/track_find_result.rb
 - lib/musix_match/track_search_result.rb
+- spec/base_model_spec.rb
 - spec/finder_spec.rb
 - spec/lyrics_spec.rb
 - spec/musix_match_spec.rb
@@ -114,6 +115,7 @@ signing_key:
 specification_version: 3
 summary: API wrapper for musixmatch.com API's
 test_files: 
+- spec/base_model_spec.rb
 - spec/finder_spec.rb
 - spec/lyrics_spec.rb
 - spec/musix_match_spec.rb