metal_archives 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be48eaad4a6cd07eb30ca4bb8fe47a2e91133a7c
-  data.tar.gz: ceb20dba52c27c606d3e41ae6c970304980e7cea
+  metadata.gz: e691c4936e5453b4ae339f5844a440e3427b4277
+  data.tar.gz: 7151b7ad03f3da331456bbb840f5e6f06fcbcdcb
 SHA512:
-  metadata.gz: 227e05ac3f34011a196a7ca11e755b83acef9f2c90d4a8e2510baf19cf67c2aa01c0efcadc12fb97dbede1ba84ba074c92fcf0fb6f396af6aa0d293f07785c82
-  data.tar.gz: 0351352e817f0f6300b52e9289b7237474071669d02c16e24f4a12965498f81838da2f224b1235af00e991a17b57abdaf30c6535d6800d3aea409e866730ae5d
+  metadata.gz: b7f1cc7c2e83a3741988341984ebdd1430f87bedf775c90c3698216af8f85ff1f9e9c779849d62e936ec792e2b39a7e60b52064f378f1342b1d3042e59feb6e2
+  data.tar.gz: ee1b4d9491e178caafd133c363d3558e3d57451e37bd845cd93e680cc8c2e65168221ae4cd458f412cc9e306995337072f66b4f8cc248ac38b5c24deb7be7877

data/.travis.yml

@@ -1,11 +1,12 @@
+sudo: false
 language: ruby
+cache: bundler
 rvm:
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
   - 2.4.1
-cache:
-  bundler: true
 env:
   - RAILS_ENV=test CI=true TRAVIS=true
-install:
-  - bundle install
 script:
   - bundle exec rspec

data/lib/metal_archives/models/artist.rb

@@ -62,7 +62,7 @@ module MetalArchives
     ##
     # :attr_reader: date_of_birth
     #
-    # Returns +Date+
+    # Returns rdoc-ref:NilDate
     #
     # [Raises]
     # - rdoc-ref:MetalArchives::Errors::InvalidIDError when no or invalid id
@@ -224,7 +224,7 @@ module MetalArchives
       #
       def find!(id)
         obj = find id
-        obj&.load!
+        obj && obj.load!
 
         obj
       end
@@ -277,7 +277,7 @@ module MetalArchives
       #
       def find_by!(query)
         obj = find_by query
-        obj&.load!
+        obj && obj.load!
 
         obj
       end

data/lib/metal_archives/models/band.rb

@@ -292,7 +292,7 @@ module MetalArchives
       #     - +:exact+: +Boolean+
       #     - +:genre+: +String+
       #     - +:country+: +ISO366::Country+
-      #     - +:year_formation+: rdoc-ref:Range of +Date+
+      #     - +:year_formation+: rdoc-ref:Range of rdoc-ref:NilDate
       #     - +:comment+: +String+
       #     - +:status+: see rdoc-ref:Band.status
       #     - +:lyrical_themes+: +String+
@@ -342,7 +342,7 @@ module MetalArchives
       #
       def find_by!(query)
         obj = find_by query
-        obj&.load!
+        obj && obj.load!
 
         obj
       end

data/lib/metal_archives/models/base_model.rb

@@ -113,13 +113,13 @@ module MetalArchives
 
         # property
         define_method(name) do
-          load! unless instance_variable_defined?("@#{name}") || name == :id
+          load! unless instance_variable_defined?("@#{name}") || name ==(:id)
           instance_variable_get("@#{name}")
         end
 
         # property?
         define_method("#{name}?") do
-          load! unless instance_variable_defined?("@#{name}") || name == :id
+          load! unless instance_variable_defined?("@#{name}") || name ==(:id)
 
           property = instance_variable_get("@#{name}")
           property.respond_to?(:empty?) ? !property.empty? : !!property

data/lib/metal_archives/parsers/artist.rb

@@ -120,7 +120,7 @@ module MetalArchives
           type = :official
 
           doc.css('#linksTablemain tr').each do |row|
