infopark_component_cache 4.0.1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab7a50ba7d1bfb35008655dbef3d86db5690e92f
-  data.tar.gz: 3398d1abaa5de2746b69701c45a81fbcfb71af86
+SHA256:
+  metadata.gz: 483ecf46119b0b36b422e0e5d2168f7f7f73b5c8717de83724be3ef99ccd453f
+  data.tar.gz: 6d337a8d224ca63190840b976f0beca554eed95c3ca71f96a3234f231e94a9e5
 SHA512:
-  metadata.gz: 972ce875a6748d43c308ebb7e8d72e0a27dab5cfb6144e79f2efd0eb2af72da6278fa80cafca3b2dabbc1b52244501fe0e632a9fb346a88ff6f879c5107b6f33
-  data.tar.gz: 3719d4f68c120363e1bf2f062501a7c2e23090e8a3cf8fc51679078939a0cb22d2e9234308fccb774b81166ae3b9f00a95c5bd3d7f460518aa414633ea3d23dc
+  metadata.gz: 1122bafaf56cbf38ca5fd730a4d569de7b72c3aa40fe97521aa9aafc41a6aaa026f44a3ceca552d458e869d4038a878117f9b14ba3885642257b9212cd8704f4
+  data.tar.gz: 6e2354f2aea1583dd0d0e1671eb6d5307c35ba7cf44a6036d5f2bccc06d3d58ddd39ad9695b6fc1fac65a3b59dd2581711245fa1ea00b17d7d89ff2e0ad4d962

data/.rubocop.yml

@@ -6,6 +6,7 @@ require:
 
 AllCops:
   NewCops: enable
+  TargetRubyVersion: 2.6.0
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.rubocop_todo.yml

@@ -1,37 +1,33 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2020-07-16 10:57:24 UTC using RuboCop version 0.87.1.
+# `rubocop --auto-gen-config`
+# on 2022-08-24 14:41:33 UTC using RuboCop version 1.35.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: 3
-# Configuration parameters: IgnoredMethods, Max.
-Metrics/AbcSize:
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
+Layout/LeadingCommentSpace:
   Exclude:
-    - 'lib/infopark_component_cache/component_cache.rb'
-    - 'spec/support/cache_switching_macros.rb'
+    - 'lib/infopark_component_cache/key_generator.rb'
 
-# Offense count: 8
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods.
-# ExcludedMethods: refine
-Metrics/BlockLength:
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
   Exclude:
-    - '**/*.gemspec'
-    - 'spec/lib/infopark_component_cache/component_cache_spec.rb'
-    - 'spec/lib/infopark_component_cache/delayed_guard_spec.rb'
-    - 'spec/lib/infopark_component_cache/guards/last_changed_spec.rb'
-    - 'spec/lib/infopark_component_cache/guards/obj_count_spec.rb'
-    - 'spec/lib/infopark_component_cache/guards/valid_from_spec.rb'
-    - 'spec/lib/infopark_component_cache/guards/valid_until_spec.rb'
+    - 'spec/dummy/db/schema.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 18
 
 # Offense count: 3
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods.
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
-  Exclude:
-    - 'lib/infopark_component_cache/component_cache.rb'
-    - 'lib/infopark_component_cache/delayed_guard.rb'
+  Max: 20
 
 # Offense count: 1
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
@@ -41,18 +37,18 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/infopark_component_cache/volatile_cache.rb'
 
 # Offense count: 3
-# Configuration parameters: Max.
+# Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Exclude:
-    - 'spec/lib/infopark_component_cache/component_cache_spec.rb'
-    - 'spec/lib/infopark_component_cache/delayed_guard_spec.rb'
+  Max: 7
 
 # Offense count: 5
-# Configuration parameters: Max, AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
-  Exclude:
-    - 'spec/lib/infopark_component_cache/component_cache_spec.rb'
-    - 'spec/lib/infopark_component_cache/delayed_guard_spec.rb'
+  Max: 3
+
+# Offense count: 4
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 7
 
 # Offense count: 1
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
@@ -66,6 +62,7 @@ Style/ClassVars:
     - 'lib/infopark_component_cache/volatile_cache_storage.rb'
 
 # Offense count: 5
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -77,25 +74,44 @@ Style/Documentation:
     - 'lib/infopark_component_cache/key_generator.rb'
 
 # Offense count: 52
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/IfUnlessModifier:
+  Exclude:
+    - 'spec/dummy/config/application.rb'
+
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: use_perl_names, use_english_names
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantFileExtensionInRequire:
+  Exclude:
+    - 'lib/engine.rb'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireEnglish, EnforcedStyle.
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
 Style/SpecialGlobalVars:
   Exclude:
     - 'infopark_component_cache.gemspec'
     - 'spec/dummy/config/boot.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - 'lib/infopark_component_cache/component.rb'
