lyricfy 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - "1.9.3"

data/README.md

@@ -2,6 +2,9 @@
 
 Song Lyrics for your Ruby apps.
 
+[![Build Status](https://travis-ci.org/javichito/Lyricfy.png?branch=master)](https://travis-ci.org/javichito/Lyricfy)
+[![Code Climate](https://codeclimate.com/github/javichito/Lyricfy.png)](https://codeclimate.com/github/javichito/Lyricfy)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,7 +25,7 @@ You need to create an instance of the <code>Lyricfy::Fetcher</code> class and se
 
     fetcher = Lyricfy::Fetcher.new
     lyric = fetcher.search 'Coldplay', 'Viva la vida'
-    puts lyric.body.join('\n')
+    lyric.body.each { |line| puts line }
 
 The <code>Lyricfy::Fetcher#search</code> method returns an OpenStruct object with the following methods:
 
@@ -43,7 +46,7 @@ By default this gem will recursively search for the lyric on each of the provide
 
     fetcher = Lyricfy::Fetcher.new(:metro_lyrics)
     lyric = fetcher.search 'Coldplay', 'Viva la vida'
-    puts lyric.body.join('\n')
+    lyric.body.each { |line| puts line }
 
 In this case Lyricfy will look for the lyric only on [MetroLyrics](http://www.metrolyrics.com/).
 

data/lib/lyricfy/providers/metro_lyrics.rb

@@ -11,14 +11,12 @@ module Lyricfy
     def search
       if data =  super
         html = Nokogiri::HTML(data)
-        container = html.css('p.lyricsbody').first || html.css('p.gnlyricsbody').first
-        elements = container.children.to_a
-        paragraphs = elements.select { |ele| ele.text? }
-        paragraphs.map! { |paragraph| paragraph.text.strip.chomp if paragraph.text != "\n" }.reject! { |ele| ele.empty? }
+        html_to_array(html)
       end
     end
 
     private
+
     def prepare_parameter(parameter)
       parameter.downcase.split(' ').map { |w| w.gsub(/\W/, '') }.join('-')
     end
@@ -28,5 +26,12 @@ module Lyricfy
       song_name = prepare_parameter(self.parameters[:song_name])
       "#{song_name}-lyrics-#{artist_name}"
     end
+
+    def html_to_array(html)
+      container = html.css('p.lyricsbody').first || html.css('p.gnlyricsbody').first
+      elements = container.children.to_a
+      paragraphs = elements.select { |ele| ele.text? }
+      paragraphs.map! { |paragraph| paragraph.text.strip.chomp if paragraph.text != "\n" }.reject! { |ele| ele.empty? }
+    end
   end
 end

data/lib/lyricfy/providers/wikia.rb

@@ -11,18 +11,23 @@ module Lyricfy
     def search
       if data = super
         html = Nokogiri::HTML(data)
-        container = html.css('div.lyricbox').first
-        elements = container.children.to_a
-        paragraphs = elements.select { |ele| ele.text? }
-        paragraphs.map! { |paragraph| paragraph.text.strip.chomp if paragraph.text != "\n" }.reject! { |ele| ele.nil? }
+        html_to_array(html)
       end
     end
 
     private
+
     def format_parameters
       artist_name = tilde_to_vocal(self.parameters[:artist_name]).gsub(" ", "_")
       song_name = tilde_to_vocal(self.parameters[:song_name]).gsub(" ", "_")
       "#{artist_name}:#{song_name}"
     end
+
+    def html_to_array(html)
+      container = html.css('div.lyricbox').first
+      elements = container.children.to_a
+      paragraphs = elements.select { |ele| ele.text? }
+      paragraphs.map! { |paragraph| paragraph.text.strip.chomp if paragraph.text != "\n" }.reject! { |ele| ele.nil? }
+    end
   end
 end

data/lib/lyricfy/version.rb

@@ -1,3 +1,3 @@
 module Lyricfy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/lyricfy.rb

@@ -20,7 +20,7 @@ module Lyricfy
       if !args.empty?
         passed_providers = {}
         args.each do |provider|
-          raise Exception if !@providers.has_key?(provider)
+          raise Exception unless @providers.has_key?(provider)
           passed_providers[provider] = @providers[provider]
         end
         @providers = passed_providers
@@ -34,6 +34,7 @@ module Lyricfy
 
         if lyric_body = fetcher.search
           result =  OpenStruct.new(artist: artist, song: song, body: lyric_body)
+          break
         end
       end
       result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyricfy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -83,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -116,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3632876031990532312
+      hash: 3084054243031445109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3632876031990532312
+      hash: 3084054243031445109
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25