librato-rails 0.5.0 → 0.5.1

data/lib/librato/rails/aggregator.rb

@@ -2,14 +2,14 @@ module Librato
   module Rails
     class Aggregator
       extend Forwardable
-      
+
       def_delegators :@cache, :empty?
-      
+
       def initialize
         @cache = Librato::Metrics::Aggregator.new
         @lock = Mutex.new
       end
-      
+
       def [](key)
         return nil if @cache.empty?
         gauges = nil
@@ -19,12 +19,12 @@ module Librato
         end
         nil
       end
-      
+
       def delete_all
         @lock.synchronize { @cache.clear }
       end
-      
-      # transfer all measurements to a queue and 
+
+      # transfer all measurements to a queue and
       # reset internal status
       def flush_to(queue, options={})
         queued = nil
@@ -35,23 +35,26 @@ module Librato
         end
         queue.merge!(queued) if queued
       end
-      
+
       def measure(*args, &block)
         event = args[0].to_s
         returned = nil
+        if block_given?
+          start = Time.now
+          returned = yield
+          value = ((Time.now - start) * 1000.0).to_i
+        elsif args[1]
+          value = args[1]
+        else
+          raise "no value provided"
+        end
         @lock.synchronize do
-          if block_given?
-            start = Time.now
-            returned = yield
-            @cache.add event => ((Time.now - start) * 1000.0).to_i
-          else
-            @cache.add event => args[1] || nil
-          end
+          @cache.add event => value
         end
         returned
       end
       alias :timing :measure
-      
+
     end
   end
 end

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/librato/rails.rb

@@ -9,7 +9,6 @@ require 'librato/rack'
 require 'librato/rails/aggregator'
 require 'librato/rails/counter_cache'
 require 'librato/rails/group'
-require 'librato/rails/helpers'
 require 'librato/rails/worker'
 require 'librato/rails/version'