metal_archives 2.2.0 → 3.1.1

data/lib/metal_archives/parsers/year.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module MetalArchives
+  module Parsers
+    ##
+    # Year range parser
+    #
+    class Year < Base
+      ##
+      # Parse year range
+      #
+      # Returns +Range+ of +Integer+
+      #
+      def self.parse(input)
+        return if input.blank?
+
+        components = input
+          .split("-")
+          .map(&:to_i)
+          .map { |y| y.zero? ? nil : y }
+
+        return if components.empty?
+
+        # Set end if only one year
+        components << components.first if components.count == 1
+
+        components[0]..components[1]
+      end
+    end
+  end
+end

data/lib/metal_archives/version.rb

@@ -4,5 +4,16 @@ module MetalArchives
   ##
   # MetalArchives API version
   #
-  VERSION = '2.2.0'
+  module Version
+    MAJOR = 3
+    MINOR = 1
+    PATCH = 1
+    PRE   = nil
+
+    VERSION = [MAJOR, MINOR, PATCH].compact.join(".")
+
+    STRING = [VERSION, PRE].compact.join("-")
+  end
+
+  VERSION = Version::STRING
 end

data/metal_archives.env.example

@@ -0,0 +1,10 @@
+## Environment
+#METAL_ARCHIVES_ENV=development
+
+## Metal Archives endpoint
+#MA_ENDPOINT=https://www.metal-archives.com/
+#MA_ENDPOINT_USER=my_user
+#MA_ENDPOINT_PASSWORD=my_password
+
+## WebMock
+#WEBMOCK_ALLOW_HOST=metal-archives.com

data/metal_archives.gemspec

@@ -1,36 +1,51 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require_relative "lib/metal_archives/version"
 
-require 'metal_archives/version'
+Gem::Specification.new do |spec|
+  spec.name          = "metal_archives"
+  spec.version       = MetalArchives::VERSION
+  spec.authors       = ["Florian Dejonckheere"]
+  spec.email         = ["florian@floriandejonckheere.be"]
 
-Gem::Specification.new do |gem|
-  gem.authors       = ['Florian Dejonckheere']
-  gem.email         = ['florian@floriandejonckheere.be']
-  gem.summary       = 'Metal Archives Ruby API'
-  gem.homepage      = 'http://github.com/floriandejonckheere/metal_archives'
+  spec.summary       = "Metal Archives Ruby API"
+  spec.description   = "Ruby API layer that transparently queries, scrapes and caches Metal Archives' website"
+  spec.homepage      = "https://github.com/floriandejonckheere/metal_archives"
+  spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
 
-  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  gem.executables   = []
-  gem.test_files    = gem.files.grep(%r{^spec/})
-  gem.name          = 'metal_archives'
-  gem.require_paths = %w[lib]
-  gem.version       = MetalArchives::VERSION
-  gem.license       = 'MIT'
+  spec.metadata["source_code_uri"] = "https://github.com/floriandejonckheere/metal_archives"
 
-  gem.add_development_dependency 'byebug'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rdoc'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'factory_girl'
-  gem.add_development_dependency 'faker'
-  gem.add_development_dependency 'rubocop'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'debase'
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r(^bin/)) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  gem.add_dependency 'faraday'
-  gem.add_dependency 'faraday_throttler'
-  gem.add_dependency 'nokogiri'
-  gem.add_dependency 'countries'
+  spec.add_runtime_dependency "countries"
+  spec.add_runtime_dependency "http"
+  spec.add_runtime_dependency "nokogiri"
+  spec.add_runtime_dependency "zeitwerk"
+
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "debase"
+  spec.add_development_dependency "factory_bot"
+  spec.add_development_dependency "fasterer"
+  spec.add_development_dependency "ffaker"
+  spec.add_development_dependency "flay"
+  spec.add_development_dependency "overcommit"
+  spec.add_development_dependency "pronto"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "redis"
+  spec.add_development_dependency "reek"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "timecop"
+  spec.add_development_dependency "webmock"
 end

data/nginx/default.conf

