pulse-meter 0.2.1 → 0.2.2

data/spec/pulse_meter/visualize/widgets/table_spec.rb

@@ -0,0 +1,78 @@
+require "spec_helper"
+
+describe PulseMeter::Visualize::Widgets::Table do
+  let(:interval){ 100 }
+  let!(:a_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:a_sensor, :ttl => 1000, :interval => interval, annotation: 'A') }
+  let!(:b_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:b_sensor, :ttl => 1000, :interval => interval, annotation: 'B') }
+
+  let(:widget_name){ "some_widget" }
+
+  let(:redraw_interval){5}
+  let(:values_label){'xxxx'}
+  let(:width){6}
+  let(:timespan){interval * 2}
+  let(:a_color){'#FF0000'}
+  let(:b_color){'#FFFF00'}
+
+  let(:interval_start){ Time.at((Time.now.to_i / interval) * interval) }
+
+  let(:widget) do
+    w = PulseMeter::Visualize::DSL::Widgets::Table.new(widget_name)
+    w.redraw_interval redraw_interval
+    w.width width
+    w.sensor :a_sensor, color: a_color
+    w.sensor :b_sensor, color: b_color
+    w.gchart_options a: 1
+    w.timespan timespan
+    w.to_data
+  end
+
+  describe "#data" do
+    it "should contain type, title, redraw_interval, width, gchart_options, timespan attriutes" do
+      wdata = widget.data
+      wdata[:type].should == 'table'
+      wdata[:title].should == widget_name
+      wdata[:redraw_interval].should == redraw_interval
+      wdata[:width].should == width
+      wdata[:gchart_options].should == {a: 1}
+      wdata[:timespan].should == timespan
+    end
+
+    describe "series attribute" do
+      before(:each) do
+        Timecop.freeze(interval_start + 1) do
+          a_sensor.event(12)
+          b_sensor.event(33)
+        end
+        Timecop.freeze(interval_start + interval + 1) do
+          a_sensor.event(111)
+        end
+        @current_time = interval_start + 2 * interval - 1
+      end
+
+      it "should contain valid series" do
+        Timecop.freeze(@current_time) do
+          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
+
+      it "should accept custom timespan" do
+        Timecop.freeze(@current_time + interval) do
+          widget.data(timespan: timespan)[:series][:rows].size.should == 1
+          widget.data(timespan: timespan + interval)[:series][:rows].size.should == 2
+        end
+      end
+
+    end
+  end
+end
+
+

data/spec/shared_examples/dsl_widget.rb

@@ -0,0 +1,106 @@
+shared_examples_for "dsl widget" do
+
+  let(:interval){ 100 }
+  let(:name) { "some_sensor" }
+  let!(:sensor){ PulseMeter::Sensor::Timelined::Max.new(name, :ttl => 1000, :interval => interval) }
+  
+  let(:widget_name){ "some_widget" }
+  let(:w){ described_class.new(widget_name)  }
+
+  describe '.new' do
+    it "should set default value for width papram" do
+      wid = w.to_data
+      wid.width.should == PulseMeter::Visualize::DSL::Widget::MAX_WIDTH
+    end
+
+    it "should set title param from .new argument" do
+      wid = w.to_data
+      wid.title.should == widget_name
+    end
+  end
+
+  describe "#process_args" do
+    it "should set sensor by :sensor param" do
+      w.process_args :sensor => :sss
+      sensors = w.to_data.sensors
+      sensors.size.should == 1
+      sensors.first.name.to_s.should == 'sss'
+    end
+
+    it "should set title by :title param" do
+      w.process_args :title => 'Title XXX'
+      w.to_data.title.should == 'Title XXX'
+    end
+
+    it "should set width by :width param" do
+      w.process_args :width => 5
+      w.to_data.width.should == 5
+    end
+
+  end
+
+  describe "#sensor" do
+    it "should add sensor" do
+      w.sensor :s1
+      w.sensor :s2
+      sensors = w.to_data.sensors
+      sensors.size.should == 2
+      sensors.first.name.to_s.should == 's1'
+      sensors.last.name.to_s.should == 's2'
+    end
+  end
+
+  describe "#title" do
+    it "should set title" do
+      w.title 'Title XXX'
+      w.to_data.title.should == 'Title XXX'
+      w.title 'Title YYY'
+      w.to_data.title.should == 'Title YYY'
+    end
+  end
+
+  describe "#width" do
+    it "should set width" do
+      w.width 6
+      w.to_data.width.should == 6
+    end
+
+    it "should raise exception if width is invalid" do
+      expect { w.width -1 }.to raise_exception(PulseMeter::Visualize::DSL::BadWidgetWidth)
+      expect { w.width 11 }.to raise_exception(PulseMeter::Visualize::DSL::BadWidgetWidth)
+    end
+  end
+
+  describe "#redraw_interval" do
+    it "should set redraw_interval" do
+      w.redraw_interval 5
+      w.to_data.redraw_interval.should == 5
+    end
+    it "should raise exception if redraw_interval is negative" do
+      expect{ w.redraw_interval(-1) }.to raise_exception(PulseMeter::Visualize::DSL::BadWidgetRedrawInterval)
+    end
+
+  end
+
+  describe "#to_data" do
+    it "should convert dsl data to widget" do
+      w.to_data.should be_kind_of(PulseMeter::Visualize::Widget)
+    end
+  end
+
+  describe "#gchart_options" do
+    it "should add options to gchart_options hash" do
+      w.gchart_options a: 1
+      w.gchart_options b: 2
+      w.to_data.gchart_options.should == {a: 1, b: 2}
+    end
+  end
+
+  describe "any anknown method" do
+    it "should add options to gchart_options hash" do
+      w.foobar 123
+      w.to_data.gchart_options.should == {foobar: 123}
+    end
+  end
+end
+

