pulse_meter-dygraphs_visualizer 0.4.20 → 0.4.21

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2Y1OTk2NWRmYjgwMmE5ZTZlZDFlOTdhNDdlMjcxZmU5YTA4YTRmOA==
-  data.tar.gz: !binary |-
-    YzQ3YjEzOTVkMjk3MGZjYWE1ZDRmZjU3ZGY3OGI3MjYzMThiNmZmZA==
+SHA1:
+  metadata.gz: 59fa9a27bec80b059be63f171091f9eacfbe7560
+  data.tar.gz: bf82152b3b4e715124dbbf36846d2a5c5eb57b5f
 SHA512:
-  metadata.gz: !binary |-
-    ODcyNjY2MWExNDk1YTI1MzdhNmZhMTA4YmQwY2MyZmE5YTczY2E3NTE2YjBj
-    Yzk5NDNhMGMyZjcwODQxN2MwZmFjNTRmYzg3OGMzNTFiNzQ2NTU5MDY5YjYw
-    ZTI1MTQ5ZTdmMTFhMTZhYzI4ZmY5ZmYyMTFiYzYzNTI2NWFmYjY=
-  data.tar.gz: !binary |-
-    MTFjYzgwNzA5NjE3MDY2MTUxNTdhZjgwZTdkYzVkZjQ5MjNkMzM2MmZiOGRj
-    Y2E3OWE3YTAxYzQxZDRkZjkwM2U4MDU1ZTdjMmMyNjJiZjIzM2Q5ZjM1YWEw
-    YTdkZDZkZTA3NTNlYjZjOTQ0NTAzZTk3NzZlNWVhYjBiOGEyZGQ=
+  metadata.gz: cae261915e613d9cb684ef1bde9afa69c26071bc9add6946695fff632e0e5cad30d8068d9bf3d01c5b0ed2aae2ebdd515c7764ca850a1da66ac003385ca2a4f9
+  data.tar.gz: 80798c35b1b368a2c885715d858cc44879c8f1ec42262c189be0edf2249b35edf12a1703e581f02d7cd91b4f4e8c397a3e0cdae421a6d2226e0d0e3ee23856fe

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/pulse_meter-dygraphs_visualizer.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "pulse_meter-dygraphs_visualizer"
   gem.require_paths = ["lib"]
-  gem.version       = "0.4.20"
+  gem.version       = "0.4.21"
 
   gem.add_runtime_dependency('pulse_meter_core')
   gem.add_runtime_dependency('gon-sinatra')

data/spec/pulse_meter/dygraphs_visualize/app_spec.rb

@@ -16,12 +16,12 @@ describe PulseMeter::DygraphsVisualize::App do
   
   it "responds to /" do
     get '/'
-    last_response.should be_ok
-    last_response.body.should include("Foo meters")
+    expect(last_response).to be_ok
+    expect(last_response.body).to include("Foo meters")
   end
 
   it "responds to /application.js" do
     get '/js/application.js'
-    last_response.should be_ok
+    expect(last_response).to be_ok
   end
 end

data/spec/pulse_meter/dygraphs_visualize/dsl/layout_spec.rb

@@ -7,17 +7,17 @@ describe PulseMeter::DygraphsVisualize::DSL::Layout do
   let(:layout){ described_class.new }
 
   describe '.new' do
-    it "should initialize pages, title, use_utc, dygraphs_options" do
+    it "initializes pages, title, use_utc, dygraphs_options" do
       l = layout.to_data
-      l.title.should == PulseMeter::DygraphsVisualize::DSL::Layout::DEFAULT_TITLE
-      l.pages.should == []
-      l.use_utc.should be_false
-      l.dygraphs_options.should == {}
+      expect(l.title).to eq(PulseMeter::DygraphsVisualize::DSL::Layout::DEFAULT_TITLE)
+      expect(l.pages).to eq([])
+      expect(l.use_utc).to be_falsey
+      expect(l.dygraphs_options).to eq({})
     end
   end
 
   describe "#page" do
-    it "should add page constructed by block to pages" do
+    it "adds page constructed by block to pages" do
       layout.page "My Foo Page" do |p|
         p.stack "foo_widget", sensor: sensor_name
         p.line "bar_widget" do |w|
@@ -25,39 +25,39 @@ describe PulseMeter::DygraphsVisualize::DSL::Layout do
         end
       end
       l = layout.to_data
-      l.pages.size.should == 1
+      expect(l.pages.size).to eq(1)
       p = l.pages.first