+
 # Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to, define_method
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowComments.
+# AllowedMethods: respond_to, define_method
 Style/SymbolProc:
   Exclude:
     - 'spec/lib/infopark_component_cache/guards/last_changed_spec.rb'
@@ -104,12 +120,8 @@ Style/SymbolProc:
     - 'spec/lib/infopark_component_cache/guards/valid_until_spec.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Exclude:
-    - 'lib/infopark_component_cache/abstract_cache_storage.rb'
-    - 'lib/infopark_component_cache/component.rb'
-    - 'spec/dummy/config/initializers/secret_token.rb'
-    - 'spec/lib/infopark_component_cache/guards/always_consistent_spec.rb'
+  Max: 171

data/.ruby-version

@@ -1 +1 @@
-2.4.2
+3.1.2

data/.travis.yml

@@ -2,12 +2,10 @@ language: ruby
 os: linux
 dist: xenial
 rvm:
-  - 2.6.6
-  - 2.5.3
-  - 2.4.5
-gemfile:
-  - Gemfile
-  - Gemfile.rails51
+  - 3.1.2
+  - 3.0.4
+  - 2.7.5
+if: branch =~ /^travis|^master$/
 bundler_args: --without production
 cache: bundler
 env:
@@ -15,10 +13,7 @@ env:
     - TASK='bundle exec rake spec'
 jobs:
   include:
-    - {}
-    - name: rubocop
-      script: bundle exec rubocop
-script: $TASK
+  - name: Rubocop
+    env: TASK='bundle exec rubocop'
 before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
+  - gem install bundler -v '~> 2.3'

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Infopark ComponentCache Changelog
+
+## 5.0.1
+
+### New
+
+- Ruby 3 and 3.1 compatibility
+- Ruby on Rails 6 compatibility
+
+## 4.2.0
+
+### New
+
+- Ruby 2.7 compatibility
+- Drop EOL Ruby versions (2.5)
+- Ruby on Rails 5.2.7 compatibility
+- Use new infopark_fiona_connector gem

data/Gemfile

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in infopark_component_cache.gemspec
 gemspec
 
-gem "rails", "~> 5.0.0"
+gem "rails", ">= 5.0", "< 7.0"

data/Gemfile.lock

@@ -1,104 +1,123 @@
 PATH
   remote: .
   specs:
