query_count 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6bf8e6307491ffbb5fb4cb411765d6641b84b97f4af8db094abdc5e9f6fd91d
-  data.tar.gz: 8a70f7fddb6d3200e01f1fe6c7be8b7699bd260d3df0acba109174c3c9cf1cf1
+  metadata.gz: 66024a7857129277ac1750e76cbfc12c00dd5583fa18456c27e24c8165b88705
+  data.tar.gz: 8241feb72c765ecbc6f142779152c10fd6d71f8b489169c46a5b85c733a55249
 SHA512:
-  metadata.gz: fe202188d69375b0124215792c42ef186edff113b1616dd069c207bd2f313165e8baef1184c95eec2852cab62415d2f0d110a983d4e1d38596037bc41bbdc8b8
-  data.tar.gz: 9771031807f5599d968154f5771d330d1c3a19c9ab221e0839a0bef241d23c7ec341989015f538be4820045562edfcd21c7d855b2fb8c29e5b6f125f9a903a32
+  metadata.gz: b9209026496704cf1abce72bc6bc9dc26c020a38d54ed0d344facf009bb58915b2bdefbfcd3b2db4bec2cddad9b6263a77fba5b753513f85c5e7b9024a04f572
+  data.tar.gz: bb7aa63426c6640384a5dc0492ae36c7087fbe0f69e5fdedf277c784965deb7e4b4dbb26620354b0703969f4fd6bd5b20826d9e6c7910cac77bbe7054bf70de0

data/.github/workflows/ci.yml