-      p.title.should == "My Foo Page"
-      p.widgets.size.should == 2
-      p.widgets.first.title.should == "foo_widget"
-      p.widgets.last.title.should == "bar_widget"
+      expect(p.title).to eq("My Foo Page")
+      expect(p.widgets.size).to eq(2)
+      expect(p.widgets.first.title).to eq("foo_widget")
+      expect(p.widgets.last.title).to eq("bar_widget")
     end
   end
 
   describe "#title" do
-    it "should set layout title" do
+    it "sets layout title" do
       layout.title "Foo Title"
-      layout.to_data.title.should == 'Foo Title'
+      expect(layout.to_data.title).to eq('Foo Title')
     end
   end
 
   describe "#use_utc" do
-    it "should set use_utc" do
+    it "sets use_utc" do
       layout.use_utc false
-      layout.to_data.use_utc.should be_false
+      expect(layout.to_data.use_utc).to be_falsey
     end
   end
 
   describe "#dygraphs_options" do
-    it "should set dygraphs_options" do
+    it "sets dygraphs_options" do
       layout.dygraphs_options({b: 1})
-      layout.to_data.dygraphs_options.should == {b: 1}
+      expect(layout.to_data.dygraphs_options).to eq({b: 1})
     end
   end
 
   describe "#to_data" do
-    it "should convert layout dsl data to DygraphsVisualize::Layout" do
-      layout.to_data.should be_kind_of(PulseMeter::DygraphsVisualize::Layout)
+    it "converts layout dsl data to DygraphsVisualize::Layout" do
+      expect(layout.to_data).to be_kind_of(PulseMeter::DygraphsVisualize::Layout)
     end
   end
 end

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

@@ -8,25 +8,25 @@ describe PulseMeter::DygraphsVisualize::DSL::Page do
   let(:page){ PulseMeter::DygraphsVisualize::DSL::Page.new(title) }
 
   describe '.new' do
-    it "should initialize title and widgets" do
+    it "initializes title and widgets" do
       p = page.to_data  
-      p.title.should == title
-      p.widgets.should == []
+      expect(p.title).to eq(title)
+      expect(p.widgets).to eq([])
     end
   end
 
   [:line, :stack].each do |widget_type|
 
     describe "##{widget_type}" do
-      it "should add #{widget_type} widget initialized by args to widgets" do
+      it "adds #{widget_type} widget initialized by args to widgets" do
         page.send(widget_type, :some_widget_name, sensor: sensor_name, width: 7)
         w = page.to_data.widgets.first
-        w.width.should == 7
-        w.title.should == "some_widget_name"
-        w.sensors.first.name.should == sensor_name
+        expect(w.width).to eq(7)
+        expect(w.title).to eq("some_widget_name")
+        expect(w.sensors.first.name).to eq(sensor_name)
       end
       
-      it "should add #{widget_type} widget initialized by block" do
+      it "adds #{widget_type} widget initialized by block" do
         page.send(widget_type, :some_widget_name) do |w|
           w.sensor(sensor_name)
           w.sensor(sensor_name)
@@ -34,27 +34,27 @@ describe PulseMeter::DygraphsVisualize::DSL::Page do
           w.width 7
         end
         w = page.to_data.widgets.first
-        w.type.should == widget_type.to_s
-        w.width.should == 7
-        w.title.should == "foo_widget"
-        w.sensors.size.should == 2
-        w.sensors.first.name.should == sensor_name
-        w.sensors.last.name.should == sensor_name
+        expect(w.type).to eq(widget_type.to_s)
+        expect(w.width).to eq(7)
+        expect(w.title).to eq("foo_widget")
+        expect(w.sensors.size).to eq(2)
+        expect(w.sensors.first.name).to eq(sensor_name)
+        expect(w.sensors.last.name).to eq(sensor_name)
       end
     end
   
   end
 
   describe "#title" do
-    it "should set page title" do
+    it "sets page title" do
       page.title "Foo Title"
-      page.to_data.title.should == 'Foo Title'
+      expect(page.to_data.title).to eq('Foo Title')
     end
   end
 
   describe "#to_data" do
-    it "should convert DSL data to DygraphsVisualize::Page" do
-      page.to_data.should be_kind_of(PulseMeter::DygraphsVisualize::Page)
+    it "converts DSL data to DygraphsVisualize::Page" do
+      expect(page.to_data).to be_kind_of(PulseMeter::DygraphsVisualize::Page)
     end
   end
 

data/spec/pulse_meter/dygraphs_visualize/dsl/sensor_spec.rb

