metal_archives 3.0.1 → 3.1.0

data/metal_archives.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Metal Archives Ruby API"
   spec.description   = "Ruby API layer that transparently queries, scrapes and caches Metal Archives' website"
-  spec.homepage      = "http://github.com/floriandejonckheere/metal_archives"
+  spec.homepage      = "https://github.com/floriandejonckheere/metal_archives"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.8")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
 
   spec.metadata["source_code_uri"] = "https://github.com/floriandejonckheere/metal_archives"
 
@@ -26,8 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "countries"
-  spec.add_runtime_dependency "faraday"
-  spec.add_runtime_dependency "faraday_throttler"
+  spec.add_runtime_dependency "http"
   spec.add_runtime_dependency "nokogiri"
   spec.add_runtime_dependency "zeitwerk"
 
@@ -41,8 +40,12 @@ Gem::Specification.new do |spec|
   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

@@ -26,8 +26,8 @@ server {
     proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header    X-Real-IP  $remote_addr;
 
-    proxy_ssl_certificate               /etc/nginx/auth.d/client.pem;
-    proxy_ssl_certificate_key           /etc/nginx/auth.d/client.key;
+    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;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metal_archives
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Florian Dejonckheere
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
-  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: faraday_throttler
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  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: reek
   requirement: !ruby/object:Gem::Requirement
@@ -262,6 +262,48 @@ dependencies:
     - - ">="
       - !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'
+- !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
@@ -287,12 +329,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -300,40 +340,44 @@ files:
 - 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/errors.rb
 - lib/metal_archives/http_client.rb
-- lib/metal_archives/lru_cache.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/nil_date.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/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
-homepage: http://github.com/floriandejonckheere/metal_archives
+homepage: https://github.com/floriandejonckheere/metal_archives
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/floriandejonckheere/metal_archives
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -341,7 +385,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.8
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -349,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Metal Archives Ruby API
 test_files: []

data/.github/workflows/release.yml

@@ -1,69 +0,0 @@
-name: Create release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  generate:
-    name: Create release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Setup Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: 2.7.x
-
-      - name: Cache Gems
-        uses: actions/cache@v1
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gem-
-
-      - name: Install Gems
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-
-      - name: Test
-        env:
-          MA_ENDPOINT: ${{ secrets.MA_ENDPOINT }}
-          MA_ENDPOINT_USER: ${{ secrets.MA_ENDPOINT_USER }}
-          MA_ENDPOINT_PASSWORD: ${{ secrets.MA_ENDPOINT_PASSWORD }}
-          WEBMOCK_ALLOW_HOST: ${{ secrets.WEBMOCK_ALLOW_HOST }}
-        run: bundle exec rspec --profile 10 --format progress
-
-      - name: Lint
-        run: bundle exec rubocop --parallel --display-cop-names
-
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-
-      - name: Publish to RubyGems
-        run: |
-          mkdir -p ~/.gem
-          touch ~/.gem/credentials
-          chmod 0600 ~/.gem/credentials
-          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > ~/.gem/credentials
-          gem build *.gemspec
-          gem push *.gem
-        env:
-          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
-
-      - name: Create Release
-        uses: actions/create-release@v1.0.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          body: |
-            Gem is available as: ${{ github.event.repository.name }}-${{ steps.get_version.outputs.VERSION }}
-            Created by Github Actions

data/.rubocop_todo.yml

@@ -1,92 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-04-14 17:51:42 +0200 using RuboCop version 0.80.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'lib/metal_archives/parsers/artist.rb'
-
-# Offense count: 2
-Lint/EmptyWhen:
-  Exclude:
-    - 'lib/metal_archives/parsers/label.rb'
-    - 'lib/metal_archives/parsers/release.rb'
-
-# Offense count: 2
-# Configuration parameters: AllowKeywordBlockArguments.
-Lint/UnderscorePrefixedVariableName:
-  Exclude:
-    - 'lib/metal_archives/range.rb'
-
-# Offense count: 6
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/metal_archives/parsers/artist.rb'
-    - 'lib/metal_archives/parsers/band.rb'
-    - 'lib/metal_archives/parsers/label.rb'
-    - 'lib/metal_archives/parsers/release.rb'
-    - 'spec/collection_spec.rb'
-
-# Offense count: 29
-Metrics/AbcSize:
-  Max: 102
-
-# Offense count: 9
-# Configuration parameters: CountComments, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
-  Max: 42
-
-# Offense count: 3
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 147
-
-# Offense count: 12
-Metrics/CyclomaticComplexity:
-  Max: 17
-
-# Offense count: 12
-Metrics/PerceivedComplexity:
-  Max: 18
-
-# Offense count: 1
-Naming/BinaryOperatorParameterName:
-  Exclude:
-    - 'lib/metal_archives/models/base_model.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/metal_archives/http_client.rb'
-
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/metal_archives.rb'
-    - 'lib/metal_archives/middleware/cache_check.rb'
-    - 'lib/metal_archives/models/base_model.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
-# SupportedStyles: predicate, comparison
-Style/NumericPredicate:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/metal_archives/nil_date.rb'
-
-# Offense count: 307
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 963

data/lib/metal_archives/lru_cache.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module MetalArchives
-  ##
-  # Generic LRU memory cache
-  #
-  class LRUCache
-    def initialize(size = 100)
-      @size = size
-
-      # Underlying data store
-      @cache = {}
-
-      # Array of keys in order of insertion
-      @keys = []
-    end
-
-    def []=(key, value)
-      @cache[key] = value
-
-      @keys.delete key if @keys.include? key
-
-      @keys << key
-
-      pop if @keys.size > @size
-    end
-
-    def [](key)
-      if @keys.include? key
-        MetalArchives.config.logger.debug "Cache hit for #{key}"
-        @keys.delete key
-        @keys << key
-      else
-        MetalArchives.config.logger.debug "Cache miss for #{key}"
-      end
-
-      @cache[key]
-    end
-
-    def clear
-      @cache.clear
-      @keys.clear
-    end
-
-    def include?(key)
-      @cache.include? key
-    end
-
-    def delete(key)
-      @cache.delete key
-    end
-
-    private
-
-    def pop
-      to_remove = @keys.shift @keys.size - @size
-
-      to_remove.each { |key| @cache.delete key }
-    end
-  end
-end