-    infopark_component_cache (4.0.1)
-      infopark_fiona_connector (~> 7.0.1.5.2.3.rc5)
-      rails (~> 5.0)
+    infopark_component_cache (5.0.1)
+      infopark_fiona_connector (~> 7.0.1.6.1.6.rc1)
+      rails (>= 5.0, < 7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
+    actioncable (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      mail (>= 2.7.1)
+    actionmailer (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.1.6.1)
+      actionview (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.6.1)
+      activesupport (= 6.1.6.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.7.2)
-      activesupport (= 5.0.7.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.6.1)
+      activesupport (= 6.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activesupport (5.0.7.2)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activestorage (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.1.4)
-    ast (2.4.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
-    diff-lcs (1.4.3)
-    erubis (2.7.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    diff-lcs (1.5.0)
+    erubi (1.11.0)
+    faraday (2.5.2)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     helpful_configuration (0.1.0)
-    i18n (1.8.3)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    infopark_fiona_connector (7.0.1.5.2.3.rc5)
-      activerecord (~> 5.0)
+    infopark_fiona_connector (7.0.1.6.1.6.rc1)
+      activerecord (>= 5.2, < 7.0)
       helpful_configuration (~> 0.1.0)
-      jquery-rails (~> 4.3)
       json (~> 2.3)
       maruku (~> 0.7)
       mime-types (~> 3.1)
-      mysql_blob_streaming (~> 2.3)
-      rails (~> 5.0)
+      mysql_blob_streaming (~> 2.5)
+      rails (>= 5.2, < 7.0)
       rake (~> 12.3)
       rsolr (~> 2.1.0s)
-    jquery-rails (4.4.0)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    json (2.3.1)
-    loofah (2.6.0)
+    json (2.6.2)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (1.0.2)
     maruku (0.7.3)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    multipart-post (2.1.1)
-    mysql2 (0.5.3)
-    mysql_blob_streaming (2.3.0)
+    mime-types-data (3.2022.0105)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
+    mysql2 (0.5.4)
+    mysql_blob_streaming (2.5.0)
       mysql2 (>= 0.4.4, < 0.6.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    nio4r (2.5.8)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -106,88 +125,95 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    rack (2.2.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7.2)
+    racc (1.6.0)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.6.1)
+      actioncable (= 6.1.6.1)
+      actionmailbox (= 6.1.6.1)
+      actionmailer (= 6.1.6.1)
+      actionpack (= 6.1.6.1)
+      actiontext (= 6.1.6.1)
+      actionview (= 6.1.6.1)
+      activejob (= 6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activerecord (= 6.1.6.1)
+      activestorage (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+      bundler (>= 1.15.0)
+      railties (= 6.1.6.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    railties (6.1.6.1)
+      actionpack (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
     rsolr (2.1.0)
       builder (>= 2.1.2)
       faraday (>= 0.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.87.1)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.11.0)
+    rubocop (1.35.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    rubocop-performance (1.7.0)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.30.1)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
-    sprockets (3.7.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.2)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    websocket-driver (0.6.5)
+    sqlite3 (1.4.4)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.2.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -195,12 +221,12 @@ PLATFORMS
 DEPENDENCIES
   infopark_component_cache!
   pry-byebug (~> 3.9)
-  rails (~> 5.0.0)
-  rspec-rails (~> 3.5)
-  rubocop (~> 0.87.1)
-  rubocop-performance (~> 1.7)
-  rubocop-rspec (~> 1.30)
+  rails (>= 5.0, < 7.0)
+  rspec-rails (~> 5.1)
+  rubocop
+  rubocop-performance
+  rubocop-rspec
   sqlite3 (~> 1.3, >= 1.3.6)
 
 BUNDLED WITH
-   1.17.3
+   2.3.16

data/README.md

@@ -1,4 +1,4 @@
-# Infopark's ComponentCache
+# Infopark's ComponentCache [![Build Status](https://travis-ci.com/infopark/component_cache.svg?token=9yf7x57D3eQF9WPTdzqX&branch=master)](https://travis-ci.com/infopark/component_cache)
 
 Fragment caching with automatic dependency resolution and cache invalidation.
 

data/infopark_component_cache.gemspec

@@ -13,18 +13,18 @@ Gem::Specification.new do |gem|
   gem.license       = "LGPL-3.0"
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.required_ruby_version = ">= 2.6"
+  gem.metadata["rubygems_mfa_required"] = "true"
 
-  gem.add_dependency "rails", "~> 5.0"
+  gem.add_dependency "rails", [">= 5.0", "< 7.0"]
 
-  gem.add_dependency "infopark_fiona_connector", "~> 7.0.1.5.2.3.rc5"
+  gem.add_dependency "infopark_fiona_connector", "~> 7.0.1.6.1.6.rc1"
 
   gem.add_development_dependency "pry-byebug", "~> 3.9"
-  gem.add_development_dependency "rspec-rails", "~> 3.5"
-  gem.add_development_dependency "rubocop", "~> 0.87.1"
-  gem.add_development_dependency "rubocop-performance", "~> 1.7"
-  gem.add_development_dependency "rubocop-rspec", "~> 1.30"
+  gem.add_development_dependency "rspec-rails", "~> 5.1"
+  gem.add_development_dependency "rubocop"
+  gem.add_development_dependency "rubocop-performance"
+  gem.add_development_dependency "rubocop-rspec"
   gem.add_development_dependency "sqlite3", "~> 1.3", ">= 1.3.6"
 end

data/lib/engine.rb

@@ -23,6 +23,8 @@ require "infopark_component_cache/cache_storage"
 require "infopark_component_cache/component"
 require "infopark_component_cache/component_cache"
 
+require "infopark_fiona_connector"
+
 module InfoparkComponentCache
   # @!scope class
   # This parameter should be initialized to the root object
@@ -32,14 +34,12 @@ module InfoparkComponentCache
   # @author Tomasz Przedmojski <tomasz.przedmojski@infopark.de>
   class Engine < Rails::Engine
     initializer "component_cache.helpers" do
-      [
-        InfoparkComponentCacheHelper
-      ].each do |helper|
-        ActionView::Base.__send__(:include, helper)
+      ActiveSupport.on_load(:action_view) do
+        include InfoparkComponentCacheHelper
       end
     end
 
-    initializer "set default obj_root_class" do
+    config.after_initialize do
       InfoparkComponentCache.obj_root_class ||= ::Obj
       CmsStateGuard.obj_root_class = InfoparkComponentCache.obj_root_class
     end

data/lib/infopark_component_cache/version.rb

@@ -1,3 +1,3 @@
 module InfoparkComponentCache
-  VERSION = "4.0.1".freeze
+  VERSION = "5.0.1".freeze
 end

data/spec/dummy/app/models/obj.rb

@@ -1,2 +1,2 @@
-class Obj
+class Obj < RailsConnector::BasicObj
 end

data/spec/dummy/config/application.rb

@@ -3,6 +3,7 @@ require File.expand_path("boot", __dir__)
 # Pick the frameworks you want:
 require "active_record/railtie"
 require "action_controller/railtie"
+require "sprockets/railtie"
 
 Bundler.require(*Rails.groups)
 require "infopark_component_cache"
@@ -12,5 +13,9 @@ module Dummy
     config.encoding = "utf-8"
     config.filter_parameters += [:password]
     config.active_support.escape_html_entities_in_json = true
+    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR == 2
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
+    config.autoloader = :zeitwerk
   end
 end

data/spec/dummy/config/database.yml

@@ -9,3 +9,4 @@ test:
 
 cms:
   <<: *dummy
+  database: db/cms.sqlite3

data/spec/dummy/config/environments/test.rb

@@ -1,4 +1,5 @@
 Dummy::Application.configure do
   config.cache_store = :memory_store
   config.eager_load = false
+  config.cache_classes = false
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: infopark_component_cache
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Tomasz Przedmojski, sveninfo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: infopark_fiona_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1.5.2.3.rc5
+        version: 7.0.1.6.1.6.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1.5.2.3.rc5
+        version: 7.0.1.6.1.6.rc1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +64,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.87.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.87.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -141,10 +147,9 @@ files:
 - ".rubocop_todo.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- Gemfile.rails51
-- Gemfile.rails51.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -175,6 +180,7 @@ files:
 - lib/infopark_component_cache/volatile_cache.rb
 - lib/infopark_component_cache/volatile_cache_storage.rb
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/models/obj.rb
 - spec/dummy/config.ru
@@ -188,6 +194,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/db/cms.sqlite3
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/log/.gitkeep
@@ -204,8 +211,9 @@ files:
 homepage: http://infopark.com
 licenses:
 - LGPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -213,43 +221,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.13
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Fragment caching with automatic dependency resolution and cache invalidation.
-test_files:
-- spec/dummy/Rakefile
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/models/obj.rb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
-- spec/dummy/db/schema.rb
-- spec/dummy/log/.gitkeep
-- spec/lib/infopark_component_cache/component_cache_spec.rb
-- spec/lib/infopark_component_cache/delayed_guard_spec.rb
-- spec/lib/infopark_component_cache/guards/always_consistent_spec.rb
-- spec/lib/infopark_component_cache/guards/last_changed_spec.rb
-- spec/lib/infopark_component_cache/guards/never_consistent_spec.rb
-- spec/lib/infopark_component_cache/guards/obj_count_spec.rb
-- spec/lib/infopark_component_cache/guards/valid_from_spec.rb
-- spec/lib/infopark_component_cache/guards/valid_until_spec.rb
-- spec/spec_helper.rb
-- spec/support/cache_switching_macros.rb
+test_files: []

data/Gemfile.rails51

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in infopark_component_cache.gemspec
-gemspec
-
-gem "rails", "~> 5.1.0"

data/Gemfile.rails51.lock

@@ -1,206 +0,0 @@
-PATH
-  remote: .
-  specs:
-    infopark_component_cache (4.0.1)
-      infopark_fiona_connector (~> 7.0.1.5.2.3.rc5)
-      rails (~> 5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
-      globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    ast (2.4.1)
-    builder (3.2.4)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    diff-lcs (1.4.4)
-    erubi (1.9.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    helpful_configuration (0.1.0)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    infopark_fiona_connector (7.0.1.5.2.3.rc5)
-      activerecord (~> 5.0)
-      helpful_configuration (~> 0.1.0)
-      jquery-rails (~> 4.3)
-      json (~> 2.3)
-      maruku (~> 0.7)
-      mime-types (~> 3.1)
-      mysql_blob_streaming (~> 2.3)
-      rails (~> 5.0)
-      rake (~> 12.3)
-      rsolr (~> 2.1.0s)
-    jquery-rails (4.4.0)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    json (2.3.1)
-    loofah (2.6.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    maruku (0.7.3)
-    method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    multipart-post (2.1.1)
-    mysql2 (0.5.3)
-    mysql_blob_streaming (2.3.0)
-      mysql2 (>= 0.4.4, < 0.6.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.19.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
-      bundler (>= 1.3.0)
-      railties (= 5.1.7)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rsolr (2.1.0)
-      builder (>= 2.1.2)
-      faraday (>= 0.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-rails (3.9.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.87.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    rubocop-performance (1.7.0)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.42.0)
-      rubocop (>= 0.87.0)
-    ruby-progressbar (1.10.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  infopark_component_cache!
-  pry-byebug (~> 3.9)
-  rails (~> 5.1.0)
-  rspec-rails (~> 3.5)
-  rubocop (~> 0.87.1)
-  rubocop-performance (~> 1.7)
-  rubocop-rspec (~> 1.30)
-  sqlite3 (~> 1.3, >= 1.3.6)
-
-BUNDLED WITH
-   1.17.3