incrdecr_cached_counts 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42bbe0c4b1d6ddc82d92bc3d1475dcf3e7553ef9f8299d0e3d75aa5d7c8519c6
-  data.tar.gz: 652f35c8b0c667c3ee9517494c2a23b04ea3f90a7591d74922538c84906c754f
+  metadata.gz: 0d5bd60c008ad0b41a08214d9243ebb6278467bb3ca2b5f3314609c5361b6c1a
+  data.tar.gz: cea01587597deb81ff143e8383a194238a00e36c2e2529760aec60a83f485b5c
 SHA512:
-  metadata.gz: 6610220977371d6bde5f48e6aa6dfbe879e4213d04fd0ae7bc05a00e4766751ee427b5e2f3e42ecb88fb8e665885a786f38a125a81fc042b258078e3a3debfa1
-  data.tar.gz: 6d8c16611f42f680f4350b196935cf0caffef9253e6b016e1731b142f5d719c3ce43f2293869efb6393cb52f61e05e4819dfdac6357fccf4f228ff05111b3306
+  metadata.gz: a8e9a0efe389831ae4f8d28db0cc23f2b873c705231fed8caa80ee322e84abf0d0998f6f3d777a8e7ce565ce0c2770ab3438322ff50a2921349d3d9e4f81dac6
+  data.tar.gz: b8fdd83b366cc6827cf925bfb003a065a2139ab98a103b9cb2ad9daac89f421fd3110328d80e5c6910caa7ce9322c06791c67b3d64caf66c5d030e41cbdd1b35

data/.circleci/config.yml

@@ -1,59 +1,47 @@
-version: 2
+version: 2.1
 
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.2
+      - image: cimg/ruby:2.7-node # use a tailored CircleCI docker image.
     steps:
       - checkout
 
+      - run: bundle config set path 'vendor/bundle'
+      - run: sudo apt-get update
+      - run: sudo apt install libsqlite3-dev
+
       # There's probably a better way of doing this that avoids the repetition and manual
       # deletion of Gemfile.lock.
       - restore_cache:
-          key: rails-4.2.9-{{ checksum "Gemfile" }}
+          key: rails-5.2.4.4-{{ checksum "Gemfile" }}
       - run:
           name: bundle install
-          command: bundle install --path vendor/bundle
+          command: bundle install
           environment:
-            ACTIVERECORD_VERSION: 4.2.9
+            ACTIVERECORD_VERSION: 5.2.4.4
       - save_cache:
-          key: rails-4.2.9-{{ checksum "Gemfile" }}
+          key: rails-5.2.4.4-{{ checksum "Gemfile" }}
           paths:
             - vendor/bundle
       - run:
-          name: Test with Rails 4.2.9
+          name: Test with Rails 5.2
           command: bundle exec rspec
 
       - run: rm Gemfile.lock
       - restore_cache:
-          key: rails-5.0.6-{{ checksum "Gemfile" }}
+          key: rails-6.0.3.4-{{ checksum "Gemfile" }}
       - run:
           name: bundle install
           command: bundle install --path vendor/bundle
           environment:
-            ACTIVERECORD_VERSION: 5.0.6
+            ACTIVERECORD_VERSION: 6.0.3.4
       - save_cache:
-          key: rails-5.0.6-{{ checksum "Gemfile" }}
+          key: rails-6.0.3.4-{{ checksum "Gemfile" }}
           paths:
             - vendor/bundle
       - restore_cache:
-          key: rails-5.0.6-{{ checksum "Gemfile" }}
-      - run:
-          name: Test with Rails 5.0.6
-          command: bundle exec rspec
-
-      - run: rm Gemfile.lock
-      - restore_cache:
-          key: rails-5.1.4-{{ checksum "Gemfile" }}
-      - run:
-          name: bundle install
-          command: bundle install --path vendor/bundle
-          environment:
-            ACTIVERECORD_VERSION: 5.1.4
-      - save_cache:
-          key: rails-5.1.4-{{ checksum "Gemfile" }}
-          paths:
-            - vendor/bundle
+          key: rails-6.0.3.4-{{ checksum "Gemfile" }}
       - run:
-          name: Test with Rails 5.1.4
+          name: Test with Rails 6.0
           command: bundle exec rspec

data/incrdecr_cached_counts.gemspec

@@ -19,13 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 4.2"
+  s.add_dependency "rails", ">= 5.2"
   s.add_dependency "dalli"
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec"
   s.add_development_dependency "database_cleaner"
-  s.add_development_dependency "test_after_commit"
-  s.add_development_dependency "after_commit_exception_notification"
   s.add_development_dependency "rake"
 end

data/lib/cached_counts/query_context.rb

@@ -0,0 +1,21 @@
+module CachedCounts
+  class << self
+    # Optional configuration: Set a proc which takes as arguments (1) the class
+    # we are counting and (2) the block that runs the count query. The
+    # `query_context` block must call the block that's passed as an argument.
+    #
+    # This is useful for replication, e.g.,
+    #
+    #     CachedCounts.query_context = proc do |klass, &run_query|
+    #       role = klass == User ? :reading : :writing
+    #       ActiveRecord::Base.connected_to(role: role) do
+    #         run_query.call
+    #       end
+    #     end
+    attr_writer :query_context
+
+    def query_context
+      @query_context ||= proc { |_klass, &block| block.call }
+    end
+  end
+end

data/lib/cached_counts/version.rb

@@ -1,3 +1,3 @@
 module CachedCounts
-  VERSION = "0.3.0"
+  VERSION = "0.6.0"
 end

data/lib/cached_counts.rb

@@ -1,6 +1,5 @@
 require 'cached_counts/logger'
