pulse-meter 0.1.11 → 0.2.0

data/spec/pulse_meter/visualize/dsl/page_spec.rb

@@ -52,9 +52,9 @@ describe PulseMeter::Visualize::DSL::Page do
 
   describe "#chart" do
     it "should create widget width type :chart" do
-      page.spline(:some_widget_name)
+      page.line(:some_widget_name)
       w = page.to_page.widgets.first
-      w.type.should == :spline
+      w.type.should == :line
     end
   end
 

data/spec/pulse_meter/visualize/layout_spec.rb

@@ -5,12 +5,12 @@ describe PulseMeter::Visualize::Layout do
     l = PulseMeter::Visualize::DSL::Layout.new
     l.page "page1" do |p|
       p.line "w1"
-      p.spline "w2"
-      p.highchart_options({a: 1})
+      p.line "w2"
+      p.gchart_options({a: 1})
     end
     l.page "page2" do |p|
       p.line "w3"
-      p.spline "w4"
+      p.line "w4"
     end
     l.to_layout
   end
@@ -18,8 +18,8 @@ describe PulseMeter::Visualize::Layout do
   describe "#page_infos" do
     it "should return list of page infos with ids" do
       layout.page_infos.should == [
-        {title: "page1", id: 1, highchart_options: {a: 1}},
-        {title: "page2", id: 2, highchart_options: {}}
+        {title: "page1", id: 1, gchart_options: {a: 1}},
+        {title: "page2", id: 2, gchart_options: {}}
       ]
     end
   end
@@ -28,10 +28,9 @@ describe PulseMeter::Visualize::Layout do
     it "should return layout options" do
       ldsl = PulseMeter::Visualize::DSL::Layout.new
       ldsl.use_utc true
-      ldsl.outlier_color '#RED'
-      ldsl.highchart_options({a: 1})
+      ldsl.gchart_options({a: 1})
       l = ldsl.to_layout
-      l.options.should == {use_utc: true, outlier_color: '#RED', highchart_options: {a: 1}}
+      l.options.should == {use_utc: true, gchart_options: {a: 1}}
     end
   end
 

data/spec/pulse_meter/visualize/page_spec.rb

@@ -67,68 +67,49 @@ describe PulseMeter::Visualize::Page do
     it "should generate correct data of single widget" do
       Timecop.freeze(interval_start + 2 * interval - 1) do
         page.widget_data(0)[:series].should ==
-          [
-            {
-              type: :pie,
-              name: values_label,
-              data: [
-                {
-                  name: a_sensor.annotation,
-                  color: a_color,
-                  y: 12
-                },
-                {
-                  name: b_sensor.annotation,
-                  color: b_color,
-                  y: 33
-                }
-              ]
-
-            }
-          ]
+          {
+            data: [
+              [a_sensor.annotation, 12],
+              [b_sensor.annotation, 33]
+            ],
+            options: [
+              {color: a_color},
+              {color: b_color}
+            ]
+          }
         page.widget_data(1)[:series].should ==
-          [{
-             name: a_sensor.annotation,
-             color: a_color,
-             data: [{x: interval_start.to_i * 1000, y: 12}]
-           }, {
-            name: b_sensor.annotation,
-            color: b_color,
-            data: [{x: interval_start.to_i * 1000, y: 33}]
-          }]
+          {
+            titles: [a_sensor.annotation, b_sensor.annotation],
+            rows: [[interval_start.to_i * 1000, 12, 33]],
+            options: [
+              {color: a_color},
+              {color: b_color}
+            ]
+          }
       end
 
       Timecop.freeze(interval_start + 2 * interval - 1) do
         page.widget_data(0, timespan: 0)[:series].should ==