@@ -6,23 +6,23 @@ describe PulseMeter::DygraphsVisualize::DSL::Sensor do
   let!(:sensor){ PulseMeter::Sensor::Timelined::Max.new(name, :ttl => 1000, :interval => interval) }
 
   describe '.new' do
-    it "should save passed name and create DygraphsVisualize::Sensor with it" do
-      described_class.new(name).to_data.name.to_s.should == name
+    it "saves passed name and create DygraphsVisualize::Sensor with it" do
+      expect(described_class.new(name).to_data.name.to_s).to eq(name)
     end
   end
 
   describe '#process_args' do
-    it "should pass args transparently to DygraphsVisualize::Sensor" do
+    it "passs args transparently to DygraphsVisualize::Sensor" do
       s = described_class.new(name)
       s.process_args color: :red
-      s.to_data.color.to_s.should == 'red'
+      expect(s.to_data.color.to_s).to eq('red')
     end
   end
 
   describe '#to_data' do
     # actually tested above
-    it "should convert dsl data to sensor" do
-      described_class.new(name).to_data.should be_kind_of(PulseMeter::DygraphsVisualize::Sensor)
+    it "converts dsl data to sensor" do
+      expect(described_class.new(name).to_data).to be_kind_of(PulseMeter::DygraphsVisualize::Sensor)
     end
   end
 

data/spec/pulse_meter/dygraphs_visualize/dsl/widgets/line_spec.rb

@@ -11,31 +11,31 @@ describe PulseMeter::DygraphsVisualize::DSL::Widgets::Line do
   let(:w){ described_class.new(widget_name)  }
 
   describe "#to_data" do
-    it "should produce PulseMeter::DygraphsVisualize::Widgets::Area class" do
-      w.to_data.should be_kind_of(PulseMeter::DygraphsVisualize::Widgets::Line)
+    it "produces PulseMeter::DygraphsVisualize::Widgets::Area class" do
+      expect(w.to_data).to be_kind_of(PulseMeter::DygraphsVisualize::Widgets::Line)
     end
   end
 
   describe "#values_label" do
-    it "should set values_label" do
+    it "sets values_label" do
       w.values_label "some y-axis legend"
-      w.to_data.values_label.should == "some y-axis legend"
+      expect(w.to_data.values_label).to eq("some y-axis legend")
     end
   end
 
   describe "#show_last_point" do
-    it "should set show_last_point" do
+    it "sets show_last_point" do
       w.show_last_point true
-      w.to_data.show_last_point.should be_true
+      expect(w.to_data.show_last_point).to be_truthy
     end
   end
 
   describe "#timespan" do
-    it "should set timespan" do
+    it "sets timespan" do
       w.timespan 5
-      w.to_data.timespan.should == 5
+      expect(w.to_data.timespan).to eq(5)
     end
-    it "should raise exception if timespan is negative" do
+    it "raises exception if timespan is negative" do
       expect{ w.timespan(-1) }.to raise_exception(PulseMeter::DygraphsVisualize::DSL::BadWidgetTimeSpan)
     end
   end

data/spec/pulse_meter/dygraphs_visualize/dsl/widgets/stack_spec.rb

@@ -13,40 +13,40 @@ describe PulseMeter::DygraphsVisualize::DSL::Widgets::Stack do
   describe "#to_data" do
     let(:data){ w.to_data }
 
-    it "should produce PulseMeter::DygraphsVisualize::Widgets::Stack class" do
-      data.should be_kind_of(PulseMeter::DygraphsVisualize::Widgets::Stack)
+    it "produces PulseMeter::DygraphsVisualize::Widgets::Stack class" do
+      expect(data).to be_kind_of(PulseMeter::DygraphsVisualize::Widgets::Stack)
     end
 
     describe "dygraphs_options" do
       let(:dygraphs_options){ data.dygraphs_options }
 
-      it "should set stack Dygraphs options" do
-        dygraphs_options[:stacked_graph].should be_true
-        dygraphs_options[:stacked_graph_na_n_fill].should == 'inside'
+      it "sets stack Dygraphs options" do
+        expect(dygraphs_options[:stacked_graph]).to be_truthy
+        expect(dygraphs_options[:stacked_graph_na_n_fill]).to eq('inside')
       end
     end
   end
 
   describe "#values_label" do
-    it "should set values_label" do
+    it "sets values_label" do
       w.values_label "some y-axis legend"
