rack-metrics 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef07a7c21b2fc9e7eae4003d64f75e5ee0972de
-  data.tar.gz: 4fe8867da81f4f9510813699dab1ee80af64f121
+  metadata.gz: 3de48a8bcf3f5ac836018a935b8d6d78261192de
+  data.tar.gz: 92e9866fc44a73a8cbc2a03eba42d4ebb696bc75
 SHA512:
-  metadata.gz: 5b6a8e2ee0a2b0601edb901bfbf956cc8f024d223e0db289b06c99459a41d390116dee03f1266ab9161c3cebd0c0229516873415a7835bb7d0aabdbbee1e9b4f
-  data.tar.gz: 27bafde80fafbcb5de8d40b0129210b39ecbdd152d6adb6ffdde77d387ef610530596089f8ef86fde206b508f27da779d98f74e9254ffb27017333ed7b9fe59a
+  metadata.gz: 0486d7ff39469aeed504055eed2c57d97247392e2fadb677a9216155f87c59412c67a32668689bbd9d308e949c00eaec1883052fcfa0c2a472b69588c33bcd77
+  data.tar.gz: 7e1d5fb7f9f12006c48920690a2b635084a9a00a3edcfe04f95aeac1b17dde206537f226fb6b9010fd1869211991c3e6b2dd2d2fc11e0f63e41458d61bc68e29

data/.travis.yml

@@ -3,5 +3,9 @@ rvm:
   - 2.0.0
   - 1.9.3
 gemfile:
-  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_3_0.gemfile
+  - gemfiles/rails_3_1.gemfile
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_4_1.gemfile
 script: 'bundle exec rake test'

data/lib/rack/metrics.rb

@@ -93,6 +93,19 @@ module Rack
           end
         end
       end
+
+      ActiveSupport::Notifications.subscribe "query.moped" do |*args|
+        query = Event.new *args
+        if Metrics.current.is_a?(Rack::Metrics::Event)
+          query.payload['stacktrace'] = Metrics.parse_stack(caller(2)).join("\r\n")
+          query.payload['sql'] = query.payload[:ops][0].log_inspect unless query.payload[:ops].nil? or !query.payload[:ops][0].respond_to?(:log_inspect)
+          if Metrics.current.stack.empty?
+            Metrics.current.template.queries<< query
+          else
+            Metrics.current.stack.peek.queries<< query
+          end
+        end
+      end
     end
   end
 end

data/lib/rack/metrics/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Metrics
-    VERSION = "0.2.0"
+    VERSION = "0.2.3"
   end
 end

data/rack-metrics.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency "rake"
 end

data/test/unit/metrics_test.rb

@@ -12,18 +12,23 @@ class MetricsTest < ActiveSupport::TestCase
 
 	test "it subscribes to sql.active_record" do
 		ActiveSupport::Notifications.instrument('sql.active_record'){}
-		refute_empty Rack::Metrics.current.template.queries
+		assert !Rack::Metrics.current.template.queries.empty?
+	end
+
+	test "it subscribes to query.moped" do
+		ActiveSupport::Notifications.instrument('query.moped'){}
+		assert !Rack::Metrics.current.template.queries.empty?
 	end
 
 	test "it subscribes to render_template.action_view" do
 		ActiveSupport::Notifications.instrument('render_template.action_view'){}
-		refute_nil Rack::Metrics.current.template
+		assert !Rack::Metrics.current.template.nil?
 	end
 
 	test "it subscribes to render_partial.action_view" do
 		ActiveSupport::Notifications.instrument('start_render_partial.action_view'){}
 		ActiveSupport::Notifications.instrument('render_partial.action_view'){}
-		refute_empty Rack::Metrics.current.template.partials
+		assert !Rack::Metrics.current.template.partials.empty?
 	end
 
 	test "it nests render_partial.action_view" do
@@ -35,9 +40,9 @@ class MetricsTest < ActiveSupport::TestCase
 					ActiveSupport::Notifications.instrument('render_partial.action_view'){}
 			end
 		end
-		refute_empty Rack::Metrics.current.template.partials
+		assert !Rack::Metrics.current.template.partials.empty?
 		assert_equal 1, Rack::Metrics.current.template.partials.count
-		refute_empty Rack::Metrics.current.template.partials[0].partials
+		assert !Rack::Metrics.current.template.partials[0].partials.empty?
 	end
 
 	test "it adds query to nested render_partial.action_view" do
@@ -48,7 +53,7 @@ class MetricsTest < ActiveSupport::TestCase
 				ActiveSupport::Notifications.instrument('render_partial.action_view') do
 			end
 		end
-		refute_empty Rack::Metrics.current.template.partials
+		assert !Rack::Metrics.current.template.partials.empty?
 		assert_equal 1, Rack::Metrics.current.template.partials.count
 		assert_equal 0, Rack::Metrics.current.template.queries.count
 		assert_equal 1, Rack::Metrics.current.template.partials[0].partials[0].queries.count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Greg Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement