rspec-sqlimit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb112af9504128b90adde574c3ec62eb7853a35e
-  data.tar.gz: 5a7a2d7ed16fc1224168435263f27d59e943530d
+SHA256:
+  metadata.gz: 17f8ef5a19ac39f9a9a2c67a32a196de82bf9b1764f04f4101b8cb57ff182799
+  data.tar.gz: 15cd5e3c7c9f8b035240eb0028ff03686f75b1812d6c215b9388f697f0c83423
 SHA512:
-  metadata.gz: 943305eafecad8557ed1ef7baaca8eb02ae9c2f05da61f538c6412fb49a568ac5df7e686c8455b47fc20d919ade80704d071e328197c51d54b96e6699d7b8b24
-  data.tar.gz: 8cede3b49a91a9ce2ab17869e94fa4a674c157ecd7043f73a95a0d25552fb51e63b4648a7cc2c2c1320642233f585234137a087ca71a2954f6c7c3b34a50af58
+  metadata.gz: 3f902b99903af0400fbe4ed04609de1abecfd5c24568eb0a4a65123d115da82de09b1bdbae7b7ec4637a461378f77a939af9aaa9a1fd1db2aabd6232ff824b1d
+  data.tar.gz: bf775886da70792c4cb468297ce6e85910e26a17a3ce6661d3ddd6177027213d312819309d76f5588bca13b3b1aaffe2dfff04d2c96f0743f506765a60748913

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -8,3 +9,6 @@
 /spec/reports/
 /tmp/
 /spec/dummy/db/*.sqlite3
+*.gem
+.rspec_status
+.idea/

data/.rubocop.yml

@@ -3,10 +3,11 @@ AllCops:
   DisplayCopNames:    true
   DisplayStyleGuide:  true
   StyleGuideCopsOnly: true
-  TargetRubyVersion:  2.3
+  TargetRubyVersion:  2.6
   Exclude:
     - spec/dummy/db/schema.rb
-
+    - vendor/bundle/**/*
+    - gemfiles/vendor/**/*
 Metrics/ParameterLists:
   Max: 5
 
@@ -14,7 +15,7 @@ Style/Alias:
   Enabled: false
 
 Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
+  Enabled: false
 
 Style/FileName:
   Enabled: false

data/.travis.yml

@@ -2,12 +2,27 @@
 sudo:     false
 language: ruby
 cache:    bundler
+before_install:
+  - gem update --system
+  - gem uninstall -v '>= 1' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v 1.3.0
+  - gem update --system
 script:
   - bundle exec rake
 rvm:
-  - 2.3.0
+  - 2.3
+  - 2.6
   - ruby-head
-before_install: gem install bundler
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_6.0.gemfile
 matrix:
+  exclude:
+    - rvm: 2.3
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_4.2.gemfile
   allow_failures:
     - rvm: ruby-head

data/Appraisals

@@ -0,0 +1,19 @@
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0"
+  gem "sqlite3", "~> 1.3.0"
+end
+
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.0"
+  gem "sqlite3", "~> 1.3.0"
+end
+
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
+  gem "sqlite3", "~> 1.3.0"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0.0"
+  gem "sqlite3", "~> 1.4"
+end

data/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.0.3] - [2019-10-02]
+
+### Added
+- Support of Rails 6 (@quikly)
+- Cached queries are ignored (@tyok)
+
 ## [0.0.2] - [2017-05-17]
 
 ### Added
@@ -16,3 +22,4 @@ This is a first public release (@nepalez)
 [Unreleased]: https://github.com/tram-rb/tram-policy
 [0.0.1]: https://github.com/nepalez/rspec-sqlimit/releases/tag/v0.0.1
 [0.0.2]: https://github.com/nepalez/rspec-sqlimit/compare/v0.0.1...v0.0.2
+[0.0.3]: https://github.com/nepalez/rspec-sqlimit/compare/v0.0.2...v0.0.3

data/Gemfile

@@ -3,6 +3,9 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in tram-form.gemspec
 gemspec
 
+gem "rails"
+gem "sqlite3"
+
 group :test, :development do
   gem "pry"
   gem "pry-byebug"

data/Rakefile

@@ -7,7 +7,23 @@ require "rspec/core/rake_task"
 load "spec/dummy/Rakefile"
 
 # Declares gem's own tasks.
+desc "Runs test suite over all rails versions."
+task :default do
+  if ENV["BUNDLE_GEMFILE"] =~ /gemfiles/
+    Rake::Task["dummy:db:create"].reenable
+    Rake::Task["dummy:db:migrate"].reenable
+    Rake::Task[:spec].invoke
+  else
+    Rake::Task[:appraise].invoke
+  end
+end
+
 desc "Runs test suite."
