running_count 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0790e1704f59e2f8973afed58b33d7adbbb3148bdc2c0bbc897603bb7962217
-  data.tar.gz: ccb0ae21424bf871eb74b257f54488d009b46fe15d2dbdc7daf7b5f60a92b5c7
+  metadata.gz: 145ddc284043b30d75e6aa9dad7804ec8941c334206f08553b27c616658fe35a
+  data.tar.gz: 2b45cb121fab92ed39ea3ddbc26bb881c9efb4fd8f4aad4cd4e7ef9b3fffa3db
 SHA512:
-  metadata.gz: b2562659454f84bea398d1489b0de4556ad68eccfe51aa1a2ac38c4e5fe2d561000aef24a24a14b30da8a3f290765a458e927d0b7fb6b3d114cdf7da9b95e286
-  data.tar.gz: 9bc35af2d7e8bea2f2bc38ee8d16b304aa54aa47e44f61ded2143f2b12c5616e56027dd7c2fdb49fdfb04a7822f419b84f52384f8822b2f0ab7e457cc42cbe93
+  metadata.gz: 52e916e41be73b6a57a0b7c64abb111a86537f93c6857a33ef1f2f99f2d2515315648da889f4de9227f0dc6dbb557c7c721cf002feb95a78708cc3bf20a1da1e
+  data.tar.gz: 51114565664c71f6d115d784414fe0628fd9cb4214849acfa4e770677c6303030d9dce8c4ae8315fa93f8b00dbb4560b3ac6e0eeea61f1b5580c344212e7169e

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in running_count.gemspec
 gemspec

data/Gemfile.lock

@@ -4,177 +4,161 @@ PATH
     running_count (0.2.8)
       activesupport
       pg (>= 0.20.0)
-      redis-rails (>= 5.0)
+      redis
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.1)
-      actionpack (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activestorage (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
-    database_cleaner (1.7.0)
-    diff-lcs (1.3)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    database_cleaner (1.8.5)
+    diff-lcs (1.4.4)
     erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.7.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.3.1)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.1)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    pg (1.1.4)
