infopark_component_cache 2.0.0 → 4.0.0

data/spec/lib/{guards → infopark_component_cache/guards}/obj_count_spec.rb

@@ -1,6 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe InfoparkComponentCache::Guards::ObjCount do
+  subject(:guard) { described_class.new(cache_component_stub) }
+
   let(:cache_component_stub) do
     double.tap do |cache_component_stub|
       cache_component_stub.stub(:cache_key) do |input|
@@ -9,7 +11,7 @@ describe InfoparkComponentCache::Guards::ObjCount do
     end
   end
 
-  let(:count) { 12314 }
+  let(:count) { 12_314 }
 
   let(:obj_stub) do
     double.tap do |obj_stub|
@@ -21,8 +23,6 @@ describe InfoparkComponentCache::Guards::ObjCount do
 
   before { InfoparkComponentCache::CmsStateGuard.obj_root_class = obj_stub }
 
-  subject { described_class.new(cache_component_stub) }
-
   context "with cache disabled" do
     disable_cache
 
@@ -31,7 +31,8 @@ describe InfoparkComponentCache::Guards::ObjCount do
     end
 
     context "with a call to guard!" do
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.not_to be_consistent }
     end
   end
@@ -45,19 +46,26 @@ describe InfoparkComponentCache::Guards::ObjCount do
     end
 
     context "with a call to guard!" do
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.to be_consistent }
     end
 
-    context "after obj count increases" do
-      before { subject.guard! } 
-      before { obj_stub.stub(:count).and_return(55555) }
+    context "when after obj count increases" do
+      before do
+        guard.guard!
+        obj_stub.stub(:count).and_return(55_555)
+      end
+
       it { is_expected.not_to be_consistent }
     end
 
-    context "after obj count decreases" do
-      before { subject.guard! } 
-      before { obj_stub.stub(:count).and_return(500) }
+    context "when after obj count decreases" do
+      before do
+        guard.guard!
+        obj_stub.stub(:count).and_return(500)
+      end
+
       it { is_expected.not_to be_consistent }
     end
   end

data/spec/lib/{guards → infopark_component_cache/guards}/valid_from_spec.rb

@@ -1,6 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe InfoparkComponentCache::Guards::ValidFrom do
+  subject(:guard) { described_class.new(cache_component_stub) }
+
   let(:cache_component_stub) do
     double.tap do |cache_component_stub|
       cache_component_stub.stub(:cache_key) do |input|
@@ -9,7 +11,7 @@ describe InfoparkComponentCache::Guards::ValidFrom do
     end
   end
 
-  let(:minimum_valid_from) { 10.minutes.since.to_iso }
+  let(:minimum_valid_from) { 10.minutes.since }
 
   let(:obj_stub) do
     double.tap do |obj_stub|
@@ -23,8 +25,6 @@ describe InfoparkComponentCache::Guards::ValidFrom do
 
   before { InfoparkComponentCache::CmsStateGuard.obj_root_class = obj_stub }
 
-  subject { described_class.new(cache_component_stub) }
-
   context "with cache disabled" do
     disable_cache
 
@@ -33,7 +33,8 @@ describe InfoparkComponentCache::Guards::ValidFrom do
     end
 
     context "with a call to guard!" do
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.not_to be_consistent }
     end
   end
@@ -47,19 +48,26 @@ describe InfoparkComponentCache::Guards::ValidFrom do
     end
 
     context "with a call to guard!" do
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.to be_consistent }
     end
 
-    context "after minimum valid from changes to a present date" do
-      before { subject.guard! } 
-      before { obj_stub.stub(:minimum).and_return(Time.now.to_iso) }
+    context "when after minimum valid from changes to a present date" do
+      before do
+        guard.guard!
+        obj_stub.stub(:minimum).and_return(Time.now.to_iso)
+      end
+
       it { is_expected.not_to be_consistent }
     end
 
-    context "after minimum valid from changes to a past date" do
-      before { subject.guard! } 
-      before { obj_stub.stub(:minimum).and_return(1.month.ago.to_iso) }
+    context "when after minimum valid from changes to a past date" do
+      before do
+        guard.guard!
+        obj_stub.stub(:minimum).and_return(1.month.ago.to_iso)
+      end
+
       it { is_expected.not_to be_consistent }
     end
   end

data/spec/lib/{guards → infopark_component_cache/guards}/valid_until_spec.rb

@@ -1,6 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe InfoparkComponentCache::Guards::ValidUntil do
+  subject(:guard) { described_class.new(cache_component_stub) }
+
   let(:cache_component_stub) do
     double.tap do |cache_component_stub|
       cache_component_stub.stub(:cache_key) do |input|
@@ -9,7 +11,7 @@ describe InfoparkComponentCache::Guards::ValidUntil do
     end
   end
 
-  let(:minimum_valid_until) { 10.minutes.since.to_iso }
+  let(:minimum_valid_until) { 10.minutes.since }
 
   let(:obj_stub) do
     double.tap do |obj_stub|
@@ -23,8 +25,6 @@ describe InfoparkComponentCache::Guards::ValidUntil do
 
   before { InfoparkComponentCache::CmsStateGuard.obj_root_class = obj_stub }
 