-require 'cached_counts/dalli_check'
-require 'cached_counts/connection_for'
+require 'cached_counts/query_context'
 
 module CachedCounts
   extend ActiveSupport::Concern
@@ -160,16 +159,6 @@ module CachedCounts
       fallback = Rails.cache.read(key)
       fallback = fallback.value if fallback.is_a?(ActiveSupport::Cache::Entry)
 
-      if fallback.nil?
-        begin
-          fallback = relation.count
-        rescue ActiveRecord::StatementInvalid => e
-          fallback = 0
-        end
-
-        Rails.cache.write key, fallback, expires_in: options.fetch(:expires_in, 1.week), raw: true
-      end
-
       -> { fallback }
     end
 
@@ -193,7 +182,7 @@ module CachedCounts
           ids.each do |id|
             result[id] = raw_result[association_count_key(id, attribute_name, version)]&.to_i || default
           end
-    
+
           result
         end
 
@@ -254,24 +243,24 @@ module CachedCounts
             # Ensure that other reads find something in the cache, but
             # continue calculating here because the default is likely inaccurate.
             fallback_value = instance_exec &race_condition_fallback
-            CachedCounts.logger.warn "Setting #{fallback_value} as race_condition_fallback for #{send(key_method)}"
-            Rails.cache.write(
-              send(key_method),
-              fallback_value.to_i,
-              expires_in: 30.seconds,
-              raw: true
-            )
+
+            if fallback_value
+              CachedCounts.logger.warn "Setting #{fallback_value} as race_condition_fallback for #{send(key_method)}"
+              Rails.cache.write(
+                send(key_method),
+                fallback_value.to_i,
+                expires_in: 30.seconds,
+                raw: true
+              )
+            end
           end
 
           relation = instance_exec(&relation_getter)
           relation = relation.reorder('')
           relation.select_values = ['count(*)']
 
-          conn = CachedCounts.connection_for(counted_class)
-          if Rails.version < '4.2'.freeze
-            conn.select_value(relation.to_sql, nil, relation.values[:bind] || []).to_i
-          else
-            conn.select_value(relation.to_sql).to_i
+          CachedCounts.query_context.call(counted_class) do
+            counted_class.connection.select_value(relation.to_sql).to_i
           end
         end
 

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 require 'pry'
 require 'active_record'
 require 'rails'
-require 'active_support/cache/dalli_store'
+require 'active_support/cache/mem_cache_store'
 require 'cached_counts'
 
 ActiveRecord::Base.configurations = YAML::load_file('spec/database.yml')
@@ -13,7 +13,7 @@ if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks)
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
 
-Rails.cache = ActiveSupport::Cache::DalliStore.new("localhost")
+Rails.cache = ActiveSupport::Cache::MemCacheStore.new("localhost")
 
 RSpec.configure do |config|
   config.before(:each) do
@@ -25,13 +25,6 @@ end
 require_relative './fixtures.rb'
 require 'database_cleaner'
 
-if Rails.version.to_f < 5.0
-  require 'test_after_commit'
-end
-if Rails.version.to_f < 4.2
-  require 'after_commit_exception_notification'
-end
-
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incrdecr_cached_counts
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - David Judd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: test_after_commit
-  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: after_commit_exception_notification
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +104,6 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
-- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - MIT-LICENSE
@@ -140,9 +111,8 @@ files:
 - Rakefile
 - incrdecr_cached_counts.gemspec
 - lib/cached_counts.rb
-- lib/cached_counts/connection_for.rb
-- lib/cached_counts/dalli_check.rb
 - lib/cached_counts/logger.rb
+- lib/cached_counts/query_context.rb
 - lib/cached_counts/railtie.rb
 - lib/cached_counts/version.rb
 - spec/caches_count_of_spec.rb
@@ -173,17 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A replacement for Rails' counter caches using memcached (via Dalli)
-test_files:
-- spec/caches_count_of_spec.rb
-- spec/caches_count_where_spec.rb
-- spec/database.yml
-- spec/fixtures.rb
-- spec/fixtures/department.rb
-- spec/fixtures/following.rb
-- spec/fixtures/university.rb
-- spec/fixtures/user.rb
-- spec/spec_helper.rb
+test_files: []

data/.travis.yml

@@ -1,15 +0,0 @@
-sudo: false # use newer travis infrastructure
-language: ruby
-rvm:
-  - "2.1.8"
-  - "2.2.4"
-  - "2.3.0"
-env:
-  - "ACTIVERECORD_VERSION=4.2.6"
-  - "ACTIVERECORD_VERSION=4.1.15"
-  - "ACTIVERECORD_VERSION=4.0.13"
-  - "ACTIVERECORD_VERSION=master"
-matrix:
-  allow_failures:
-    # Master may or may not pass
-    - env: "ACTIVERECORD_VERSION=master"

data/lib/cached_counts/connection_for.rb

@@ -1,14 +0,0 @@
-module CachedCounts
-  class << self
-    # Optional configuration: set a proc which takes the class we are counting
-    # and returns a connection. Useful with replication, e.g. with Octopus:
-    #
-    # `CachedCounts.connection_for = proc { |klass| klass.using(:read_slave).connection }`
-    attr_writer :connection_for
-
-    def connection_for(counted_class)
-      @connection_for ||= proc { |klass| klass.connection }
-      @connection_for[counted_class]
-    end
-  end
-end

data/lib/cached_counts/dalli_check.rb

@@ -1,5 +0,0 @@
-if defined?(Rails)
-  ActiveSupport.on_load :cached_counts do
-    raise "CachedCounts depends on Dalli!" unless Rails.cache.respond_to?(:dalli)
-  end
-end