fnordmetric 1.2.6 → 1.2.7

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

data/lib/fnordmetric/web/app.rb

@@ -28,7 +28,7 @@ class FnordMetric::App < Sinatra::Base
   end
 
   def initialize(opts = {})
-    @opts = FnordMetric.default_options(opts)
+    @opts = FnordMetric.options(opts)
 
     @namespaces = FnordMetric.namespaces
     @redis = Redis.connect(:url => @opts[:redis_url])

data/lib/fnordmetric/web/reactor.rb

@@ -22,8 +22,12 @@ class FnordMetric::Reactor
 private
 
   def execute_unsafe(socket, event, messages = [])
-    return false unless event["namespace"]
-    return false unless ns = @namespaces[event["namespace"].to_sym]
+    return [] unless event["namespace"]
+
+    unless ns = @namespaces[event["namespace"].to_sym]
+      return([{ "error" => "invalid namespace: #{event["namespace"]}" }])
+    end
+
     messages << discover(ns) if event["type"] == "discover_request"
     messages << widget(ns, event) if event["type"] == "widget_request"
     messages << gauge(ns, event) if event["type"] == "render_request"

data/lib/fnordmetric/web/websocket.rb

@@ -29,6 +29,9 @@ class FnordMetric::WebSocket < Rack::WebSocket::Application
         send_data m.to_json
       end
     end
+  rescue Exception => e
+    FnordMetric.error("[WebSocket] #{e.to_s}")
+    puts e.backtrace.join("\n")
   end
 
   def get_uuid

data/lib/fnordmetric/worker.rb

@@ -1,8 +1,8 @@
 class FnordMetric::Worker
 
-  def initialize
+  def initialize(opts = {})
     @namespaces = FnordMetric.namespaces
-    @opts = FnordMetric.options
+    @opts = FnordMetric.options(opts)
 
     FnordMetric.register(self)
   end

data/spec/worker_spec.rb

@@ -2,31 +2,37 @@ require ::File.expand_path('../spec_helper.rb', __FILE__)
 
 describe FnordMetric::Worker do
 
-  before(:each) do
-    @worker = FnordMetric::Worker.new()
-  end
- 
+  let(:worker) { FnordMetric::Worker.new() }
+
   it "should generate the correct pubsub-key" do
-    @worker.pubsub_key.should == "fnordmetric-announce"
+    worker.pubsub_key.should == "fnordmetric-announce"
   end
 
   it "should generate the correct queue-key" do
-    @worker.queue_key.should == "fnordmetric-queue"
+    worker.queue_key.should == "fnordmetric-queue"
   end
 
   it "should generate the correct event-key" do
-    @worker.event_key("myevent").should == "fnordmetric-event-myevent"
+    worker.event_key("myevent").should == "fnordmetric-event-myevent"
   end
 
   it "should generate the correct stats-key" do
-    @worker.stats_key.should == "fnordmetric-stats"
+    worker.stats_key.should == "fnordmetric-stats"
+  end
+
+  context "configurable options" do
+    let(:worker) { FnordMetric::Worker.new(:redis_prefix => "fnordmetric-special") }
+
+    it "should include redis prefix" do
+      worker.pubsub_key.should == "fnordmetric-special-announce"
+    end
   end
 
-  it "should add a namespace"  
-  it "should add a namespace and pass options"  
-  it "should add a namespace and the key"  
+  it "should add a namespace"
+  it "should add a namespace and pass options"
+  it "should add a namespace and the key"
   it "should add a namespace and instance_eval the block"
-      
+
   it "should find a namespace by key"
   it "should find the namespace default namespace without key"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &21703020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *21703020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &21702480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *21702480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &21702100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +53,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21702100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: websocket-rack
-  requirement: &21701540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *21701540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &21718000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21718000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21717440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21717440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &21716580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21716580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &21716120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21716120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &21715600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21715600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &21714860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21714860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &21714300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21714300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &21713440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *21713440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &21712940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21712940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &21712360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21712360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21711640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +245,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *21711640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &21710960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +261,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21710960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email:
 - paul@paulasmuth.com
@@ -333,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: FnordMetric is a Ruby Event-Tracking gem on steroids