@@ -0,0 +1,60 @@
+proxy_cache_path /cache levels=1:2 keys_zone=metal_archives:10m max_size=10g
+                 inactive=6M use_temp_path=off;
+
+limit_req_zone $binary_remote_addr zone=ma_limit_req:10m rate=2r/s;
+
+server {
+  listen 80;
+
+  # Don't send the NGINX version number in error pages and Server header
+  server_tokens off;
+
+  # Don't process logs
+  access_log off;
+
+  # Proxy to MA server
+  location / {
+    proxy_pass          https://www.metal-archives.com;
+
+    sub_filter          www.metal-archives.com localhost;
+    sub_filter_once     off;
+
+    proxy_redirect      off;
+    proxy_set_header    Host www.metal-archives.com;
+    proxy_set_header    X-Forwarded-Host $host;
+    proxy_set_header    X-Forwarded-Server $host;
+    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header    X-Real-IP  $remote_addr;
+
+    proxy_ssl_certificate               /etc/nginx/conf.d/client.pem;
+    proxy_ssl_certificate_key           /etc/nginx/conf.d/client.key;
+    proxy_ssl_server_name on;
+    proxy_ssl_session_reuse on;
+
+    proxy_ignore_headers  X-Accel-Expires;
+    proxy_ignore_headers  Expires;
+    proxy_ignore_headers  Cache-Control;
+    proxy_ignore_headers  Set-Cookie;
+
+    proxy_hide_header     Set-Cookie;
+    proxy_hide_header     Pragma;
+
+    # Limit HTTP requests
+    limit_req         zone=ma_limit_req burst=5;
+    limit_req_status  429;
+    limit_conn_status 429;
+
+    # Cache responses
+    proxy_cache       metal_archives;
+    proxy_cache_valid 200 301 302 30d;
+    proxy_cache_valid 404 7d;
+    expires           30d;
+
+    proxy_cache_use_stale               error timeout updating http_500 http_502 http_503 http_504;
+    proxy_cache_background_update       on;
+    proxy_cache_lock                    on;
+    proxy_cache_bypass                  $cookie_nocache $arg_nocache;
+
+    add_header X-Cache-Status           $upstream_cache_status;
+  }
+}

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: metal_archives
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Florian Dejonckheere
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: debase
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fasterer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: flay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: overcommit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: pronto
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: debase
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,13 +193,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -151,13 +207,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_throttler
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,13 +221,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -179,82 +235,149 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: countries
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby API layer that transparently queries, scrapes and caches Metal Archives'
+  website
 email:
 - florian@floriandejonckheere.be
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
+- ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
+- config/inflections.rb
+- config/initializers/.keep
+- docker-compose.yml
 - lib/metal_archives.rb
+- lib/metal_archives/cache/base.rb
+- lib/metal_archives/cache/memory.rb
+- lib/metal_archives/cache/null.rb
+- lib/metal_archives/cache/redis.rb
+- lib/metal_archives/collection.rb
 - lib/metal_archives/configuration.rb
-- lib/metal_archives/error.rb
+- lib/metal_archives/errors.rb
 - lib/metal_archives/http_client.rb
-- lib/metal_archives/middleware/cache_check.rb
-- lib/metal_archives/middleware/encoding.rb
-- lib/metal_archives/middleware/headers.rb
-- lib/metal_archives/middleware/rewrite_endpoint.rb
 - lib/metal_archives/models/artist.rb
 - lib/metal_archives/models/band.rb
-- lib/metal_archives/models/base_model.rb
+- lib/metal_archives/models/base.rb
 - lib/metal_archives/models/label.rb
 - lib/metal_archives/models/release.rb
 - lib/metal_archives/parsers/artist.rb
 - lib/metal_archives/parsers/band.rb
+- lib/metal_archives/parsers/base.rb
+- lib/metal_archives/parsers/country.rb
+- lib/metal_archives/parsers/date.rb
+- lib/metal_archives/parsers/genre.rb
 - lib/metal_archives/parsers/label.rb
 - lib/metal_archives/parsers/parser.rb
 - lib/metal_archives/parsers/release.rb
-- lib/metal_archives/utils/collection.rb
-- lib/metal_archives/utils/lru_cache.rb
-- lib/metal_archives/utils/nil_date.rb
-- lib/metal_archives/utils/range.rb
+- lib/metal_archives/parsers/year.rb
 - lib/metal_archives/version.rb
+- metal_archives.env.example
 - metal_archives.gemspec
+- nginx/default.conf
 - publish.sh
-- spec/configuration_spec.rb
-- spec/factories/artist_factory.rb
-- spec/factories/band_factory.rb
-- spec/factories/nil_date_factory.rb
-- spec/factories/range_factory.rb
-- spec/models/artist_spec.rb
-- spec/models/band_spec.rb
-- spec/models/base_model_spec.rb
-- spec/models/release_spec.rb
-- spec/parser_spec.rb
-- spec/spec_helper.rb
-- spec/support/factory_girl.rb
-- spec/support/metal_archives.rb
-- spec/utils/collection_spec.rb
-- spec/utils/lru_cache_spec.rb
-- spec/utils/nil_date_spec.rb
-- spec/utils/range_spec.rb
-homepage: http://github.com/floriandejonckheere/metal_archives
+homepage: https://github.com/floriandejonckheere/metal_archives
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/floriandejonckheere/metal_archives
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,33 +385,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Metal Archives Ruby API
-test_files:
-- spec/configuration_spec.rb
-- spec/factories/artist_factory.rb
-- spec/factories/band_factory.rb
-- spec/factories/nil_date_factory.rb
-- spec/factories/range_factory.rb
-- spec/models/artist_spec.rb
-- spec/models/band_spec.rb
-- spec/models/base_model_spec.rb
-- spec/models/release_spec.rb
-- spec/parser_spec.rb
-- spec/spec_helper.rb
-- spec/support/factory_girl.rb
-- spec/support/metal_archives.rb
-- spec/utils/collection_spec.rb
-- spec/utils/lru_cache_spec.rb
-- spec/utils/nil_date_spec.rb
-- spec/utils/range_spec.rb
+test_files: []