data/spec/shared_examples/timeline_sensor.rb

@@ -19,9 +19,15 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
 
   before(:each) do
     @interval_id = (Time.now.to_i / interval) * interval
+    @prev_interval_id = (Time.now.to_i / interval) * interval - interval
+
     @raw_data_key = sensor.raw_data_key(@interval_id)
+    @prev_raw_data_key = sensor.raw_data_key(@prev_interval_id)
+
     @next_raw_data_key = sensor.raw_data_key(@interval_id + interval)
+
     @start_of_interval = Time.at(@interval_id)
+    @start_of_prev_interval = Time.at(@prev_interval_id)
   end
 
   describe "#dump" do
@@ -66,12 +72,36 @@ shared_examples_for "timeline sensor" do |extra_init_values, default_event|
     end
 
     it "should write data to bucket indicated by truncated timestamp" do
-      key = sensor.raw_data_key(@interval_id)
       expect{
         Timecop.freeze(@start_of_interval) do
           sensor.event(sample_event)
         end
-      }.to change{ redis.ttl(key) }
+      }.to change{ redis.ttl(@raw_data_key) }
+    end
+  end
+
+  describe "#event_at" do
+    let(:now) {Time.now}
+    it "should write events to redis" do
+      expect{
+          sensor.event_at(now, sample_event)
+      }.to change{ redis.keys('*').count }.by(1)
+    end
+
+    it "should write data so that it totally expires after :raw_data_ttl" do
+      key_count = redis.keys('*').count
+      sensor.event_at(now, sample_event)
+      Timecop.freeze(Time.now + raw_data_ttl + 1) do
+        redis.keys('*').count.should == key_count
+      end
+    end
+
+    it "should write data to bucket indicated by passed time" do
+      expect{
+        Timecop.freeze(@start_of_interval) do
+          sensor.event_at(@start_of_prev_interval, sample_event)
+        end
+      }.to change{ redis.ttl(@prev_raw_data_key) }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -92,6 +92,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-partial
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -325,6 +341,7 @@ files:
 - lib/pulse-meter/sensor/configuration.rb
 - lib/pulse-meter/sensor/counter.rb
 - lib/pulse-meter/sensor/hashed_counter.rb
+- lib/pulse-meter/sensor/hashed_indicator.rb
 - lib/pulse-meter/sensor/indicator.rb
 - lib/pulse-meter/sensor/remote.rb
 - lib/pulse-meter/sensor/timeline.rb
@@ -343,12 +360,19 @@ files:
 - lib/pulse-meter/server/sensors.rb
 - lib/pulse-meter/version.rb
 - lib/pulse-meter/visualize/app.rb
-- lib/pulse-meter/visualize/dsl.rb
+- lib/pulse-meter/visualize/base.rb
+- lib/pulse-meter/visualize/dsl/base.rb
 - lib/pulse-meter/visualize/dsl/errors.rb
 - lib/pulse-meter/visualize/dsl/layout.rb
 - lib/pulse-meter/visualize/dsl/page.rb
 - lib/pulse-meter/visualize/dsl/sensor.rb
 - lib/pulse-meter/visualize/dsl/widget.rb
