metal_archives 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc72b807bbb20dcb70cfc38a6808b1088a3c5a187a6b033f82ef0083e5ff7794
-  data.tar.gz: b2424b28220556afc3c777efcd38e10f9b03d92d58905130e53723a0f5e5691c
+  metadata.gz: 39ec01fd7f1c69fc54d794cd58693912fd4c1ece0ca6f70c4281ba3b3d7cad4c
+  data.tar.gz: d518c8a15a0e5a9fbb26565696aeead06435a06f12dafcd586b54a4c50be5f3e
 SHA512:
-  metadata.gz: 5d80a6bf547b425d5d85c1b789e62a9224cf77e06911e8e8e45f298041778e2b9e976e754fc1a6f43a939e2e5b5cabf581f7b43b8677d8d48f4023a11df516fb
-  data.tar.gz: 2911d68d5725d92def587f482cc01235c280e7989b1903cac2374632136e667f988384141ffbb2ae9c69bae95a555c7f7cac50e96e12af273e562bc372bb141c
+  metadata.gz: 15cf3a9ae549ff1a43aae068a83b16287c7a70ad95ee176e41dbccac78fe0884031bfff6ec1a4cdda098b7dcbcc7b720b1087cfd9fa3a6da39a766b805321720
+  data.tar.gz: f4738548bd36c4af3e97e6a666df23861a3a2bc969a1148d66fccf9cd2d404593f1fb77b3a63a61fa9f1a0325dd754173a7763424653c271abdbefcf201f2817

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.1
+
+- Fix some invalid parsing
+
 ## 3.1.0
 
 - Add members property on band

data/lib/metal_archives/models/artist.rb

@@ -251,7 +251,7 @@ module MetalArchives
       #     +Integer+
       #
       def find(id)
-        return MetalArchives.cache[id] if MetalArchives.cache.include? id
+        return MetalArchives.cache[cache(id)] if MetalArchives.cache.include? cache(id)
 
         Artist.new id: id
       end

data/lib/metal_archives/models/band.rb

@@ -277,7 +277,7 @@ module MetalArchives
       #     +Integer+
       #
       def find(id)
-        return MetalArchives.cache[id] if MetalArchives.cache.include? id
+        return MetalArchives.cache[cache(id)] if MetalArchives.cache.include? cache(id)
 
         Band.new id: id
       end

data/lib/metal_archives/models/base.rb

@@ -43,10 +43,10 @@ module MetalArchives
       set(**assemble)
 
       @loaded = true
-      MetalArchives.cache[id] = self
+      MetalArchives.cache[self.class.cache(id)] = self
     rescue StandardError => e
       # Don't cache invalid requests
-      MetalArchives.cache.delete id
+      MetalArchives.cache.delete self.class.cache(id)
       raise e
     end
 
@@ -61,7 +61,7 @@ module MetalArchives
     # Whether or not the object is currently cached
     #
     def cached?
-      loaded? && MetalArchives.cache.include?(id)
+      loaded? && MetalArchives.cache.include?(self.class.cache(id))
     end
 
     ##
@@ -94,6 +94,13 @@ module MetalArchives
         @properties ||= {}
       end
 
+      ##
+      # Generate cache key for id
+      #
+      def cache(id)
+        "#{self.class.name}//#{id}"
+      end
+
       protected
 
       ##

data/lib/metal_archives/models/release.rb

@@ -139,7 +139,7 @@ module MetalArchives
       #     +Integer+
       #
       def find(id)
-        return MetalArchives.cache[id] if MetalArchives.cache.include? id
+        return MetalArchives.cache[cache(id)] if MetalArchives.cache.include? cache(id)
 
         Release.new id: id
       end

data/lib/metal_archives/parsers/artist.rb

@@ -115,7 +115,7 @@ module MetalArchives
             r = row.css(".member_in_band_role")
 
             range = Parsers::Year.parse(r.xpath("text()").map(&:content).join.strip.gsub(/[\n\r\t]/, "").gsub(/.*\((.*)\)/, '\1'))
-            role = sanitize r.css("strong").first.content
+            role = sanitize r.css("strong")&.first&.content
 
             {
               id: id,

data/lib/metal_archives/parsers/band.rb

@@ -144,7 +144,7 @@ module MetalArchives
             end
 
             r = row.css("td").last.text
-            role, range = r.match(/(.*)\(([^(]*)\)/).captures
+            role, range = r.match(/(.*)\(([^(]*)\)/)&.captures
 
             range = Parsers::Year.parse(range)
 

data/lib/metal_archives/parsers/genre.rb

@@ -25,7 +25,7 @@ module MetalArchives
       def self.parse(input)
         genres = []
         # Split fields
-        input.split(",").each do |genre|
+        input.split(/[,;]/).each do |genre|
           ##
           # Start with a single empty genre string. Split the genre by spaces
           # and process each component. If a component does not have a slash,

data/lib/metal_archives/parsers/parser.rb

@@ -15,6 +15,8 @@ module MetalArchives
         # Return +String+
         #
         def sanitize(input)
+          return if input.blank?
+
           input
             .gsub(/^"/, "")
             .gsub(/"$/, "")

data/lib/metal_archives/parsers/year.rb

@@ -12,6 +12,8 @@ module MetalArchives
       # Returns +Range+ of +Integer+
       #
       def self.parse(input)
+        return if input.blank?
+
         components = input
           .split("-")
           .map(&:to_i)

data/lib/metal_archives/version.rb

@@ -7,7 +7,7 @@ module MetalArchives
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     PRE   = nil
 
     VERSION = [MAJOR, MINOR, PATCH].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metal_archives
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Florian Dejonckheere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries