profit 0.1.3 → 0.1.4

data/lib/profit/client.rb

@@ -1,11 +1,16 @@
 module Profit
+
+  def self.client
+    @client ||= Client.new
+  end
+
   class Client
 
-    attr_accessor :ctx, :socket, :pending
+    attr_accessor :ctx, :pending
 
-    def initialize(ctx = nil)
-      @ctx = ctx || ZMQ::Context.new
-      @socket = @ctx.connect(:PUSH, "tcp://127.0.0.1:5556")
+    def initialize(options = {})
+      @ctx            = options[:ctx]            || ZMQ::Context.new
+      @server_address = options[:server_address] || "tcp://127.0.0.1:5556"
       @pending = {}
     end
 
@@ -17,24 +22,34 @@ module Profit
       # TODO: wrap in a Mutex & make the key a combo of metric_type,
       #       pid, and/or thread object_id to make this thread safe and
       #       thread-robust.
-      @pending[metric_type] = { start_file: start_file,
-                                start_line: start_line,
-                                start_time: now }
+      @pending[key_for(metric_type)] = { start_file: start_file,
+                                         start_line: start_line,
+                                         start_time: now }
     end
 
     def stop(metric_type)
       now = Time.now
-      metric = @pending.delete(metric_type)
+      metric = @pending.delete key_for(metric_type)
       recorded_time = Time.now - metric[:start_time]
       stop_file = caller[0][/(.+):(.+):/,1]
       stop_line = caller[0][/(.+):(.+):/,2].to_i - 1
 
-      @socket.send({ metric_type: metric_type,
-                     recorded_time: recorded_time,
-                     start_file: metric[:start_file],
-                     start_line: metric[:start_line],
-                     stop_file: stop_file,
-                     stop_line: stop_line }.to_json)
+      socket.send({ metric_type: metric_type,
+                    recorded_time: recorded_time,
+                    start_file: metric[:start_file],
+                    start_line: metric[:start_line],
+                    stop_file: stop_file,
+                    stop_line: stop_line }.to_json)
+    end
+
+    def socket
+      Thread.current[:socket] ||= @ctx.connect(:PUSH, @server_address)
+    end
+
+    private
+
+    def key_for(metric_type)
+      "#{metric_type}:#{Thread.current.object_id}"
     end
   end
 end

data/lib/profit/version.rb

@@ -1,3 +1,3 @@
 module Profit
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Profit::Client do
 
   let!(:redis)         { Redis.new(host: "127.0.0.1", port: 6379) }
-  let!(:client)        { Profit::Client.new(server.ctx) }
+  let!(:client)        { Profit::Client.new(ctx: server.ctx) }
   let!(:server)        { TestServer.server }
   let!(:server_thread) { TestServer.server_thread }
 
@@ -60,7 +60,8 @@ describe Profit::Client do
       client.start("some_foo_measurement")
       now = Time.now
 
-      pending_metric = client.pending["some_foo_measurement"]
+      key = client.pending.keys.grep(/some_foo_measurement/).first
+      pending_metric = client.pending[key]
       expect(pending_metric[:start_time].to_i).to be_within(1).of(now.to_i)
     end
 
@@ -71,7 +72,8 @@ describe Profit::Client do
       start_line = __LINE__
       start_file = __FILE__
 
-      pending_metric = client.pending["some_foo_measurement"]
+      key = client.pending.keys.grep(/some_foo_measurement/).first
+      pending_metric = client.pending[key]
       expect(pending_metric[:start_file]).to eq start_file
       expect(pending_metric[:start_line]).to eq start_line
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: profit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -957264636356464606
+      hash: 1282582636223262720
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -957264636356464606
+      hash: 1282582636223262720
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23