+- lib/pulse-meter/visualize/dsl/widget_old.rb
+- lib/pulse-meter/visualize/dsl/widgets/area.rb
+- lib/pulse-meter/visualize/dsl/widgets/gauge.rb
+- lib/pulse-meter/visualize/dsl/widgets/line.rb
+- lib/pulse-meter/visualize/dsl/widgets/pie.rb
+- lib/pulse-meter/visualize/dsl/widgets/table.rb
 - lib/pulse-meter/visualize/layout.rb
 - lib/pulse-meter/visualize/page.rb
 - lib/pulse-meter/visualize/public/css/application.css
@@ -367,8 +391,31 @@ files:
 - lib/pulse-meter/visualize/sensor.rb
 - lib/pulse-meter/visualize/series_extractor.rb
 - lib/pulse-meter/visualize/views/main.haml
+- lib/pulse-meter/visualize/views/widgets/area.haml
+- lib/pulse-meter/visualize/views/widgets/extend_options.haml
+- lib/pulse-meter/visualize/views/widgets/gauge.haml
+- lib/pulse-meter/visualize/views/widgets/line.haml
+- lib/pulse-meter/visualize/views/widgets/pie.haml
+- lib/pulse-meter/visualize/views/widgets/table.haml
 - lib/pulse-meter/visualize/widget.rb
+- lib/pulse-meter/visualize/widgets/gauge.rb
+- lib/pulse-meter/visualize/widgets/pie.rb
+- lib/pulse-meter/visualize/widgets/timeline.rb
 - lib/pulse-meter/visualizer.rb
+- perl/PulseMeter/Sensor/Base.pm
+- perl/PulseMeter/Sensor/Counter.pm
+- perl/PulseMeter/Sensor/HashedIndicator.pm
+- perl/PulseMeter/Sensor/Indicator.pm
+- perl/PulseMeter/Sensor/Timeline.pm
+- perl/PulseMeter/Sensor/Timelined/Average.pm
+- perl/PulseMeter/Sensor/Timelined/Counter.pm
+- perl/PulseMeter/Sensor/Timelined/HashedCounter.pm
+- perl/PulseMeter/Sensor/Timelined/Max.pm
+- perl/PulseMeter/Sensor/Timelined/Median.pm
+- perl/PulseMeter/Sensor/Timelined/Min.pm
+- perl/PulseMeter/Sensor/Timelined/Percentile.pm
+- perl/PulseMeter/Sensor/Timelined/UniqCounter.pm
+- perl/PulseMeter/Sensor/UniqCounter.pm
 - pulse-meter.gemspec
 - spec/pulse_meter/mixins/dumper_spec.rb
 - spec/pulse_meter/mixins/utils_spec.rb
@@ -376,6 +423,7 @@ files:
 - spec/pulse_meter/sensor/configuration_spec.rb
 - spec/pulse_meter/sensor/counter_spec.rb
 - spec/pulse_meter/sensor/hashed_counter_spec.rb
+- spec/pulse_meter/sensor/hashed_indicator_spec.rb
 - spec/pulse_meter/sensor/indicator_spec.rb
 - spec/pulse_meter/sensor/remote_spec.rb
 - spec/pulse_meter/sensor/timeline_spec.rb
@@ -393,13 +441,23 @@ files:
 - spec/pulse_meter/visualize/dsl/page_spec.rb
 - spec/pulse_meter/visualize/dsl/sensor_spec.rb
 - spec/pulse_meter/visualize/dsl/widget_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/area_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/gauge_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/line_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/pie_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/table_spec.rb
 - spec/pulse_meter/visualize/layout_spec.rb
 - spec/pulse_meter/visualize/page_spec.rb
 - spec/pulse_meter/visualize/sensor_spec.rb
 - spec/pulse_meter/visualize/series_extractor_spec.rb
-- spec/pulse_meter/visualize/widget_spec.rb
+- spec/pulse_meter/visualize/widgets/area_spec.rb
+- spec/pulse_meter/visualize/widgets/gauge_spec.rb
+- spec/pulse_meter/visualize/widgets/line_spec.rb
+- spec/pulse_meter/visualize/widgets/pie_spec.rb
+- spec/pulse_meter/visualize/widgets/table_spec.rb
 - spec/pulse_meter/visualizer_spec.rb
 - spec/pulse_meter_spec.rb
+- spec/shared_examples/dsl_widget.rb
 - spec/shared_examples/timeline_sensor.rb
 - spec/shared_examples/timelined_subclass.rb
 - spec/spec_helper.rb
@@ -424,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -872514711759576933
+      hash: 3972958232601263142
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -439,6 +497,7 @@ test_files:
 - spec/pulse_meter/sensor/configuration_spec.rb
 - spec/pulse_meter/sensor/counter_spec.rb
 - spec/pulse_meter/sensor/hashed_counter_spec.rb
