metal_archives 2.2.0 → 2.2.3

data/lib/metal_archives/models/release.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require 'date'
+require "date"
+require "nokogiri"
 
 module MetalArchives
   ##
@@ -12,7 +13,7 @@ module MetalArchives
     #
     # Returns +Integer+
     #
-    property :id, :type => Integer
+    property :id, type: Integer
 
     ##
     # :attr_reader: title
@@ -36,7 +37,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    enum :type, :values => %i[full_length live demo single ep video boxed_set split compilation split_video collaboration]
+    enum :type, values: %i(full_length live demo single ep video boxed_set split compilation split_video collaboration)
 
     ##
     # :attr_reader: date_released
@@ -47,7 +48,7 @@ module MetalArchives
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
     # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
     #
-    property :date_released, :type => NilDate
+    property :date_released, type: NilDate
 
     ##
     # :attr_reader_: catalog_id
@@ -76,7 +77,7 @@ module MetalArchives
     ##
     # :attr_reader: format
     #
-    # Returns +:cd+, +:cassette+, +:vinyl+, +:vhs+, +:dvd+, +:digital+, +:blu_ray+, +:other+
+    # Returns +:cd+, +:cassette+, +:vinyl+, +:vhs+, +:dvd+, +:digital+, +:blu_ray+, +:other+, +:unknown+
     #
     # [Raises]
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
@@ -143,7 +144,7 @@ module MetalArchives
       def find(id)
         return cache[id] if cache.include? id
 
-        Release.new :id => id
+        Release.new id: id
       end
 
       ##
@@ -205,10 +206,10 @@ module MetalArchives
         response = HTTPClient.get url, params
         json = JSON.parse response.body
 
-        return nil if json['aaData'].empty?
+        return nil if json["aaData"].empty?
 
-        data = json['aaData'].first
-        id = Nokogiri::HTML(data[1]).xpath('//a/@href').first.value.delete('\\').split('/').last.gsub(/\D/, '').to_i
+        data = json["aaData"].first
+        id = Nokogiri::HTML(data[1]).xpath("//a/@href").first.value.delete('\\').split("/").last.gsub(/\D/, "").to_i
 
         find id
       end
@@ -295,16 +296,16 @@ module MetalArchives
           if @max_items && @start >= @max_items
             []
           else
-            response = HTTPClient.get url, params.merge(:iDisplayStart => @start)
+            response = HTTPClient.get url, params.merge(iDisplayStart: @start)
             json = JSON.parse response.body
 
-            @max_items = json['iTotalRecords']
+            @max_items = json["iTotalRecords"]
 
             objects = []
 
-            json['aaData'].each do |data|
+            json["aaData"].each do |data|
               # Create Release object for every ID in the results list
-              id = Nokogiri::HTML(data.first).xpath('//a/@href').first.value.delete('\\').split('/').last.gsub(/\D/, '').to_i
+              id = Nokogiri::HTML(data.first).xpath("//a/@href").first.value.delete('\\').split("/").last.gsub(/\D/, "").to_i
               objects << Release.find(id)
             end
 
@@ -333,7 +334,8 @@ module MetalArchives
       #
       def search(title)
         raise MetalArchives::Errors::ArgumentError unless title.is_a? String
-        search_by :title => title
+
+        search_by title: title
       end
 
       ##
@@ -346,7 +348,7 @@ module MetalArchives
       # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
       #
       def all
-        search ''
+        search ""
       end
     end
   end

