fnordmetric 0.7.4 → 0.7.5

data/lib/fnordmetric/event.rb

@@ -9,13 +9,21 @@ module FnordMetric
     def self.all(opts)    
       range_opts = { :withscores => true }
       range_opts.merge!(:limit => [0,opts[:limit]]) if opts[:limit]
-      opts[:redis].zrevrangebyscore(
+      events = opts[:redis].zrevrangebyscore(
         "#{opts[:namespace_prefix]}-timeline", 
         '+inf', opts[:since]||'0',
         range_opts
-      ).in_groups_of(2).map do |event_id, ts|
+      )
+
+      unless events.first.is_a?(Array)
+        events = events.in_groups_of(2).map do |event_id, ts|
+          [event_id, Float(ts)]
+        end
+      end
+
+      events.map do |event_id, ts|
         next if event_id.blank?
-        find(event_id, opts).tap{ |e| e.time = ts }
+        find(event_id, opts).tap{ |e| e.time = "%.f" % ts }
       end
     end
 

data/lib/fnordmetric/gauge_calculations.rb

@@ -47,12 +47,20 @@ module FnordMetric::GaugeCalculations
 
   def field_values_at(time, opts={}, &block)
     opts[:max_fields] ||= 50
-    redis.zrevrange(
+    field_values = redis.zrevrange(
       tick_key(time), 
       0, opts[:max_fields]-1, 
       :withscores => true
-    ).in_groups_of(2).map do |key, val|
-      [key, calculate_value(val, time, opts, block)]
+    )
+
+    unless field_values.first.is_a?(Array)
+      field_values = field_values.in_groups_of(2).map do |key, val|
+        [key, Float(val)]
+      end
+    end
+
+    field_values.map do |key, val|
+      [key, calculate_value("%.f" % val, time, opts, block)]
     end
   end
 

data/lib/fnordmetric/session.rb

@@ -27,8 +27,15 @@ class FnordMetric::Session
     set_key = "#{opts[:namespace_prefix]}-session"
     limit = (opts[:limit].try(:to_i)||0)-1
     session_ids = opts[:redis].zrevrange(set_key, 0, limit, :withscores => true)
-    session_ids.in_groups_of(2).map do |session_key, ts|
-      find(session_key, opts).tap{ |s| s.updated_at = ts }
+
+    unless session_ids.first.is_a?(Array)
+      session_ids = session_ids.in_groups_of(2).map do |session_id, ts|
+        [session_id, Float(ts)]
+      end
+    end
+
+    session_ids.map do |session_key, ts|
+      find(session_key, opts).tap{ |s| s.updated_at = "%.f" % ts }
     end
   end
 

data/lib/fnordmetric/timeline_widget.rb

@@ -7,7 +7,7 @@ class FnordMetric::TimelineWidget  < FnordMetric::Widget
       :gauges => gauges.map(&:name),
       :gauge_titles => gauge_titles,
       :start_timestamp => ticks.first,
-      :end_timestamp => ticks.last,
+      :end_timestamp => ticks.max,
       :autoupdate => (@opts[:autoupdate] || 60),
       :include_current => !!@opts[:include_current],
       :plot_style => (@opts[:plot_style] || 'line'),

data/lib/fnordmetric/version.rb

@@ -1,3 +1,3 @@
 module FnordMetric
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/gauge_modifiers_spec.rb

@@ -294,7 +294,7 @@ describe "increment three-dimensional gagues" do
         event = { :_time => @now }
         context.call(event, @redis_wrap)
       end
-      @redis.zscore(gauge_key, "whoopwhoop").should == "13"
+      @redis.zscore(gauge_key, "whoopwhoop").to_f.should == 13.0
       @redis.get(gauge_key+"-count").should == "1"
     end
 
@@ -311,7 +311,7 @@ describe "increment three-dimensional gagues" do
         event = { :_time => @now }
         context.call(event, @redis_wrap)
       end
-      @redis.zscore(gauge_key, "whoopwhoop").should == "5"
+      @redis.zscore(gauge_key, "whoopwhoop").to_f.should == 5.0
       @redis.get(gauge_key+"-count").should == "7"
     end
 
@@ -328,7 +328,7 @@ describe "increment three-dimensional gagues" do
         event = { :_time => @now, :myfield => "fnordybar" }
         context.call(event, @redis_wrap)
       end
