a_r_q_logger 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6114759f2f64fb1e746e8a923e7e44c0a27ed7bd
-  data.tar.gz: a2ddaeec362030948e7a4e6af3319b180afe761a
+  metadata.gz: b9a251d9cfd3b33fcb329117f9ff040cee2ccad1
+  data.tar.gz: c4cfe26cbe924a0b3e0ec25f6c7e7afe80cdb699
 SHA512:
-  metadata.gz: 5b5e549c08d77ffeec395f6740bfbbd655d339a3678d27a8a006eb575bb5e9defa1a532c56e8899e2fdfe8cc4917fdbb0c35e83ea712db9d9ef1f96f44974724
-  data.tar.gz: 9e81078f265d2a3408d85c8c481ae8adbbab5bc38a4f510c0f9fbc3f2e1570cfa4686d26cb0a985f316c9f1b6ec41c2f06cf27fee6ac080053184a5c63eb089d
+  metadata.gz: 7f1e088ddf44627932e295bf012762e71b02eae9c071b67473e5d20bdea464184d359484cf4eadbc369df92ed918a1ef3edff8432b5d875c4cb00cd51e1cab0b
+  data.tar.gz: 0709b43bc47bea5ec2c68fdffa7dc817417353e8c6de64fedb2db8060af3b91095f11bf348bc9c0af1c0ca4fdc6cdd7175e8286ec3d6e627dc41a2027b16fdb0

data/Gemfile.lock

@@ -7,42 +7,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    arel (7.1.3)
     builder (3.2.2)
     concurrent-ruby (1.0.2)
     coveralls (0.8.15)
@@ -62,43 +64,44 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.3)
+    json (2.0.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
+    nio4r (1.2.1)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
@@ -147,6 +150,9 @@ GEM
     tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby

data/lib/a_r_q_logger.rb

@@ -1,5 +1,18 @@
+require 'a_r_q_logger/initializer'
+
 module ARQLogger
   class << self
+    attr_accessor :store
+
+    def pass(event)
+      return unless store
+
+      payload = event.payload
+      if payload[:name] && !ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES.include?(payload[:name])
+        store.push(event.duration)
+      end
+    end
+
     def log(&block)
       start
       block.call
@@ -9,12 +22,12 @@ module ARQLogger
     private
 
     def start
-      ActiveRecord::LogSubscriber.duration_store_box = []
+      self.store = []
     end
 
     def finish
-      logged = ActiveRecord::LogSubscriber.duration_store_box
-      ActiveRecord::LogSubscriber.duration_store_box = nil
+      logged = store
+      self.store = nil
 
       Result.new(
         count: logged.size,
@@ -29,21 +42,3 @@ module ARQLogger
     end
   end
 end
-
-class ARQLoggerApplicationProxy < ::Rails::Railtie
-  initializer 'set data store for ARQLogger' do
-    class ::ActiveRecord::LogSubscriber
-      cattr_accessor :duration_store_box
-
-      alias_method :real_sql, :sql
-
-      def sql(event)
-        payload = event.payload
-        if payload[:name] && !IGNORE_PAYLOAD_NAMES.include?(payload[:name])
-          self.class.duration_store_box.push(event.duration) if self.class.duration_store_box
-        end
-        real_sql(event)
-      end
-    end
-  end
-end

data/lib/a_r_q_logger/initializer.rb

@@ -0,0 +1,24 @@
+module ARQLogger
+  module Initializer
+    def self.patch
+      class_eval <<-EOS
+        class ActiveRecord::LogSubscriber
+          alias_method :real_sql, :sql
+
+          def sql(event)
+            ARQLogger.pass(event)
+            real_sql(event)
+          end
+        end
+      EOS
+    end
+  end
+end
+
+if defined?(ActiveRecord::LogSubscriber)
+  ARQLogger::Initializer.patch
+else
+  class ARQLoggerApplicationProxy < ::Rails::Railtie
+    initializer('add pass method') { ARQLogger::Initializer.patch }
+  end
+end

data/lib/a_r_q_logger/version.rb

@@ -1,3 +1,3 @@
 module ARQLogger
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/dummy/app/models/test_child_model.rb

@@ -0,0 +1,3 @@
+class TestChildModel < ActiveRecord::Base
+  belongs_to :test_model
+end

data/spec/dummy/app/models/test_model.rb

@@ -0,0 +1,3 @@
+class TestModel < ActiveRecord::Base
+  has_many :test_child_models, dependent: :destroy
+end

data/spec/dummy/config/application.rb

@@ -7,9 +7,6 @@ require "action_mailer/railtie"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
-Bundler.require(*Rails.groups)
-require "a_r_q_logger"
-
 module Dummy
 	class Application < Rails::Application
 		config.generators do |g|

data/spec/dummy/db/migrate/20161016035357_create_test_models.rb

@@ -0,0 +1,9 @@
+class CreateTestModels < ActiveRecord::Migration
+  def change
+    create_table :test_models do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20161016035434_create_test_child_models.rb

@@ -0,0 +1,10 @@
+class CreateTestChildModels < ActiveRecord::Migration
+  def change
+    create_table :test_child_models do |t|
+      t.integer :test_model_id
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,28 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20161016035434) do
+
+  create_table "test_child_models", force: :cascade do |t|
+    t.integer  "test_model_id"
+    t.string   "name"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
+  create_table "test_models", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+end

data/spec/dummy/spec/models/test_model_spec.rb

@@ -0,0 +1,45 @@
+require 'rails_helper'
+require 'a_r_q_logger'
+
+RSpec.describe TestModel, type: :model do
+  it do
+    TestModel.create!
+  end
+
+  it do
+    expect(ARQLogger.log {
+      TestModel.create!
+    }.count).to eq(1)
+  end
+
+  it do
+    expect(ARQLogger.log {
+      TestModel.create!
+      TestModel.create!
+    }.count).to eq(2)
+  end
+
+  context 'with associations' do
+    before :all do
+      10.times {
+        TestChildModel.create!(test_model: TestModel.create!, name: SecureRandom.hex(4))
+      }
+    end
+
+    after :all do
+      TestModel.destroy_all
+    end
+
+    it do
+      expect(ARQLogger.log {
+        TestModel.includes(:test_child_models).all.each { |m| m.test_child_models.map(&:name) }
+      }.count).to eq(2)
+    end
+
+    it do
+      expect(ARQLogger.log {
+        TestModel.all.each { |m| m.test_child_models.map(&:name) }
+      }.count).to eq(11)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a_r_q_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - mmmpa
@@ -167,6 +167,7 @@ files:
 - Rakefile
 - a_r_q_logger.gemspec
 - lib/a_r_q_logger.rb
+- lib/a_r_q_logger/initializer.rb
 - lib/a_r_q_logger/version.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -179,6 +180,8 @@ files:
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
+- spec/dummy/app/models/test_child_model.rb
+- spec/dummy/app/models/test_model.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
@@ -200,12 +203,16 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20161016035357_create_test_models.rb
+- spec/dummy/db/migrate/20161016035434_create_test_child_models.rb
+- spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/spec/models/test_model_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 homepage: http://mmmpa.net