data/lib/metal_archives/{utils/nil_date.rb → nil_date.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'date'
+require "date"
 
 module MetalArchives
   ##
@@ -35,7 +35,7 @@ module MetalArchives
     # Return a +Date+ object
     #
     def date
-      raise MetalArchives::Errors::ArgumentError, "Invalid conversion to Date: #{self.to_s}" unless year?
+      raise MetalArchives::Errors::ArgumentError, "Invalid conversion to Date: #{self}" unless year?
 
       ::Date.new @year, month || 1, day || 1
     end
@@ -44,7 +44,7 @@ module MetalArchives
     # Parse YYYY[-MM[-DD]]
     #
     def self.parse(value)
-      split = value.split('-')
+      split = value.split("-")
 
       year = Integer(split[0], 10) if split.any? && split[0] && !split[0].empty?
       year = nil if year == 0
@@ -55,19 +55,11 @@ module MetalArchives
       day = Integer(split[2], 10) if split.length > 2 && split[2] && !split[2].empty?
       day = nil if day == 0
 
-      return MetalArchives::NilDate.new year, month, day
-    rescue => e
+      MetalArchives::NilDate.new year, month, day
+    rescue StandardError => e
       raise MetalArchives::Errors::ArgumentError, "Invalid date: #{value}: #{e}"
     end
 
-    def to_s
-      year = (@year || 0).to_s.rjust 2, '0'
-      month = (@month || 0).to_s.rjust 2, '0'
-      day = (@day || 0).to_s.rjust 2, '0'
-
-      "#{year}-#{month}-#{day}"
-    end
-
     ##
     # Comparison operator
     #
@@ -75,21 +67,21 @@ module MetalArchives
       return nil if other.nil?
 
       # Return nil if one of the two years is nil
-      return nil if (@year.nil? && !other.year.nil?) || !@year.nil? && other.year.nil?
+      return nil if (@year.nil? && !other.year.nil?) || (!@year.nil? && other.year.nil?)
 
       # Return nil if one of the two months is nil
-      return nil if (@month.nil? && !other.month.nil?) || !@month.nil? && other.month.nil?
+      return nil if (@month.nil? && !other.month.nil?) || (!@month.nil? && other.month.nil?)
 
       # Return nil if one of the two months is nil
-      return nil if (@day.nil? && !other.day.nil?) || !@day.nil? && other.day.nil?
+      return nil if (@day.nil? && !other.day.nil?) || (!@day.nil? && other.day.nil?)
 
       comp_year = @year <=> other.year
       if comp_year == 0
         comp_month = @month <=> other.month
         if comp_month == 0
-          return @day <=> other.day
+          @day <=> other.day
         else
-          return comp_month
+          comp_month
         end
       else
         comp_year

data/lib/metal_archives/parsers/artist.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'date'
-require 'countries'
-
-require 'metal_archives/middleware/rewrite_endpoint'
+require "json"
+require "date"
+require "countries"
 
 module MetalArchives
   module Parsers
@@ -23,7 +21,7 @@ module MetalArchives
         #
         def map_params(query)
           params = {
-            :query => query[:name] || ''
+            query: query[:name] || "",
           }
 
           params
@@ -42,21 +40,21 @@ module MetalArchives
           doc = Nokogiri::HTML response
 
           # Photo
-          unless doc.css('.member_img').empty?
-            photo_uri = URI doc.css('.member_img img').first.attr('src')
+          unless doc.css(".member_img").empty?
+            photo_uri = URI doc.css(".member_img img").first.attr("src")
             props[:photo] = Middleware::RewriteEndpoint.rewrite photo_uri
           end
 
-          doc.css('#member_info dl').each do |dl|
-            dl.css('dt').each do |dt|
+          doc.css("#member_info dl").each do |dl|
+            dl.css("dt").each do |dt|
               content = sanitize(dt.next_element.content)
 
-              next if content == 'N/A'
+              next if content == "N/A"
 
               case sanitize(dt.content)
-              when 'Real/full name:'
+              when "Real/full name:"
                 props[:name] = content
-              when 'Age:'
+              when "Age:"
                 date = content.strip.gsub(/[0-9]* *\(born ([^\)]*)\)/, '\1')
                 begin
                   props[:date_of_birth] = NilDate.parse date
@@ -64,24 +62,24 @@ module MetalArchives
                   dob = Date.parse date
                   props[:date_of_birth] = NilDate.new dob.year, dob.month, dob.day
                 end
-              when 'R.I.P.:'
+              when "R.I.P.:"
                 begin
                   dod = Date.parse content
                   props[:date_of_death] = NilDate.new dod.year, dod.month, dod.day
                 rescue ArgumentError => e
                   props[:date_of_death] = NilDate.parse content
                 end
-              when 'Died of:'
+              when "Died of:"
                 props[:cause_of_death] = content