-task default: %w(dummy:db:create dummy:db:migrate) do
-  system "bundle exec rspec spec"
+task default: %w[dummy:db:create dummy:db:migrate] do
+  exec "bundle exec rspec spec"
+  exec "bundle exec rubocop"
+end
+
+task :appraise do
+  exec "appraisal install && appraisal rake"
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "sqlite3", "~> 1.3.0"
+
+group :test, :development do
+  gem "pry"
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.0"
+
+group :test, :development do
+  gem "pry"
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.0"
+
+group :test, :development do
+  gem "pry"
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "sqlite3", "~> 1.4"
+
+group :test, :development do
+  gem "pry"
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/lib/rspec/sqlimit/counter.rb

@@ -30,13 +30,24 @@ module RSpec::SQLimit
 
     def callback
       @callback ||= lambda do |_name, start, finish, _message_id, values|
-        return if %w(CACHE SCHEMA).include? values[:name]
+        return if %w[CACHE SCHEMA].include? values[:name]
+        return if cached_query?(values)
         queries << {
           sql: values[:sql],
           duration: (finish - start) * 1_000,
-          binds: values[:type_casted_binds]
+          binds: values[:type_casted_binds] || type_cast(values[:binds])
         }
       end
     end
+
+    def type_cast(binds)
+      binds.map do |column, value|
+        ActiveRecord::Base.connection.type_cast(value, column)
+      end
+    end
+
+    def cached_query?(values)
+      values[:type_casted_binds].respond_to?(:call)
+    end
   end
 end

data/lib/rspec/sqlimit/reporter.rb

@@ -28,8 +28,9 @@ module RSpec::SQLimit
 
     def line(query, index)
       prefix = (matcher && query[:sql] =~ matcher) ? "->" : "  "
-      binds = query[:binds].any? ? "; #{query[:binds]} " : ''
-      "#{prefix} #{index + 1}) #{query[:sql]}#{binds} (#{query[:duration].round(3)} ms)"
+      binds = query[:binds].any? ? "; #{query[:binds]} " : ""
+      "#{prefix} #{index + 1}) #{query[:sql]}#{binds}" \
+      " (#{query[:duration].round(3)} ms)"
     end
   end
 end

data/rspec-sqlimit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "rspec-sqlimit"
-  gem.version     = "0.0.2"
+  gem.version     = "0.0.3"
   gem.author      = "Andrew Kozin (nepalez)"
   gem.email       = "andrew.kozin@gmail.com"
   gem.homepage    = "https://github.com/nepalez/rspec-sqlimit"
@@ -13,12 +13,13 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3"
 
-  gem.add_runtime_dependency "rails", "> 4.0", "< 6.0"
+  gem.add_runtime_dependency "rails", "> 4.2", "< 7.0"
   gem.add_runtime_dependency "rspec", "~> 3.0"
 
+  gem.add_development_dependency "appraisal", "~> 2.2"
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rake", "> 10.0"
   gem.add_development_dependency "sqlite3", "~> 1.3"
   gem.add_development_dependency "database_cleaner", "~> 1.5"
-  gem.add_development_dependency "rubocop", "~> 0.44"
+  gem.add_development_dependency "rubocop", "~> 0.49"
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170211104800) do
+ActiveRecord::Schema.define(version: 2017_02_11_104800) do
 
   create_table "users", force: :cascade do |t|
   end

data/spec/dummy/lib/dummy.rb

@@ -2,6 +2,7 @@ require "active_record"
 require "bundler/setup"
 
 module Dummy
+  require_relative "dummy/compatibility"
   require_relative "dummy/application"
   require_relative "../config/environment"
   require_relative "../app/models/user.rb"

data/spec/dummy/lib/dummy/compatibility.rb

@@ -0,0 +1,11 @@
+# ActiveRecord::Migration['5.0'] syntax is not supported prior to Rails 5.0
+# This snippet supports it on Rails 4.2
+unless ActiveRecord::Migration.respond_to?(:[])
+  class ActiveRecord::Migration
+    class << self
+      def [](_version)
+        self
+      end
+    end
+  end
+end

data/spec/rspec/sqlimit/reporter_spec.rb

@@ -3,8 +3,8 @@ require "spec_helper"
 describe RSpec::SQLimit::Reporter do
   subject { described_class.new(counter) }
 
