sequel-rails 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba946c66e7d9fa0575c3ca8be8d9b2814aea6f5
-  data.tar.gz: d2babb6feab008ba8a5351cdc8a8be90bad8b2d2
+  metadata.gz: 44b6703d7b0e5a73f9539c3a89e7d4cad0dcfff3
+  data.tar.gz: eb21ad4107e1eacf55d4f21175e815be2ef308b2
 SHA512:
-  metadata.gz: 51725615f608c37dca7faafb45abd22861438d3b26d428c37577062703c9d9a6712a0585c7af3f0967419d823ff70d3b53c38ccf269f3d76af1dbd3b99754a24
-  data.tar.gz: 0df87880f42c040b73b312f397b65e82411109db500043ed6ae32def27c59c397851284cc7ed0628d4d3cb3129dccd0e6bfa226d7160c2b1efa00647f8abdc8e
+  metadata.gz: b0d73d406b6477ecbe4dc74d3870fd0b70cafaa4b27e1cd1deb14126d4b46c9606aa2225e11f536f0e27f12de3c916bdbcd09f0405f1611c75469b217675afee
+  data.tar.gz: 1a5b250db4634b304caf5e9d9169801e51415e21c3819d8400dacb11126e8985bc2adb52716c360c13d126c870957db4df59b4d648ff3d907c0d07c531ec155e

data/History.md

@@ -1,3 +1,8 @@
+0.9.11 (2015-03-13)
+===================
+
+* Track query count in `SequelRails::Railties::LogSubscriber.count`
+
 0.9.10 (2015-02-26)
 ===================
 

data/lib/sequel_rails/railties/controller_runtime.rb

@@ -14,6 +14,7 @@ module SequelRails
         # because of queries in middleware or in cases we are streaming
         # and it won't be cleaned up by the method below.
         ::SequelRails::Railties::LogSubscriber.reset_runtime
+        ::SequelRails::Railties::LogSubscriber.reset_count
         super
       end
 
@@ -29,6 +30,7 @@ module SequelRails
       def append_info_to_payload(payload)
         super
         payload[:db_runtime] = (db_runtime || 0) + ::SequelRails::Railties::LogSubscriber.reset_runtime
+        payload[:db_query_count] = ::SequelRails::Railties::LogSubscriber.count
       end
 
       module ClassMethods

data/lib/sequel_rails/railties/log_subscriber.rb

@@ -9,13 +9,27 @@ module SequelRails
         Thread.current['sequel_sql_runtime'] ||= 0
       end
 
+      def self.count=(value)
+        Thread.current['sequel_sql_count'] = value
+      end
+
+      def self.count
+        Thread.current['sequel_sql_count'] ||= 0
+      end
+
       def self.reset_runtime
-        rt, self.runtime = runtime, 0
-        rt
+        previous, self.runtime = runtime, 0
+        previous
+      end
+
+      def self.reset_count
+        previous, self.count = count, 0
+        previous
       end
 
       def sql(event)
         self.class.runtime += event.duration
+        self.class.count += 1
         return unless logger.debug?
 
         payload = event.payload

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

data/spec/lib/sequel_rails/railties/log_subscriber_spec.rb

@@ -10,19 +10,24 @@ describe SequelRails::Railties::LogSubscriber do
   before do
     setup
     described_class.attach_to :sequel
+    described_class.reset_count
   end
   after { teardown }
 
-  it 'logs queries' do
+  it 'logs queries, runtime and count' do
+    expect(described_class.count).to eq 0
     User.all
     wait
     expect(@logger.logged(:debug).last).to match(/SELECT \* FROM ("|`)users("|`)/)
+    expect(described_class.count).to be > 0
   end
 
-  it 'does not log query when logger level is not debug' do
+  it 'does not log query when logger level is not debug, but track runtime and count' do
+    expect(described_class.count).to eq 0
     @logger.level = :info
     User.all
     wait
     expect(@logger.logged(:debug).size).to eq 0
+    expect(described_class.count).to be > 0
   end
 end

metadata

@@ -1,176 +1,190 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Brasten Sager (brasten)
 - Jonathan TRON
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: activemodel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-  name: railties
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-  name: actionpack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.28'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-  name: sequel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.28'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: combustion
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: generator_spec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  name: rspec-rails
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.28.0
-  name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.28.0
 - !ruby/object:Gem::Dependency
+  name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
-  name: ammeter
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: Integrate Sequel with Rails (3.x and 4.x)
 email:
 - brasten@gmail.com
@@ -181,10 +195,10 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - History.md
 - LICENSE
@@ -260,25 +274,25 @@ homepage: http://talentbox.github.io/sequel-rails/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)
 test_files: