LyricFind 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fdf2f4d062693f196d6dbbad0d79b7afdc64305
-  data.tar.gz: a4aa878c290fdd3daf7960fcff95422e8faf85b6
+  metadata.gz: 6f1ebd78a0d5206fc86f6c7c5eef54af3ca92677
+  data.tar.gz: 416561a039b43edcc0c7ce1029ee2ef282fe8427
 SHA512:
-  metadata.gz: f33aa6c38e308eee978a5576b54c70b41df4a99433c78410d8fbc6a7283b05148911db9b8dc503d8b7b7ee265dca9df17718e2126ef3fd7c17ba44e79ddad766
-  data.tar.gz: 90e9574edb1d97200de4db64eb04e70902988b93106d2f1cf28709586c6c86b00e10ffd3778b86aff60c1e1b9f601b9a9a996cc12aaceafbda91abcc03b8608b
+  metadata.gz: b426119dc6dbb268e2807e14de22d70ed88e5c0db087e946435111e587f64e95b28bc8b3c77b17e879bdee3864bf20fd53ba955efc1d5712297c1153ecdc9874
+  data.tar.gz: 97995d024e3053a31743365ebb39f06e945de31400d2e3168297bc3cf9e85e564a824772263a520664f722f2281c5ae164c9be3dbf255c7767d19462ba6c4b1b

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'bundler'
-gem 'vcr'
+

data/Gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: .
+  specs:
+    LyricFind (0.1.4)
+      nokogiri (~> 1.6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.8)
+    builder (3.2.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    cucumber (2.0.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.1.3)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.1.3)
+      gherkin (~> 2.12.0)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rake (10.4.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    safe_yaml (1.0.4)
+    vcr (2.9.3)
+    webmock (1.21.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  LyricFind!
+  bundler
+  cucumber (~> 2.0)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  vcr (~> 2.9)
+  webmock (~> 1.21)

data/README.md

@@ -53,3 +53,7 @@ puts lf.get_lyrics_by_song_name 'u2', 'one'
 ## License
 
 [MIT](https://github.com/ihassin/lyricfind/blob/master/LICENSE.txt).
+
+## Other efforts
+
+Look [here](https://github.com/pilu/lyricfind) if you're looking for am impementation in Go

data/lib/lyricfind.rb

@@ -1,2 +1,3 @@
 require "lyricfind/version"
 require "lyricfind/get_lyrics_by_song_name"
+require "lyricfind/instrumental"

data/lib/lyricfind/get_lyrics_by_song_name.rb

@@ -9,21 +9,10 @@ module LyricFind
     end
 
     def get_lyrics_by_song_name artist, song_name
-      return nil if artist.nil? or artist.length == 0
-      return nil if song_name.nil? or song_name.length == 0
-
-      artist = URI.escape artist
-      song_name = URI.escape song_name
+      doc = get_search_api_response artist, song_name
+      return if doc == nil
 
       begin
-        query_url = URI.escape "http://api.lyricfind.com/search.do?apikey=#{@search_key}&reqtype=default&searchtype=track&artist=#{artist}&track=#{song_name}"
-        response = open(query_url).read
-        doc = Nokogiri::HTML(response)
-        doc.encoding = 'utf-8'
-
-        return nil if !(check_success doc, 100)
-        tracks = doc.xpath('//tracks')[0]['totalresults'].to_i
-        return nil if tracks == 0
 
         track = doc.xpath('//tracks/track')[0]['amg']
 
@@ -37,7 +26,29 @@ module LyricFind
 
         lyrics = doc.xpath('//lyrics')
         lyrics[0].content
-      rescue
+      rescue Exception => ex
+        nil
+      end
+    end
+
+    def get_search_api_response artist, song_name
+      return nil if artist.nil? or artist.length == 0
+      return nil if song_name.nil? or song_name.length == 0
+
+      artist = URI.escape artist
+      song_name = URI.escape song_name
+
+      begin
+        query_url = URI.escape "http://api.lyricfind.com/search.do?apikey=#{@search_key}&reqtype=default&searchtype=track&artist=#{artist}&track=#{song_name}"
+        response = open(query_url).read
+        doc = Nokogiri::HTML(response)
+        doc.encoding = 'utf-8'
+
+        return nil if !(check_success doc, 100)
+        tracks = doc.xpath('//tracks')[0]['totalresults'].to_i
+        return nil if tracks == 0
+        doc
+      rescue Exception => ex
         nil
       end
     end

data/lib/lyricfind/instrumental.rb

@@ -0,0 +1,13 @@
+require 'open-uri'
+require 'nokogiri'
+
+module LyricFind
+  class API
+    def instrumental? artist, song_name
+      doc = get_search_api_response artist, song_name
+      return nil if doc.nil?
+
+      return doc.xpath('//tracks/track')[0]['instrumental'] == 'true'
+    end
+  end
+end

data/lib/lyricfind/version.rb

@@ -1,3 +1,3 @@
 module LyricFind
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: LyricFind
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Itamar Hassin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,9 +117,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -127,6 +127,7 @@ files:
 - bin/setup
 - lib/lyricfind.rb
 - lib/lyricfind/get_lyrics_by_song_name.rb
+- lib/lyricfind/instrumental.rb
 - lib/lyricfind/version.rb
 - lyricfind.gemspec
 - vendor/cache/addressable-2.3.8.gem

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.1
-sudo: required