dragonfly-cache 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9c2bd6a296538d40627ac2d72d59b22899b939f058df6733c536cb8ccb31154
-  data.tar.gz: c42cb333f27257b8b2522433dc1a303768eb8eca01c829793e7e30ac1e51aa23
+  metadata.gz: 561fa0bea39eade52c3ee69a15a630ddbc7241ef2a35541fac85203885bcd5a9
+  data.tar.gz: aef5435adb61fbde4c8415f9347564bb60c995f49f521e3ed8dc831002668e8e
 SHA512:
-  metadata.gz: 405297344133ee35cb4547dd1d7499020cb77f751e3e81e23cf2378a77e6e6d5cb83e91fc11e60d105cd131bf54d67364bf197ab244299e700ba8f41ea4e7b75
-  data.tar.gz: fbbf31316483fd3721015225e25145967ad0dc2a929b68e042d5a0a064ca23958eba53c1328aace339dce28aa7b926e430c44e978722541f12b6743f96fa1fa4
+  metadata.gz: 52f872f835d64278e48732f144496f262337207195040b7277e1b2869f0c99552002c056cce188baf272d51ecfe875688e12f9798212f687b63cc6b605339ba6
+  data.tar.gz: 617e6ef49815dd8d0c7e214893f168d431da0343679049adf4a9f786ed4dddf49652d675ccbac13f484176e257815b40e6f71fbd34ef033c0d475f9c510fdafe

data/.gitignore

@@ -5,4 +5,6 @@
 /doc/
 /pkg/
 /spec/reports/
-/tmp/
+
+/tmp/*
+!/tmp/.keep

data/.rubocop.yml

@@ -0,0 +1,6 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 3.0

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+sudo: false
+script: "bundle exec rake clean spec"
+
+rvm:
+  - 2.6
+  - 2.7
+  - 3.0
+
+gemfile:
+  - Gemfile

data/Gemfile.lock

@@ -1,67 +1,77 @@
 PATH
   remote: .
   specs:
-    dragonfly-cache (0.1.3)
-      dragonfly (~> 1.1.5)
+    dragonfly-cache (0.1.8)
+      dragonfly
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.3)
-    dragonfly (1.1.5)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.4.4)
+    dragonfly (1.3.0)
       addressable (~> 2.3)
       multi_json (~> 1.0)
       rack (>= 1.3)
-    i18n (1.1.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    multi_json (1.13.1)
-    parallel (1.12.1)
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    public_suffix (3.0.3)
-    rack (2.0.5)
+    multi_json (1.15.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.59.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.13.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    unicode-display_width (1.4.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1)
   dragonfly-cache!
-  rake (~> 10.0)
-  rspec (~> 3.8.0)
+  rake (~> 13.0)
+  rspec (~> 3.10.0)
   rubocop
+  rubocop-rake
+  rubocop-rspec
 
 BUNDLED WITH
-   1.16.2
+   2.2.3

data/dragonfly-cache.gemspec

@@ -15,24 +15,26 @@ Gem::Specification.new do |spec|
   spec.description   = 'Allow Dragonfly to keep a cache of jobs results'
   spec.homepage      = 'https://github.com/notus-sh/dragonfly-cache'
 
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  else
-    raise 'RubyGems 2.0 or newer is required.'
-  end
+  raise 'RubyGems 2.0 or newer is required.' unless spec.respond_to?(:metadata)
+
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.require_paths = ['lib']
   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.add_dependency 'dragonfly', '~> 1.1.5'
+  spec.required_ruby_version = '>= 2.6'
+
+  spec.add_dependency 'dragonfly'
   spec.add_dependency 'i18n'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.8.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 
   spec.post_install_message = <<~POST_INSTALL_MESSAGE
     Don't forget to configure Dragonfly::Cache:

data/lib/dragonfly/cache/manager.rb

@@ -29,6 +29,7 @@ module Dragonfly
 
       def valid?(job, uri)
         valid = (@map.key?(job.sha) && @map[job.sha] == uri) || !@map.key?(job.sha)
+        valid &= (@map.value?(uri) && @map.key(uri) == job.sha) || !@map.value?(uri)
         increase_sha_size! unless valid
         valid
       end

data/lib/dragonfly/cache/mapper/yaml.rb

@@ -9,11 +9,13 @@ module Dragonfly
         extend Forwardable
 
         attr_reader :root, :internal
-        delegate %i[[] key? value? keys values] => :internal
+
+        delegate %i[[] key? value? key keys values] => :internal
 
         def initialize(config)
           @root = config[:server_root]
           @internal = {}
+          load!
         end
 
         def store(key, value)

data/lib/dragonfly/cache/plugin.rb

@@ -23,8 +23,8 @@ module Dragonfly
         @config = Dragonfly::Cache::Config.new(cache_servers_options)
         @manager = Dragonfly::Cache::Manager.new(self)
 
-        app.define_url do |app, job, opts|
-          url_for(app, job, opts)
+        app.define_url do |same, job, opts|
+          url_for(same, job, opts)
         rescue Dragonfly::Cache::Error => e
           Dragonfly.warn(e.message)
           app.server.url_for(job, opts) # Fallback to default Dragonfly::App url building

data/lib/dragonfly/cache/version.rb

@@ -2,6 +2,6 @@
 
 module Dragonfly
   module Cache
-    VERSION = '0.1.3'
+    VERSION = '0.1.8'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Gaël-Ian Havard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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: Allow Dragonfly to keep a cache of jobs results
 email:
 - gael-ian@notus.sh
@@ -103,6 +131,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -117,6 +147,7 @@ files:
 - lib/dragonfly/cache/plugin.rb
 - lib/dragonfly/cache/storage/local.rb
 - lib/dragonfly/cache/version.rb
+- tmp/.keep
 homepage: https://github.com/notus-sh/dragonfly-cache
 licenses:
 - Apache-2.0
@@ -138,16 +169,16 @@ 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.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Cache adapter for Dragonfly
 test_files: []
+...