-              when 'Place of origin:'
-                props[:country] = ISO3166::Country.find_country_by_name(sanitize(dt.next_element.css('a').first.content))
-                location = dt.next_element.xpath('text()').map(&:content).join('').strip.gsub(/[()]/, '')
+              when "Place of origin:"
+                props[:country] = ISO3166::Country.find_country_by_name(sanitize(dt.next_element.css("a").first.content))
+                location = dt.next_element.xpath("text()").map(&:content).join("").strip.gsub(/[()]/, "")
                 props[:location] = location unless location.empty?
-              when 'Gender:'
+              when "Gender:"
                 case content
-                when 'Male'
+                when "Male"
                   props[:gender] = :male
-                when 'Female'
+                when "Female"
                   props[:gender] = :female
                 else
                   raise Errors::ParserError, "Unknown gender: #{content}"
@@ -94,11 +92,44 @@ module MetalArchives
 
           # Aliases
           props[:aliases] = []
-          alt = sanitize doc.css('.band_member_name').first.content
+          alt = sanitize doc.css(".band_member_name").first.content
           props[:aliases] << alt unless props[:name] == alt
 
+          # Active bands
+          props[:bands] = []
+
+          proc = proc do |row|
+            link = row.css("h3 a")
+            band = if link.any?
+                     # Band name contains a link
+                     MetalArchives::Band.find Integer(link.attr("href").text.gsub(%r(^.*/([^/#]*)#.*$), '\1'))
+                   else
+                     # Band name does not contain a link
+                     sanitize row.css("h3").text
+                   end
+
+            r = row.css(".member_in_band_role")
+
+            range = parse_year_range r.xpath("text()").map(&:content).join("").strip.gsub(/[\n\r\t]/, "").gsub(/.*\((.*)\)/, '\1')
+            role = sanitize r.css("strong").first.content
+
+            {
+              band: band,
+              date_active: range,
+              role: role,
+            }
+          end
+
+          doc.css("#artist_tab_active .member_in_band").each do |row|
+            props[:bands] << proc.call(row).merge(active: true)
+          end
+
+          doc.css("#artist_tab_past .member_in_band").each do |row|
+            props[:bands] << proc.call(row).merge(active: false)
+          end
+
           props
-        rescue => e
+        rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
           raise Errors::ParserError, e
         end
@@ -119,25 +150,25 @@ module MetalArchives
           # Default to official links
           type = :official
 
-          doc.css('#linksTablemain tr').each do |row|
-            if row['id'].match /^header_/
-              type = row['id'].gsub(/^header_/, '').downcase.to_sym
+          doc.css("#linksTablemain tr").each do |row|
+            if row["id"].match /^header_/
+              type = row["id"].gsub(/^header_/, "").downcase.to_sym
             else
-              a = row.css('td a').first
+              a = row.css("td a").first
 
               # No links have been added yet
               next unless a
 
               links << {
-                :url => a['href'],
-                :type => type,
-                :title => a.content
+                url: a["href"],
+                type: type,
+                title: a.content,
               }
             end
           end
 
           links
-        rescue => e
+        rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
           raise Errors::ParserError, e
         end

data/lib/metal_archives/parsers/band.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
-require 'json'
-require 'date'
-require 'countries'
+
+require "json"
+require "date"
+require "countries"
 
 module MetalArchives
   module Parsers
@@ -20,22 +21,22 @@ module MetalArchives
         #
         def map_params(query)
           params = {
-            :bandName => query[:name] || '',
-            :exactBandMatch => (!!query[:exact] ? 1 : 0),
-            :genre => query[:genre] || '',
-            :yearCreationFrom => (query[:year] && query[:year].begin ? query[:year].begin.year : '') || '',
-            :yearCreationTo => (query[:year] && query[:year].end ? query[:year].end.year : '') || '',
-            :bandNotes => query[:comment] || '',
-            :status => map_status(query[:status]),
-            :themes => query[:lyrical_themes] || '',
-            :location => query[:location] || '',
-            :bandLabelName => query[:label] || '',
-            :indieLabelBand => (!!query[:independent] ? 1 : 0)
+            bandName: query[:name] || "",
+            exactBandMatch: (query[:exact] ? 1 : 0),
+            genre: query[:genre] || "",
+            yearCreationFrom: (query[:year]&.begin ? query[:year].begin.year : "") || "",
+            yearCreationTo: (query[:year]&.end ? query[:year].end.year : "") || "",
+            bandNotes: query[:comment] || "",
+            status: map_status(query[:status]),
+            themes: query[:lyrical_themes] || "",
+            location: query[:location] || "",
+            bandLabelName: query[:label] || "",
+            indieLabelBand: (query[:independent] ? 1 : 0),
           }
 
           params[:country] = []
           Array(query[:country]).each do |country|
-            params[:country] << (country.is_a?(ISO3166::Country) ? country.alpha2 : (country || ''))
+            params[:country] << (country.is_a?(ISO3166::Country) ? country.alpha2 : (country || ""))
           end
           params[:country] = params[:country].first if params[:country].size == 1
 
@@ -54,64 +55,64 @@ module MetalArchives
           props = {}
           doc = Nokogiri::HTML response
 
-          props[:name] = sanitize doc.css('#band_info .band_name a').first.content
+          props[:name] = sanitize doc.css("#band_info .band_name a").first.content
 
           props[:aliases] = []
 
           # Logo
-          unless doc.css('.band_name_img').empty?
-            logo_uri = URI doc.css('.band_name_img img').first.attr('src')
+          unless doc.css(".band_name_img").empty?
+            logo_uri = URI doc.css(".band_name_img img").first.attr("src")
             props[:logo] = Middleware::RewriteEndpoint.rewrite logo_uri
           end
 
           # Photo
-          unless doc.css('.band_img').empty?
-            photo_uri = URI doc.css('.band_img img').first.attr('src')
+          unless doc.css(".band_img").empty?
+            photo_uri = URI doc.css(".band_img img").first.attr("src")
             props[:photo] = Middleware::RewriteEndpoint.rewrite photo_uri
           end
 
-          doc.css('#band_stats dl').each do |dl|
-            dl.search('dt').each do |dt|
+          doc.css("#band_stats dl").each do |dl|
+            dl.search("dt").each do |dt|
               content = sanitize(dt.next_element.content)
 
-              next if content == 'N/A'
+              next if content == "N/A"
 
               case dt.content
-              when 'Country of origin:'
-                props[:country] = ISO3166::Country.find_country_by_name sanitize(dt.next_element.css('a').first.content)
-              when 'Location:'
+              when "Country of origin:"
+                props[:country] = ISO3166::Country.find_country_by_name sanitize(dt.next_element.css("a").first.content)
+              when "Location:"
                 props[:location] = content
-              when 'Status:'
-                props[:status] = content.downcase.tr(' ', '_').to_sym
-              when 'Formed in:'
+              when "Status:"
+                props[:status] = content.downcase.tr(" ", "_").to_sym
+              when "Formed in:"
                 begin
                   dof = Date.parse content
                   props[:date_formed] = NilDate.new dof.year, dof.month, dof.day
                 rescue ArgumentError => e
                   props[:date_formed] = NilDate.parse content
                 end
-              when 'Genre:'
+              when "Genre:"
                 props[:genres] = parse_genre content
-              when 'Lyrical themes:'
+              when "Lyrical themes:"
                 props[:lyrical_themes] = []
-                content.split(',').each do |theme|
+                content.split(",").each do |theme|
                   t = theme.split.map(&:capitalize)
-                  t.delete '(early)'
-                  t.delete '(later)'
-                  props[:lyrical_themes] << t.join(' ')
+                  t.delete "(early)"
+                  t.delete "(later)"
+                  props[:lyrical_themes] << t.join(" ")
                 end
               when /(Current|Last) label:/
-                props[:independent] = (content == 'Unsigned/independent')
-                # TODO
-              when 'Years active:'
+                props[:independent] = (content == "Unsigned/independent")
+                # TODO: label
+              when "Years active:"
                 props[:date_active] = []
-                content.split(',').each do |range|
+                content.split(",").each do |range|
                   # Aliases
                   range.scan(/\(as ([^)]*)\)/).each { |name| props[:aliases] << name.first }
                   # Ranges
-                  r = range.gsub(/ *\(as ([^)]*)\) */, '').strip.split('-')
-                  date_start = (r.first == '?' ? nil : Date.new(r.first.to_i))
-                  date_end = (r.last ==( '?') || r.last == 'present' ? nil : Date.new(r.first.to_i))
+                  r = range.gsub(/ *\(as ([^)]*)\) */, "").strip.split("-")
+                  date_start = (r.first == "?" ? nil : NilDate.new(r.first.to_i))
+                  date_end = (r.last == "?" || r.last == "present" ? nil : NilDate.new(r.first.to_i))
                   props[:date_active] << MetalArchives::Range.new(date_start, date_end)
                 end
               else
@@ -121,9 +122,9 @@ module MetalArchives
           end
 
           props
-        rescue => e
+        rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise Errors::ParserError, e
+          raise MetalArchives::Errors::ParserError, e
         end
 
         ##
@@ -138,17 +139,17 @@ module MetalArchives
           similar = []
 
           doc = Nokogiri::HTML response
-          doc.css('#artist_list tbody tr').each do |row|
+          doc.css("#artist_list tbody tr").each do |row|
             similar << {
-              :band => MetalArchives::Band.new(:id => row.css('td a').first['href'].split('/').last.to_i),
-                :score => row.css('td').last.content.strip
+              band: MetalArchives::Band.new(id: row.css("td a").first["href"].split("/").last.to_i),
+              score: row.css("td").last.content.strip,
             }
           end
 
           similar
-        rescue => e
+        rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise Errors::ParserError, e
+          raise MetalArchives::Errors::ParserError, e
         end
 
         ##
@@ -163,46 +164,68 @@ module MetalArchives
           links = []
 
           doc = Nokogiri::HTML response
-          doc.css('#linksTableOfficial td a').each do |a|
+          doc.css("#linksTableOfficial td a").each do |a|
             links << {
-              :url => a['href'],
-              :type => :official,
-              :title => a.content
+              url: a["href"],
+              type: :official,
+              title: a.content,
             }
           end
-          doc.css('#linksTableOfficial_merchandise td a').each do |a|
+          doc.css("#linksTableOfficial_merchandise td a").each do |a|
             links << {
-              :url => a['href'],
-              :type => :merchandise,
-              :title => a.content
+              url: a["href"],
+              type: :merchandise,
+              title: a.content,
             }
           end
 
           links
-        rescue => e
+        rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise Errors::ParserError, e
+          raise MetalArchives::Errors::ParserError, e
+        end
+
+        ##
+        # Parse releases HTML page
+        #
+        # Returns +Array+
+        # [Raises]
+        # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
+        #
+        def parse_releases_html(response)
+          releases = []
+
+          doc = Nokogiri::HTML response
+          doc.css("tbody tr td:first a").each do |a|
+            id = a["href"].split("/").last.to_i
+            releases << MetalArchives::Release.find(id)
+          end
+
+          releases
+        rescue StandardError => e
+          e.backtrace.each { |b| MetalArchives.config.logger.error b }
+          raise MetalArchives::Errors::ParserError, e
         end
 
         private
 
-          ##
-          # Map MA band status
-          #
-          # Returns +Symbol+
-          #
-          # [Raises]
-          # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
-          #
+        ##
+        # Map MA band status
+        #
+        # Returns +Symbol+
+        #
+        # [Raises]
+        # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
+        #
         def map_status(status)
           s = {
-            nil => '',
-            :active => 'Active',
-            :split_up => 'Split-up',
-            :on_hold => 'On hold',
-            :unknown => 'Unknown',
-            :changed_name => 'Changed name',
-            :disputed => 'Disputed'
+            nil => "",
+            :active => "Active",
+            :split_up => "Split-up",
+            :on_hold => "On hold",
+            :unknown => "Unknown",
+            :changed_name => "Changed name",
+            :disputed => "Disputed",
           }
 
           raise MetalArchives::Errors::ParserError, "Unknown status: #{status}" unless s[status]