lyrics_finder 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87caaf1a92687f124d09bfd2cfe69420841c1468
-  data.tar.gz: f938b5851c7dca280eeb144ccd34da99f50a9c43
+  metadata.gz: 7687aa59df44d91c4cd3f53290eae5a53125f25a
+  data.tar.gz: 08de33c09c38c33264cfdc5e4ba592843f2e3d31
 SHA512:
-  metadata.gz: 7f7d8db6f81bb41b3dec0d573c31640cc1a528da8d3270bd732e6b60b4ccd198ef0ee36efb41b7cc20d2514cc85890af0e39d2e55c1624751d704fc08b2f9165
-  data.tar.gz: 586ce2f585563bd46c861ba324a4db732cc3afa75620827f74b792ca5ea2af54942865cfeca75f631760a1917bf42b4ceacc202e9ac1a0ee93cb92d13ac83742
+  metadata.gz: 046b9bbc64a9c059b6f92c584d18ff340afb1dad91c8342815d614d6face705fab414da93c0c4b9c20b18761fee1851d15e7ffc758c58f34a119bf45f5470901
+  data.tar.gz: 4121f9282103d2889b7e8e378347a797edc801efe651c579673f7e2544640a14cbb49b8130629e0314a7628338235313250b0ed71de125c00c61d3f0590479fb

data/lib/lyrics_finder.rb

@@ -5,27 +5,28 @@ require 'i18n'
 I18n.enforce_available_locales = false
 require_relative 'lyrics_finder/version'
 require_relative 'lyrics_finder/song'
-require_relative 'lyrics_finder/providers'
+require_relative 'lyrics_finder/provider'
+
+require 'pry'
+require 'pry-byebug'
+require 'awesome_print'
 
 
 module LyricsFinder
+
   def self.search(author, title)
-    Providers.list.each do |provider|
-      url = Providers.provider_url_for_song(provider, Song.new(author, title))
-      data = perform_request(url)
-      result = Providers.extract_lyric_from_data(data) unless data.nil?
-      return result unless result.nil?
+    begin
+      Provider.list.each do |provider|
+        url = Provider.url_for_song(provider, Song.new(author, title))
+        data = open(url)
+        result = Provider.extract_lyric_from_data(data) unless data.nil?
+        return result unless result.nil?
+      end
+    rescue SocketError => ex
+      puts "LyricsFinder can't connect to the internet"
+    rescue OpenURI::HTTPError => ex
+      puts "LyricsFinder can't find any matching lyrics for that song"
     end
-    return nil # song not found
   end
 
-  private
-
-    def self.perform_request(url)
-      begin
-        open(url)
-      rescue Exception => ex
-        # puts "ERROR: " + ex.message
-      end
-    end
 end

data/lib/lyrics_finder/cli.rb

@@ -3,12 +3,11 @@ require 'lyrics_finder'
 
 module LyricsFinder
   class CLI < Thor
-    desc 'search -a Author -t Song Title', 'Search the lyrics for the specified author and title'
+    desc 'search -a "author" -t "song"', 'Search the lyrics for the specified author and song'
     method_option 'author', :aliases => '-a', :type => :string
     method_option 'title', :aliases => '-t', :type => :string
     def search
-      result = LyricsFinder.search(options[:author], options[:title])
-      puts result.nil? ? "Song not found." : result
+      puts LyricsFinder.search(options[:author], options[:title])
     end
   end
 end

data/lib/lyrics_finder/{providers.rb → provider.rb}

@@ -1,10 +1,10 @@
 module LyricsFinder
-  module Providers
+  module Provider
     def self.list
       [LyricsWikia, LyricsMania, SongLyrics, Azlyrics]
     end
 
-    def self.provider_url_for_song(provider, song)
+    def self.url_for_song(provider, song)
       @current_provider = provider.new(song)
       @current_provider.format_url
     end

data/lib/lyrics_finder/version.rb

