n_plus_one_control 0.3.1 → 0.6.1

data/lib/n_plus_one_control/minitest.rb

@@ -5,10 +5,6 @@ require "n_plus_one_control"
 module NPlusOneControl
   # Minitest assertions
   module MinitestHelper
-    def warming_up(warmup)
-      (warmup || methods.include?(:warmup) ? method(:warmup) : nil)&.call
-    end
-
     def assert_perform_constant_number_of_queries(
       populate: nil,
       matching: nil,
@@ -20,15 +16,64 @@ module NPlusOneControl
 
       warming_up warmup
 
-      queries = NPlusOneControl::Executor.call(
-        population: populate || method(:populate),
-        matching: matching || /^SELECT/i,
+      @executor = NPlusOneControl::Executor.new(
+        population: populate || population_method,
+        matching: matching || NPlusOneControl.default_matching,
         scale_factors: scale_factors || NPlusOneControl.default_scale_factors
-      ) { yield }
+      )
+
+      queries = @executor.call { yield }
 
       counts = queries.map(&:last).map(&:size)
 
-      assert counts.max == counts.min, NPlusOneControl.failure_message(queries)
+      assert counts.max == counts.min, NPlusOneControl.failure_message(:constant_queries, queries)
+    end
+
+    def assert_perform_linear_number_of_queries(
+      slope: 1,
+      populate: nil,
+      matching: nil,
+      scale_factors: nil,
+      warmup: nil
+    )
+
+      raise ArgumentError, "Block is required" unless block_given?
+
+      warming_up warmup
+
+      @executor = NPlusOneControl::Executor.new(
+        population: populate || population_method,
+        matching: matching || NPlusOneControl.default_matching,
+        scale_factors: scale_factors || NPlusOneControl.default_scale_factors
+      )
+
+      queries = @executor.call { yield }
+
+      assert linear?(queries, slope: slope), NPlusOneControl.failure_message(:linear_queries, queries)
+    end
+
+    def current_scale
+      @executor&.current_scale
+    end
+
+    private
+
+    def warming_up(warmup)
+      (warmup || methods.include?(:warmup) ? method(:warmup) : nil)&.call
+    end
+
+    def population_method
+      methods.include?(:populate) ? method(:populate) : nil
+    end
+
+    def linear?(queries, slope:)
+      queries.each_cons(2).all? do |pair|
+        scales = pair.map(&:first)
+        query_lists = pair.map(&:last)
+
+        actual_slope = (query_lists[1].size - query_lists[0].size) / (scales[1] - scales[0])
+        actual_slope <= slope
+      end
     end
   end
 end

data/lib/n_plus_one_control/railtie.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module NPlusOneControl # :nodoc:
+  class Railtie < ::Rails::Railtie # :nodoc:
+    initializer "n_plus_one_control.backtrace_cleaner" do
+      ActiveSupport.on_load(:active_record) do
+        NPlusOneControl.backtrace_cleaner = lambda do |locations|
+          ::Rails.backtrace_cleaner.clean(locations)
+        end
+      end
+    end
+  end
+end

data/lib/n_plus_one_control/rspec.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+gem "rspec-core", ">= 3.5"
+
 require "n_plus_one_control"
 require "n_plus_one_control/rspec/dsl"
-require "n_plus_one_control/rspec/matcher"
+require "n_plus_one_control/rspec/matchers/perform_constant_number_of_queries"
+require "n_plus_one_control/rspec/matchers/perform_linear_number_of_queries"
 require "n_plus_one_control/rspec/context"
 
 module NPlusOneControl
@@ -11,5 +14,6 @@ module NPlusOneControl
 end
 
 ::RSpec.configure do |config|
-  config.extend NPlusOneControl::RSpec::DSL, n_plus_one: true
+  config.extend NPlusOneControl::RSpec::DSL::ClassMethods, n_plus_one: true
+  config.include NPlusOneControl::RSpec::DSL, n_plus_one: true
 end

data/lib/n_plus_one_control/rspec/context.rb

@@ -3,17 +3,8 @@
 RSpec.shared_context "n_plus_one_control" do
   # Helper to access populate block from within example/matcher
   let(:n_plus_one_populate) do |ex|
-    if ex.example_group.populate.nil?
-      raise(
-        <<-MSG
-          Populate block is missing!
+    return if ex.example_group.populate.nil?
 
-          Please provide populate callback, e.g.:
-
-            populate { |n| n.times { create_some_stuff } }
-        MSG
-      )
-    end
     ->(n) { ex.instance_exec(n, &ex.example_group.populate) }
   end
 

data/lib/n_plus_one_control/rspec/dsl.rb

@@ -2,23 +2,32 @@
 
 module NPlusOneControl
   module RSpec
-    # Extends RSpec ExampleGroup with populate & warmup methods
+    # Includes scale method into RSpec Example
     module DSL
-      # Setup warmup block, wich will run before matching
-      # for example, if using cache, then later queries
-      # will perform less DB queries than first
-      def warmup
-        return @warmup unless block_given?
+      # Extends RSpec ExampleGroup with populate & warmup methods
+      module ClassMethods
+        # Setup warmup block, wich will run before matching
+        # for example, if using cache, then later queries
+        # will perform less DB queries than first
+        def warmup(&block)
+          return @warmup unless block
 
-        @warmup = Proc.new
+          @warmup = block
+        end
+
+        # Setup populate callback, which is used
+        # to prepare data for each run.
+        def populate(&block)
+          return @populate unless block
+
+          @populate = block
+        end
       end
 
-      # Setup populate callback, which is used
-      # to prepare data for each run.
-      def populate
-        return @populate unless block_given?
+      attr_accessor :executor
 
-        @populate = Proc.new
+      def current_scale
+        executor&.current_scale
       end
     end
   end

data/lib/n_plus_one_control/rspec/{matcher.rb → matchers/perform_constant_number_of_queries.rb}

@@ -27,16 +27,16 @@
 
     warmup.call if warmup.present?
 
-    # by default we're looking for select queries
-    pattern = @pattern || /^SELECT/i
+    pattern = @pattern || NPlusOneControl.default_matching
 
-    @queries = NPlusOneControl::Executor.call(
+    @matcher_execution_context.executor = NPlusOneControl::Executor.new(
       population: populate,
       matching: pattern,
-      scale_factors: @factors,
-      &actual
+      scale_factors: @factors
     )
 
+    @queries = @matcher_execution_context.executor.call(&actual)
+
     counts = @queries.map(&:last).map(&:size)
 
     counts.max == counts.min
@@ -46,6 +46,6 @@
     raise "This matcher doesn't support negation"
   end
 
-  failure_message { |_actual| NPlusOneControl.failure_message(@queries) }
+  failure_message { |_actual| NPlusOneControl.failure_message(:constant_queries, @queries) }
 end
 # rubocop:enable  Metrics/BlockLength

data/lib/n_plus_one_control/rspec/matchers/perform_linear_number_of_queries.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# rubocop:disable  Metrics/BlockLength
+::RSpec::Matchers.define :perform_linear_number_of_queries do |slope: 1|
+  supports_block_expectations
+
+  chain :with_scale_factors do |*factors|
+    @factors = factors
+  end
+
+  chain :matching do |pattern|
+    @pattern = pattern
+  end
+
+  chain :with_warming_up do
+    @warmup = true
+  end
+
+  match do |actual, *_args|
+    raise ArgumentError, "Block is required" unless actual.is_a? Proc
+
+    raise "Missing tag :n_plus_one" unless
+      @matcher_execution_context.respond_to?(:n_plus_one_populate)
+
+    populate = @matcher_execution_context.n_plus_one_populate
+    warmup = @warmup ? actual : @matcher_execution_context.n_plus_one_warmup
+
+    warmup.call if warmup.present?
+
+    @matcher_execution_context.executor = NPlusOneControl::Executor.new(
+      population: populate,
+      matching: nil,
+      scale_factors: @factors
+    )
+
+    @queries = @matcher_execution_context.executor.call(&actual)
+
+    @queries.each_cons(2).all? do |pair|
+      scales = pair.map(&:first)
+      query_lists = pair.map(&:last)
+
+      actual_slope = (query_lists[1].size - query_lists[0].size) / (scales[1] - scales[0])
+      actual_slope <= slope
+    end
+  end
+
+  match_when_negated do |_actual|
+    raise "This matcher doesn't support negation"
+  end
+
+  failure_message { |_actual| NPlusOneControl.failure_message(:linear_queries, @queries) }
+end
+# rubocop:enable  Metrics/BlockLength

data/lib/n_plus_one_control/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NPlusOneControl
-  VERSION = "0.3.1"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: n_plus_one_control
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.1
 platform: ruby
 authors:
 - palkan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,62 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.8.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.61.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.61.0
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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'
 description: "\n    RSpec and Minitest matchers to prevent N+1 queries problem.\n\n
   \   Evaluates code under consideration several times with different scale factors\n
   \   to make sure that the number of DB queries behaves as expected (i.e. O(1) instead
@@ -146,37 +90,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
-- Gemfile
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/n_plus_one_control.rb
 - lib/n_plus_one_control/executor.rb
 - lib/n_plus_one_control/minitest.rb
+- lib/n_plus_one_control/railtie.rb
 - lib/n_plus_one_control/rspec.rb
 - lib/n_plus_one_control/rspec/context.rb
 - lib/n_plus_one_control/rspec/dsl.rb
-- lib/n_plus_one_control/rspec/matcher.rb
+- lib/n_plus_one_control/rspec/matchers/perform_constant_number_of_queries.rb
+- lib/n_plus_one_control/rspec/matchers/perform_linear_number_of_queries.rb
 - lib/n_plus_one_control/version.rb
-- n_plus_one_control.gemspec
-- spec/n_plus_one_control/executor_spec.rb
-- spec/n_plus_one_control/rspec_spec.rb
-- spec/n_plus_one_control_spec.rb
-- spec/spec_helper.rb
-- spec/support/post.rb
-- spec/support/user.rb
-- tests/minitest_test.rb
-- tests/test_helper.rb
 homepage: http://github.com/palkan/n_plus_one_control
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: http://github.com/palkan/n_plus_one_control/issues
+  changelog_uri: https://github.com/palkan/n_plus_one_control/blob/master/CHANGELOG.md
+  documentation_uri: http://github.com/palkan/n_plus_one_control
+  homepage_uri: http://github.com/palkan/n_plus_one_control
+  source_code_uri: http://github.com/palkan/n_plus_one_control
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -185,15 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RSpec and Minitest matchers to prevent N+1 queries problem