metal_archives 2.2.3 → 3.2.0

data/lib/metal_archives/models/label.rb

@@ -7,7 +7,7 @@ module MetalArchives
   ##
   # Represents a record label
   #
-  class Label < MetalArchives::BaseModel
+  class Label < Base
     ##
     # :attr_reader: id
     #
@@ -73,20 +73,20 @@ module MetalArchives
     ##
     # :attr_reader: date_founded
     #
-    # Returns +NilDate+
+    # Returns +Date+
     #
     # [Raises]
     # - 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_founded, type: NilDate
+    property :date_founded, type: Date
 
     ##
     # :attr_reader: sub_labels
     #
     # Returns +Array+ of rdoc-ref:Label
     #
-    property :sub_labels, type: MetalArchives::Label, multiple: true
+    property :sub_labels, type: Label, multiple: true
 
     ##
     # :attr_reader: online_shopping
@@ -107,7 +107,7 @@ module MetalArchives
     #
     # Returns +:active+, +:closed+ or +:unknown+
     #
-    enum :status, values: %i(active closed unknown)
+    enum :status, values: [:active, :closed, :unknown]
 
     class << self
       ##
@@ -116,8 +116,7 @@ module MetalArchives
       # Returns +Array+ of rdoc-ref:Label
       #
       def search(_name)
-        results = []
-        results
+        []
       end
 
       ##
@@ -129,7 +128,7 @@ module MetalArchives
         client.find_resource(
           :band,
           name: name,
-          id: id
+          id: id,
         )
       end
     end

data/lib/metal_archives/models/release.rb

@@ -7,7 +7,7 @@ module MetalArchives
   ##
   # Represents a release
   #
-  class Release < MetalArchives::BaseModel
+  class Release < Base
     ##
     # :attr_reader: id
     #
@@ -26,7 +26,16 @@ module MetalArchives
     #
     property :title
 
-    # TODO: band
+    ##
+    # :attr_reader: band
+    #
+    # Returns +rdoc-ref:MetalArchives::Band+
+    #
+    # [Raises]
+    # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
+    # - rdoc-ref:MetalArchives::Errors::APIError when receiving a status code >= 400 (except 404)
+    #
+    property :band, type: Band
 
     ##
     # :attr_reader: type
@@ -37,18 +46,18 @@ 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: [:full_length, :live, :demo, :single, :ep, :video, :boxed_set, :split, :compilation, :split_video, :collaboration]
 
     ##
     # :attr_reader: date_released
     #
-    # Returns rdoc-ref:NilDate
+    # Returns rdoc-ref:Date
     #
     # [Raises]
     # - 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: Date
 
     ##
     # :attr_reader_: catalog_id
@@ -124,12 +133,9 @@ module MetalArchives
     #
     def assemble # :nodoc:
       ## Base attributes
-      url = "#{MetalArchives.config.default_endpoint}albums/view/id/#{id}"
-      response = HTTPClient.get url
+      response = MetalArchives.http.get "/albums/view/id/#{id}"
 
-      properties = Parsers::Release.parse_html response.body
-
-      properties
+      Parsers::Release.parse_html response.to_s
     end
 
     class << self
@@ -142,7 +148,7 @@ module MetalArchives
       #     +Integer+
       #
       def find(id)
-        return cache[id] if cache.include? id
+        return MetalArchives.cache[cache(id)] if MetalArchives.cache.include? cache(id)
 
         Release.new id: id
       end
@@ -200,11 +206,10 @@ module MetalArchives
       #     - +:formats+: +Array+ of +Symbol+, see rdoc-ref:Release.format
       #
       def find_by(query)
-        url = "#{MetalArchives.config.default_endpoint}search/ajax-advanced/searching/albums"
         params = Parsers::Release.map_params query
 
-        response = HTTPClient.get url, params
-        json = JSON.parse response.body
+        response = MetalArchives.http.get "/search/ajax-advanced/searching/albums", params
+        json = JSON.parse response.to_s
 
         return nil if json["aaData"].empty?
 
@@ -286,8 +291,6 @@ module MetalArchives
       #     - +:formats+: +Array+ of +Symbol+, see rdoc-ref:Release.format
       #
       def search_by(query)