+- spec/pulse_meter/sensor/hashed_indicator_spec.rb
 - spec/pulse_meter/sensor/indicator_spec.rb
 - spec/pulse_meter/sensor/remote_spec.rb
 - spec/pulse_meter/sensor/timeline_spec.rb
@@ -456,13 +515,23 @@ test_files:
 - spec/pulse_meter/visualize/dsl/page_spec.rb
 - spec/pulse_meter/visualize/dsl/sensor_spec.rb
 - spec/pulse_meter/visualize/dsl/widget_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/area_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/gauge_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/line_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/pie_spec.rb
+- spec/pulse_meter/visualize/dsl/widgets/table_spec.rb
 - spec/pulse_meter/visualize/layout_spec.rb
 - spec/pulse_meter/visualize/page_spec.rb
 - spec/pulse_meter/visualize/sensor_spec.rb
 - spec/pulse_meter/visualize/series_extractor_spec.rb
-- spec/pulse_meter/visualize/widget_spec.rb
+- spec/pulse_meter/visualize/widgets/area_spec.rb
+- spec/pulse_meter/visualize/widgets/gauge_spec.rb
+- spec/pulse_meter/visualize/widgets/line_spec.rb
+- spec/pulse_meter/visualize/widgets/pie_spec.rb
+- spec/pulse_meter/visualize/widgets/table_spec.rb
 - spec/pulse_meter/visualizer_spec.rb
 - spec/pulse_meter_spec.rb
+- spec/shared_examples/dsl_widget.rb
 - spec/shared_examples/timeline_sensor.rb
 - spec/shared_examples/timelined_subclass.rb
 - spec/spec_helper.rb

data/spec/pulse_meter/visualize/widget_spec.rb

@@ -1,122 +0,0 @@
-require "spec_helper"
-
-describe PulseMeter::Visualize::Widget do
-  let(:interval){ 100 }
-  let!(:a_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:a_sensor, :ttl => 1000, :interval => interval, annotation: 'A') }
-  let!(:b_sensor){ PulseMeter::Sensor::Timelined::Counter.new(:b_sensor, :ttl => 1000, :interval => interval, annotation: 'B') }
-
-  let(:type) { :some_type }
-  let(:widget_name){ "some_widget" }
-
-  let(:redraw_interval){5}
-  let(:values_label){'xxxx'}
-  let(:width){6}
-  let(:show_last_point){false}
-  let(:timespan){interval * 2}
-  let(:a_color){'#FF0000'}
-  let(:b_color){'#FFFF00'}
-
-  let(:interval_start){ Time.at((Time.now.to_i / interval) * interval) }
-
-  def add_widget_settings(w)
-    w.redraw_interval redraw_interval
-    w.values_label values_label
-    w.width width
-    w.show_last_point show_last_point
-    w.timespan timespan
-
-    w.sensor :a_sensor, color: a_color
-    w.sensor :b_sensor, color: b_color
-  end
-
-  let(:widgets) do
-    [: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
-    end
-  end
-
-  describe "#data" do
-    it "should contain type, title, interval, values_label, width, show_last_point attriutes" do
-      widgets.each do |k,w|
-        wdata = w.data
-        wdata[:type].should == k
-        wdata[:title].should == widget_name
-        wdata[:interval].should == redraw_interval
-        wdata[:values_title].should == values_label
-        wdata[:width].should == width
-      end
-    end
-
-    describe "series attribute" do
-      before(:each) do
-        Timecop.freeze(interval_start + 1) do
-          a_sensor.event(12)
-          b_sensor.event(33)
-        end
-        Timecop.freeze(interval_start + interval + 1) do
-          a_sensor.event(111)
-        end
-        @current_time = interval_start + 2 * interval - 1
-
-      end
-      context "pie widget" do
-
-        it "should contain valid pie series" do
-
-          Timecop.freeze(@current_time) do
-            widgets[:pie].data[:series].should ==
-              {
-                data: [
-                  [a_sensor.annotation, 12],
-                  [b_sensor.annotation, 33]
-                ],
-                options: [
-                  {color: a_color},
-                  {color: b_color}
-                ]
-              }
-          end
-
-        end
-
-        context "line, spline, area widgets" do
-
-          it "should contain valid series" do
-
-            Timecop.freeze(@current_time) do
-
-              [:line, :area].each do |type|
-
-                widget = widgets[type]
-                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, :area].each do |type|
-                widget = widgets[type]
-                widget.data(timespan: timespan)[:series][:rows].size.should == 1
-                widget.data(timespan: timespan + interval)[:series][:rows].size.should == 2
-              end
-            end
-          end
-
-
-        end
-      end
-    end
-
-  end
-end