fnordmetric 0.5.1 → 0.5.2

data/spec/widget_spec.rb

@@ -41,7 +41,7 @@ describe FnordMetric::Widget do
   
   it "should raise an error if two gauges with different ticks are added" do
     lambda{
-      widget = FnordMetric::Widget.new(
+      widget = FnordMetric::TimelineWidget.new(
         :title => "My Widget",
         :gauges => [@gauge1, @gauge2]
       ) 
@@ -49,57 +49,57 @@ describe FnordMetric::Widget do
   end
 
   it "should generate the correct default range for daily graphs without include current" do
-    widget = FnordMetric::Widget.new(
+    widget = FnordMetric::TimelineWidget.new(
       :title => "My Widget",
       :include_current => false,
       :gauges => [@gauge1]
     ) 
     range = widget.default_range(Time.utc(1992,01,13,18,23,23))
-    Time.at(range.last).utc.should == Time.utc(1992,01,13,00,00)
-    Time.at(range.first).utc.should == Time.utc(1991,12,14,00,00)
+    Time.at(range.last).utc.should == Time.utc(1992,01,12,00,00)
+    Time.at(range.first).utc.should == Time.utc(1991,12,13,00,00)
   end
 
   it "should generate the correct default range for daily graphs with include current" do
-    widget = FnordMetric::Widget.new(
+    widget = FnordMetric::TimelineWidget.new(
       :title => "My Widget",
       :gauges => [@gauge1]
     ) 
     range = widget.default_range(Time.utc(1992,01,13,18,23,23))
-    Time.at(range.last).utc.should == Time.utc(1992,01,14,00,00)
-    Time.at(range.first).utc.should == Time.utc(1991,12,15,00,00)
+    Time.at(range.last).utc.should == Time.utc(1992,01,13,00,00)
+    Time.at(range.first).utc.should == Time.utc(1991,12,14,00,00)
   end
 
   it "should generate the correct default range for hourly graphs with include current" do
-    widget = FnordMetric::Widget.new(
+    widget = FnordMetric::TimelineWidget.new(
       :title => "My Widget",
       :gauges => [@gauge2]
     ) 
     range = widget.default_range(Time.utc(1992,01,13,18,23,23))
-    Time.at(range.last).utc.should == Time.utc(1992,01,13,19,00)
-    Time.at(range.first).utc.should == Time.utc(1992,01,12,19,00)
+    Time.at(range.last).utc.should == Time.utc(1992,01,13,18,00)
+    Time.at(range.first).utc.should == Time.utc(1992,01,12,18,00)
   end
 
   it "should generate the correct default range for hourly graphs with include current" do
-    widget = FnordMetric::Widget.new(
+    widget = FnordMetric::TimelineWidget.new(
       :title => "My Widget",
       :include_current => false,
       :gauges => [@gauge2]
     ) 
     range = widget.default_range(Time.utc(1992,01,13,18,23,23))
-    Time.at(range.last).utc.should == Time.utc(1992,01,13,18,00)
-    Time.at(range.first).utc.should == Time.utc(1992,01,12,18,00)
+    Time.at(range.last).utc.should == Time.utc(1992,01,13,17,00)
+    Time.at(range.first).utc.should == Time.utc(1992,01,12,17,00)
   end
 
   it "should generate the correct ticks" do
-    widget = FnordMetric::Widget.new(
+    widget = FnordMetric::TimelineWidget.new(
       :title => "My Widget",
       :gauges => [@gauge2]
     ) 
     Delorean.time_travel_to(Time.utc(1992,01,13,18,23,23)) do
-      Time.at(widget.ticks[0]).should == Time.utc(1992,01,12,19,00)
-      Time.at(widget.ticks[1]).should == Time.utc(1992,01,12,20,00)
-      Time.at(widget.ticks[-1]).should == Time.utc(1992,01,13,19,00)
-      Time.at(widget.ticks[-2]).should == Time.utc(1992,01,13,18,00)
+      Time.at(widget.ticks[0]).utc.should == Time.utc(1992,01,12,18,00)
+      Time.at(widget.ticks[1]).utc.should == Time.utc(1992,01,12,19,00)
+      Time.at(widget.ticks[-1]).utc.should == Time.utc(1992,01,13,18,00)
+      Time.at(widget.ticks[-2]).utc.should == Time.utc(1992,01,13,17,00)
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: fnordmetric
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Paul Asmuth
@@ -10,11 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-10 00:00:00 +01:00
+date: 2011-12-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -22,10 +23,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.0
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongo
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +34,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bson_ext
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,10 +45,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.0
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,10 +56,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.6
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: redis
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +67,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.2
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: eventmachine
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +78,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: em-hiredis
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +89,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: json
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,10 +100,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: haml
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,10 +111,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rack
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -121,10 +122,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack-test
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -132,10 +133,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,10 +144,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: thin
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -154,10 +155,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: delorean
+  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -165,10 +166,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -176,10 +177,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
-  prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: shoulda
+  prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -187,10 +188,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -198,10 +199,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -209,7 +210,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.2
   type: :development
-  prerelease: false
   version_requirements: *id018
 description: FnordMetric is a Ruby Event-Tracking gem on steroids
 email: paul@paulasmuth.com
@@ -220,30 +220,22 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - VERSION
-- _spec/app_spec.rb
-- _spec/cache_spec.rb
-- _spec/combine_metric_spec.rb
-- _spec/core_spec.rb
-- _spec/count_metric_spec.rb
-- _spec/dashboard_spec.rb
-- _spec/event_spec.rb
-- _spec/metric_spec.rb
-- _spec/report_spec.rb
-- _spec/sum_metric_spec.rb
-- _spec/widget_spec.rb
-- doc/example_server.rb
-- doc/import_dump.rb
+- doc/preview1.png
+- doc/preview2.png
+- doc/ulm_stats.rb
+- doc/version
 - fnordmetric.gemspec
 - haml/app.haml
 - haml/widget.haml
 - lib/fnordmetric.rb
 - lib/fnordmetric/app.rb
 - lib/fnordmetric/average_metric.rb
+- lib/fnordmetric/bars_widget.rb
 - lib/fnordmetric/cache.rb
 - lib/fnordmetric/combine_metric.rb
 - lib/fnordmetric/context.rb
@@ -260,34 +252,21 @@ files:
 - lib/fnordmetric/metric_api.rb
 - lib/fnordmetric/namespace.rb
 - lib/fnordmetric/numbers_widget.rb
+- lib/fnordmetric/pie_widget.rb
 - lib/fnordmetric/report.rb
 - lib/fnordmetric/session.rb
 - lib/fnordmetric/standalone.rb
 - lib/fnordmetric/sum_metric.rb
 - lib/fnordmetric/timeline_widget.rb
+- lib/fnordmetric/toplist_widget.rb
 - lib/fnordmetric/widget.rb
 - lib/fnordmetric/worker.rb
-- pub/fnordmetric/fnordmetric.css
-- pub/fnordmetric/fnordmetric.js
-- pub/fnordmetric/widget_numbers.js
-- pub/fnordmetric/widget_timeline.css
-- pub/fnordmetric/widget_timeline.js
-- pub/highcharts/adapters/mootools-adapter.js
-- pub/highcharts/adapters/mootools-adapter.src.js
-- pub/highcharts/adapters/prototype-adapter.js
-- pub/highcharts/adapters/prototype-adapter.src.js
-- pub/highcharts/highcharts.js
-- pub/highcharts/highcharts.src.js
-- pub/highcharts/modules/exporting.js
-- pub/highcharts/modules/exporting.src.js
-- pub/highcharts/themes/dark-blue.js
-- pub/highcharts/themes/dark-green.js
-- pub/highcharts/themes/gray.js
-- pub/highcharts/themes/grid.js
-- pub/jquery-1.6.1.min.js
-- pub/raphael-min.js
-- pub/raphael-utils.js
+- pub/fnordmetric.css
+- pub/fnordmetric.js
+- pub/loader.gif
 - pub/sprite.png
+- pub/vendor/highcharts.js
+- pub/vendor/jquery-1.6.1.min.js
 - readme.rdoc
 - spec/app_spec.rb
 - spec/context_spec.rb
@@ -300,7 +279,6 @@ files:
 - spec/spec_helper.rb
 - spec/widget_spec.rb
 - spec/worker_spec.rb
-- ulm_stats.rb
 has_rdoc: true
 homepage: http://github.com/paulasmuth/fnordmetric
 licenses: 
@@ -315,9 +293,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -764930577
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/_spec/app_spec.rb

@@ -1,178 +0,0 @@
-require ::File.expand_path('../spec_helper.rb', __FILE__)
-
-include Rack::Test::Methods
-
-describe "app" do
-
-  before(:each) do
-    FnordMetric::Event.destroy_all
-  end
-
-  def app
-    @app ||= FnordMetric::App
-  end
-
-  it "should redirect to the default dashboard" do
-  	get "/"
-  	last_response.status.should == 302
-  	last_response.location.should == "http://example.org/dashboard/default"
-  end
-
-  it "should render the dashboard" do
-    FnordMetric.dashboard("Deine Mama"){|dash|}
-  	get "/dashboard/default"
-  	last_response.status.should == 200
-    last_response.body.should include("Deine Mama")
-  end
-
-  it "should render the right dashboard" do
-    FnordMetric.dashboard("Deine Mama"){|dash|}
-    FnordMetric.dashboard("My Dashboard"){|dash|}
-    get "/dashboard/DeineMama"
-    last_response.status.should == 200
-    last_response.body.should include("Deine Mama")
-    get "/dashboard/MyDashboard"
-    last_response.status.should == 200
-    last_response.body.should include("My Dashboard")
-  end
-
-  it "should track an event without auth" do
-  	post "/events", :type => "myevent", :fnord => "foobar"
-  	last_response.status.should == 200
-  	FnordMetric::Event.last.type.should == "myevent"
-  	FnordMetric::Event.last.fnord.should == "foobar"
-  end
-
-  it "should return 400 if no type is provided" do
-  	post "/events", :fnord => "foobar"
-  	last_response.status.should == 400  	
-  	last_response.body.should == "please specify the event_type"
-  end
-
-  it "should track an event in the past" do
-  	my_time = (Time.now-3.years).to_i
-  	post "/events", :type => "myevent", :time => my_time
-  	last_response.status.should == 200
-  	FnordMetric::Event.last.type.should == "myevent"
-  	FnordMetric::Event.last.time.should == my_time
-  end
-
-  it "should track an event with integer data" do
-  	post "/events", :type => "myevent", :blubb => "123"
-  	last_response.status.should == 200
-  	FnordMetric::Event.last.type.should == "myevent"
-  	FnordMetric::Event.last.blubb.should == 123
-  end
-  
-  it "should track an event with float data" do
-  	post "/events", :type => "myevent", :blubb => "42.23"
-  	last_response.status.should == 200
-  	FnordMetric::Event.last.type.should == "myevent"
-  	FnordMetric::Event.last.blubb.should == 42.23
-  end
-
-
-  describe "metrics api" do
-
-    before(:each) do
-      FnordMetric::Event.destroy_all
-      FnordMetric.metric('my_event_count', :count => true, :types => [:my_event_type])
-      FnordMetric.track('my_event_type', :time => 33.hours.ago)
-      FnordMetric.track('my_event_type', :time => 32.hours.ago)
-      FnordMetric.track('my_event_type', :time => 29.hours.ago)
-      FnordMetric.track('my_event_type', :time => 27.hours.ago)
-      FnordMetric.track('my_event_type', :time => 26.hours.ago)
-      FnordMetric.track('my_event_type', :time => 13.hours.ago)
-      FnordMetric.track('my_event_type', :time => 12.hours.ago)
-      FnordMetric.track('my_event_type', :time => 2.hours.ago)      
-      FnordMetric.track('my_event_type', :time => 3.hours.ago)  
-    end
-
-    it "should return the right answer for: /metric/:name" do      
-      get "/metric/my_event_count"
-      JSON.parse(last_response.body)["value"].to_i.should == 9      
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp" do      
-      get "/metric/my_event_count", :at => 18.hours.ago.to_i.to_s
-      JSON.parse(last_response.body)["value"].to_i.should == 5
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp" do      
-      get "/metric/my_event_count", :at => "#{30.hours.ago.to_i}-#{20.hours.ago.to_i}"
-      JSON.parse(last_response.body)["value"].to_i.should == 3
-    end   
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i, :delta => true
-      JSON.parse(last_response.body)["values"].length.should == 6
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i, :delta => true
-      JSON.parse(last_response.body)["values"][0].first.should == 34.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][0].last.should == 3
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i, :delta => true
-      JSON.parse(last_response.body)["values"][1].first.should == 28.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][1].last.should == 2
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i, :delta => true
-      JSON.parse(last_response.body)["values"][2].first.should == 22.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][2].last.should == 0
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i, :delta => true
-      JSON.parse(last_response.body)["values"][3].first.should == 16.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][3].last.should == 2
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i, :delta => true
-      JSON.parse(last_response.body)["values"][5].first.should == 4.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][5].last.should == 2
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i
-      JSON.parse(last_response.body)["values"].length.should == 6
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i
-      JSON.parse(last_response.body)["values"][0].first.should == 34.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][0].last.should == 0
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i
-      JSON.parse(last_response.body)["values"][1].first.should == 28.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][1].last.should == 3
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i
-      JSON.parse(last_response.body)["values"][2].first.should == 22.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][2].last.should == 5
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i
-      JSON.parse(last_response.body)["values"][3].first.should == 16.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][3].last.should == 5
-    end
-
-    it "should return the right answer for: /metric/:name?at=timestamp-timstamp&tick=seconds" do
-      get "/metric/my_event_count", :at => "#{34.hours.ago.to_i}-#{1.hour.ago.to_i}", :tick => 6.hours.to_i
-      JSON.parse(last_response.body)["values"][5].first.should == 4.hours.ago.to_i
-      JSON.parse(last_response.body)["values"][5].last.should == 7
-    end
-
-  end
- 
-end