rspec-activerecord-formatter 1.2.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db1b2dbddfb326ac8143998c1b7cc204d90d84f83ccfabe9f3cc022d435a49d8
-  data.tar.gz: 7f29a63684b8e1ce6614e99cbf6ad978739f2f08357d14abc7a4209f2fd866ea
+  metadata.gz: 33c3cdd6e50f53d2ce7e803f8d7490615e17998c22965a47a8d12c6d7b40112d
+  data.tar.gz: caaa01518eae7a43266947818f50af3e25109c1953e28f4427ae64025e4810c1
 SHA512:
-  metadata.gz: 9f7f871268d7ce2c007d1bede488b073e443ee5e93ae6ed9f07ca7e787811b2bd38d373ca5843c34403dc877942c1b7908f83ed9729f6c5010f71801dbced20d
-  data.tar.gz: 5dc551ee718ce1fdd0e5ce8997f105750b2295d2e7a9b14e399acce10ee5a17be8a07b76bd51c8d21c30b8c2278337b224cb0d8dda5916977f8082040e72a07a
+  metadata.gz: 93b57c45de4afc430f279e03514a61b4c9c2f8bf4b9d3d9b3048dde014265725ff80c9583b6a1f14696163459d62ea1f75abc336647ca93ceb0fcf8ec4da050d
+  data.tar.gz: 81ca2e730955c82c4b5ab13cc538907eaf63cb70e55366a26bddd52587555397b55b888c7afcf0db72a85f7ef320e7a82e3e00e58f6eba9ce7c980f670f1d28f

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+
+## [Unreleased]
+
+## [2.1.1] - 2020-11-07
+- Pin dependencies a bit more closely.
+
+## [2.1.0] - 2020-11-07
+
+- Added better detection for query types. Specifically, it's easier now to see
+  how `database_cleaner` impacts your total queries.
+- Adding a changelog, apparently.
+

data/README.md

@@ -27,14 +27,14 @@ The current answer is to change your `.rspec` initializer to include the followi
 
     --require rspec-activerecord-formatter
     --require rails_helper
-    --format ActiveRecordFormatter
+    --format ActiveRecordDocumentationFormatter
 
 We have to include the rails_helper so that ActiveRecord is loaded prior to trying to load the
 formatter. That way, we can hook into AR creations.
 
 You can also run the formatter as a one-off option to rspec:
 
-    rspec path/to/example_spec.rb --require rspec-activerecord-formatter --require rails_helper --format ActiveRecordFormatter
+    rspec path/to/example_spec.rb --require rspec-activerecord-formatter --require rails_helper --format ActiveRecordDocumentationFormatter
 
 Once you set the formatter, you should now see the number of objects created and total queries
 for each of your tests:
