newrelic-redis 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.3.2 / 2012-05-18
+
+ * 1 minor bugfix:
+   * Pass a block through properly for 3.0
+
 === 1.3.1 / 2012-05-17
 
  * 1 minor bugfix:

data/lib/newrelic_redis/instrumentation.rb

@@ -20,7 +20,7 @@ load_probes =
   call_method = 
     ::Redis::Client.new.respond_to?(:call) ? :call : :raw_call_command
 
-  def call_with_newrelic_trace(*args)
+  def call_with_newrelic_trace(*args, &blk)
     if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
       total_metric = 'Database/Redis/allWeb'
     else
@@ -34,7 +34,7 @@ load_probes =
       start = Time.now
 
       begin
-        call_without_newrelic_trace(*args)
+        call_without_newrelic_trace(*args, &blk)
       ensure
         s = NewRelic::Agent.instance.transaction_sampler
         s.notice_nosql(args.inspect, (Time.now - start).to_f) rescue nil

data/lib/newrelic_redis/version.rb

@@ -1,3 +1,3 @@
 class NewRelicRedis
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/newrelic-redis.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "newrelic-redis"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2012-05-17"
+  s.date = "2012-05-18"
   s.description = "Redis instrumentation for Newrelic."
   s.email = ["evan@phx.io"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]

data/test/test_newrelic_redis.rb

@@ -55,4 +55,18 @@ class TestNewRelicRedis < Test::Unit::TestCase
     prm = @sampler.builder.current_segment.params
     assert_equal "[[:select, 15]];\n[[:hgetall, \"foo\"], [:incr, \"bar\"]]", prm[:key]
   end
+
+  def test_call_with_block
+    rep = nil
+
+    @redis.client.call [:info] do |reply|
+      rep = reply
+    end
+
+    if Redis::VERSION.split(".").first.to_i >= 3
+      assert_kind_of String, rep
+    else
+      assert_nil rep
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic-redis
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Evan Phoenix
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redis
@@ -70,11 +70,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 7
         segments: 
-        - 2
-        - 16
-        version: "2.16"
+        - 3
+        - 0
+        version: "3.0"
   type: :development
   version_requirements: *id004
 description: Redis instrumentation for Newrelic.