time_bandits 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b5dc842db4022fe784671d7387d31aba84fa23
-  data.tar.gz: 6c821882f1104e05d02aabb24c568cec412757fe
+  metadata.gz: cd2fea3396b9dc6b70fe418f7acd0955eba13231
+  data.tar.gz: 84ce369bee8fe66c3d610a52eb1baaf74bab6b54
 SHA512:
-  metadata.gz: d0046d74137b95d4ab0993e184f38c8992bf668f6ca0e869245418b5147a15895f53d43b5e50ab353508d66ced9fab0c8b160b4381b5619908831848f6b5c882
-  data.tar.gz: f31f4da71e755fdb3fe4014bbdf7e390398150ff9f276265ab88f1e56f143a32c175109fcc1d4c200aae45d17cabcb30f585f0179c1382baac0624c05a0bbaab
+  metadata.gz: 3088b4806584633d9ea8b67f8f6ca9d50d0c3c6cd2c0780edcf88aa2db04f3d13690098d003259c678aae19682338dd601331b64ea1e3871f9bebede96a7f6b9
+  data.tar.gz: e03a9141f1107232b757e94df87f5fda7aac3b63315260e87e4f91d56c3cf2477e961734be5c0d599df4f4866669932c08c7e404cd0154a808679aa564f261c7

data/lib/time_bandits/monkey_patches/active_record.rb

@@ -42,18 +42,29 @@ module ActiveRecord
       hits
     end
 
-    def render_bind(column, value)
-      if column
-        if column.type == :binary
-          value = "<#{value.bytesize} bytes of binary data>"
+    # Rails 4.1 uses method_added to automatically subscribe newly
+    # added methods. Since :render_bind and :sql are already defined,
+    # the net effect is that sql gets called twice. Therefore, we
+    # temporarily switch to protected mode and change it back later to
+    # public.
+
+    unless instance_methods.include?(:render_bind)
+      protected
+      def render_bind(column, value)
+        if column
+          if column.type == :binary
+            value = "<#{value.bytesize} bytes of binary data>"
+          end
+          [column.name, value]
+        else
+          [nil, value]
         end
-
-        [column.name, value]
-      else
-        [nil, value]
       end
-    end unless instance_methods.include?(:render_bind)
+      public :render_bind
+      public
+    end
 
+    protected
     def sql(event)
       self.class.runtime += event.duration
       self.class.call_count += 1
@@ -85,6 +96,8 @@ module ActiveRecord
       debug "  #{name}  #{sql}#{binds}"
     end
   end
+  public :sql
+  public
 
   module Railties
     module ControllerRuntime
@@ -99,4 +112,3 @@ module ActiveRecord
     end
   end
 end
-

data/lib/time_bandits/time_consumers/redis.rb

@@ -16,7 +16,7 @@ module TimeBandits
         def request(event)
           i = Redis.instance
           i.time += event.duration
-          i.calls += event.payload[:commands].size
+          i.calls += 1 #count redis round trips, not calls
 
           return unless logger.debug?
 

data/lib/time_bandits/version.rb

@@ -1,3 +1,3 @@
 module TimeBandits
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/test/unit/redis_test.rb

@@ -37,7 +37,28 @@ class RedisTest < Test::Unit::TestCase
     assert_equal 0, m[:redis_time]
   end
 
+  test "counts pipelined calls as single call" do
+    pipelined_work
+    m = TimeBandits.metrics
+    assert_equal 1, m[:redis_calls]
+  end
+
+  test "counts multi calls as single call" do
+    pipelined_work(:multi)
+    m = TimeBandits.metrics
+    assert_equal 1, m[:redis_calls]
+  end
+
   private
+  def pipelined_work(type = :pipelined)
+    TimeBandits.reset
+    @redis.send(type) do
+      @redis.get("foo")
+      @redis.set("bar", 1)
+      @redis.hgetall("baz")
+    end
+  end
+
   def work
     TimeBandits.reset
     2.times do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_bandits
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_variables