-    rack (2.0.7)
+    pg (1.2.3)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.1)
-      actioncable (= 6.0.1)
-      actionmailbox (= 6.0.1)
-      actionmailer (= 6.0.1)
-      actionpack (= 6.0.1)
-      actiontext (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
-      activemodel (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.1)
+      railties (= 6.0.3.2)
       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 (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.1)
-    redis (4.1.3)
-    redis-actionpack (5.1.0)
-      actionpack (>= 4.0, < 7)
-      redis-rack (>= 1, < 3)
-      redis-store (>= 1.1.0, < 2)
-    redis-activesupport (5.2.0)
-      activesupport (>= 3, < 7)
-      redis-store (>= 1.3, < 2)
-    redis-rack (2.0.6)
-      rack (>= 1.5, < 3)
-      redis-store (>= 1.2, < 2)
-    redis-rails (5.0.2)
-      redis-actionpack (>= 5.0, < 6)
-      redis-activesupport (>= 5.0, < 6)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.8.1)
-      redis (>= 4, < 5)
+    redis (4.2.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.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.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    sprockets (4.0.0)
+    rspec-support (3.9.3)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    zeitwerk (2.2.1)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  database_cleaner (>= 1.7.0)
+  database_cleaner
   rails
-  rake (>= 10.0)
-  rspec (>= 3.0)
+  rake
+  rspec
   running_count!
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/running_count.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'active_support/lazy_load_hooks'
-require 'redis'
+require "active_support/concern"
+require "active_support/lazy_load_hooks"
+require "redis"
 
 require "running_count/callbacks"
 require "running_count/counter"
@@ -11,10 +11,20 @@ require "running_count/format"
 require "running_count/storage"
 
 module RunningCount
+
   class Error < StandardError; end
+
+  class << self
+
+    attr_accessor :redis
+
+  end
+
 end
 
 # extend ActiveRecord with our own code here
 ActiveSupport.on_load(:active_record) do
   include RunningCount::Callbacks
+  RunningCount.redis ||= $redis # rubocop:disable Style/GlobalVars
+  RunningCount.redis ||= REDIS if defined?(REDIS)
 end

data/lib/running_count/callbacks.rb

@@ -25,7 +25,7 @@ module RunningCount
       end
 
       def reconcile_changes
-        self._counter_data.values.each do |data|
+        self._counter_data.each_value do |data|
           Counter.reconcile_changes(data)
         end
       end

data/lib/running_count/counter.rb

@@ -12,7 +12,7 @@ module RunningCount
           .tap do |sums, counts|
             sums.each { |data| Counter.enqueue_sum(record, data) }
             counts.each { |data| Counter.enqueue_count(record, data) }
-        end
+          end
       end
 
       def enqueue_sum(record, counter_data)
@@ -28,7 +28,7 @@ module RunningCount
       end
 
       def enqueue_count(record, counter_data)
-        if changed_field = counter_data[:changed_field]
+        if (changed_field = counter_data[:changed_field])
           return true unless record.previous_changes.has_key?(changed_field) && counter_data[:if].call(record)
         end
 
@@ -39,11 +39,9 @@ module RunningCount
       end
 
       def enqueue_deletion(record, counter_data)
-        counter_data
-          .values
-          .each do |data|
-            Counter.enqueue_single_delete(record, data)
-          end
+        counter_data.each_value do |data|
+          Counter.enqueue_single_delete(record, data)
+        end
       end
 
       def enqueue_single_delete(record, data)
@@ -52,7 +50,7 @@ module RunningCount
         amount = amount_from_deleted_record(record, data)
 
         Storage.add_item(item, data[:running_set_name], 0 - amount)
-      rescue StandardError => e
+      rescue StandardError => exception
       end
 
       def reconcile_changes(counter_data)

data/lib/running_count/storage.rb

@@ -7,18 +7,18 @@ module RunningCount
 
       def scores(running_set_name, item = nil)
         if item
-          $redis.zscore(running_set_name, item)
+          RunningCount.redis.zscore(running_set_name, item)
         else
-          $redis.zrange(running_set_name, 0, -1, with_scores: true)
+          RunningCount.redis.zrange(running_set_name, 0, -1, with_scores: true)
         end
       end
 
       def add_item(item, running_set_name, amount)
-        $redis.zincrby(running_set_name, amount || 1, item)
+        RunningCount.redis.zincrby(running_set_name, amount || 1, item)
       end
 
       def clear_item(item, running_set_name)
-        $redis.zrem(running_set_name, item)
+        RunningCount.redis.zrem(running_set_name, item)
       end
 
     end

data/lib/running_count/version.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 module RunningCount
-  VERSION = "0.2.8"
+
+  VERSION = "0.2.9"
+
 end

data/running_count.gemspec

@@ -1,7 +1,6 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "running_count/version"
+require_relative "lib/running_count/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "running_count"
@@ -9,27 +8,20 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Isaac Priestley"]
   spec.email         = ["isaac@teachable.com"]
 
-  spec.summary       = %q{Write a short summary, because RubyGems requires one.}
-  spec.description   = %q{Write a longer description or delete this line.}
-  spec.homepage      = "http://www.teachable.com"
+  spec.summary       = "Counter caches for Rails applications, including cached running counts."
+  spec.description   = "Counter caches for Rails applications, including cached running counts. Using redis and native PostgreSQL features for performance gains"
+  spec.homepage      = "https://github.com/UseFedora/running_count"
   spec.license       = "MIT"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "http://github.com/usefedora/running_count"
-    spec.metadata["changelog_uri"] = "http://github.com/usefedora/running_count"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["homepage_uri"]      = spec.homepage
+  spec.metadata["source_code_uri"]   = "https://github.com/UseFedora/running_count"
+  spec.metadata["changelog_uri"]     = "https://github.com/UseFedora/running_count"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  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.bindir        = "exe"
@@ -37,11 +29,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "redis-rails",  ">= 5.0"
+  spec.add_dependency "redis"
   spec.add_dependency "pg", ">= 0.20.0"
 
-  spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_development_dependency "rspec", ">= 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rails"
-  spec.add_development_dependency "database_cleaner", ">= 1.7.0"
+  spec.add_development_dependency "database_cleaner"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: running_count
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Isaac Priestley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis-rails
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -100,15 +100,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
-description: Write a longer description or delete this line.
+        version: '0'
+description: Counter caches for Rails applications, including cached running counts.
+  Using redis and native PostgreSQL features for performance gains
 email:
 - isaac@teachable.com
 executables: []
@@ -134,14 +135,14 @@ files:
 - lib/running_count/storage.rb
 - lib/running_count/version.rb
 - running_count.gemspec
-homepage: http://www.teachable.com
+homepage: https://github.com/UseFedora/running_count
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: http://www.teachable.com
-  source_code_uri: http://github.com/usefedora/running_count
-  changelog_uri: http://github.com/usefedora/running_count
+  homepage_uri: https://github.com/UseFedora/running_count
+  source_code_uri: https://github.com/UseFedora/running_count
+  changelog_uri: https://github.com/UseFedora/running_count
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -150,15 +151,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
-summary: Write a short summary, because RubyGems requires one.
+summary: Counter caches for Rails applications, including cached running counts.
 test_files: []