-      @redis.zscore(gauge_key, "fnordybar").should == "16"
+      @redis.zscore(gauge_key, "fnordybar").to_f.should == 16.0
     end
 
     it "should increment_unique a three-dim gauge" do  
@@ -346,7 +346,7 @@ describe "increment three-dimensional gagues" do
         event = { :_time => @now, :_session_key => "mysesskey" }
         context.call(event, @redis_wrap)
       end
-      @redis.zscore(gauge_key, "mykey").should == "84"
+      @redis.zscore(gauge_key, "mykey").to_f.should == 84.0
       @redis.get(gauge_key+"-sessions-count").should == "6"
       @redis.smembers(gauge_key+"-sessions").should == ["mysesskey"]
     end
@@ -367,7 +367,7 @@ describe "increment three-dimensional gagues" do
         event = { :_time => @now, :_session_key => "mysesskey" }
         context.call(event, @redis_wrap)
       end
-      @redis.zscore(gauge_key, "otherkey").should == "54"
+      @redis.zscore(gauge_key, "otherkey").to_f.should == 54.0
       @redis.get(gauge_key+"-sessions-count").should == "5"
       @redis.smembers(gauge_key+"-sessions").should == ["mysesskey"]
     end
@@ -397,7 +397,7 @@ describe "increment three-dimensional gagues" do
     it "should set a value on a two-dim gauge" do  
       gauge_key = "fnordmetrics-myns-gauge-mygauge_1463-10-695280200"
       @redis.zadd(gauge_key, 65, "asdasdkey")
-      @redis.zscore(gauge_key, "asdasdkey").should == "65"
+      @redis.zscore(gauge_key, "asdasdkey").to_f.should == 65.0
       create_gauge_context({
         :key => "mygauge_1463",
         :three_dimensional => true,
@@ -408,7 +408,7 @@ describe "increment three-dimensional gagues" do
         event = { :_time => @now, :_session_key => "mysesskey" }
         context.call(event, @redis_wrap)
       end
-      @redis.zscore(gauge_key, "asdasdkey").should == "23"
+      @redis.zscore(gauge_key, "asdasdkey").to_f.should == 23.0
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fnordmetric
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &76649680 !ruby/object:Gem::Requirement
+  requirement: &72692540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *76649680
+  version_requirements: *72692540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &76649430 !ruby/object:Gem::Requirement
+  requirement: &72691750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *76649430
+  version_requirements: *72691750
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &76649170 !ruby/object:Gem::Requirement
+  requirement: &72691150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76649170
+  version_requirements: *72691150
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &76648980 !ruby/object:Gem::Requirement
+  requirement: &72690410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76648980
+  version_requirements: *72690410
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &76648650 !ruby/object:Gem::Requirement
+  requirement: &72687990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76648650
+  version_requirements: *72687990
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &76648380 !ruby/object:Gem::Requirement
+  requirement: &72686750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76648380
+  version_requirements: *72686750
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &76648090 !ruby/object:Gem::Requirement
+  requirement: &73268710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76648090
+  version_requirements: *73268710
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &76665410 !ruby/object:Gem::Requirement
+  requirement: &73267810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76665410
+  version_requirements: *73267810
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &76665200 !ruby/object:Gem::Requirement
+  requirement: &73266740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76665200
+  version_requirements: *73266740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &76664960 !ruby/object:Gem::Requirement
+  requirement: &73266240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76664960
+  version_requirements: *73266240
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &76664730 !ruby/object:Gem::Requirement
+  requirement: &73264900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76664730
+  version_requirements: *73264900
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &76664460 !ruby/object:Gem::Requirement
+  requirement: &73264520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76664460
+  version_requirements: *73264520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76664200 !ruby/object:Gem::Requirement
+  requirement: &73264010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76664200
+  version_requirements: *73264010
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &76663890 !ruby/object:Gem::Requirement
+  requirement: &73263370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76663890
+  version_requirements: *73263370
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76663400 !ruby/object:Gem::Requirement
+  requirement: &73262880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *76663400
+  version_requirements: *73262880
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &76663190 !ruby/object:Gem::Requirement
+  requirement: &73262260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76663190
+  version_requirements: *73262260
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email:
 - paul@paulasmuth.com
@@ -273,12 +273,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -854255121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -854255121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
@@ -302,4 +308,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/widget_spec.rb
 - spec/worker_spec.rb
-has_rdoc: