rjl-allmusic 0.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b155dfb8ba731eb2b83141639618bc488cf4bf69
-  data.tar.gz: a150392aa792c92b30be443bb676a0edaab3be52
+  metadata.gz: 787431b076c2ee822666ea04063ce6b8cda6c27f
+  data.tar.gz: c739491f05b3407a9ee54a7b0fa76dd0a6dbd501
 SHA512:
-  metadata.gz: 4b3ce309787ceda0bcc62d004e26b5e5e4de19b681d3954c90a5734263f9eb8716d6547255c4852322efd60158efff8b447e6b37bc2a9e40923ed03ee44bff86
-  data.tar.gz: 065de01a7543af3c01a1f1dba95f3793d6281f3186c80d8bd82eba4cde83255c9f39127d46f9b49854a7c66cbff2d1ab003ea063c82d1afd7dbb462e3483e4f9
+  metadata.gz: ea7d62c96dae2e47f7a88a6ec58458decea7aa7565cfa039bd6448a50d9739f0c1323a9f97201444dd3512385cf1bac5a65f7ca190faf43721667a5c89765d38
+  data.tar.gz: 557d55e82be8b31d40194b9b7cb6517a30f60ccfd188cd790e6156b4cf6355775893a5c4d4bb1b631e957eafd26267b1bd9edb4919f5ed021610ac6516ee3033

data/lib/allmusic.rb

@@ -7,26 +7,24 @@ require 'fuzzystringmatch' #https://github.com/kiyoka/fuzzy-string-match
 # @param [String]
 class Allmusic
 
-  # @!attribute album
-  #   @return [String] Album name
-  attr_accessor :album
-  # @!attribute artist
-  #   @return [String] Artist name
-  attr_accessor :artist
-  attr_reader   :genres
-  attr_reader   :styles
-  attr_reader   :genre
-  attr_reader   :style
-
   ARTIST_SEARCH_URL = "http://www.allmusic.com/search/artists/"
 
-  def initialize( artist = nil, album = nil)
+  def initialize( artist = nil, album = nil )
     @artist = artist
     @album  = album
-    @genre = nil
-    @style = nil
+    @metadata = get_metadata( @artist, @album )
+  end
+
+  def genres
+    return @metadata[:genres]
   end
 
+  def styles
+    return @metadata[:styles]
+  end
+
+  private
+
   # return a list of the albums genre/styles
   # @param album_page [Nokogiri] the page node to parse
   # @param type [String] 'genre' | 'styles'
@@ -41,20 +39,25 @@ class Allmusic
   end
 
   # Sets @genre and @style for @album, @artist
-  def get_meta
-
+  def get_metadata( artist, album )
+    metadata = {:genres => [], :styles => []}
     # search for artist page e.g. http://www.allmusic.com/search/artists/abba
-    artist_search_url = make_url(ARTIST_SEARCH_URL, @artist)
-    artist_search_page = Nokogiri::HTML(open(artist_search_url))
+    artist_search_url = make_url(ARTIST_SEARCH_URL, artist)
+    artist_search_page = nil
+    begin
+      artist_search_page = Nokogiri::HTML(open(artist_search_url))
+    rescue
+      return
+    end
 
     if no_search_result?(artist_search_page)
-      raise "Couldn't find artist '#{@artist}'"
-      exit
+      # raise "Couldn't find artist '#{@artist}'"
+      return
     end
 
     # get the url of the artist page
     artist_urls = artist_search_page.xpath("//ul[@class='search-results']//div[@class='name']/a")
-    artist_url = best_match(@artist, artist_urls)
+    artist_url = best_match(artist, artist_urls)
 
     # get the artist discography page
     album_search_page = make_url(artist_url, '/discography/all')
@@ -62,31 +65,19 @@ class Allmusic
 
     # get album link
     album_urls = artist_discography_page.xpath("//td[@class='title']/a[1]")
-    album_url = best_match(@album, album_urls)
+    album_url = best_match(album, album_urls)
 
     unless album_url.nil?
       # get album page
       begin
         album_page = Nokogiri::HTML(open(album_url))
-        @genres = parse( album_page, 'genre' )
-        @styles = parse( album_page, 'styles')
-        # # get genre
-        # # TODO: Improve this is there are more than one
-        # @genre = album_page.xpath("//div[@class='genre']//a[1]").text
-        # # get style
-        # @style = album_page.xpath("//div[@class='styles']//a[1]").text
+        metadata[:genres] = parse( album_page, 'genre' )
+        metadata[:styles] = parse( album_page, 'styles')
       rescue
-        puts ">> ERROR: Couldn't open #{album_url} for #{@artist} / #{@album}"
+        puts ">> ERROR: Couldn't open #{album_url} for #{artist} / #{album}"
       end
     end
-  end
-
-  def genre
-    return @genres[0]
-  end
-
-  def style
-    return @styles[0]
+    return metadata
   end
 
   # @return [URL] Joins URL parts
@@ -120,10 +111,4 @@ class Allmusic
     end
     return best_url
   end
-
-  def debug( prefix = "debug", message )
-    puts "-"*50
-    puts "#{prefix}: #{message}"
-    puts "="*50
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rjl-allmusic
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.4'
 platform: ruby
 authors:
 - Richard Lyon