-  context 'no params were passed to the query' do
-    let(:counter) { RSpec::SQLimit::Counter[/CREATE/, Proc.new{ User.create }] }
+  context "no params were passed to the query" do
+    let(:counter) { RSpec::SQLimit::Counter[/CREATE/, proc{ User.create }] }
 
     it "doesn't print binds" do
       # INSERT INTO "users" DEFAULT VALUES (0.284 ms)
@@ -12,9 +12,11 @@ describe RSpec::SQLimit::Reporter do
     end
   end
 
-  context 'query contains params' do
-    context 'nil was passed as param' do
-      let(:counter) { RSpec::SQLimit::Counter[/CREATE/, Proc.new{ User.create(id: nil) }] }
+  context "query contains params" do
+    context "nil was passed as param" do
+      let(:counter) do
+        RSpec::SQLimit::Counter[/CREATE/, proc { User.create(id: nil) }]
+      end
 
       it "doesn't print binds" do
         # INSERT INTO "users" DEFAULT VALUES (0.284 ms)
@@ -22,22 +24,51 @@ describe RSpec::SQLimit::Reporter do
       end
     end
 
-    context 'single param was passed' do
-      let(:counter) { RSpec::SQLimit::Counter[/CREATE/, Proc.new{ User.create(id: 1) }] }
+    context "single param was passed" do
+      let(:counter) do
+        RSpec::SQLimit::Counter[/CREATE/, proc { User.create(id: 1) }]
+      end
 
-      it 'prints param as an array with one element' do
+      it "prints param as an array with one element" do
         # INSERT INTO "users" ("id") VALUES (?); [1]  (0.234 ms)
         expect(subject.call).to include("VALUES (?); [1]")
       end
     end
 
-    context 'array was passed as a param' do
-      let(:counter) { RSpec::SQLimit::Counter[/SELECT/, Proc.new{ User.where(id: [1, 2, 3]).to_a }] }
+    context "array was passed as a param" do
+      let(:counter) do
+        RSpec::SQLimit::Counter[
+          /SELECT/, proc { User.where(id: [1, 2, 3]).to_a }
+        ]
+      end
 
-      it 'prints all params' do
+      it "prints all params" do
+        # rubocop: disable Metrics/LineLength
         # SELECT "users".* FROM "users" WHERE "users"."id" IN (1, 2, 3) (0.17 ms))
-        expect(subject.call).to include("IN (1, 2, 3)")
+        # Rails >= 6:
+        # SELECT "users".* FROM "users" WHERE "users"."id" IN (?, ?, ?); [1, 2, 3]  (0.121 ms)
+        # rubocop: enable Metrics/LineLength
+        expect(subject.call).to include("1, 2, 3")
       end
     end
   end
+
+  context "activerecord query caching was enabled" do
+    let(:counter) do
+      RSpec::SQLimit::Counter[/SELECT "users"/, proc { queries }]
+    end
+
+    let(:queries) do
+      User.cache do
+        User.where(id: 1).to_a
+        User.where(id: 1).to_a
+        User.where(id: [2, 3]).to_a
+        User.where(id: [2, 3]).to_a
+      end
+    end
+
+    it "ignores cached queries" do
+      expect(subject.call).to include("2 queries were invoked")
+    end
+  end
 end

data/spec/rspec/sqlimit_spec.rb

@@ -33,7 +33,9 @@ describe "exceed_query_limit" do
     end
 
     it "works when array is used as a restriction" do
-      expect { (User.where id: [1, 2, 3]).to_a }.to exceed_query_limit(0).with(/SELECT/)
+      expect { (User.where id: [1, 2, 3]).to_a }
+        .to exceed_query_limit(0)
+        .with(/SELECT/)
     end
 
     it "works when actual number of queries is below the limit" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sqlimit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.44'
+        version: '0.49'
 description: 
 email: andrew.kozin@gmail.com
 executables: []
@@ -127,11 +141,17 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/.bundle/config
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/rspec-sqlimit.rb
 - lib/rspec/sqlimit.rb
 - lib/rspec/sqlimit/counter.rb
@@ -145,6 +165,7 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/dummy.rb
 - spec/dummy/lib/dummy/application.rb
+- spec/dummy/lib/dummy/compatibility.rb
 - spec/rspec/sqlimit/reporter_spec.rb
 - spec/rspec/sqlimit_spec.rb
 - spec/spec_helper.rb
@@ -167,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RSpec matcher to control SQL queries made by block of code
@@ -181,6 +201,7 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/dummy.rb
 - spec/dummy/lib/dummy/application.rb
+- spec/dummy/lib/dummy/compatibility.rb
 - spec/rspec/sqlimit/reporter_spec.rb
 - spec/rspec/sqlimit_spec.rb
 - spec/spec_helper.rb