-            if row['id'].match?(/^header_/)
+            if row['id'].match /^header_/
               type = row['id'].gsub(/^header_/, '').downcase.to_sym
             else
               a = row.css('td a').first

data/lib/metal_archives/parsers/band.rb

@@ -84,7 +84,12 @@ module MetalArchives
               when 'Status:'
                 props[:status] = content.downcase.tr(' ', '_').to_sym
               when 'Formed in:'
-                props[:date_formed] = Date.new content.to_i
+                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:'
                 props[:genres] = parse_genre content
               when 'Lyrical themes:'

data/lib/metal_archives/parsers/label.rb

@@ -30,30 +30,34 @@ module MetalArchives
 
           doc.css('#label_info dl').each do |dl|
             dl.search('dt').each do |dt|
-              case dt.content
+              content = sanitize(dt.next_element.content)
+
+              next if content == 'N/A'
+
+              case sanitize(dt.content)
               when 'Address:'
-                break if dt.next_element.content == 'N/A'
-                props[:address] = dt.next_element.content
+                props[:address] = content
               when 'Country:'
-                break if dt.next_element.content == 'N/A'
-                props[:country] = ParserHelper.parse_country dt.next_element.css('a').first.content
+                props[:country] = ParserHelper.parse_country css('a').first.content
               when 'Phone number:'
-                break if dt.next_element.content == 'N/A'
-                props[:phone] = dt.next_element.content
+                props[:phone] = content
               when 'Status:'
-                props[:status] = dt.next_element.content.downcase.tr(' ', '_').to_sym
+                props[:status] = content.downcase.tr(' ', '_').to_sym
               when 'Specialised in:'
-                break if dt.next_element.content == 'N/A'
-                props[:specializations] = ParserHelper.parse_genre dt.next_element.content
+                props[:specializations] = ParserHelper.parse_genre content
               when 'Founding date :'
-                break if dt.next_element.content == 'N/A'
-                props[:date_founded] = Date.new dt.next_element.content.to_i
+                begin
+                  dof = Date.parse content
+                  props[:date_founded] = NilDate.new dof.year, dof.month, dof.day
+                rescue ArgumentError => e
+                  props[:date_founded] = NilDate.parse content
+                end
               when 'Sub-labels:'
                 # TODO
               when 'Online shopping:'
-                if dt.next_element.content == 'Yes'
+                if content == 'Yes'
                   props[:online_shopping] = true
-                elsif dt.next_element.content == 'No'
+                elsif content == 'No'
                   props[:online_shopping] = false
                 end
               else

data/lib/metal_archives/version.rb

@@ -4,5 +4,5 @@ module MetalArchives
   ##
   # MetalArchives API version
   #
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/spec/models/band_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe MetalArchives::Band do
       expect(band.aliases).to be_empty
       expect(band.country).to eq ISO3166::Country['PL']
       expect(band.location).to eq 'Poznań'
-      expect(band.date_formed).to eq Date.new(2006)
+      expect(band.date_formed).to eq MetalArchives::NilDate.new(2006)
       expect(band.date_active).to eq [MetalArchives::Range.new(Date.new(2006), nil)]
       expect(band.status).to eq :active
       expect(band.genres).to eq ['Symphonic Power']

data/spec/support/metal_archives.rb

@@ -8,6 +8,15 @@ MetalArchives.configure do |c|
   c.app_version = MetalArchives::VERSION
   c.app_contact = 'user@example.com'
 
+  if ENV.has_key? 'TRAVIS'
+    ## Request throttling (optional, overrides defaults)
+    c.request_rate = 1
+    c.request_timeout = 3
+  end
+
+  ## Connect additional Faraday middleware
+  # c.middleware = [MyMiddleware, MyOtherMiddleware]
+
   ## Custom cache size per object class (optional, overrides defaults)
   # c.cache_size = 100
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metal_archives
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Florian Dejonckheere