-      w.to_data.values_label.should == "some y-axis legend"
+      expect(w.to_data.values_label).to eq("some y-axis legend")
     end
   end
 
   describe "#show_last_point" do
-    it "should set show_last_point" do
+    it "sets show_last_point" do
       w.show_last_point true
-      w.to_data.show_last_point.should be_true
+      expect(w.to_data.show_last_point).to be_truthy
     end
   end
 
   describe "#timespan" do
-    it "should set timespan" do
+    it "sets timespan" do
       w.timespan 5
-      w.to_data.timespan.should == 5
+      expect(w.to_data.timespan).to eq(5)
     end
-    it "should raise exception if timespan is negative" do
+    it "raises exception if timespan is negative" do
       expect{ w.timespan(-1) }.to raise_exception(PulseMeter::DygraphsVisualize::DSL::BadWidgetTimeSpan)
     end
   end

data/spec/pulse_meter/dygraphs_visualize/layout_spec.rb

@@ -16,38 +16,38 @@ describe PulseMeter::DygraphsVisualize::Layout do
   end
 
   describe "#page_infos" do
-    it "should return list of page infos with ids" do
-      layout.page_infos.should == [
+    it "returns list of page infos with ids" do
+      expect(layout.page_infos).to eq([
         {title: "page1", id: 1, dygraphs_options: {a: 1}},
         {title: "page2", id: 2, dygraphs_options: {}}
-      ]
+      ])
     end
   end
 
   describe "#options" do
-    it "should return layout options" do
+    it "returns layout options" do
       ldsl = PulseMeter::DygraphsVisualize::DSL::Layout.new
       ldsl.use_utc true
       ldsl.dygraphs_options({a: 1})
       l = ldsl.to_data
-      l.options.should == {use_utc: true, dygraphs_options: {a: 1}}
+      expect(l.options).to eq({use_utc: true, dygraphs_options: {a: 1}})
     end
   end
 
   describe "#widget" do
-    it "should return data for correct widget" do
+    it "returns data for correct widget" do
       w = layout.widget(1, 0)
-      w.should include(id: 1, title: "w3")
+      expect(w).to include(id: 1, title: "w3")
       w = layout.widget(0, 1, timespan: 123)
-      w.should include(id: 2, title: "w2")
+      expect(w).to include(id: 2, title: "w2")
     end
   end
 
   describe "#widgets" do
-    it "should return data for correct widgets of a page" do
+    it "returns data for correct widgets of a page" do
       datas = layout.widgets(1)
-      datas[0].should include(id: 1, title: "w3")
-      datas[1].should include(id: 2, title: "w4")
+      expect(datas[0]).to include(id: 1, title: "w3")
+      expect(datas[1]).to include(id: 2, title: "w4")
     end
   end
 

data/spec/pulse_meter/dygraphs_visualize/page_spec.rb

@@ -57,16 +57,16 @@ describe PulseMeter::DygraphsVisualize::Page do
 
   describe "#widget_data" do
 
-    it "should generate correct data of single widget" do
+    it "generates correct data of single widget" do
       Timecop.freeze(interval_start + 2 * interval - 1) do
-        page.widget_data(0)[:id].should == 1
-        page.widget_data(1)[:id].should == 2
+        expect(page.widget_data(0)[:id]).to eq(1)
+        expect(page.widget_data(1)[:id]).to eq(2)
       end
     end
 
-    it "should generate correct data of single widget" do
+    it "generates correct data of single widget" do
       Timecop.freeze(interval_start + 2 * interval - 1) do
-        page.widget_data(0)[:series].should ==
+        expect(page.widget_data(0)[:series]).to eq(
           {
             titles: [a_sensor.annotation, b_sensor.annotation],
             rows: [[interval_start.to_i * 1000, 12, 33]],
@@ -75,7 +75,8 @@ describe PulseMeter::DygraphsVisualize::Page do
               {color: b_color}
             ]
           }
-        page.widget_data(1)[:series].should ==
+        )
+        expect(page.widget_data(1)[:series]).to eq(
           {
             titles: [a_sensor.annotation, b_sensor.annotation],
             rows: [[interval_start.to_i * 1000, 12, 33]],
@@ -84,10 +85,11 @@ describe PulseMeter::DygraphsVisualize::Page do
               {color: b_color}
             ]
           }
+        )
       end
 
       Timecop.freeze(interval_start + 2 * interval - 1) do