@@ -1,3 +1,3 @@
 module LyricsFinder
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lyrics_finder.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 2.9.2'
   spec.add_development_dependency 'webmock', '~> 1.19.0'
   spec.add_development_dependency 'coveralls', '~> 0.7.0'
-  # spec.add_development_dependency 'pry', '~> 0.10'
-  # spec.add_development_dependency 'pry-byebug', '~> 2.0.0'
-  # spec.add_development_dependency 'awesome_print', '~> 1.2.0'
+  spec.add_development_dependency 'pry', '~> 0.10.1'
+  spec.add_development_dependency 'pry-byebug', '~> 2.0.0'
+  spec.add_development_dependency 'awesome_print', '~> 1.6.1'
 
   spec.add_dependency 'nokogiri', '~> 1.6.0'
-  spec.add_dependency 'activesupport', '~> 4.1.0'
-  spec.add_dependency 'i18n', '~> 0.6.9'
+  spec.add_dependency 'activesupport', '~> 4.1.0' # Not working with activesupport 4.2
+  spec.add_dependency 'i18n', '~> 0.6'
   spec.add_dependency 'thor', '~> 0.19.1'
 end

data/spec/lyrics_finder/lyrics_finder_spec.rb

@@ -3,7 +3,7 @@ describe LyricsFinder do
 
     context 'With LyricsWikia as the provider' do
       before :each do
-        allow(LyricsFinder::Providers).to receive(:list).and_return([LyricsFinder::Providers::LyricsWikia])
+        allow(LyricsFinder::Provider).to receive(:list).and_return([LyricsFinder::Provider::LyricsWikia])
         VCR.use_cassette 'LyricsWikia 200 search' do
           @song = LyricsFinder.search("american authors", "best day of my life")
         end
@@ -20,7 +20,7 @@ describe LyricsFinder do
 
     context 'With LyricsMania as the provider' do
       before :each do
-        allow(LyricsFinder::Providers).to receive(:list).and_return([LyricsFinder::Providers::LyricsMania])
+        allow(LyricsFinder::Provider).to receive(:list).and_return([LyricsFinder::Provider::LyricsMania])
         VCR.use_cassette 'LyricsMania 200 search' do
           @song = LyricsFinder.search("american authors", "best day of my life")
         end
@@ -37,7 +37,7 @@ describe LyricsFinder do
 
     context 'With SongLyrics as the provider' do
       before :each do
-        allow(LyricsFinder::Providers).to receive(:list).and_return([LyricsFinder::Providers::SongLyrics])
+        allow(LyricsFinder::Provider).to receive(:list).and_return([LyricsFinder::Provider::SongLyrics])
         VCR.use_cassette 'SongLyrics 200 search' do
           @song = LyricsFinder.search("american authors", "best day of my life")
         end
@@ -54,7 +54,7 @@ describe LyricsFinder do
 
     context 'With Azlyrics as the provider' do
       before :each do
-        allow(LyricsFinder::Providers).to receive(:list).and_return([LyricsFinder::Providers::Azlyrics])
+        allow(LyricsFinder::Provider).to receive(:list).and_return([LyricsFinder::Provider::Azlyrics])
         VCR.use_cassette 'Azlyrics 200 search' do
           @song = LyricsFinder.search("american authors", "best day of my life")
         end
@@ -69,17 +69,29 @@ describe LyricsFinder do
       end
     end
 
-    context 'with a sound that does not exist yet in any provider' do
+    context 'with a song that does not exist yet in any provider' do
+      # it 'raises HTTP Error' do
+      #   expect{
+      #     LyricsFinder.search('asdfqwerty', 'poiulkj')
+      #   }.to raise_error(OpenURI::HTTPError)
+      # end
+
       it 'returns nil' do
-        expect(LyricsFinder.search("","")).to eq nil
+        expect(LyricsFinder.search('', '')).to eq nil
       end
     end
 
     context 'with invalid parameters' do