-  subject { described_class.new(cache_component_stub) }
-
   context "with cache disabled" do
     disable_cache
 
@@ -33,7 +33,8 @@ describe InfoparkComponentCache::Guards::ValidUntil do
     end
 
     context "with a call to guard!" do
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.not_to be_consistent }
     end
   end
@@ -47,26 +48,34 @@ describe InfoparkComponentCache::Guards::ValidUntil do
     end
 
     context "with a call to guard!" do
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.to be_consistent }
     end
 
-    context "after minimum valid until changes to a present date" do
-      before { subject.guard! } 
-      before { obj_stub.stub(:minimum).and_return(Time.now.to_iso) }
+    context "when after minimum valid until changes to a present date" do
+      before do
+        guard.guard!
+        obj_stub.stub(:minimum).and_return(Time.now.to_iso)
+      end
+
       it { is_expected.not_to be_consistent }
     end
 
-    context "after minimum valid until changes to a past date" do
-      before { subject.guard! } 
-      before { obj_stub.stub(:minimum).and_return(1.month.ago.to_iso) }
+    context "when after minimum valid until changes to a past date" do
+      before do
+        guard.guard!
+        obj_stub.stub(:minimum).and_return(1.month.ago.to_iso)
+      end
+
       it { is_expected.not_to be_consistent }
     end
 
-    context "nil valid until" do
+    context "when nil valid until" do
       let(:minimum_valid_until) { nil }
 
-      before { subject.guard! }
+      before { guard.guard! }
+
       it { is_expected.to be_consistent }
     end
   end

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
-ENV['RAILS_ENV'] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 # Load dummy app
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("dummy/config/environment.rb", __dir__)
 # Load rspec components
-require 'rspec/rails'
-require 'byebug'
+require "rspec/rails"
+require "byebug"
 # Nice backtraces
 Rails.backtrace_cleaner.remove_silencers!
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
 
 # configure rspec
 RSpec.configure do |config|
@@ -17,9 +17,12 @@ RSpec.configure do |config|
   config.order = "random"
   config.extend CacheSwitchingMacros
   config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = %i(should expect)
   end
   config.mock_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = %i(should expect)
+  end
+  config.before do
+    Rails.cache.clear
   end
 end

data/spec/support/cache_switching_macros.rb

@@ -1,5 +1,5 @@
 module CacheSwitchingMacros
-  def enable_cache(trigger=:all)
+  def enable_cache(trigger = :all)
     before(trigger) do
       @__perform_caching_before ||= []
       @__perform_caching_before.push Rails.application.config.action_controller.perform_caching
@@ -7,13 +7,13 @@ module CacheSwitchingMacros
     end
 
     after(trigger) do
-      @__perform_caching_before ||=[]
+      @__perform_caching_before ||= []
       previous_setting = @__perform_caching_before.pop || false
       Rails.application.config.action_controller.perform_caching = previous_setting
     end
   end
 
-  def disable_cache(trigger=:all)
+  def disable_cache(trigger = :all)
     before(trigger) do
       @__perform_caching_before ||= []
       @__perform_caching_before.push Rails.application.config.action_controller.perform_caching
@@ -21,7 +21,7 @@ module CacheSwitchingMacros
     end
 
     after(trigger) do
-      @__perform_caching_before ||=[]
+      @__perform_caching_before ||= []
       previous_setting = @__perform_caching_before.pop || false
       Rails.application.config.action_controller.perform_caching = previous_setting
     end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: infopark_component_cache
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 4.0.0
 platform: ruby
 authors:
-- Tomasz Przedmojski
+- Tomasz Przedmojski, sveninfo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: infopark_fiona_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.1.5.2.3.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.1.5.2.3.rc5
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.87.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.87.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 description: Easy and intelligent fragment caching for RailsConnector projects
 email:
 - tomasz.przedmojski@infopark.de
@@ -89,8 +131,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
+- Gemfile.rails51
+- Gemfile.rails51.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -137,17 +185,19 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/log/.gitkeep
-- spec/lib/delayed_guard_spec.rb
-- spec/lib/guards/always_consistent_spec.rb
-- spec/lib/guards/last_changed_spec.rb
-- spec/lib/guards/never_consistent_spec.rb
-- spec/lib/guards/obj_count_spec.rb
-- spec/lib/guards/valid_from_spec.rb
-- spec/lib/guards/valid_until_spec.rb
+- 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
 homepage: ''
-licenses: []
+licenses:
+- Nonstandard
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -165,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Fragment caching with automatic dependency resolution and cache invalidation.
@@ -187,12 +237,13 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/log/.gitkeep
-- spec/lib/delayed_guard_spec.rb
-- spec/lib/guards/always_consistent_spec.rb
-- spec/lib/guards/last_changed_spec.rb
-- spec/lib/guards/never_consistent_spec.rb
-- spec/lib/guards/obj_count_spec.rb
-- spec/lib/guards/valid_from_spec.rb
-- spec/lib/guards/valid_until_spec.rb
+- 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