-          [
-            {
-              type: :pie,
-              name: values_label,
-              data: [
-                {
-                  name: a_sensor.annotation,
-                  color: a_color,
-                  y: 12
-                },
-                  {
-                    name: b_sensor.annotation,
-                    color: b_color,
-                    y: 33
-                  }
-              ]
-
-            }
-          ]
+          {
+            data: [
+              [a_sensor.annotation, 12],
+              [b_sensor.annotation, 33]
+            ],
+            options: [
+              {color: a_color},
+              {color: b_color}
+            ]
+          }
         page.widget_data(1, timespan: 1)[:series].should ==
-          [{
-            name: a_sensor.annotation,
-            color: a_color,
-            data: []
-          }, {
-            name: b_sensor.annotation,
-            color: b_color,
-            data: []
-          }]
+          {
+            titles: [a_sensor.annotation, b_sensor.annotation],
+            rows: [],
+            options: [
+              {color: a_color},
+              {color: b_color}
+            ]
+          }
+
       end
 
 
@@ -146,38 +127,27 @@ describe PulseMeter::Visualize::Page do
       Timecop.freeze(interval_start + 2 * interval - 1) do
 
         page.widget_datas.map{|h| h[:series]}.should == [
-          [
-            {
-              type: :pie,
-              name: values_label,
-              data: [
-                {
-                  name: a_sensor.annotation,
-                  color: a_color,
-                  y: 12
-                },
-                {
-                  name: b_sensor.annotation,
-                  color: b_color,
-                  y: 33
-                }
-              ]
-
-            }
-          ],
-          [{
-             name: a_sensor.annotation,
-             color: a_color,
-             data: [{x: interval_start.to_i * 1000, y: 12}]
-           }, {
-            name: b_sensor.annotation,
-            color: b_color,
-            data: [{x: interval_start.to_i * 1000, y: 33}]
-          }]
+          {
+            data: [
+              [a_sensor.annotation, 12],
+              [b_sensor.annotation, 33]
+            ],
+            options: [
+              {color: a_color},
+              {color: b_color}
+            ]
+          },
+          {
+            titles: [a_sensor.annotation, b_sensor.annotation],
+            rows: [[interval_start.to_i * 1000, 12, 33]],
+            options: [
+              {color: a_color},
+              {color: b_color}
+            ]
+          }
         ]
       end
 
-
     end
   end
 end

data/spec/pulse_meter/visualize/sensor_spec.rb

@@ -16,14 +16,14 @@ describe PulseMeter::Visualize::Sensor do
   describe '#last_value' do
     context "when sensor does not exist" do
       it "should raise RestoreError" do
-        expect{ bad_sensor.last_value }.to raise_exception(PulseMeter::RestoreError)
+        expect{ bad_sensor.last_value(Time.now) }.to raise_exception(PulseMeter::RestoreError)
       end
     end
 
 
     context "when sensor has no data" do
       it "should return nil" do
-        sensor.last_value.should be_nil
+        sensor.last_value(Time.now).should be_nil
       end
     end
 
@@ -34,7 +34,7 @@ describe PulseMeter::Visualize::Sensor do
             real_sensor.event(101)
           end
           Timecop.freeze(interval_start+1) do
-            sensor.last_value(true).should == 101
+            sensor.last_value(Time.now, true).should == 101
           end
         end
       end
@@ -45,10 +45,10 @@ describe PulseMeter::Visualize::Sensor do
             real_sensor.event(101)
           end
           Timecop.freeze(interval_start + 1) do
-            sensor.last_value.should be_nil
+            sensor.last_value(Time.now).should be_nil
           end
           Timecop.freeze(interval_start + interval + 1) do
-            sensor.last_value.should == 101
+            sensor.last_value(Time.now).should == 101
           end
         end
       end
@@ -60,7 +60,7 @@ describe PulseMeter::Visualize::Sensor do
 
     context "when sensor does not exist" do
       it "should raise RestoreError" do
-        expect{ bad_sensor.last_point_data }.to raise_exception(PulseMeter::RestoreError)
+        expect{ bad_sensor.last_point_data(Time.now) }.to raise_exception(PulseMeter::RestoreError)
       end
     end
 