+      # it 'raises HTTP Error' do
+      #   expect{
+      #     LyricsFinder.search('', '')
+      #   }.to raise_error(OpenURI::HTTPError)
+      # end
+
       it 'returns nil' do
-        expect(LyricsFinder.search("","")).to eq nil
+        expect(LyricsFinder.search('', '')).to eq nil
       end
     end
 
-  end # '#search'
+  end
 end

data/spec/lyrics_finder/providers/azlyrics_spec.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-describe LyricsFinder::Providers::Azlyrics do
+describe LyricsFinder::Provider::Azlyrics do
 
   describe '.format_url' do
     context 'with valid author and title' do
       let(:song) { Song.new("amêricàn authors", "best day of my life") }
-      let(:az_lyrics) { LyricsFinder::Providers::Azlyrics.new(song) }
+      let(:az_lyrics) { LyricsFinder::Provider::Azlyrics.new(song) }
       let(:valid_url) { "http://www.azlyrics.com/lyrics/americanauthors/bestdayofmylife.html" }
 
       it 'returns a properly formatted url' do

data/spec/lyrics_finder/providers/lyrics_mania_spec.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-describe LyricsFinder::Providers::LyricsMania do
+describe LyricsFinder::Provider::LyricsMania do
 
   describe '.format_url' do
     context 'with valid author and title' do
       let(:song) { Song.new("amêricàn authors", "best day of my life") }
-      let(:lyrics_mania) { LyricsFinder::Providers::LyricsMania.new(song) }
+      let(:lyrics_mania) { LyricsFinder::Provider::LyricsMania.new(song) }
       let(:valid_url) { "http://www.lyricsmania.com/best_day_of_my_life_lyrics_american_authors.html" }
 
       it 'returns a properly formatted url' do

data/spec/lyrics_finder/providers/lyrics_wikia_spec.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-describe LyricsFinder::Providers::LyricsWikia do
+describe LyricsFinder::Provider::LyricsWikia do
 
   describe '.format_url' do
     context 'with valid author and title' do
       let(:song) { Song.new("amëricán authòrs", "best day of my life") }
-      let(:lyrics_wikia) { LyricsFinder::Providers::LyricsWikia.new(song) }
+      let(:lyrics_wikia) { LyricsFinder::Provider::LyricsWikia.new(song) }
       let(:valid_url) { "http://lyrics.wikia.com/american_authors:best_day_of_my_life" }
 
       it 'returns a properly formatted url' do

data/spec/lyrics_finder/providers/song_lyrics_spec.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
-describe LyricsFinder::Providers::SongLyrics do
+describe LyricsFinder::Provider::SongLyrics do
 
   describe '.format_url' do
     context 'with valid author and title' do
       let(:song) { Song.new("amêricàn authors", "best day of my life") }
-      let(:song_lyrics) { LyricsFinder::Providers::SongLyrics.new(song) }
+      let(:song_lyrics) { LyricsFinder::Provider::SongLyrics.new(song) }
       let(:valid_url) { "http://www.songlyrics.com/american-authors/best-day-of-my-life-lyrics/" }
 
       it 'returns a properly formatted url' do

data/spec/support/sample_songs.rb

@@ -95,46 +95,60 @@ LYRICS_MANIA_EXAMPLE = ["Wo-o-o-o-o-oh Wooh",
                         "This is gonna be the best day of my life",
                         "My li-i-i-i-i-ife"]
 