-        page.widget_data(0, timespan: 0)[:series].should ==
+        expect(page.widget_data(0, timespan: 0)[:series]).to eq(
           {
             titles: [a_sensor.annotation, b_sensor.annotation],
             rows: [],
@@ -96,7 +98,8 @@ describe PulseMeter::DygraphsVisualize::Page do
               {color: b_color}
             ]
           }
-        page.widget_data(1, timespan: 1)[:series].should ==
+        )
+        expect(page.widget_data(1, timespan: 1)[:series]).to eq(
           {
             titles: [a_sensor.annotation, b_sensor.annotation],
             rows: [],
@@ -105,22 +108,23 @@ describe PulseMeter::DygraphsVisualize::Page do
               {color: b_color}
             ]
           }
+        )
 
       end
     end
   end
 
   describe "#widget_datas" do
-    it "should generate correct ids for all widgets" do
+    it "generates correct ids for all widgets" do
       Timecop.freeze(interval_start + 2 * interval - 1) do
-        page.widget_datas.map{|h| h[:id]}.should == [1,2]
+        expect(page.widget_datas.map{|h| h[:id]}).to eq([1,2])
       end
     end
 
-    it "should generate correct series data of all widgets" do
+    it "generates correct series data of all widgets" do
       Timecop.freeze(interval_start + 2 * interval - 1) do
 
-        page.widget_datas.map{|h| h[:series]}.should == [
+        expect(page.widget_datas.map{|h| h[:series]}).to eq([
           {
             titles: [a_sensor.annotation, b_sensor.annotation],
             rows: [[interval_start.to_i * 1000, 12, 33]],
@@ -137,7 +141,7 @@ describe PulseMeter::DygraphsVisualize::Page do
               {color: b_color}
             ]
           }
-        ]
+        ])
       end
 
     end

data/spec/pulse_meter/dygraphs_visualize/sensor_spec.rb

@@ -15,40 +15,40 @@ describe PulseMeter::DygraphsVisualize::Sensor do
 
   describe '#last_value' do
     context "when sensor does not exist" do
-      it "should raise RestoreError" do
+      it "raises RestoreError" do
         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(Time.now).should be_nil
+      it "returns nil" do
+        expect(sensor.last_value(Time.now)).to be_nil
       end
     end
 
     context "when sensor has data" do
       context "when need_incomplete arg is true" do
-        it "should return last value" do
+        it "returns last value" do
           Timecop.freeze(interval_start) do
             real_sensor.event(101)
           end
           Timecop.freeze(interval_start+1) do
-            sensor.last_value(Time.now, true).should == 101
+            expect(sensor.last_value(Time.now, true)).to eq(101)
           end
         end
       end
 
       context "when need_incomplete arg is false" do
-        it "should return last complete value" do
+        it "returns last complete value" do
           Timecop.freeze(interval_start) do
             real_sensor.event(101)
           end
           Timecop.freeze(interval_start + 1) do
-            sensor.last_value(Time.now).should be_nil
+            expect(sensor.last_value(Time.now)).to be_nil
           end
           Timecop.freeze(interval_start + interval + 1) do
-            sensor.last_value(Time.now).should == 101
+            expect(sensor.last_value(Time.now)).to eq(101)
           end
         end
       end
@@ -59,20 +59,20 @@ describe PulseMeter::DygraphsVisualize::Sensor do
   describe "#last_point_data" do
 
     context "when sensor does not exist" do
-      it "should raise RestoreError" do
+      it "raises RestoreError" do
         expect{ bad_sensor.last_point_data(Time.now) }.to raise_exception(PulseMeter::RestoreError)
       end
     end
 
-    it "should return last value with annotation (and color)" do
+    it "returns last value with annotation (and color)" do
       Timecop.freeze(interval_start) do
         real_sensor.event(101)
       end
       Timecop.freeze(interval_start + 1) do
-        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}]
+        expect(sensor.last_point_data(Time.now, true)).to eq([{name: annotation, y: 101}])
+        expect(sensor.last_point_data(Time.now)).to eq([{name: annotation, y: nil}])
+        expect(sensor_with_color.last_point_data(Time.now, true)).to eq([{name: annotation, y: 101, color: color}])
+        expect(sensor_with_color.last_point_data(Time.now)).to eq([{name: annotation, y: nil, color: color}])
       end
     end
   end
@@ -81,11 +81,11 @@ describe PulseMeter::DygraphsVisualize::Sensor do
     subject{ checked_sensor.valid? }
     context "when sensor exists" do
       let(:checked_sensor){ sensor }
-      it{ should be_true }
+      it{ is_expected.to be_truthy }
     end
     context "when sensor does not exist" do
       let(:checked_sensor){ bad_sensor }