-        url = "#{MetalArchives.config.default_endpoint}search/ajax-advanced/searching/albums"
-
         params = Parsers::Release.map_params query
 
         l = lambda do
@@ -296,8 +299,8 @@ module MetalArchives
           if @max_items && @start >= @max_items
             []
           else
-            response = HTTPClient.get url, params.merge(iDisplayStart: @start)
-            json = JSON.parse response.body
+            response = MetalArchives.http.get "/search/ajax-advanced/searching/albums", params.merge(iDisplayStart: @start)
+            json = JSON.parse response.to_s
 
             @max_items = json["iTotalRecords"]
 

data/lib/metal_archives/parsers/artist.rb

@@ -20,11 +20,9 @@ module MetalArchives
         #     +Hash+
         #
         def map_params(query)
-          params = {
+          {
             query: query[:name] || "",
           }
-
-          params
         end
 
         ##
@@ -36,13 +34,30 @@ module MetalArchives
         # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
         #
         def parse_html(response)
-          props = {}
+          # Set default props
+          props = {
+            name: nil,
+            aliases: [],
+
+            date_of_birth: nil,
+            date_of_death: nil,
+            cause_of_death: nil,
+            gender: nil,
+
+            country: nil,
+            location: nil,
+
+            photo: nil,
+
+            bands: [],
+          }
+
           doc = Nokogiri::HTML response
 
           # Photo
           unless doc.css(".member_img").empty?
             photo_uri = URI doc.css(".member_img img").first.attr("src")
-            props[:photo] = Middleware::RewriteEndpoint.rewrite photo_uri
+            props[:photo] = rewrite(photo_uri)
           end
 
           doc.css("#member_info dl").each do |dl|
@@ -55,25 +70,14 @@ module MetalArchives
               when "Real/full name:"
                 props[:name] = content
               when "Age:"
-                date = content.strip.gsub(/[0-9]* *\(born ([^\)]*)\)/, '\1')
-                begin
-                  props[:date_of_birth] = NilDate.parse date
-                rescue MetalArchives::Errors::ArgumentError => e
-                  dob = Date.parse date
-                  props[:date_of_birth] = NilDate.new dob.year, dob.month, dob.day
-                end
+                props[:date_of_birth] = Parsers::Date.parse(content.strip.gsub(/[0-9]* *\(born ([^)]*)\)/, '\1'))
               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
+                props[:date_of_death] = Parsers::Date.parse(content)
               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(/[()]/, "")