@@ -69,10 +69,10 @@ describe PulseMeter::Visualize::Sensor do
         real_sensor.event(101)
       end
       Timecop.freeze(interval_start + 1) do
-        sensor.last_point_data(true).should == {name: annotation, y: 101}
-        sensor.last_point_data.should == {name: annotation, y: nil}
-        sensor_with_color.last_point_data(true).should == {name: annotation, y: 101, color: color}
-        sensor_with_color.last_point_data.should == {name: annotation, y: nil, color: color}
+        sensor.last_point_data(Time.now, true).should == [{name: annotation, y: 101}]
+        sensor.last_point_data(Time.now).should == [{name: annotation, y: nil}]
+        sensor_with_color.last_point_data(Time.now, true).should == [{name: annotation, y: 101, color: color}]
+        sensor_with_color.last_point_data(Time.now).should == [{name: annotation, y: nil, color: color}]
       end
     end
   end
@@ -89,7 +89,7 @@ describe PulseMeter::Visualize::Sensor do
 
     context "when sensor does not exist" do
       it "should raise RestoreError" do
-        expect{ bad_sensor.timeline_data(interval) }.to raise_exception(PulseMeter::RestoreError)
+        expect{ bad_sensor.timeline_data(Time.now, interval) }.to raise_exception(PulseMeter::RestoreError)
       end
     end
 
@@ -97,21 +97,21 @@ describe PulseMeter::Visualize::Sensor do
     describe "returned value" do
       it "should contain sensor annotation" do
         Timecop.freeze(interval_start + interval + 1) do
-          sensor.timeline_data(interval)[:name].should == annotation
+          sensor.timeline_data(Time.now, interval).first[:name].should == annotation
         end
       end
       it "should contain sensor color" do
         Timecop.freeze(interval_start + interval + 1) do
-          sensor_with_color.timeline_data(interval)[:color].should == color
+          sensor_with_color.timeline_data(Time.now, interval).first[:color].should == color
         end
       end
 
       it "should contain [interval_start, value] pairs for each interval" do
         Timecop.freeze(interval_start + interval + 1) do
-          data = sensor.timeline_data(interval * 2)
-          data[:data].should == [{x: interval_start.to_i * 1000, y: 101}]
-          data = sensor.timeline_data(interval * 2, true)
-          data[:data].should == [{x: interval_start.to_i * 1000, y: 101}, {x: (interval_start + interval).to_i * 1000, y: 55}]
+          data = sensor.timeline_data(Time.now, interval * 2)
+          data.first[:data].should == [{x: interval_start.to_i * 1000, y: 101}]
+          data = sensor.timeline_data(Time.now, interval * 2, true)
+          data.first[:data].should == [{x: interval_start.to_i * 1000, y: 101}, {x: (interval_start + interval).to_i * 1000, y: 55}]
         end
       end
     end

data/spec/pulse_meter/visualize/series_extractor_spec.rb

@@ -25,7 +25,7 @@ describe PulseMeter::Visualize::SeriesExtractor do
     end
 
     it "should create point data correctly" do
-      extractor.point_data(123).should == {y: 123, name: 'simple sensor'}
+      extractor.point_data(123).should == [{y: 123, name: 'simple sensor'}]
     end
 
     it "should create timeline data correctly" do
@@ -33,10 +33,10 @@ describe PulseMeter::Visualize::SeriesExtractor do
         PulseMeter::SensorData.new(Time.at(1), 11),
         PulseMeter::SensorData.new(Time.at(2), "22")
       ]
-      extractor.series_data(tl_data).should == {
+      extractor.series_data(tl_data).should == [{
         name: 'simple sensor',
         data: [{x: 1000, y: 11}, {x: 2000, y: 22}]
-      }
+      }]
     end
 
   end

data/spec/pulse_meter/visualize/widget_spec.rb

@@ -30,7 +30,7 @@ describe PulseMeter::Visualize::Widget do
   end
 
   let(:widgets) do