-      it{ should be_false }
+      it{ is_expected.to be_falsey }
     end
   end
 
@@ -100,30 +100,30 @@ describe PulseMeter::DygraphsVisualize::Sensor do
     end
 
     context "when sensor does not exist" do
-      it "should raise RestoreError" do
+      it "raises RestoreError" do
         expect{ bad_sensor.timeline_data(Time.now - interval, Time.now) }.to raise_exception(PulseMeter::RestoreError)
       end
     end
 
 
     describe "returned value" do
-      it "should contain sensor annotation" do
+      it "contains sensor annotation" do
         Timecop.freeze(interval_start + interval + 1) do
-          sensor.timeline_data(Time.now - interval, Time.now).first[:name].should == annotation
+          expect(sensor.timeline_data(Time.now - interval, Time.now).first[:name]).to eq(annotation)
         end
       end
-      it "should contain sensor color" do
+      it "contains sensor color" do
         Timecop.freeze(interval_start + interval + 1) do
-          sensor_with_color.timeline_data(Time.now - interval, Time.now).first[:color].should == color
+          expect(sensor_with_color.timeline_data(Time.now - interval, Time.now).first[:color]).to eq(color)
         end
       end
 
-      it "should contain [interval_start, value] pairs for each interval" do
+      it "contains [interval_start, value] pairs for each interval" do
         Timecop.freeze(interval_start + interval + 1) do
           data = sensor.timeline_data(Time.now - interval * 2, Time.now)
-          data.first[:data].should == [{x: interval_start.to_i * 1000, y: 101}]
+          expect(data.first[:data]).to eq([{x: interval_start.to_i * 1000, y: 101}])
           data = sensor.timeline_data(Time.now - interval * 2, Time.now, true)
-          data.first[:data].should == [{x: interval_start.to_i * 1000, y: 101}, {x: (interval_start + interval).to_i * 1000, y: 55}]
+          expect(data.first[:data]).to eq([{x: interval_start.to_i * 1000, y: 101}, {x: (interval_start + interval).to_i * 1000, y: 55}])
         end
       end
     end

data/spec/pulse_meter/dygraphs_visualize/series_extractor_spec.rb

@@ -20,23 +20,23 @@ describe PulseMeter::DygraphsVisualize::SeriesExtractor do
 
     let(:extractor) {PulseMeter::DygraphsVisualize.extractor(simple_sensor)}
 
-    it "should be created for simple sensors" do
-      extractor.should be_kind_of(PulseMeter::DygraphsVisualize::SeriesExtractor::Simple)
+    it "bes created for simple sensors" do
+      expect(extractor).to be_kind_of(PulseMeter::DygraphsVisualize::SeriesExtractor::Simple)
     end
 
-    it "should create point data correctly" do
-      extractor.point_data(123).should == [{y: 123, name: 'simple sensor'}]
+    it "creates point data correctly" do
+      expect(extractor.point_data(123)).to eq([{y: 123, name: 'simple sensor'}])
     end
 
-    it "should create timeline data correctly" do
+    it "creates timeline data correctly" do
       tl_data = [
         PulseMeter::SensorData.new(Time.at(1), 11),
         PulseMeter::SensorData.new(Time.at(2), "22")
       ]
-      extractor.series_data(tl_data).should == [{
+      expect(extractor.series_data(tl_data)).to eq([{
         name: 'simple sensor',
         data: [{x: 1000, y: 11}, {x: 2000, y: 22}]
-      }]
+      }])
     end
 
   end
@@ -44,23 +44,23 @@ describe PulseMeter::DygraphsVisualize::SeriesExtractor do
   describe "hash extractor" do
     let(:extractor) {PulseMeter::DygraphsVisualize.extractor(hashed_sensor)}
 
-    it "should be created for hash sensors" do
-      extractor.should be_kind_of(PulseMeter::DygraphsVisualize::SeriesExtractor::Hashed)
+    it "bes created for hash sensors" do
+      expect(extractor).to be_kind_of(PulseMeter::DygraphsVisualize::SeriesExtractor::Hashed)
     end
 
-    it "should create point data correctly" do
-      extractor.point_data('{"x": 123, "y": 321}').should == [
+    it "creates point data correctly" do
+      expect(extractor.point_data('{"x": 123, "y": 321}')).to eq([
         {y: 123, name: 'hashed sensor: x'},
         {y: 321, name: 'hashed sensor: y'}
-      ]
+      ])
     end
 