@@ -45,14 +45,14 @@ You'll also get a summary at the end of your test run:
 
 ![Test summary.](https://github.com/jmmastey/rspec-activerecord-formatter/raw/master/doc/images/demo_1.png "Test summary.")
 
-Next Steps
-------------
-* The method I was using to count AR objects doesn't work well with DatabaseCleaner when not explicitly wiring the library into `before` blocks.
-  I'd like to be able to go back to a method other than scanning for `INSERT INTO` strings.
-* Configuration, especially formatting the output to optionally outdent the counts.
-* Add a `--profile`-like behavior to output the most offending tests.
-* The current dependency versions are a vague guess. They can and should clearly be more lenient.
-* I dunno, tests.
+The formatter will spit out a report with more data at the end of your run:
+
+
+If you want less granularity, you can also use the progress formatter:
+
+    --require rspec-activerecord-formatter
+    --require rails_helper
+    --format ActiveRecordProgressFormatter
 
 Contributing
 ------------

data/lib/rspec-activerecord-formatter.rb

@@ -1 +1,6 @@
+require "rspec/activerecord/helpers/collector"
+require "rspec/activerecord/helpers/report"
+require 'rspec/activerecord/base'
+require 'rspec/activerecord/progress_formatter'
+require 'rspec/activerecord/documentation_formatter'
 require 'rspec/activerecord/formatter'

data/lib/rspec/activerecord/base.rb

@@ -0,0 +1,43 @@
+class ActiveRecordFormatterBase
+  attr_reader :colorizer, :summary, :collector
+
+  def initialize(summary, collector)
+    @colorizer  = ::RSpec::Core::Formatters::ConsoleCodes
+    @summary    = summary
+    @collector  = collector
+  end
+
+  def colorized_summary
+    formatted = "\nFinished in #{summary.formatted_duration} " \
+      "(files took #{summary.formatted_load_time} to load)\n" \
+      "#{colorized_expanded_totals}\n"
+
+    unless summary.failed_examples.empty?
+      formatted << summary.colorized_rerun_commands(colorizer) << "\n"
+    end
+
+    formatted
+  end
+
+  private
+
+  def colorized_expanded_totals
+    if summary.failure_count > 0
+      colorizer.wrap(expanded_totals_line, RSpec.configuration.failure_color)
+    elsif summary.pending_count > 0
+      colorizer.wrap(expanded_totals_line, RSpec.configuration.pending_color)
+    else
+      colorizer.wrap(expanded_totals_line, RSpec.configuration.success_color)
+    end
+  end
+
+  def expanded_totals_line
+    summary_text = ::RSpec::Core::Formatters::Helpers.pluralize(summary.example_count, "example")
+    summary_text << ", " << ::RSpec::Core::Formatters::Helpers.pluralize(summary.failure_count, "failure")
+    summary_text << ", #{summary.pending_count} pending" if summary.pending_count > 0
+    summary_text << ", #{collector.total_objects} AR objects"
+    summary_text << ", #{collector.total_queries} AR queries"
+
+    summary_text
+  end
+end

data/lib/rspec/activerecord/documentation_formatter.rb

@@ -0,0 +1,58 @@
+class ActiveRecordDocumentationFormatter < ::RSpec::Core::Formatters::DocumentationFormatter
+  attr_reader :collector, :colorizer, :report
+
+  ::RSpec::Core::Formatters.register self, :start, :dump_summary,
+                                           :example_started, :example_group_started,
+                                           :example_group_finished
+
+  def initialize(output)
+    super
+
+    @colorizer  = ::RSpec::Core::Formatters::ConsoleCodes
+    @collector  = ActiveRecordFormatterHelpers::Collector.new
+    @report     = ActiveRecordFormatterHelpers::Report.new(collector)
+  end
+
+  def start(_start_notification)
+    output.puts "Recording and reporting ActiveRecord select and creation counts."
+    super
+  end
+
+  def example_group_started(example_group)
+    collector.group_started(example_group.group)
+    super
+  end
+
+  def example_group_finished(example_group)
+    collector.group_finished(example_group.group)
+    super
+  end
+
+  def example_started(example)
+    collector.reset_example(example)
+  end
+
+  def dump_summary(summary)
+    base = ActiveRecordFormatterBase.new(summary, collector)
+    output.puts base.colorized_summary
+
+    output.puts "\nOutputting Detailed Profile Data to #{report.report_path}"
+    report.write
+  end
+
+  protected
+
+  def passed_output(example)
+    "#{current_indentation}#{example_counts}" +
+      colorizer.wrap(example.description.strip, :success)
+  end
+
+  def failure_output(example)
+    "#{current_indentation}#{example_counts}" +
+      colorizer.wrap("#{example.description.strip} (FAILED - #{next_failure_index})", :failure)
+  end
+
+  def example_counts(suffix: " ")
+    "(%02d, %02d)#{suffix}" % [collector.objects_count, collector.query_count]
+  end
+end

data/lib/rspec/activerecord/formatter.rb

@@ -1,107 +1 @@
-require_relative "helpers/collector"
-
-class ActiveRecordFormatter < ::RSpec::Core::Formatters::DocumentationFormatter
-  attr_reader :collector, :colorizer, :configuration
-
-  ::RSpec::Core::Formatters.register self, :start, :dump_summary,
-                                           :example_started, :example_group_started,
-                                           :example_group_finished
-
-  def initialize(output)
-    super
-
-    @colorizer      = ::RSpec::Core::Formatters::ConsoleCodes
-    @collector      = ActiveRecordFormatterHelpers::Collector.new
-  end
-
-  def start(start_notification)
-    output.puts "Recording and reporting ActiveRecord select and creation counts."
-  end
-
-  def example_group_started(example_group)
-    collector.group_started(example_group.group)
-    super
-  end
-
-  def example_group_finished(example_group)
-    collector.group_finished(example_group.group)
-    super
-  end
-
-  def example_started(example)
-    collector.reset_example(example)
-  end
-
-  def dump_summary(summary)
-    formatted = "\nFinished in #{summary.formatted_duration} " \
-      "(files took #{summary.formatted_load_time} to load)\n" \
-      "#{colorized_expanded_totals(summary)}\n"
-
-    unless summary.failed_examples.empty?
-      formatted << summary.colorized_rerun_commands(colorizer) << "\n"
-    end
-
-    output.puts formatted
-    write_profile_summary
-  end
-
-  def write_profile_summary
-    output_report_filename = Time.now.strftime("ar_%Y_%m_%d_%H_%m_%S.txt")
-    report_dir = Rails.root.join("tmp", "profile")
-    output_report_path = report_dir.join(output_report_filename)
-
-    output.puts "\nOutputting Detailed Profile Data to #{output_report_path}"
-    Dir.mkdir(report_dir) unless File.exists?(report_dir)
-    File.open(output_report_path, "wb") do |f|
-      f.puts "#{collector.total_objects} AR objects, #{collector.total_queries} AR queries"
-
-      f.puts ""
-      f.puts "Worst Example Groups by Object Creation"
-      collector.most_expensive_groups.first(50).each do |name, count|
-        f.puts "%-5s %s" % [count, name]
-      end
-
-      f.puts ""
-      f.puts "Most Common Queries"
-      collector.most_common_query_names.first(50).each do |name, count|
-        f.puts "%-5s %s" % [count, name]
-      end
-    end
-  end
-
-  protected
-
-  def passed_output(example)
-    "#{current_indentation}#{example_counts}" +
-      colorizer.wrap(example.description.strip, :success)
-  end
-
-  def failure_output(example)
-    "#{current_indentation}#{example_counts}" +
-      colorizer.wrap("#{example.description.strip} (FAILED - #{next_failure_index})", :failure)
-  end
-
-  def example_counts(suffix: " ")
-    "(%02d, %02d)#{suffix}" % [collector.objects_count, collector.query_count]
-  end
-
-  def colorized_expanded_totals(summary)
-    if summary.failure_count > 0
-      colorizer.wrap(expanded_totals_line(summary), RSpec.configuration.failure_color)
-    elsif summary.pending_count > 0
-      colorizer.wrap(expanded_totals_line(summary), RSpec.configuration.pending_color)
-    else
-      colorizer.wrap(expanded_totals_line(summary), RSpec.configuration.success_color)
-    end
-  end
-
-  def expanded_totals_line(summary)
-    summary_text = ::RSpec::Core::Formatters::Helpers.pluralize(summary.example_count, "example")
-    summary_text << ", " << ::RSpec::Core::Formatters::Helpers.pluralize(summary.failure_count, "failure")
-    summary_text << ", #{summary.pending_count} pending" if summary.pending_count > 0
-    summary_text << ", #{collector.total_objects} AR objects"
-    summary_text << ", #{collector.total_queries} AR queries"
-
-    summary_text
-  end
-end
+ActiveRecordFormatter = ActiveRecordDocumentationFormatter

data/lib/rspec/activerecord/helpers/collector.rb

@@ -3,12 +3,14 @@ require 'active_support/notifications'
 module ActiveRecordFormatterHelpers
   class Collector
     attr_reader :query_count, :objects_count, :total_queries, :total_objects,
-                :query_names, :active_groups, :group_counts
+                :query_names, :active_groups, :group_counts, :groups_encountered
 
     SKIP_QUERIES = ["SELECT tablename FROM pg_tables", "select sum(ct) from (select count(*) ct from"]
 
     def initialize
+      #@unnamed_queries = []
       @query_count    = 0
+      @groups_encountered = 0
       @objects_count  = 0
       @total_queries  = 0
       @total_objects  = 0
@@ -41,6 +43,8 @@ module ActiveRecordFormatterHelpers
     end
 
     def group_started(group)
+      @groups_encountered += 1
+
       return unless group.parent_groups.length > 1
 
       active_groups.push(group_path(group))
@@ -69,6 +73,41 @@ module ActiveRecordFormatterHelpers
     def inc_query_name(data)
       name = data[:name] || "Unnamed"
 
+      # In older versions of Rails, insert statements are just counted as SQL
+      # queries, which means that all the queries are just bunchedup at the top.
+      # Makes this data pretty useless. So anyway, try to suss out a name for
+      # at least those insertions (which are much more frequent than, say,
+      # updates in a test suite anyway).
+      if data[:name] == "SQL" && query_is_an_insert?(data[:sql])
+        table = data[:sql].scan(/INSERT INTO "(\w+)"/).first.first
+        name = "#{table} Create"
+      elsif query_is_a_full_table_delete?(data[:sql])
+        table = data[:sql].scan(/DELETE FROM "(\w+)"/).first.first
+        name = "Full Delete Table"
+      # TODO: truncate table
+      elsif query_is_transaction_management?(data[:sql])
+        name = "Transaction Management"
+      elsif query_is_schema_detection?(data[:sql])
+        name = "SCHEMA"
+      elsif query_is_trigger_management?(data[:sql])
+        name = "Trigger Management"
+      elsif query_refreshes_materialized_view?(data[:sql])
+        name = "Refresh Materialized View"
+      end
+
+
+      # In older versions of Rails, insert statements are just counted as SQL
+      # queries, which means that all the queries are just bunchedup at the top.
+      # Makes this data pretty useless. So anyway, try to suss out a name for
+      # at least those insertions (which are much more frequent than, say,
+      # updates in a test suite anyway).
+      #if data[:name].nil? && query_is_a_delete?(data[:sql])
+      #  table = data[:sql].scan(/DELETE FROM "(\w+)"/).first.first
+      #  name = "#{table} Delete"
+      #end
+
+      #@unnamed_queries << data if name == "Unnamed"
+
       query_names[name] += 1
     end
 
@@ -79,7 +118,32 @@ module ActiveRecordFormatterHelpers
     # TODO: what happens if we try to create many records at once?
     # TODO: are there any false positives we need to worry about? false negatives?
     def query_is_an_insert?(query)
-      query =~ /INSERT INTO/
+      query =~ /^INSERT INTO/
+    end
+
+    def query_is_a_delete?(query)
+      query =~ /^DELETE FROM/
+    end
+
+    def query_is_a_full_table_delete?(query)
+      query =~ /^DELETE FROM [a-z_\."]*;$/i
+    end
+
+    def query_is_transaction_management?(query)
+      query =~ /^(COMMIT|BEGIN|ROLLBACK|SAVEPOINT|RELEASE SAVEPOINT)/
+    end
+
+    def query_is_schema_detection?(query)
+      query =~ /SELECT .* FROM pg_tables/m ||
+        query =~ /SELECT .* FROM information_schema.views/
+    end
+
+    def query_is_trigger_management?(query)
+      query =~ /(DISABLE|ENABLE) TRIGGER ALL/m
+    end
+
+    def query_refreshes_materialized_view?(query)
+      query =~ /REFRESH MATERIALIZED VIEW/m
     end
   end
 end

data/lib/rspec/activerecord/helpers/report.rb

@@ -0,0 +1,45 @@
+module ActiveRecordFormatterHelpers
+  class Report
+    attr_reader :report_path, :default_path, :report_dir, :collector
+
+    def initialize(collector)
+      @collector = collector
+
+      @report_dir   = Rails.root.join("tmp", "profile")
+      @report_path  = report_dir.join(timestamped_filename)
+      @default_path = report_dir.join('ar_most_recent.txt')
+    end
+
+    def write
+      write_file(file_path: report_path)
+      write_file(file_path: default_path)
+    end
+
+    private
+
+    def timestamped_filename
+      Time.now.strftime("ar_%Y_%m_%d_%H_%m_%S.txt")
+    end
+
+    def write_file(file_path:)
+      Dir.mkdir(report_dir) unless File.exists?(report_dir)
+
+      File.open(file_path, "wb") do |f|
+        f.puts "#{collector.total_objects} AR objects, #{collector.total_queries} AR queries"
+        f.puts "#{collector.groups_encountered} example groups executed"
+
+        f.puts ""
+        f.puts "Worst Example Groups by Object Creation"
+        collector.most_expensive_groups.first(50).each do |name, count|
+          f.puts "%-5s %s" % [count, name]
+        end
+
+        f.puts ""
+        f.puts "Most Common Queries"
+        collector.most_common_query_names.first(50).each do |name, count|
+          f.puts "%-5s %s" % [count, name]
+        end
+      end
+    end
+  end
+end

data/lib/rspec/activerecord/progress_formatter.rb

@@ -0,0 +1,44 @@
+require_relative "helpers/collector"
+require_relative "helpers/report"
+
+class ActiveRecordProgressFormatter < ::RSpec::Core::Formatters::ProgressFormatter
+  attr_reader :collector, :colorizer, :report
+
+  ::RSpec::Core::Formatters.register self, :start, :dump_summary,
+                                           :example_started, :example_group_started,
+                                           :example_group_finished
+
+  def initialize(output)
+    super
+
+    @colorizer  = ::RSpec::Core::Formatters::ConsoleCodes
+    @collector  = ActiveRecordFormatterHelpers::Collector.new
+    @report     = ActiveRecordFormatterHelpers::Report.new(collector)
+  end
+
+  def start(_start_notification)
+    output.puts "Recording and reporting ActiveRecord select and creation counts."
+    super
+  end
+
+  def example_group_started(example_group)
+    collector.group_started(example_group.group)
+    super
+  end
+
+  def example_group_finished(example_group)
+    collector.group_finished(example_group.group)
+  end
+
+  def example_started(example)
+    collector.reset_example(example)
+  end
+
+  def dump_summary(summary)
+    base = ActiveRecordFormatterBase.new(summary, collector)
+    output.puts base.colorized_summary
+
+    output.puts "\nOutputting Detailed Profile Data to #{report.report_path}"
+    report.write
+  end
+end

data/rspec-activerecord-formatter.gemspec

@@ -6,7 +6,7 @@ $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
 Gem::Specification.new do |gem|
 
   gem.name    = "rspec-activerecord-formatter"
-  gem.version = "1.2.0"
+  gem.version = "2.2.0"
 
   gem.summary     = "Adds object creations and queries to Rspec output."
   gem.description = "Creates a new formatter for ActiveRecord that can help you diagnose performance issues in RSpec"
@@ -25,9 +25,8 @@ Gem::Specification.new do |gem|
 
   gem.require_paths = %w[ext lib].select { |dir| File.directory?(dir) }
 
-  # TODO: these are almost certainly too restrictive.
-  gem.add_dependency "activesupport", ">= 4.0"
-  gem.add_dependency "rspec", "~> 3.4"
+  gem.add_dependency "activesupport", ">= 4.0", "< 7.0"
+  gem.add_dependency "rspec", ">= 3.4"
 
-  gem.add_development_dependency "coveralls"
+  gem.add_development_dependency "coveralls", "~> 0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activerecord-formatter
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Joseph Mastey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,40 +27,44 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: Creates a new formatter for ActiveRecord that can help you diagnose performance
   issues in RSpec
 email: jmmastey@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - README.md
 files:
@@ -65,6 +72,7 @@ files:
 - ".rspec"
 - ".simplecov"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - MIT-LICENSE
@@ -72,8 +80,12 @@ files:
 - doc/images/demo_1.png
 - doc/images/demo_2.png
 - lib/rspec-activerecord-formatter.rb
+- lib/rspec/activerecord/base.rb
+- lib/rspec/activerecord/documentation_formatter.rb
 - lib/rspec/activerecord/formatter.rb
 - lib/rspec/activerecord/helpers/collector.rb
+- lib/rspec/activerecord/helpers/report.rb
+- lib/rspec/activerecord/progress_formatter.rb
 - rspec-activerecord-formatter.gemspec
 - spec/collector_spec.rb
 - spec/formatter_spec.rb
@@ -97,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Adds object creations and queries to Rspec output.