deezer-lookup 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de809526e8bc3e88c6541aa75cb83bb563658007
-  data.tar.gz: 03c9a04132a778097a07c8fa2452b89a491dfa3b
+  metadata.gz: 520fa1d126f05911efd703c2af2b148bc28a2308
+  data.tar.gz: 43dae851208c67b4527a7e3802e665e170f398c8
 SHA512:
-  metadata.gz: 9c4ec78d49f18ba78ff71102af1655ae7272c3b953a0875ffd0f6d2f5481b3b9f6389ea0de8e38d99d74f477bf968f0e9ab40188f9934edfc340912c83090b44
-  data.tar.gz: c3b1de9ba01b532348cdabf666719b2e250538c1a877d30c91183ba5daaf7c2f6f513d8cce3c6f24ed8e7d0a24760edb76084a43aaa56058747fdc5a27a0e90d
+  metadata.gz: 43f942930f977d5bdb36f39b9c6ebb94a4575b367db91ca6425ee5bd16f75e3bc9c67ca3bf9a96e7636822a503d99e92d973be26b6bffa7484d976b15be2bd73
+  data.tar.gz: 6099bfd8a765886ac31db3d34b09d2962f6072ae7195c8a8545d5de3ed7b0daa7d5bbfb5dbb330e493b5120367d5a881aeaa3507c9e7eb12b5872f5186f60893

data/lib/_sample.rb

@@ -2,4 +2,5 @@ require_relative 'deezer-lookup'
 require 'pp'
 Deezer.access_token 'nypmrN5hry5408738ae132endQ8sQed5408738ae1369wgcn7g'
 Deezer.levenshtein_thresholds = nil
-pp Deezer.lookup( 'riptide', 'vance joy' ).size
+pp Deezer.lookup( 14495578)
+

data/lib/deezer-lookup.rb

@@ -15,27 +15,34 @@ module Deezer
   end
 
   def self.lookup(*query)
-    base_url = "http://api.deezer.com/search?access_token=#{@access_token}&q="
-    base_url += URI.escape( query.join(' ').downcase )
-    raw_json = open(base_url).read()
+    if query.size == 2
+      base_url = "http://api.deezer.com/search?access_token=#{@access_token}&q="
+      base_url += URI.escape( query.join(' ').downcase )
+      raw_json = open(base_url).read()
 
-    results, input_song_title, input_artist_name, filtered_results = JSON.parse(raw_json)['data'], query[0].downcase, query[1].downcase, []
+      results, input_song_title, input_artist_name, filtered_results = JSON.parse(raw_json)['data'], query[0].downcase, query[1].downcase, []
 
-    results.each do |r|
-      song_title, artist_name = r['title'].downcase, r['artist']['name'].downcase
-      r['levenshtein'] = [ DamerauLevenshtein.distance(song_title, input_song_title), DamerauLevenshtein.distance(artist_name, input_artist_name) ]
-    end
-
-    if @levenshtein_thresholds
       results.each do |r|
         song_title, artist_name = r['title'].downcase, r['artist']['name'].downcase
-        if r['levenshtein'][0] <= @levenshtein_thresholds[:song] and r['levenshtein'][1] <= @levenshtein_thresholds[:artist]
-          filtered_results.push(r)
+        r['levenshtein'] = [ DamerauLevenshtein.distance(song_title, input_song_title), DamerauLevenshtein.distance(artist_name, input_artist_name) ]
+      end
+
+      if @levenshtein_thresholds
+        results.each do |r|
+          song_title, artist_name = r['title'].downcase, r['artist']['name'].downcase
+          if r['levenshtein'][0] <= @levenshtein_thresholds[:song] and r['levenshtein'][1] <= @levenshtein_thresholds[:artist]
+            filtered_results.push(r)
+          end
         end
+        filtered_results
+      else
+        results
       end
-      filtered_results
     else
-      results
+      # single track
+      base_url = "http://api.deezer.com/track/#{query.first}"
+      raw_json = open(base_url).read()
+      return JSON.parse(raw_json)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deezer-lookup
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - Matias Insaurralde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: damerau-levenshtein