-    it "should create timeline data correctly" do
+    it "creates timeline data correctly" do
       tl_data = [
         PulseMeter::SensorData.new(Time.at(1), {"a" => 5, "b" => 6}),
         PulseMeter::SensorData.new(Time.at(2), '{"c": 7, "b": 6}')
       ]
-      extractor.series_data(tl_data).should == [
+      expect(extractor.series_data(tl_data)).to eq([
         {
           name: 'hashed sensor: a',
           data: [{x: 1000, y: 5}, {x: 2000, y: nil}]
@@ -73,7 +73,7 @@ describe PulseMeter::DygraphsVisualize::SeriesExtractor do
           name: 'hashed sensor: c',
           data: [{x: 1000, y: nil}, {x: 2000, y: 7}]
         }
-      ]
+      ])
     end
   end
 

data/spec/pulse_meter/dygraphs_visualizer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe PulseMeter::DygraphsVisualizer do
   describe "::draw" do
-    it "should generate correct layout with passed block" do
+    it "generates correct layout with passed block" do
       layout = described_class.draw do |l|
 
         l.title "My Gauges"
@@ -35,7 +35,7 @@ describe PulseMeter::DygraphsVisualizer do
         end
 
       end
-      layout.should be_kind_of(PulseMeter::DygraphsVisualize::Layout)
+      expect(layout).to be_kind_of(PulseMeter::DygraphsVisualize::Layout)
     end
   end
 end

data/spec/shared_examples/dsl_widget.rb

@@ -8,33 +8,33 @@ shared_examples_for "dsl widget" do
   let(:w){ described_class.new(widget_name)  }
 
   describe '.new' do
-    it "should set default value for width papram" do
+    it "sets default value for width papram" do
       wid = w.to_data
-      wid.width.should == PulseMeter::DygraphsVisualize::DSL::Widget::MAX_WIDTH
+      expect(wid.width).to eq(PulseMeter::DygraphsVisualize::DSL::Widget::MAX_WIDTH)
     end
 
-    it "should set title param from .new argument" do
+    it "sets title param from .new argument" do
       wid = w.to_data
-      wid.title.should == widget_name
+      expect(wid.title).to eq(widget_name)
     end
   end
 
   describe "#process_args" do
-    it "should set sensor by :sensor param" do
+    it "sets sensor by :sensor param" do
       w.process_args :sensor => :some_sensor
       sensors = w.to_data.sensors
-      sensors.size.should == 1
-      sensors.first.name.to_s.should == 'some_sensor'
+      expect(sensors.size).to eq(1)
+      expect(sensors.first.name.to_s).to eq('some_sensor')
     end
 
-    it "should set title by :title param" do
+    it "sets title by :title param" do
       w.process_args :title => 'Title XXX'
-      w.to_data.title.should == 'Title XXX'
+      expect(w.to_data.title).to eq('Title XXX')
     end
 
-    it "should set width by :width param" do
+    it "sets width by :width param" do
       w.process_args :width => 5
-      w.to_data.width.should == 5
+      expect(w.to_data.width).to eq(5)
     end
 
   end
@@ -44,66 +44,66 @@ shared_examples_for "dsl widget" do
     let!(:s2){ PulseMeter::Sensor::Timelined::Max.new('s2', :ttl => 1000, :interval => interval) }
 
 
-    it "should add sensor" do
+    it "adds 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'
+      expect(sensors.size).to eq(2)
+      expect(sensors.first.name.to_s).to eq('s1')
+      expect(sensors.last.name.to_s).to eq('s2')
     end
   end
 
   describe "#title" do
-    it "should set title" do
+    it "sets title" do
       w.title 'Title XXX'
-      w.to_data.title.should == 'Title XXX'
+      expect(w.to_data.title).to eq('Title XXX')
       w.title 'Title YYY'
-      w.to_data.title.should == 'Title YYY'
+      expect(w.to_data.title).to eq('Title YYY')
     end
   end
 
   describe "#width" do
-    it "should set width" do
+    it "sets width" do
       w.width 6
-      w.to_data.width.should == 6
+      expect(w.to_data.width).to eq(6)
     end
 
-    it "should raise exception if width is invalid" do
+    it "raises exception if width is invalid" do
       expect { w.width -1 }.to raise_exception(PulseMeter::DygraphsVisualize::DSL::BadWidgetWidth)
       expect { w.width 13 }.to raise_exception(PulseMeter::DygraphsVisualize::DSL::BadWidgetWidth)
     end
   end
 
   describe "#redraw_interval" do
