time_bandits 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17110b29f1ba8ee80a3ca0de9909218131cdf064
-  data.tar.gz: 4dfb3e7de75bc3501e6f85cfb18c07cd0f518868
+  metadata.gz: 116ff4f8110fea48a1fce36cea8362c06d9df6f5
+  data.tar.gz: 700559c495052c511e3b7ec61162249181653fcc
 SHA512:
-  metadata.gz: 2463780ec2f4d803d685aec3aa32ba3026b51fc416a4651763abf109183b9102a166e2f8f50241df224d79e91045e95cbdbf17d8b395297519e7bf6c4c3e740a
-  data.tar.gz: 01e05bdadc84b9c14c6a1e8b0437c7794d67b1a69243d85c2bdee7b627bbcfee3506333fe113c9bafe057512d192205d30206e7bd36af7762a478055e30b3d99
+  metadata.gz: 6e215bb352bd437f48d955a387514006feedabb8b636fe3fe9abc65265af289a90d80e5c8eabba0cc3249b53729df2b2d37c0a1d00165ae857f5222b56726920
+  data.tar.gz: b761564d4c867a55bec84221c674901cf223312de4788714e37a5cb999c044b001a2857f03b318740a335b109e6f8e74ea383715b7f92d78d701a31d334923bd

data/lib/time_bandits.rb

@@ -37,6 +37,11 @@ module TimeBandits
     time_bandits.map{|b| b.consumed}.sum
   end
 
+  def self.current_runtime(except = [])
+    except = Array(except)
+    time_bandits.map{|b| except.include?(b) ? 0 : b.current_runtime}.sum
+  end
+
   def self.runtimes
     time_bandits.map{|b| b.runtime}.reject{|t| t.blank?}
   end

data/lib/time_bandits/time_consumers/base_consumer.rb

@@ -54,6 +54,8 @@ module TimeBandits::TimeConsumers
       @counters[0]
     end
 
+    alias_method :current_runtime, :consumed
+
     def runtime
       values = metrics.values_at(*self.class.runtime_keys)
       if values.all?{|v|v==0}

data/lib/time_bandits/time_consumers/database.rb

@@ -26,6 +26,10 @@ module TimeBandits
         i.time += time
       end
 
+      def current_runtime
+        Database.instance.time + ActiveRecord::LogSubscriber.runtime
+      end
+
       private
 
       def reset_stats

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

data/test/unit/base_test.rb

@@ -26,6 +26,7 @@ class NoTimeBanditsTest < Test::Unit::TestCase
   def test_clean_state
     assert_equal Hash.new, TimeBandits.metrics
     assert_equal 0, TimeBandits.consumed
+    assert_equal 0, TimeBandits.current_runtime
     assert_equal "", TimeBandits.runtime
   end
 end
@@ -33,9 +34,10 @@ end
 class DummyConsumerTest < Test::Unit::TestCase
   module DummyConsumer
     extend self
-    def consumed; 0; end
+    def consumed; 1; end
+    def current_runtime; 1; end
     def runtime; "Dummy: 0ms"; end
-    def metrics; {:dummy_time => 0, :dummy_calls => 0}; end
+    def metrics; {:dummy_time => 1, :dummy_calls => 1}; end
     def reset; end
   end
 
@@ -57,7 +59,19 @@ class DummyConsumerTest < Test::Unit::TestCase
     assert_nothing_raised { TimeBandits.reset }
   end
 
+  test "consumed" do
+    assert_equal 1, TimeBandits.consumed
+  end
+
+  test "current_runtime" do
+    assert_equal 1, TimeBandits.current_runtime
+  end
+
+  test "current_runtime without DummyConsumer" do
+    assert_equal 0, TimeBandits.current_runtime(DummyConsumer)
+  end
+
   test "getting metrics" do
-    assert_equal({:dummy_time => 0, :dummy_calls => 0}, TimeBandits.metrics)
+    assert_equal({:dummy_time => 1, :dummy_calls => 1}, TimeBandits.metrics)
   end
 end

data/test/unit/database_test.rb

@@ -0,0 +1,47 @@
+require_relative '../test_helper'
+require 'active_record'
+require 'time_bandits/monkey_patches/active_record'
+
+class DatabaseTest < Test::Unit::TestCase
+  def setup
+    TimeBandits.time_bandits = []
+    TimeBandits.add TimeBandits::TimeConsumers::Database
+    TimeBandits.reset
+  end
+
+  test "getting metrics" do
+    nothing_measured = {
+      :db_time => 0,
+      :db_calls => 0,
+      :db_sql_query_cache_hits => 0
+    }
+    assert_equal nothing_measured, TimeBandits.metrics
+  end
+
+  test "formatting" do
+    log_subscriber.runtime += 1.234
+    log_subscriber.call_count += 3
+    log_subscriber.query_cache_hits += 1
+    TimeBandits.consumed
+    assert_equal "ActiveRecord: 1.234ms(3q,1h)", TimeBandits.runtime
+  end
+
+  test "accessing current runtime" do
+    log_subscriber.runtime += 1.234
+    assert_equal 1.234, TimeBandits.consumed
+    assert_equal 0, log_subscriber.runtime
+    log_subscriber.runtime += 4.0
+    assert_equal 5.234, bandit.current_runtime
+    assert_equal "ActiveRecord: 1.234ms(0q,0h)", TimeBandits.runtime
+  end
+
+  private
+
+  def bandit
+    TimeBandits::TimeConsumers::Database.instance
+  end
+
+  def log_subscriber
+    ActiveRecord::LogSubscriber
+  end
+end

data/time_bandits.gemspec

@@ -25,12 +25,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency("appraisal")
   s.add_development_dependency("byebug")
   s.add_development_dependency("dalli")
-  s.add_development_dependency("memcached")
+  s.add_development_dependency("memcached", "~> 1.8.0")
   s.add_development_dependency("minitest", "~> 5.5")
   s.add_development_dependency("mocha")
   s.add_development_dependency("mysql2")
   s.add_development_dependency("rake")
   s.add_development_dependency("redis")
   s.add_development_dependency("sequel")
+  s.add_development_dependency("activerecord")
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables
@@ -98,16 +98,16 @@ dependencies:
   name: memcached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: Rails Completed Line on Steroids
 email:
 - skaes@railsexpress.de
@@ -233,6 +247,7 @@ files:
 - test/unit/active_support_notifications_test.rb
 - test/unit/base_test.rb
 - test/unit/dalli_test.rb
+- test/unit/database_test.rb
 - test/unit/duplicate_bandits.rb
 - test/unit/gc_consumer_test.rb
 - test/unit/memcached_test.rb
@@ -268,6 +283,7 @@ test_files:
 - test/unit/active_support_notifications_test.rb
 - test/unit/base_test.rb
 - test/unit/dalli_test.rb
+- test/unit/database_test.rb
 - test/unit/duplicate_bandits.rb
 - test/unit/gc_consumer_test.rb
 - test/unit/memcached_test.rb