-SONG_LYRICS_EXAMPLE = ["I had a dream so big and loud",
+SONG_LYRICS_EXAMPLE = ["(Ooh, Ooh-Ooh, Ooh)",
+                       "I had a dream so big and loud",
                        "I jumped so high I touched the clouds",
-                       "Wo-o-o-o-o-oh, wo-o-o-o-o-oh",
+                       "Whoa-Oh-Oh-Oh-Oh-Oh-Oh (Whoa-Oh-Oh-Oh-Oh-Oh-Oh)",
                        "I stretched my hands out to the sky",
-                       "We danced with Angels through the night",
-                       "Wo-o-o-o-o-oh, wo-o-o-o-o-oh",
-                       "I'm never gonna look back",
-                       "Woah, never gonna give it up",
-                       "No, please don't wake me now",
+                       "We danced with monsters through the night",
+                       "Whoa-Oh-Oh-Oh-Oh-Oh-Oh (Whoa-Oh-Oh-Oh-Oh-Oh-Oh)",
+                       "I'm never gonna look back, Whoa-Oh",
+                       "Never gonna give it up, No-Oh",
+                       "Please don't wake me now",
+                       "(Ooh, Ooh-Ooh, Ooh)",
                        "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh)",
                        "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife",
-                       "I hailed at the moon with friends",
-                       "And then the sun came shinning in",
-                       "Wo-o-o-o-o-oh, wo-o-o-o-o-oh",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh) Whoo",
+                       "(Ooh, Ooh-Ooh, Ooh)",
+                       "I howled at the moon with my friends",
+                       "And then the sun came crashing in",
+                       "Whoa-Oh-Oh-Oh-Oh-Oh-Oh (Whoa-Oh-Oh-Oh-Oh-Oh-Oh)",
                        "But all the possibilities",
                        "No limits just epiphanies",
-                       "Wo-o-o-o-o-oh, wo-o-o-o-o-oh",
-                       "I'm never gonna look back",
-                       "Woah, never gonna give it up",
-                       "No, just don't wake me now",
+                       "Whoa-Oh-Oh-Oh-Oh-Oh-Oh (Whoa-Oh-Oh-Oh-Oh-Oh-Oh)",
+                       "I'm never gonna look back, Whoa-Oh",
+                       "Never gonna give it up, No-Oh",
+                       "Just don't wake me now",
+                       "(Ooh, Ooh-Ooh, Ooh)",
                        "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh)",
                        "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife",
-                       "I hear it calling outside my window",
-                       "I feel it in my soul (soul)",
-                       "The stars were flashing so bright",
-                       "The sun was out 'til midnight",
-                       "I say we gained control (control)",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh)",
+                       "(Ooh, Ooh-Ooh, Ooh)",
+                       "I hear it calling",
+                       "Outside my window",
+                       "I feel it in my soul (Soul)",
+                       "The stars were burning so bright",
+                       "The sun was out 'till midnight",
+                       "I say we lose control (Control)",
+                       "(Ooh, Ooh-Ooh, Ooh)",
+                       "(Ooh, Ooh-Ooh, Ooh)",
                        "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh)",
                        "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife",
-                       "This is gonna be, this is gonna be, this is gonna be",
-                       "The best day of my life",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-i-ife",
+                       "(Ooh, Ooh-Ooh, Ooh) This is gonna be, this is gonna be",
+                       "This has gotta be, the best day of my life (Ooh, Ooh-Ooh, Ooh)",
                        "Everything is looking up, everybody up now",
-                       "This is gonna be the best day of my life",
-                       "My li-i-i-i-i-ife"]
+                       "(Ooh, Ooh-Ooh, Ooh)",
+                       "This is gonna be the best day of my liife",
+                       "(Ooh, Ooh-Ooh, Ooh) My li-i-i-i-i-ife"]
 
 AZ_LYRICS_EXAMPLE = ["I had a dream so big and loud",
                      "I jumped so high I touched the clouds",

data/spec/support/vcr_setup.rb

@@ -1,4 +1,5 @@
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/vcr_cassettes'
   c.hook_into :webmock
+  c.allow_http_connections_when_no_cassette = true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyrics_finder
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Daniel Romero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.9
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +212,7 @@ files:
 - bin/lyricsfinder
 - lib/lyrics_finder.rb
 - lib/lyrics_finder/cli.rb
-- lib/lyrics_finder/providers.rb
+- lib/lyrics_finder/provider.rb
 - lib/lyrics_finder/song.rb
 - lib/lyrics_finder/version.rb
 - lyrics_finder.gemspec
@@ -202,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Solution for finding song lyrics