-    it "should set redraw_interval" do
+    it "sets redraw_interval" do
       w.redraw_interval 5
-      w.to_data.redraw_interval.should == 5
+      expect(w.to_data.redraw_interval).to eq(5)
     end
-    it "should raise exception if redraw_interval is negative" do
+    it "raises exception if redraw_interval is negative" do
       expect{ w.redraw_interval(-1) }.to raise_exception(PulseMeter::DygraphsVisualize::DSL::BadWidgetRedrawInterval)
     end
 
   end
 
   describe "#to_data" do
-    it "should convert dsl data to widget" do
-      w.to_data.should be_kind_of(PulseMeter::DygraphsVisualize::Widget)
+    it "converts dsl data to widget" do
+      expect(w.to_data).to be_kind_of(PulseMeter::DygraphsVisualize::Widget)
     end
   end
 
   describe "#dygraphs_options" do
-    it "should add options to dygraphs_options hash" do
+    it "adds options to dygraphs_options hash" do
       w.dygraphs_options a: 1
       w.dygraphs_options b: 2
-      w.to_data.dygraphs_options.should include(a: 1, b: 2)
+      expect(w.to_data.dygraphs_options).to include(a: 1, b: 2)
     end
   end
 
   describe "any anknown method" do
-    it "should add options to dygraphs_options hash" do
+    it "adds options to dygraphs_options hash" do
       w.foobar 123
-      w.to_data.dygraphs_options[:foobar].should == 123
+      expect(w.to_data.dygraphs_options[:foobar]).to eq(123)
     end
   end
 end

data/spec/shared_examples/widget.rb

@@ -50,15 +50,15 @@ shared_examples_for "widget" do
       end
     end
 
-    it "should contain type, title, redraw_interval, width, dygraphs_options, timespan attriutes" do
+    it "contains type, title, redraw_interval, width, dygraphs_options, timespan attriutes" do
       wdata = widget.data
-      wdata[:type].should == class_name.downcase
-      wdata[:title].should == widget_name
-      wdata[:redraw_interval].should == redraw_interval
-      wdata[:width].should == width
-      wdata[:dygraphs_options][:a].should == 1
-      wdata[:timespan].should == timespan
-      wdata[:interval].should == interval
+      expect(wdata[:type]).to eq(class_name.downcase)
+      expect(wdata[:title]).to eq(widget_name)
+      expect(wdata[:redraw_interval]).to eq(redraw_interval)
+      expect(wdata[:width]).to eq(width)
+      expect(wdata[:dygraphs_options][:a]).to eq(1)
+      expect(wdata[:timespan]).to eq(timespan)
+      expect(wdata[:interval]).to eq(interval)
     end
 
     describe "series attribute" do
@@ -75,7 +75,7 @@ shared_examples_for "widget" do
 
       it "contains valid series" do
         Timecop.freeze(@current_time) do
-          widget.data[:series].should ==
+          expect(widget.data[:series]).to eq(
             {
               titles: [a_sensor.annotation, b_sensor.annotation],
               rows: [[interval_start.to_i * 1000, 12, 33]],
@@ -84,23 +84,24 @@ shared_examples_for "widget" do
                 {color: b_color}
               ]
             }
+          )
         end
       end
 
       it "accepts 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
+          expect(widget.data(timespan: timespan)[:series][:rows].size).to eq(1)
+          expect(widget.data(timespan: timespan + interval)[:series][:rows].size).to eq(2)
         end
       end
 
       it "accepts start_time and end_time" do
         Timecop.freeze(@current_time + interval) do
-          widget.data(start_time: (Time.now - timespan).to_i)[:series][:rows].size.should == 1
-          widget.data(
+          expect(widget.data(start_time: (Time.now - timespan).to_i)[:series][:rows].size).to eq(1)
+          expect(widget.data(
             start_time: (Time.now - interval - timespan).to_i,
             end_time: Time.now.to_i
-          )[:series][:rows].size.should == 2
+          )[:series][:rows].size).to eq(2)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse_meter-dygraphs_visualizer
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.21
 platform: ruby
 authors:
 - Ilya Averyanov
@@ -15,280 +15,280 @@ dependencies:
   name: pulse_meter_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-partial
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aquarium
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Customizable web interface for PulseMeter gem
@@ -299,11 +299,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rbenv-version
-- .rspec
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".rvmrc"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - Procfile
@@ -416,17 +416,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Customizable Dygraphs-based web interface for lightweight metrics aggregator

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p125