counter_culture 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c929583c30094df5eb38dce579819edf8e528fce64b06e3f5bddb95d5f2d13
-  data.tar.gz: 75a32b65babe86a8fef2d7aeb006b29db1c39210134b95c6854103eab72ee756
+  metadata.gz: 74cbe60d3814256ebdde674294cde8b9a086ecd181651370c4785b751b7e7c00
+  data.tar.gz: 8a1487ddb9f56cedefec29a96c900083b27975079b11e0bacc0aacbdc4c049da
 SHA512:
-  metadata.gz: 890a315177031dedb9d63ab8b2bb40887ec81ff240a11b323cf6bfb1287f16ab1c9cf479591a111562278e9e63fd840ea9751e486bbe7ef4ed58364c89bd7cd6
-  data.tar.gz: 8feec9380863959dbc3e362e31c0392d238508378f644335c6a10032fedb16641deaafea436442f231e9dc1b6bd917198251fb5bda85afc0aae2d1183b80f322
+  metadata.gz: f7fade10fb91c25c24a7d233e75cc1cf7f9d3989ac3fbb11833e592b5746c3e6880f8d83d63873b3d2c2d5195e93ff291b217daa33aad4c8e95b0edc34d1f92b
+  data.tar.gz: 2b6f5f9accf8e20eb5eca36d1a5189ef9050d279165a1750d784ea130b33b4128e6464f18cb44f3e7f61f4dcb82872e32e4cdb6ead764113686c55ef902a479d

data/.gitignore

