pulse_meter_visualizer 0.4.20 → 0.4.21

data/pulse_meter_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_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')
@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake')
   gem.add_development_dependency('rb-fsevent')
   gem.add_development_dependency('redcarpet')
-  gem.add_development_dependency('rspec')
+  gem.add_development_dependency('rspec', '~> 3.0')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('sprockets')
   gem.add_development_dependency('timecop')

data/spec/pulse_meter/visualize/app_spec.rb

@@ -16,12 +16,12 @@ describe PulseMeter::Visualize::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/visualize/dsl/layout_spec.rb

@@ -7,17 +7,17 @@ describe PulseMeter::Visualize::DSL::Layout do
   let(:layout){ described_class.new }
 
   describe '.new' do
-    it "should initialize pages, title, use_utc, gchart_options" do
+    it "initializes pages, title, use_utc, gchart_options" do
       l = layout.to_data
-      l.title.should == PulseMeter::Visualize::DSL::Layout::DEFAULT_TITLE
-      l.pages.should == []
-      l.use_utc.should == false
-      l.gchart_options.should == {}
+      expect(l.title).to eq(PulseMeter::Visualize::DSL::Layout::DEFAULT_TITLE)
+      expect(l.pages).to eq([])
+      expect(l.use_utc).to eq(false)
+      expect(l.gchart_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.pie "foo_widget", sensor: sensor_name
         p.line "bar_widget" do |w|
@@ -25,39 +25,39 @@ describe PulseMeter::Visualize::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 == false
+      expect(layout.to_data.use_utc).to eq(false)
     end
   end
 
   describe "#gchart_options" do
-    it "should set gchart_options" do
+    it "sets gchart_options" do
       layout.gchart_options({b: 1})
-      layout.to_data.gchart_options.should == {b: 1}
+      expect(layout.to_data.gchart_options).to eq({b: 1})
     end
   end
 
   describe "#to_data" do
-    it "should convert layout dsl data to Visualize::Layout" do
-      layout.to_data.should be_kind_of(PulseMeter::Visualize::Layout)
+    it "converts layout dsl data to Visualize::Layout" do
+      expect(layout.to_data).to be_kind_of(PulseMeter::Visualize::Layout)
     end
   end
 end

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

@@ -8,25 +8,25 @@ describe PulseMeter::Visualize::DSL::Page do
   let(:page){ PulseMeter::Visualize::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
 
   [:area, :line, :table, :pie, :gauge].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::Visualize::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 Visualize::Page" do
-      page.to_data.should be_kind_of(PulseMeter::Visualize::Page)
+    it "converts DSL data to Visualize::Page" do
+      expect(page.to_data).to be_kind_of(PulseMeter::Visualize::Page)
     end
   end
 

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

@@ -6,23 +6,23 @@ describe PulseMeter::Visualize::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 Visualize::Sensor with it" do
-      described_class.new(name).to_data.name.to_s.should == name
+    it "saves passed name and create Visualize::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 Visualize::Sensor" do
+    it "passes args transparently to Visualize::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::Visualize::Sensor)
+    it "converts dsl data to sensor" do
+      expect(described_class.new(name).to_data).to be_kind_of(PulseMeter::Visualize::Sensor)
     end
   end
 

data/spec/pulse_meter/visualize/dsl/widgets/area_spec.rb

@@ -6,36 +6,36 @@ describe PulseMeter::Visualize::DSL::Widgets::Area 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 "#to_data" do
-    it "should produce PulseMeter::Visualize::Widgets::Area class" do
-      w.to_data.should be_kind_of(PulseMeter::Visualize::Widgets::Area)
+    it "produces PulseMeter::Visualize::Widgets::Area class" do
+      expect(w.to_data).to be_kind_of(PulseMeter::Visualize::Widgets::Area)
     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 == true
+      expect(w.to_data.show_last_point).to eq(true)
     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::Visualize::DSL::BadWidgetTimeSpan)
     end
   end

data/spec/pulse_meter/visualize/dsl/widgets/gauge_spec.rb

@@ -6,13 +6,13 @@ describe PulseMeter::Visualize::DSL::Widgets::Gauge 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 "#to_data" do
-    it "should produce PulseMeter::Visualize::Widgets::Gauge class" do
-      w.to_data.should be_kind_of(PulseMeter::Visualize::Widgets::Gauge)
+    it "produces PulseMeter::Visualize::Widgets::Gauge class" do
+      expect(w.to_data).to be_kind_of(PulseMeter::Visualize::Widgets::Gauge)
     end
   end
 

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

@@ -6,36 +6,36 @@ describe PulseMeter::Visualize::DSL::Widgets::Line 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 "#to_data" do
-    it "should produce PulseMeter::Visualize::Widgets::Area class" do
-      w.to_data.should be_kind_of(PulseMeter::Visualize::Widgets::Line)
+    it "produces PulseMeter::Visualize::Widgets::Area class" do
+      expect(w.to_data).to be_kind_of(PulseMeter::Visualize::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 == true
+      expect(w.to_data.show_last_point).to eq(true)
     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::Visualize::DSL::BadWidgetTimeSpan)
     end
   end

data/spec/pulse_meter/visualize/dsl/widgets/pie_spec.rb

@@ -6,27 +6,27 @@ describe PulseMeter::Visualize::DSL::Widgets::Pie 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 "#to_data" do
-    it "should produce PulseMeter::Visualize::Widgets::Pie class" do
-      w.to_data.should be_kind_of(PulseMeter::Visualize::Widgets::Pie)
+    it "produces PulseMeter::Visualize::Widgets::Pie class" do
+      expect(w.to_data).to be_kind_of(PulseMeter::Visualize::Widgets::Pie)
     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 == true
+      expect(w.to_data.show_last_point).to eq(true)
     end
   end
 

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

@@ -6,29 +6,29 @@ describe PulseMeter::Visualize::DSL::Widgets::Table 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 "#to_data" do
-    it "should produce PulseMeter::Visualize::Widgets::Area class" do
-      w.to_data.should be_kind_of(PulseMeter::Visualize::Widgets::Table)
+    it "produces PulseMeter::Visualize::Widgets::Area class" do
+      expect(w.to_data).to be_kind_of(PulseMeter::Visualize::Widgets::Table)
     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 == true
+      expect(w.to_data.show_last_point).to eq(true)
     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::Visualize::DSL::BadWidgetTimeSpan)
     end
   end

data/spec/pulse_meter/visualize/layout_spec.rb

@@ -16,38 +16,38 @@ describe PulseMeter::Visualize::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, gchart_options: {a: 1}},
         {title: "page2", id: 2, gchart_options: {}}
-      ]
+      ])
     end
   end
 
   describe "#options" do
-    it "should return layout options" do
+    it "returns layout options" do
       ldsl = PulseMeter::Visualize::DSL::Layout.new
       ldsl.use_utc true
       ldsl.gchart_options({a: 1})
       l = ldsl.to_data
-      l.options.should == {use_utc: true, gchart_options: {a: 1}}
+      expect(l.options).to eq({use_utc: true, gchart_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