@@ -0,0 +1,114 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # rails 4.2, ruby 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6
+          - rails: '4.2'
+            ruby: '2.0'
+          - rails: '4.2'
+            ruby: '2.1'
+          - rails: '4.2'
+            ruby: '2.2'
+          - rails: '4.2'
+            ruby: '2.3'
+          - rails: '4.2'
+            ruby: '2.4'
+          - rails: '4.2'
+            ruby: '2.5'
+          - rails: '4.2'
+            ruby: '2.6'
+          # rails 5.0, ruby 2.2, 2.3, 2.4, 2.5, 2.6, 2.7
+          - rails: '5.0'
+            ruby: '2.2'
+          - rails: '5.0'
+            ruby: '2.3'
+          - rails: '5.0'
+            ruby: '2.4'
+          - rails: '5.0'
+            ruby: '2.5'
+          - rails: '5.0'
+            ruby: '2.6'
+          - rails: '5.0'
+            ruby: '2.7'
+          # rails 5.1, ruby 2.2, 2.3, 2.4, 2.5, 2.6, 2.7
+          - rails: '5.1'
+            ruby: '2.2'
+          - rails: '5.1'
+            ruby: '2.3'
+          - rails: '5.1'
+            ruby: '2.4'
+          - rails: '5.1'
+            ruby: '2.5'
+          - rails: '5.1'
+            ruby: '2.6'
+          - rails: '5.1'
+            ruby: '2.7'
+          # rails 5.2, ruby 2.2, 2.3, 2.4, 2.5, 2.6, 2.7
+          - rails: '5.2'
+            ruby: '2.2'
+          - rails: '5.2'
+            ruby: '2.3'
+          - rails: '5.2'
+            ruby: '2.4'
+          - rails: '5.2'
+            ruby: '2.5'
+          - rails: '5.2'
+            ruby: '2.6'
+          - rails: '5.2'
+            ruby: '2.7'
+          # rails 6.0, ruby 2.5, 2.6, 2.7, 3.0, 3.1
+          - rails: '6.0'
+            ruby: '2.5'
+          - rails: '6.0'
+            ruby: '2.6'
+          - rails: '6.0'
+            ruby: '2.7'
+          - rails: '6.0'
+            ruby: '3.0'
+          - rails: '6.0'
+            ruby: '3.1'
+          # rails 6.1, ruby 2.5, 2.6, 2.7, 3.0, 3.1
+          - rails: '6.1'
+            ruby: '2.5'
+          - rails: '6.1'
+            ruby: '2.6'
+          - rails: '6.1'
+            ruby: '2.7'
+          - rails: '6.1'
+            ruby: '3.0'
+          - rails: '6.1'
+            ruby: '3.1'
+          # rails 7.0; ruby 2.7, 3.0, 3.1
+          - rails: '7.0'
+            ruby: '2.7'
+          - rails: '7.0'
+            ruby: '3.0'
+          - rails: '7.0'
+            ruby: '3.1'
+          # rails edge; ruby 2.7, 3.0, 3.1
+          - rails: 'edge'
+            ruby: '2.7'
+          - rails: 'edge'
+            ruby: '3.0'
+          - rails: 'edge'
+            ruby: '3.1'
+    name: Rails ${{ matrix.rails }} on Ruby ${{ matrix.ruby }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        env:
+          RAILS_VERSION: ${{ matrix.rails }}
+        run: bundle exec rake

data/.rubocop.yml

@@ -1,6 +1,10 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  SuggestExtensions: false
+  TargetRubyVersion: 3.1
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
 
 Layout/IndentationConsistency:
   EnforcedStyle: indented_internal_methods
@@ -9,7 +13,7 @@ Layout/LineLength:
   Max: 100
 
 Metrics/BlockLength:
-  ExcludedMethods: [RSpec.describe, context]
+  IgnoredMethods: [RSpec.describe, context]
 
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.1.0](https://github.com/rubysamurai/query_count/compare/v1.0.0...v1.1.0) (2022-01-26)
+
+
+### Features
+
+* Support Rails 4.2+ and Ruby 2.0+
+
 # 1.0.0 (2020-05-23)
 
 Initial release.

data/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['CI']
-  rails_version = ENV['RAILS_VERSION'] || '6.0'
+  rails_version = ENV['RAILS_VERSION'] || '6.1'
   eval_gemfile File.expand_path("../gemfiles/#{rails_version}.gemfile", __FILE__)
 end

data/README.md

@@ -1,6 +1,10 @@
 # Query Count
 
-Counts the number of SQL queries performed by the ActiveRecord.
+[![Gem Version](https://badge.fury.io/rb/query_count.svg)](https://badge.fury.io/rb/query_count)
+[![CI](https://github.com/rubysamurai/query_count/workflows/CI/badge.svg)](https://github.com/rubysamurai/query_count/actions?query=workflow%3ACI)
+
+A zero-configuration gem to count the number of SQL queries performed by the ActiveRecord.
+Supports **Rails 4.2+** and **Ruby 2.0+** (the complete testing matrix is [here](.github/workflows/ci.yml)).
 
 ## Installation
 
@@ -10,17 +14,29 @@ Add this line to your application's Gemfile:
 gem 'query_count'
 ```
 
-Run `$ bundle install`
+Run `bundle install`.
 
 ## Usage
 
-The gem will automatically include the number of SQL queries  to the Rails log.
+The gem will automatically include the number of SQL queries to the default Rails log.
 
 ```
 ActiveRecord: 34.0ms | SQL Queries: 8 (1 cached)
 ```
 
-This log example shows that the total number of queries was 8 and 1 of those queries was cached. Meaning that the database was hit 7 times.
+This log example shows that the total number of queries was 8, and 1 was cached, which means the request hit the database 7 times.
+
+`QueryCount::Counter` provides public methods `counter`, `counter_cache`, `reset_counter`, `reset_counter_cache`.
+
+RSpec 3 example:
+
+```ruby
+it 'performs exactly 5 queries' do
+  QueryCount::Counter.reset_counter
+  5.times { User.last }
+  expect(QueryCount::Counter.counter).to eq 5
+end
+```
 
 ## License
 

data/gemfiles/4.2.gemfile

@@ -0,0 +1,3 @@
+gem 'activerecord', '~> 4.2.0'
+gem 'railties', '~> 4.2.0'
+gem 'sqlite3', '~> 1.3.0'

data/gemfiles/5.0.gemfile

@@ -1,2 +1,3 @@
-gem 'rails', '~> 5.0.0'
+gem 'activerecord', '~> 5.0.0'
+gem 'railties', '~> 5.0.0'
 gem 'sqlite3', '~> 1.3.0'

data/gemfiles/5.1.gemfile

@@ -1 +1,2 @@
-gem 'rails', '~> 5.1.0'
+gem 'activerecord', '~> 5.1.0'
+gem 'railties', '~> 5.1.0'

data/gemfiles/5.2.gemfile

@@ -1 +1,2 @@
-gem 'rails', '~> 5.2.0'
+gem 'activerecord', '~> 5.2.0'
+gem 'railties', '~> 5.2.0'

data/gemfiles/6.0.gemfile

@@ -1 +1,2 @@
-gem 'rails', '~> 6.0.0'
+gem 'activerecord', '~> 6.0.0'
+gem 'railties', '~> 6.0.0'

data/gemfiles/6.1.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 6.1.0'
+gem 'railties', '~> 6.1.0'

data/gemfiles/7.0.gemfile

@@ -0,0 +1,2 @@
+gem 'activerecord', '~> 7.0.0'
+gem 'railties', '~> 7.0.0'

data/gemfiles/edge.gemfile

@@ -0,0 +1,4 @@
+git 'https://github.com/rails/rails.git' do
+  gem 'activerecord'
+  gem 'railties'
+end

data/lib/query_count/version.rb

@@ -1,3 +1,3 @@
 module QueryCount
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/query_count.gemspec

@@ -10,12 +10,13 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/rubysamurai/query_count'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.0.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
   spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/master/CHANGELOG.md"
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -24,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rails', '>= 5.0'
+  spec.add_runtime_dependency 'activerecord', '>= 4.2'
+  spec.add_runtime_dependency 'railties', '>= 4.2'
 
-  spec.add_development_dependency 'rake',  '>= 13.0'
   spec.add_development_dependency 'rspec', '>= 3.9'
   spec.add_development_dependency 'sqlite3', '>= 1.3'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: query_count
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dmitriy Tarasov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-23 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: '4.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -84,10 +84,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/4.2.gemfile
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
+- gemfiles/edge.gemfile
 - lib/query_count.rb
 - lib/query_count/controller_runtime.rb
 - lib/query_count/counter.rb
@@ -102,7 +106,8 @@ metadata:
   source_code_uri: https://github.com/rubysamurai/query_count
   bug_tracker_uri: https://github.com/rubysamurai/query_count/issues
   changelog_uri: https://github.com/rubysamurai/query_count/blob/master/CHANGELOG.md
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,15 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: SQL queries counter for Rails apps
 test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-env:
-  - RAILS_VERSION=5.0
-  - RAILS_VERSION=5.1
-  - RAILS_VERSION=5.2
-  - RAILS_VERSION=6.0