LyricFind 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 394a1b69e759c034601bc5e11504fb8b323c84ca
-  data.tar.gz: 87f8ea293c44d6ec1b43e0df8d9e94ad65a76966
+  metadata.gz: 20b1ab696d7544364ffd20a380e5cd7c14b63ee5
+  data.tar.gz: 6a8ddb99be8d235adc8f93f4a8fcd5bf3b286156
 SHA512:
-  metadata.gz: affa41b89722d4c1bd63924601624b36c4e554737d3a5c39f2b6177d942cb392f89394f77dc61fa661ad51c5938e7d23766970fbb00fe58089e4b9903ec02985
-  data.tar.gz: 1e6c4b9d5536f0839b4b79bbfd555c1a77ce0debdb53ff9fd8c19e5568d41ceca8b8c48edf656a29f410f10721f3f97fc678365fc636c20a5b18909855f73aea
+  metadata.gz: 755e33933aa02295c4f50fa0d1f929d21017b24c31131f514abea759fe9f922377ec5d8f4a6cf533700066d2d995f3f4b7550d6257870161fd8821df2fc2573c
+  data.tar.gz: 0ceb9c046d67f779847656dfbfb602d9d70d26ba575e20903276f106b49dbf0d1f8c650a3da4da95367802cd98787e425e781f4c81a8df7d360500064b899d08

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    LyricFind (0.1.5)
+    LyricFind (0.1.6)
       nokogiri (~> 1.6)
 
 GEM

data/lib/lyricfind.rb

@@ -4,3 +4,4 @@ require "lyricfind/instrumental"
 require "lyricfind/duration"
 require "lyricfind/album"
 require "lyricfind/get_snippet_by_song_name"
+require "lyricfind/get_song_info"

data/lib/lyricfind/album.rb

@@ -7,7 +7,7 @@ module LyricFind
       doc = get_search_api_response artist, song_name
       return nil if doc.nil?
 
-      doc.xpath('//album')[0].content.gsub("\r\n", '').strip
+      get_album doc
     end
   end
 end

data/lib/lyricfind/duration.rb

@@ -7,7 +7,7 @@ module LyricFind
       doc = get_search_api_response artist, song_name
       return nil if doc.nil?
 
-      return doc.xpath('//tracks/track')[0]['duration']
+      get_duration doc
 
     end
   end

data/lib/lyricfind/get_lyrics_by_song_name.rb

@@ -12,23 +12,7 @@ module LyricFind
       doc = get_search_api_response artist, song_name
       return if doc == nil
 
-      begin
-
-        track = doc.xpath('//tracks/track')[0]['amg']
-
-        query_url = URI.escape "http://api.lyricfind.com/lyric.do?apikey=#{@display_key}&reqtype=default&trackid=amg:#{track}"
-
-        response = open(query_url).read
-        doc = Nokogiri::HTML(response)
-        doc.encoding = 'utf-8'
-
-        return nil if !(check_success doc, 101)
-
-        lyrics = doc.xpath('//lyrics')
-        lyrics[0].content
-      rescue Exception => ex
-        nil
-      end
+      get_lyrics get_track_amg doc
     end
 
     def get_search_api_response artist, song_name

data/lib/lyricfind/get_snippet_by_song_name.rb

@@ -7,7 +7,7 @@ module LyricFind
       doc = get_search_api_response artist, song_name
       return nil if doc.nil?
 
-      return doc.xpath('//snippet')[0].content.gsub("\r\n",'').strip
+      get_snippet doc
 
     end
   end

data/lib/lyricfind/get_song_info.rb

@@ -0,0 +1,61 @@
+require_relative 'song_info'
+
+module LyricFind
+  class API
+    def get_song_info artist, song_name
+      song_info = SongInfo.new
+
+      doc = get_search_api_response artist, song_name
+      return if doc == nil
+
+      song_info.artist        = artist
+      song_info.song_name     = song_name
+      song_info.album         = get_album doc
+      song_info.duration      = get_duration doc
+      song_info.snippet       = get_snippet doc
+      song_info.instrumental  = get_instrumental doc
+
+      song_info.lyrics = get_lyrics get_track_amg doc
+
+      song_info
+    end
+
+    def get_album doc
+      doc.xpath('//album')[0].content.gsub("\r\n", '').strip
+    end
+
+    def get_duration doc
+      doc.xpath('//tracks/track')[0]['duration']
+    end
+
+    def get_snippet doc
+      doc.xpath('//snippet')[0].content.gsub("\r\n",'').strip
+    end
+
+    def get_instrumental doc
+      doc.xpath('//tracks/track')[0]['instrumental'] == 'true'
+    end
+
+    def get_track_amg doc
+      doc.xpath('//tracks/track')[0]['amg']
+    end
+
+    def get_lyrics track
+      begin
+        query_url = URI.escape "http://api.lyricfind.com/lyric.do?apikey=#{@display_key}&reqtype=default&trackid=amg:#{track}"
+
+        response = open(query_url).read
+        doc = Nokogiri::HTML(response)
+        doc.encoding = 'utf-8'
+
+        return nil if !(check_success doc, 101)
+
+        lyrics = doc.xpath('//lyrics')
+        lyrics[0].content
+      rescue Exception => ex
+        nil
+      end
+
+    end
+  end
+end

data/lib/lyricfind/instrumental.rb

@@ -7,7 +7,7 @@ module LyricFind
       doc = get_search_api_response artist, song_name
       return nil if doc.nil?
 
-      return doc.xpath('//tracks/track')[0]['instrumental'] == 'true'
+      get_instrumental doc
     end
   end
 end

data/lib/lyricfind/song_info.rb

@@ -0,0 +1,9 @@
+require 'open-uri'
+require 'nokogiri'
+
+module LyricFind
+  class SongInfo
+    attr_accessor :lyrics, :artist, :song_name, :album, :duration, :snippet, :instrumental
+
+  end
+end

data/lib/lyricfind/version.rb

@@ -1,3 +1,3 @@
 module LyricFind
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: LyricFind
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Itamar Hassin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-01 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,9 @@ files:
 - lib/lyricfind/duration.rb
 - lib/lyricfind/get_lyrics_by_song_name.rb
 - lib/lyricfind/get_snippet_by_song_name.rb
+- lib/lyricfind/get_song_info.rb
 - lib/lyricfind/instrumental.rb
+- lib/lyricfind/song_info.rb
 - lib/lyricfind/version.rb
 - lyricfind.gemspec
 - vendor/cache/addressable-2.3.8.gem