+                props[:country] = Country.parse(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:"
                 case content
@@ -91,33 +95,34 @@ module MetalArchives
           end
 
           # Aliases
-          props[:aliases] = []
           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
+
+            name, id = nil
+
+            if link.any?
+              # Band name contains a link
+              id = Integer(link.attr("href").text.gsub(%r(^.*/([^/#]*)#.*$), '\1'))
+            else
+              # Band name does not contain a link
+              name = 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
+            range = Parsers::Year.parse(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,
+              id: id,
+              name: name,
+              years_active: range,
               role: role,
-            }
+            }.compact
           end
 
           doc.css("#artist_tab_active .member_in_band").each do |row|
@@ -151,7 +156,7 @@ module MetalArchives
           type = :official
 
           doc.css("#linksTablemain tr").each do |row|
-            if row["id"].match /^header_/
+            if /^header_/.match?(row["id"])
               type = row["id"].gsub(/^header_/, "").downcase.to_sym
             else
               a = row.css("td a").first

data/lib/metal_archives/parsers/band.rb

@@ -24,8 +24,8 @@ module MetalArchives
             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 : "") || "",
+            yearCreationFrom: query[:year]&.begin || "",
+            yearCreationTo: query[:year]&.end || "",
             bandNotes: query[:comment] || "",
             status: map_status(query[:status]),
             themes: query[:lyrical_themes] || "",
@@ -52,23 +52,42 @@ module MetalArchives
         # - rdoc-ref:MetalArchives::Errors::ParserError when parsing failed. Please report this error.
         #
         def parse_html(response)
-          props = {}
+          # Set default props
+          props = {
+            name: nil,
+            aliases: [],
+
+            logo: nil,
+            photo: nil,
+
+            country: nil,
+            location: nil,
+
+            status: nil,
+            date_formed: nil,
+            years_active: [],
+            independent: nil,
+
+            genres: [],
+            lyrical_themes: [],
+
+            members: [],
+          }
+
           doc = Nokogiri::HTML response
 
           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")
-            props[:logo] = Middleware::RewriteEndpoint.rewrite logo_uri
+            props[:logo] = rewrite(logo_uri)
           end
 
           # Photo
           unless doc.css(".band_img").empty?
             photo_uri = URI doc.css(".band_img img").first.attr("src")
-            props[:photo] = Middleware::RewriteEndpoint.rewrite photo_uri
+            props[:photo] = rewrite(photo_uri)
           end
 
           doc.css("#band_stats dl").each do |dl|
@@ -79,22 +98,16 @@ module MetalArchives
 
               case dt.content
               when "Country of origin:"
-                props[:country] = ISO3166::Country.find_country_by_name sanitize(dt.next_element.css("a").first.content)
+                props[:country] = Country.parse(sanitize(dt.next_element.css("a").first.content))
               when "Location:"
                 props[:location] = content
               when "Status:"
-                props[:status] = content.downcase.tr(" ", "_").to_sym
+                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
+                props[:date_formed] = Parsers::Date.parse(content)
               when "Genre:"
-                props[:genres] = parse_genre content
+                props[:genres] = Parsers::Genre.parse(content)
               when "Lyrical themes:"
-                props[:lyrical_themes] = []
                 content.split(",").each do |theme|
                   t = theme.split.map(&:capitalize)
                   t.delete "(early)"
@@ -105,26 +118,56 @@ module MetalArchives
                 props[:independent] = (content == "Unsigned/independent")
                 # TODO: label
               when "Years active:"
-                props[:date_active] = []
                 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 : 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)
+                  props[:years_active] << Parsers::Year.parse(range.gsub(/ *\(as ([^)]*)\) */, ""))
                 end
               else
-                raise MetalArchives::Errors::ParserError, "Unknown token: #{dt.content}"
+                raise Errors::ParserError, "Unknown token: #{dt.content}"
               end
             end
           end
 
+          # Members
+          proc = proc do |row|
+            link = row.css("a")
+
+            if link.any?
+              # Artist name contains a link
+              id = Integer(link.attr("href").text.split("/").last)
+              name = sanitize link.text
+            else
+              # Artist name does not contain a link
+              name = sanitize row.css("h3").text
+            end
+
+            r = row.css("td").last.text
+            role, range = r.match(/(.*)\(([^(]*)\)/)&.captures
+
+            range = Parsers::Year.parse(range)
+
+            {
+              id: id,
+              name: name,
+              years_active: range,
+              role: sanitize(role),
+            }.compact
+          end
+
+          doc.css("#band_tab_members_current .lineupRow").each do |row|
+            props[:members] << proc.call(row).merge(current: true)
+          end
+
+          doc.css("#band_tab_members_past .lineupRow").each do |row|
+            props[:members] << proc.call(row).merge(current: false)
+          end
+
           props
         rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise MetalArchives::Errors::ParserError, e
+          raise Errors::ParserError, e
         end
 
         ##
@@ -141,15 +184,16 @@ module MetalArchives
           doc = Nokogiri::HTML response
           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),
+              id: row.css("td a").first["href"].split("/").last.to_i,
               score: row.css("td").last.content.strip,
             }
           end
 
           similar
         rescue StandardError => e
+          MetalArchives.config.logger e.message
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise MetalArchives::Errors::ParserError, e
+          raise Errors::ParserError, e
         end
 
         ##
@@ -182,7 +226,7 @@ module MetalArchives
           links
         rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise MetalArchives::Errors::ParserError, e
+          raise Errors::ParserError, e
         end
 
         ##
@@ -204,7 +248,7 @@ module MetalArchives
           releases
         rescue StandardError => e
           e.backtrace.each { |b| MetalArchives.config.logger.error b }
-          raise MetalArchives::Errors::ParserError, e
+          raise Errors::ParserError, e
         end
 
         private
@@ -228,7 +272,7 @@ module MetalArchives
             :disputed => "Disputed",
           }
 
-          raise MetalArchives::Errors::ParserError, "Unknown status: #{status}" unless s[status]
+          raise Errors::ParserError, "Unknown status: #{status}" unless s[status]
 
           s[status]
         end