-    [:line, :spline, :area, :pie].each_with_object({}) do |type, h|
+    [:line, :area, :pie].each_with_object({}) do |type, h|
       w = PulseMeter::Visualize::DSL::Widget.new(type, widget_name)
       add_widget_settings(w)
       h[type] = w.to_widget
@@ -66,20 +66,17 @@ describe PulseMeter::Visualize::Widget do
         it "should contain valid pie series" do
 
           Timecop.freeze(@current_time) do
-            widgets[:pie].data[:series].should == [{
-              type: :pie,
-              name: values_label,
-              data: [{
-                name: a_sensor.annotation,
-                color: a_color,
-                y: 12
-              }, {
-                name: b_sensor.annotation,
-                color: b_color,
-                y: 33
-              }]
-
-            }]
+            widgets[:pie].data[:series].should ==
+              {
+                data: [
+                  [a_sensor.annotation, 12],
+                  [b_sensor.annotation, 33]
+                ],
+                options: [
+                  {color: a_color},
+                  {color: b_color}
+                ]
+              }
           end
 
         end
@@ -90,34 +87,28 @@ describe PulseMeter::Visualize::Widget do
 
             Timecop.freeze(@current_time) do
 
-              [:line, :spline, :area].each do |type|
+              [:line, :area].each do |type|
 
                 widget = widgets[type]
-                widget.data[:series].should == [{
-                  name: a_sensor.annotation,
-                  color: a_color,
-                  data: [{x: interval_start.to_i * 1000, y: 12}]
-                }, {
-                  name: b_sensor.annotation,
-                  color: b_color,
-                  data: [{x: interval_start.to_i * 1000, y: 33}]
-                }]
+                widget.data[:series].should ==
+                  {
+                    titles: [a_sensor.annotation, b_sensor.annotation],
+                    rows: [[interval_start.to_i * 1000, 12, 33]],
+                    options: [
+                      {color: a_color},
+                      {color: b_color}
+                    ]
+                  }
               end
             end
           end
 
           it "should accept custom timespan" do
             Timecop.freeze(@current_time + interval) do
-              [:line, :spline, :area].each do |type|
+              [:line, :area].each do |type|
                 widget = widgets[type]
-                widget.data(timespan: timespan)[:series].each do |s|
-                  s[:data].size.should == 1
-                end
-
-                widget.data(timespan: timespan + interval)[:series].each do |s|
-                  s[:data].size.should == 2
-                end
-
+                widget.data(timespan: timespan)[:series][:rows].size.should == 1
+                widget.data(timespan: timespan + interval)[:series][:rows].size.should == 2
               end
             end
           end
@@ -128,4 +119,4 @@ describe PulseMeter::Visualize::Widget do
     end
 
   end
-end
+end

data/spec/pulse_meter/visualizer_spec.rb

@@ -8,7 +8,7 @@ describe PulseMeter::Visualizer do
         l.title "My Gauges"
 
         l.page "Dashboard" do |p|
-          p.spline :convertion do |c|
+          p.line :convertion do |c|
             c.sensor :adv_clicks, color: :green
             c.sensor :adv_shows, color: :red
           end
@@ -23,7 +23,7 @@ describe PulseMeter::Visualizer do
         end
 
         l.page "Request stats" do |p|
-          p.spline :rph_total, sensor: :rph_total
+          p.line :rph_total, sensor: :rph_total
           p.line :rph_main_page, sensor: :rph_main_page
           p.line :request_time_p95_hour
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -360,7 +360,6 @@ files:
 - lib/pulse-meter/visualize/public/js/application.js
 - lib/pulse-meter/visualize/public/js/backbone-min.js
 - lib/pulse-meter/visualize/public/js/bootstrap.js
-- lib/pulse-meter/visualize/public/js/highcharts.js
 - lib/pulse-meter/visualize/public/js/jquery-1.7.2.min.js
 - lib/pulse-meter/visualize/public/js/json2.js
 - lib/pulse-meter/visualize/public/js/underscore-min.js
@@ -424,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1712600594864838902
+      hash: 2820697990026524466
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24