@@ -0,0 +1,65 @@
+# appraisal lockfiles
+gemfiles/*.lock
+
+# spec coverage
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# this changes all the time when we change multiple Rails versions
+Gemfile.lock
+
+# allow people to manage their own Ruby versions / gemsets
+.ruby-version
+.ruby-gemset
+
+# rspec pass/fail status
+.rspec_status
+
+# sqlite3 db
+db
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/.travis.yml

@@ -1,19 +1,36 @@
 language: ruby
+services:
+  - postgresql
+  - mysql
+addons:
+  postgresql: "9.6"
 rvm:
   - "2.3.8"
   - "2.4.6"
   - "2.5.5"
   - "2.6.2"
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.0.rc1.gemfile
 env:
-  - 'RAILS_VERSION="~> 4.2.0"'
-  - 'RAILS_VERSION="~> 5.0.0"'
-  - 'RAILS_VERSION="= 5.1.4"'
-  - 'RAILS_VERSION="= 5.1.5"'
-  - 'RAILS_VERSION="~> 5.1.5"'
-  - 'RAILS_VERSION="~> 5.2.0"'
+  - DB=postgresql
+  - DB=sqlite3
+  - DB=mysql2
+matrix:
+  exclude:
+    - rvm: "2.3.8"
+      gemfile: gemfiles/rails_6.0.0.rc1.gemfile
+    - rvm: "2.4.6"
+      gemfile: gemfiles/rails_6.0.0.rc1.gemfile
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v '< 2'
 install:
   - bundle update
+before_script:
+  - psql -c 'create database counter_culture_test;' -U postgres
+  - mysql -e 'CREATE DATABASE counter_culture_test;'
 script: TRAVIS=true bundle exec rake spec

data/Appraisals

@@ -0,0 +1,22 @@
+%w[
+  4.2
+  5.0
+  5.1
+  5.2
+  6.0.0.rc1
+].each do |rails_version|
+  gem_rails_version = Gem::Version.new(rails_version)
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0') &&
+      gem_rails_version >= Gem::Version.new('6.0.0.beta')
+
+    # Rails 6 requires Ruby >= 2.5
+    next
+  end
+  appraise "rails-#{rails_version}" do
+    gem 'rails', "~> #{rails_version}.0"
+
+    gem 'pg', gem_rails_version < Gem::Version.new('5.0') ? '~> 0.15' : '~> 1.0'
+    gem 'mysql2'
+    gem 'sqlite3', gem_rails_version < Gem::Version.new(5.2) ? '~> 1.3.0' : '~> 1.4'
+  end
+end

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.2.3 (June 20, 2019)
+
+Improvements:
+  - Start testing against MySQL and PostgreSQL as well as sqlite3 (#257)
+
+Bugfixes:
+  - Fix edge cases in MySQL (#257)
+
 ## 2.2.2 (May 5, 2019)
 
 Bugfixes:

data/Gemfile

@@ -1,48 +1,9 @@
-source "https://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'https://rubygems.org'
 
-gem "after_commit_action", "~> 1.0"
-gem "activerecord", ">= 4.2.0"
-gem "activesupport", ">= 4.2.0"
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development, :test do
-  gem "rake"
+# Specify the gem's dependencies in counter_culture.gemspec
+gemspec
 
-  rails = case ENV["RAILS_VERSION"]
-  when "master"
-    { github: "rails/rails" }
-  when nil, ""
-    ">= 4.2.0"
-  else
-    ENV["RAILS_VERSION"]
-  end
-  gem "rails", rails
-
-  gem "rspec", "~> 3.0"
-  gem "awesome_print"
-  gem "timecop"
-
-  # To test integrations
-  gem "discard"
-  gem "paranoia"
-  gem "paper_trail"
-end
-
-group :development do
-  gem "rdoc", "~> 3.12"
-  gem "bundler", ">= 1.2.0"
-  gem "jeweler", "~> 2.1"
-end
-
-group :test do
-  # something's going on with sqlite 1.4 that doesn't work with ActiveRecord, see
-  # https://stackoverflow.com/questions/54527277/cant-activate-sqlite3-1-3-6-already-activated-sqlite3-1-4-0
-  # this seems like a hack but it works, so...
-  gem 'sqlite3', '~> 1.3.13'
-  gem "rspec-extra-formatters"
-  gem "database_cleaner", ">= 1.1.1"
-end
+# Ensure we have the default DB adapter for testing
+gem 'sqlite3'

data/README.md

@@ -76,9 +76,9 @@ end
 class Membership < ActiveRecord::Base
   belongs_to :group
   belongs_to :member, class: "User"
-  counter_cuture :group, column: "members_count"
+  counter_culture :group, column_name: "members_count"
   # If you'd like to also touch the group when `members_count` is updated
-  # counter_culture :group, column: "members_count", touch: true
+  # counter_culture :group, column_name: "members_count", touch: true
 end
 ```
 

data/Rakefile

@@ -1,49 +1,21 @@
-# encoding: utf-8
-
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "counter_culture"
-  gem.homepage = "http://github.com/magnusvk/counter_culture"
-  gem.license = "MIT"
-  gem.summary = %Q{Turbo-charged counter caches for your Rails app.}
-  gem.description = %Q{counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.}
-  gem.email = "magnus@vonkoeller.de"
-  gem.authors = ["Magnus von Koeller"]
-  gem.required_ruby_version = '>= 2.3.0'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rdoc/task'
+require 'counter_culture/version'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = CounterCulture::VERSION
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "counter_culture #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task default: :spec

data/counter_culture.gemspec

@@ -1,181 +1,46 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: counter_culture 2.2.2 ruby lib
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'counter_culture/version'
 
-Gem::Specification.new do |s|
-  s.name = "counter_culture".freeze
-  s.version = "2.2.2"
+Gem::Specification.new do |spec|
+  spec.name          = 'counter_culture'
+  spec.version       = CounterCulture::VERSION
+  spec.authors       = ['Magnus von Koeller']
+  spec.email         = ["magnus@vonkoeller.de"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Magnus von Koeller".freeze]
-  s.date = "2019-05-05"
-  s.description = "counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.".freeze
-  s.email = "magnus@vonkoeller.de".freeze
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".travis.yml",
-    "CHANGELOG.md",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "circle.yml",
-    "counter_culture.gemspec",
-    "lib/counter_culture.rb",
-    "lib/counter_culture/counter.rb",
-    "lib/counter_culture/extensions.rb",
-    "lib/counter_culture/reconciler.rb",
-    "lib/generators/counter_culture_generator.rb",
-    "lib/generators/templates/counter_culture_migration.rb.erb",
-    "spec/counter_culture_spec.rb",
-    "spec/models/another_post.rb",
-    "spec/models/another_post_comment.rb",
-    "spec/models/candidate.rb",
-    "spec/models/candidate_profile.rb",
-    "spec/models/categ.rb",
-    "spec/models/category.rb",
-    "spec/models/company.rb",
-    "spec/models/conditional_dependent.rb",
-    "spec/models/conditional_main.rb",
-    "spec/models/conversation.rb",
-    "spec/models/has_non_pk_id.rb",
-    "spec/models/has_string_id.rb",
-    "spec/models/industry.rb",
-    "spec/models/person.rb",
-    "spec/models/poly_employee.rb",
-    "spec/models/poly_image.rb",
-    "spec/models/poly_product.rb",
-    "spec/models/post.rb",
-    "spec/models/post_comment.rb",
-    "spec/models/product.rb",
-    "spec/models/review.rb",
-    "spec/models/simple_dependent.rb",
-    "spec/models/simple_main.rb",
-    "spec/models/simple_review.rb",
-    "spec/models/soft_delete_discard.rb",
-    "spec/models/soft_delete_paranoia.rb",
-    "spec/models/subcateg.rb",
-    "spec/models/transaction.rb",
-    "spec/models/twitter_review.rb",
-    "spec/models/user.rb",
-    "spec/models/with_module/model1.rb",
-    "spec/models/with_module/model2.rb",
-    "spec/rails_app/.gitignore",
-    "spec/rails_app/Gemfile",
-    "spec/rails_app/README.rdoc",
-    "spec/rails_app/Rakefile",
-    "spec/rails_app/app/assets/images/rails.png",
-    "spec/rails_app/app/assets/javascripts/application.js",
-    "spec/rails_app/app/assets/stylesheets/application.css",
-    "spec/rails_app/app/controllers/application_controller.rb",
-    "spec/rails_app/app/helpers/application_helper.rb",
-    "spec/rails_app/app/mailers/.gitkeep",
-    "spec/rails_app/app/models/.gitkeep",
-    "spec/rails_app/app/views/layouts/application.html.erb",
-    "spec/rails_app/config.ru",
-    "spec/rails_app/config/application.rb",
-    "spec/rails_app/config/boot.rb",
-    "spec/rails_app/config/database.yml",
-    "spec/rails_app/config/environment.rb",
-    "spec/rails_app/config/environments/development.rb",
-    "spec/rails_app/config/environments/test.rb",
-    "spec/rails_app/config/initializers/backtrace_silencers.rb",
-    "spec/rails_app/config/initializers/inflections.rb",
-    "spec/rails_app/config/initializers/mime_types.rb",
-    "spec/rails_app/config/initializers/paper_trail.rb",
-    "spec/rails_app/config/initializers/secret_token.rb",
-    "spec/rails_app/config/initializers/session_store.rb",
-    "spec/rails_app/config/initializers/wrap_parameters.rb",
-    "spec/rails_app/config/locales/en.yml",
-    "spec/rails_app/config/routes.rb",
-    "spec/rails_app/db/seeds.rb",
-    "spec/rails_app/lib/assets/.gitkeep",
-    "spec/rails_app/lib/tasks/.gitkeep",
-    "spec/rails_app/log/.gitkeep",
-    "spec/rails_app/public/404.html",
-    "spec/rails_app/public/422.html",
-    "spec/rails_app/public/500.html",
-    "spec/rails_app/public/favicon.ico",
-    "spec/rails_app/public/index.html",
-    "spec/rails_app/public/robots.txt",
-    "spec/rails_app/script/rails",
-    "spec/rails_app/test/fixtures/.gitkeep",
-    "spec/rails_app/test/functional/.gitkeep",
-    "spec/rails_app/test/integration/.gitkeep",
-    "spec/rails_app/test/performance/browsing_test.rb",
-    "spec/rails_app/test/test_helper.rb",
-    "spec/rails_app/test/unit/.gitkeep",
-    "spec/rails_app/vendor/assets/javascripts/.gitkeep",
-    "spec/rails_app/vendor/assets/stylesheets/.gitkeep",
-    "spec/rails_app/vendor/plugins/.gitkeep",
-    "spec/schema.rb",
-    "spec/spec_helper.rb",
-    "test_rails_versions.sh"
-  ]
-  s.homepage = "http://github.com/magnusvk/counter_culture".freeze
-  s.licenses = ["MIT".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze)
-  s.rubygems_version = "2.7.6.2".freeze
-  s.summary = "Turbo-charged counter caches for your Rails app.".freeze
+  spec.summary       = 'Turbo-charged counter caches for your Rails app.'
+  spec.description   = 'counter_culture provides turbo-charged counter caches that are kept up-to-date not just on create and destroy, that support multiple levels of indirection through relationships, allow dynamic column names and that avoid deadlocks by updating in the after_commit callback.'
+  spec.homepage      = 'http://github.com/magnusvk/counter_culture'
+  spec.license       = 'MIT'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
-      s.add_runtime_dependency(%q<activerecord>.freeze, [">= 4.2.0"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.2.0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rails>.freeze, [">= 4.2.0"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
-      s.add_development_dependency(%q<awesome_print>.freeze, [">= 0"])
-      s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
-      s.add_development_dependency(%q<discard>.freeze, [">= 0"])
-      s.add_development_dependency(%q<paranoia>.freeze, [">= 0"])
-      s.add_development_dependency(%q<paper_trail>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 1.2.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1"])
-    else
-      s.add_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<activerecord>.freeze, [">= 4.2.0"])
-      s.add_dependency(%q<activesupport>.freeze, [">= 4.2.0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<rails>.freeze, [">= 4.2.0"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
-      s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
-      s.add_dependency(%q<timecop>.freeze, [">= 0"])
-      s.add_dependency(%q<discard>.freeze, [">= 0"])
-      s.add_dependency(%q<paranoia>.freeze, [">= 0"])
-      s.add_dependency(%q<paper_trail>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
-    end
-  else
-    s.add_dependency(%q<after_commit_action>.freeze, ["~> 1.0"])
-    s.add_dependency(%q<activerecord>.freeze, [">= 4.2.0"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 4.2.0"])
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<rails>.freeze, [">= 4.2.0"])
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
-    s.add_dependency(%q<awesome_print>.freeze, [">= 0"])
-    s.add_dependency(%q<timecop>.freeze, [">= 0"])
-    s.add_dependency(%q<discard>.freeze, [">= 0"])
-    s.add_dependency(%q<paranoia>.freeze, [">= 0"])
-    s.add_dependency(%q<paper_trail>.freeze, [">= 0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-    s.add_dependency(%q<bundler>.freeze, [">= 1.2.0"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
+  # 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(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-end
+  spec.extra_rdoc_files = ['LICENSE.txt', 'README.md']
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'after_commit_action', '~> 1.0'
+  spec.add_dependency 'activerecord', '>= 4.2'
+  spec.add_dependency 'activesupport', '>= 4.2'
 
+  spec.add_development_dependency 'appraisal', '> 2.0.0'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'database_cleaner', '>= 1.1.1'
+  spec.add_development_dependency 'discard'
+  spec.add_development_dependency 'paper_trail'
+  spec.add_development_dependency 'paranoia'
+  spec.add_development_dependency 'rails', '>= 4.2'
+  spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rdoc', '~> 5.0.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-extra-formatters'
+  spec.add_development_dependency 'simplecov', '~> 0.16.1'
+  spec.add_development_dependency 'timecop'
+end