lazy_high_charts 1.5.2 → 1.6.1

data/lib/lazy_high_charts/options_key_filter.rb

@@ -1,39 +1,57 @@
-#
 # A way to filter certain keys of data provided to the LazyHighCharts#series method and the LazyHighCharts#options
 #
-# Add methods or keys to the FILTER_MAP hash to have them applied to the options in a series
-# In the FILTER_MAP, the hash keys are methods, and the values are arrays of the hash keys the filter should be
-# applied to
+# Add keys and methods to the FILTER_MAP hash to have them applied to the options in a series
 #
 # Be careful that it is OK to filter the hash keys you specify for every key of the options or series hash
 #
 module LazyHighCharts
   module OptionsKeyFilter
-    def self.milliseconds value
-      value * 1000
-    end
+    FILTER_MAP = {
+      :data => [:format_data],
+      :pointInterval => [:milliseconds],
+      :pointStart => [:date_to_js_code]
+    }
 
-    def self.date_to_js_code date
-      "Date.UTC(#{date.year}, #{date.month - 1}, #{date.day})".js_code
-    end
+    class << self
+      def filter options
+        {}.tap do |hash|
+          options.each do |key, value|
+            if value.is_a?(::Hash)
+              hash[key] = filter(value)
+            else
+              hash[key] = value
+              methods = Array(FILTER_MAP[key])
+              methods.each do |method_name|
+                hash[key] = send(method_name, hash[key])
+              end
+            end
+          end
+        end
+      end
 
-    def self.filter options
-      new_options = options.map do |k, v|
-        if v.is_a? ::Hash
-          v = filter v
+      private
+
+      def milliseconds value
+        value * 1_000
+      end
+
+      def date_to_js_code date
+        "Date.UTC(#{date.year}, #{date.month - 1}, #{date.day})".js_code
+      end
+
+      def format_data(data)
+        data.map { |item| format_data_item(item) }
+      end
+
+      def format_data_item(item)
+        if item.is_a?(::Array)
+          format_data item
+        elsif item.is_a?(DateTime)
+          date_to_js_code item
         else
-          FILTER_MAP.each_pair do |method, matchers|
-            v = method.call(v) if matchers.include?(k)
-          end
+          item
         end
-        [k, v]
       end
-      Hash[new_options]
     end
-
-    FILTER_MAP = {
-        method(:milliseconds) => [:pointInterval],
-        method(:date_to_js_code) => [:pointStart]
-    }
   end
-end
+end

data/lib/tasks/high_charts.rake

@@ -15,10 +15,28 @@ namespace :highcharts do
     say "Grabbing Core from Highcharts codebase..." do
       sh "mkdir -p vendor/assets/javascripts/highcharts/modules/"
       sh "mkdir -p vendor/assets/javascripts/highcharts/adapters/"
-      
+
       sh "curl -# http://code.highcharts.com/highcharts.js -L --compressed -o vendor/assets/javascripts/highcharts/highcharts.js"
+      sh "curl -# http://code.highcharts.com/highcharts-3d.js -L --compressed -o vendor/assets/javascripts/highcharts/highcharts-3d.js"
       sh "curl -# http://code.highcharts.com/highcharts-more.js -L --compressed -o vendor/assets/javascripts/highcharts/highcharts-more.js"
+
+      # Modules
+      sh "curl -# http://code.highcharts.com/modules/accessibility.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/accessibility.js"
+      sh "curl -# http://code.highcharts.com/modules/annotations.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/annotations.js"
+      sh "curl -# http://code.highcharts.com/modules/boost.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/boost.js"
+      sh "curl -# http://code.highcharts.com/modules/broken-axis.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/broken-axis.js"
+      sh "curl -# http://code.highcharts.com/modules/canvas-tools.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/canvas-tools.js"
+      sh "curl -# http://code.highcharts.com/modules/data.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/data.js"
       sh "curl -# http://code.highcharts.com/modules/exporting.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/exporting.js"
+      sh "curl -# http://code.highcharts.com/modules/export-data.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/export-data.js"
+      sh "curl -# http://code.highcharts.com/modules/drilldown.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/drilldown.js"
+      sh "curl -# http://code.highcharts.com/modules/funnel.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/funnel.js"
+      sh "curl -# http://code.highcharts.com/modules/heatmap.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/heatmap.js"
+      sh "curl -# http://code.highcharts.com/modules/no-data-to-display.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/no-data-to-display.js"
+      sh "curl -# http://code.highcharts.com/modules/offline-exporting.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/offline-exporting.js"
+      sh "curl -# http://code.highcharts.com/modules/solid-gauge.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/solid-gauge.js"
+      sh "curl -# http://code.highcharts.com/modules/treemap.js -L --compressed -o vendor/assets/javascripts/highcharts/modules/treemap.js"
+
       sh "curl -# http://code.highcharts.com/adapters/mootools-adapter.js -L --compressed -o vendor/assets/javascripts/highcharts/adapters/mootools-adapter.js"
       sh "curl -# http://code.highcharts.com/adapters/prototype-adapter.js -L --compressed -o vendor/assets/javascripts/highcharts/adapters/prototype-adapter.js"
     end
@@ -29,13 +47,14 @@ namespace :highcharts do
 
       sh "mkdir -p vendor/assets/javascripts/highcharts/stock/modules/"
       sh "mkdir -p vendor/assets/javascripts/highcharts/stock/adapters/"
-      
+
       sh "curl -# http://code.highcharts.com/stock/highstock.js -L --compressed -o vendor/assets/javascripts/highcharts/highstock.js"
       sh "curl -# http://code.highcharts.com/stock/highcharts-more.js -L --compressed -o vendor/assets/javascripts/highcharts/stock/highcharts-more.js"
       sh "curl -# http://code.highcharts.com/stock/modules/exporting.js -L --compressed -o vendor/assets/javascripts/highcharts/stock/modules/exporting.js"
+      sh "curl -# http://code.highcharts.com/stock/modules/funnel.js -L --compressed -o vendor/assets/javascripts/highcharts/stock/modules/funnel.js"
       sh "curl -# http://code.highcharts.com/stock/adapters/mootools-adapter.js -L --compressed -o vendor/assets/javascripts/highcharts/stock/adapters/mootools-adapter.js"
       sh "curl -# http://code.highcharts.com/stock/adapters/prototype-adapter.js -L --compressed -o vendor/assets/javascripts/highcharts/stock/adapters/prototype-adapter.js"
     end
   end
 
-end
+end

data/spec/dummy_sinatra/app.rb

@@ -10,27 +10,51 @@ get '/' do
   erb :index #, :layout => :layout
 end
 
+get '/dates' do
+  irregular_time_example()
+  erb :index
+end
+
 def highchart_example
   # https://github.com/michelson/lazy_high_charts/wiki/Combination-Chart
   @chart = LazyHighCharts::HighChart.new('graph') do |f|
     f.title({ text: "Combination chart"})
-    f.options[:xAxis][:categories] = 
+    f.options[:xAxis][:categories] =
       ['Apples', 'Oranges', 'Pears', 'Bananas', 'Plums']
     f.labels(:items=>
-      [:html=>"Total fruit consumption", 
+      [:html=>"Total fruit consumption",
        :style=>{:left=>"40px", :top=>"8px", :color=>"black"} ])
     f.series(:type=> 'column',:name=> 'Jane',:data=> [3, 2, 1, 3, 4])
     f.series(:type=> 'column',:name=> 'John',:data=> [2, 3, 5, 7, 6])
     f.series(:type=> 'column', :name=> 'Joe',:data=> [4, 3, 3, 9, 0])
-    f.series(:type=> 'spline',:name=> 'Average', 
+    f.series(:type=> 'spline',:name=> 'Average',
              :data=> [3, 2.67, 3, 6.33, 3.33])
-    f.series(:type=> 'pie',:name=> 'Total consumption', 
+    f.series(:type=> 'column', :data=> [[DateTime.new(10), 100], [DateTime.new(20), 100]])
+
+    f.series(:type=> 'pie',:name=> 'Total consumption',
       :data=> [
-        {:name=> 'Jane', :y=> 13, :color=> 'red'}, 
+        {:name=> 'Jane', :y=> 13, :color=> 'red'},
         {:name=> 'John', :y=> 23,:color=> 'green'},
         {:name=> 'Joe', :y=> 19,:color=> 'blue'}
       ],
       :center=> [100, 80], :size=> 100, :showInLegend=> false)
   end
-  
-end
+end
+
+def irregular_time_example()
+  @chart = LazyHighCharts::HighChart.new('graph') do |f|
+    f.title({ text: "Irregular Time Example"})
+    f.xAxis({type: 'datetime' })
+    f.series(:type=> 'spline', :data=> make_random_series(1))
+    f.series(:type=> 'spline', :data=> make_random_series(2))
+    f.series(:type=> 'spline', :data=> make_random_series(3))
+  end
+end
+
+def make_random_series(step)
+  data = []
+  for i in 0..10
+    data << [DateTime.new(i * step), (rand * 100).to_i]
+  end
+  data
+end

data/spec/high_chart_globals_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "HighChartGlobals" do
+  before(:each) do
+    @chart_globals = LazyHighCharts::HighChartGlobals.new do |chart|
+      chart.global( useUTC: false )
+      chart.chart(
+        backgroundColor: {
+          linearGradient: [0, 0, 500, 500],
+          stops: [
+            [0, "rgb(255, 255, 255)"],
+            [1, "rgb(240, 240, 255)"]
+          ]
+        },
+        borderWidth: 2,
+        plotBackgroundColor: "rgba(255, 255, 255, .9)",
+        plotShadow: true,
+        plotBorderWidth: 1
+      )
+      chart.lang(
+        thousandsSep: ","
+      )
+      chart.colors([
+        "#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354"
+      ])
+    end
+  end
+
+  # this is almost all flotomatic stuff
+  describe "initialization" do
+
+    it "should set options hash by default" do
+      @chart_globals.options.is_a?(Hash).should == true
+    end
+
+    it "should take a block and set attributes" do
+      @chart_globals.options[:lang][:thousandsSep].should == ","
+      @chart_globals.options[:global][:useUTC].should == false
+      @chart_globals.options[:chart][:backgroundColor][:linearGradient].should == [0, 0, 500, 500]
+    end
+
+    it "should override options" do
+      chart = LazyHighCharts::HighChartGlobals.new
+      chart.global({ useUTC: true })
+      chart.options[:global][:useUTC].should == true
+      chart.global({ useUTC: false })
+      chart.options[:global][:useUTC].should == false
+    end
+
+  end
+end

data/spec/high_chart_spec.rb

@@ -17,25 +17,25 @@ describe "HighChart" do
   # this is almost all flotomatic stuff
   describe "initialization" do
     it "should take an optional 'placeholder' argument" do
-      LazyHighCharts::HighChart.new(@placeholder).placeholder.should == @placeholder
-      LazyHighCharts::HighChart.new.placeholder.should_not == @placeholder
+      expect(LazyHighCharts::HighChart.new(@placeholder).placeholder).to eq(@placeholder)
+      expect(LazyHighCharts::HighChart.new.placeholder).not_to eq(@placeholder)
     end
 
     it "shouldn't generate a nil placeholder" do
-      LazyHighCharts::HighChart.new.placeholder.should_not be_nil
+      expect(LazyHighCharts::HighChart.new.placeholder).not_to be_nil
     end
 
     it "should generate different placeholders for different charts" do
       a_different_placeholder = LazyHighCharts::HighChart.new.placeholder
-      LazyHighCharts::HighChart.new.placeholder.should_not == a_different_placeholder
+      expect(LazyHighCharts::HighChart.new.placeholder).not_to eq(a_different_placeholder)
     end
 
     it "should take an optional html_options argument (defaulting to 300px height)" do
-      LazyHighCharts::HighChart.new(@placeholder, @html_options).html_options.should == @html_options
+      expect(LazyHighCharts::HighChart.new(@placeholder, @html_options).html_options).to eq(@html_options)
     end
 
     it "should set options by default" do
-      LazyHighCharts::HighChart.new.options.should == {
+      expect(LazyHighCharts::HighChart.new.options).to eq({
           :title => {:text => nil},
           :legend => {:layout => "vertical", :style => {}},
           :xAxis => {},
@@ -44,27 +44,27 @@ describe "HighChart" do
           :credits => {:enabled => false},
           :plotOptions => {:areaspline => {}},
           :chart => {:defaultSeriesType => "line", :renderTo => nil},
-          :subtitle => {}}
+          :subtitle => {}})
     end
 
     it "should set data empty by default" do
-      LazyHighCharts::HighChart.new.series_data.should == []
+      expect(LazyHighCharts::HighChart.new.series_data).to eq([])
     end
 
     it "should take a block setting attributes" do
       chart = LazyHighCharts::HighChart.new { |f| f.series_data = @data; f.options = @options }
-      chart.series_data.should == @data
-      chart.options.should == @options
+      expect(chart.series_data).to eq(@data)
+      expect(chart.options).to eq(@options)
     end
 
     it "should take a block setting attributes" do
       chart = LazyHighCharts::HighChart.new { |f| f.options[:legend][:layout] = "horizontal" }
-      chart.options[:legend][:layout].should == "horizontal"
+      expect(chart.options[:legend][:layout]).to eq("horizontal")
     end
 
     it "should take a block setting attributes" do
       chart = LazyHighCharts::HighChart.new { |f| f.options[:range_selector] = {}; f.options[:range_selector][:selected] = 1 }
-      chart.options[:range_selector][:selected].should == 1
+      expect(chart.options[:range_selector][:selected]).to eq(1)
     end
 
     it "should change a block data without overriding options" do
@@ -77,11 +77,11 @@ describe "HighChart" do
         f.options[:legend][:layout] = "horizontal"
         f.options[:xAxis][:categories] = ["uno", "dos", "tres", "cuatro"]
       end
-      chart.series_data.should == [{:name => "John", :data => [3, 20]}, {:name => "Jane", :data => [1, 3]}]
-      chart.options[:legend][:layout].should == "horizontal"
-      chart.options[:xAxis][:categories].should == ["uno", "dos", "tres", "cuatro"]
-      chart.options[:chart][:defaultSeriesType].should == "area"
-      chart.options[:chart][:inverted].should == true
+      expect(chart.series_data).to eq([{:name => "John", :data => [3, 20]}, {:name => "Jane", :data => [1, 3]}])
+      expect(chart.options[:legend][:layout]).to eq("horizontal")
+      expect(chart.options[:xAxis][:categories]).to eq(["uno", "dos", "tres", "cuatro"])
+      expect(chart.options[:chart][:defaultSeriesType]).to eq("area")
+      expect(chart.options[:chart][:inverted]).to eq(true)
     end
 
     it "should change a block data with overriding entire options" do
@@ -93,12 +93,12 @@ describe "HighChart" do
         f.xAxis(:categories => ["uno", "dos", "tres", "cuatro"], :labels => {:rotation => -45, :align => 'right'})
         f.chart({:defaultSeriesType => "spline", :renderTo => "myRenderArea", :inverted => true})
       end
-      chart.options[:xAxis][:categories].should == ["uno", "dos", "tres", "cuatro"]
-      chart.options[:xAxis][:labels][:rotation].should == -45
-      chart.options[:xAxis][:labels][:align].should == "right"
-      chart.options[:chart][:defaultSeriesType].should == "spline"
-      chart.options[:chart][:renderTo].should == "myRenderArea"
-      chart.options[:chart][:inverted].should == true
+      expect(chart.options[:xAxis][:categories]).to eq(["uno", "dos", "tres", "cuatro"])
+      expect(chart.options[:xAxis][:labels][:rotation]).to eq(-45)
+      expect(chart.options[:xAxis][:labels][:align]).to eq("right")
+      expect(chart.options[:chart][:defaultSeriesType]).to eq("spline")
+      expect(chart.options[:chart][:renderTo]).to eq("myRenderArea")
+      expect(chart.options[:chart][:inverted]).to eq(true)
     end
 
     it "should have subtitles" do
@@ -111,7 +111,7 @@ describe "HighChart" do
         f.chart({:defaultSeriesType => "spline", :renderTo => "myRenderArea", :inverted => true})
         f.subtitle({:text => "Bar"})
       end
-      chart.options[:subtitle][:text].should == "Bar"
+      expect(chart.options[:subtitle][:text]).to eq("Bar")
     end
 
     it 'should override entire option by default when resetting it again' do
@@ -119,8 +119,8 @@ describe "HighChart" do
         f.xAxis(categories: [3, 5, 7])
         f.xAxis(title: {text: 'x title'})
       end
-      chart.options[:xAxis][:categories].should == nil
-      chart.options[:xAxis][:title][:text].should == 'x title'
+      expect(chart.options[:xAxis][:categories]).to eq(nil)
+      expect(chart.options[:xAxis][:title][:text]).to eq('x title')
     end
 
     it 'should allow to build options step by step without overriding previously set values' do
@@ -128,8 +128,8 @@ describe "HighChart" do
         f.xAxis!(categories: [3, 5, 7])
         f.xAxis!(title: {text: 'x title'})
       end
-      chart.options[:xAxis][:categories].should == [3, 5, 7]
-      chart.options[:xAxis][:title][:text].should == 'x title'
+      expect(chart.options[:xAxis][:categories]).to eq([3, 5, 7])
+      expect(chart.options[:xAxis][:title][:text]).to eq('x title')
     end
 
     it 'should merge options and data into a full options hash' do
@@ -142,9 +142,10 @@ describe "HighChart" do
       end
 
       json = chart.full_options
-      json.should match /\"series\"/
-      json.should match /\"title\"/
-      json.should match /\"tooltip\": { \"enabled\": true,\"formatter\"/
+      expect(json).to match /\"series\"/
+      expect(json).to match /\"title\"/
+      expect(json).to match /\"tooltip\": { \"enabled\": true,\"formatter\"/
+      expect(json).to match /\"data\": \[ 29.9,71.5,106.4,129.2,144.0,176.0,135.6,148.5,216.4,194.1,95.6,54.4 \]/
     end
 
   end

data/spec/lazy_high_charts_spec.rb

@@ -10,56 +10,86 @@ describe HighChartsHelper do
     @chart = LazyHighCharts::HighChart.new(@placeholder)
     @data = "data"
     @options = "options"
+    @chart_globals = LazyHighCharts::HighChartGlobals.new do |chart|
+      chart.global({ useUTC: false })
+      chart.chart({
+        backgroundColor: {
+          linearGradient: [0, 0, 500, 500],
+          stops: [
+            [0, "rgb(255, 255, 255)"],
+            [1, "rgb(240, 240, 255)"]
+          ]
+        },
+        borderWidth: 2,
+        plotBackgroundColor: "rgba(255, 255, 255, .9)",
+        plotShadow: true,
+        plotBorderWidth: 1
+      })
+      chart.lang({
+        thousandsSep: ","
+      })
+      chart.colors([
+        "#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354"
+      ])
+    end
   end
 
   context "layout_helper" do
     it "should return a div with an id of high_chart object" do
-      high_chart(@placeholder, @chart).should have_selector('div', :id => @placeholder)
+      expect(high_chart(@placeholder, @chart)).to have_selector('div', :id => @placeholder)
     end
 
     it "should return a script" do
       hc = LazyHighCharts::HighChart.new("placeholder")
-      high_chart(hc.placeholder, hc).should have_selector('script')
+      expect(high_chart(hc.placeholder, hc)).to have_selector('script')
+    end
+  end
+
+  context "high_chart_globals" do
+    it "should return a script" do
+      high_chart_globals(@chart_globals).should have_selector('script')
+    end
+
+    it "should take a block and set attributes" do
+      high_chart_globals(@chart_globals).should match(/useUTC/)
+      high_chart_globals(@chart_globals).should match(/backgroundColor/)
+      high_chart_globals(@chart_globals).should match(/thousandsSep/)
     end
   end
 
   context "high_chart_graph" do
     describe "ready function" do
       it "should be a javascript script" do
-        high_chart(@placeholder, @chart).should have_selector('script', :type => 'text/javascript')
-        high_chart(@placeholder, @chart).should match(/}\)\(\)/)
+        expect(high_chart(@placeholder, @chart)).to have_selector('script', :type => 'text/javascript')
+        expect(high_chart(@placeholder, @chart)).to match(/}\)\(\)/)
       end
 
       it "should assign to the onload event" do
-        high_chart(@placeholder, @chart).should include('window.onload = function(){')
-      end
-      it "should call any existing onload function" do
-        high_chart(@placeholder, @chart).should match(/onload = window.onload;/)
-        high_chart(@placeholder, @chart).should match(/if \(typeof onload == "function"\)\s*onload\(\)/)
+        expect(high_chart(@placeholder, @chart)).to include('window.addEventListener(\'load\', function() {')
       end
     end
     describe "initialize HighChart" do
       it "should set variables `chart` `options`" do
-        high_chart(@placeholder, @chart).should match(/var\s+options\s+=/)
-        high_chart(@placeholder, @chart).should match(/window.chart_placeholder\s=/)
+        expect(high_chart(@placeholder, @chart)).to match(/var\s+options\s+=/)
+        expect(high_chart(@placeholder, @chart)).to match(/window.chart_placeholder\s=/)
       end
       it "should set Chart data" do
-        high_chart(@placeholder, @chart).should match(/window\.chart_placeholder\s=\snew\sHighcharts.Chart/)
+        expect(high_chart(@placeholder, @chart)).to match(/window\.chart_placeholder\s=\snew\sHighcharts.Chart/)
       end
 
       it "should set chart renderTo" do
-        high_chart(@placeholder, @chart).should match(/"renderTo": "placeholder"/)
+        expect(high_chart(@placeholder, @chart)).to match(/"renderTo": "placeholder"/)
       end
 
       it "should set Chart Stock" do
-        high_stock(@placeholder, @chart).should match(/window\.chart_placeholder\s+=\s+new\s+Highcharts.StockChart/)
+        expect(high_stock(@placeholder, @chart)).to match(/window\.chart_placeholder\s+=\s+new\s+Highcharts.StockChart/)
       end
     end
 
     describe "HighChart Variable" do
       it "should underscore chart_ variable" do
-        high_chart("place-holder", @chart).should match(/window.chart_place_holder\s=/)
-        high_chart("PlaceHolder",  @chart).should match(/window.chart_place_holder\s=/)
+        expect(high_chart("place-holder", @chart)).to match(/window.chart_place_holder\s=/)
+        expect(high_chart("PlaceHolder",  @chart)).to match(/window.chart_place_holder\s=/)
       end
     end
   end
@@ -75,11 +105,11 @@ describe HighChartsHelper do
                :data => [0, 1, 2, 3, 5, 6, 0, 7]
       )
     }
-    chart.options[:rangeSelector][:selected].should == 1
-    high_chart(@placeholder, chart).should match(/rangeSelector/)
-    high_chart(@placeholder, chart).should match(/xAxis/)
-    high_chart(@placeholder, chart).should match(/yAxis/)
-    high_chart(@placeholder, chart).should match(/series/)
+    expect(chart.options[:rangeSelector][:selected]).to eq(1)
+    expect(high_chart(@placeholder, chart)).to match(/rangeSelector/)
+    expect(high_chart(@placeholder, chart)).to match(/xAxis/)
+    expect(high_chart(@placeholder, chart)).to match(/yAxis/)
+    expect(high_chart(@placeholder, chart)).to match(/series/)
 
   end
 
@@ -88,7 +118,7 @@ describe HighChartsHelper do
     chart = LazyHighCharts::HighChart.new { |f|
       f.others(:foo => "bar")
     }
-    high_chart(@placeholder, chart).should match(/foo/)
+    expect(high_chart(@placeholder, chart)).to match(/foo/)
   end
 
   it "should allow js code as attribute" do
@@ -96,7 +126,7 @@ describe HighChartsHelper do
       f.options[:foo] = "function () { alert('hello') }".js_code
     }
 
-    high_chart(@placeholder, chart).should match(/"foo": function \(\) { alert\('hello'\) }/)
+    expect(high_chart(@placeholder, chart)).to match(/"foo": function \(\) { alert\('hello'\) }/)
   end
 
   it "should convert keys to proper format" do
@@ -104,8 +134,8 @@ describe HighChartsHelper do
       f.options[:foo_bar] = {:bar_foo => "someattrib"}
     }
 
-    high_chart(@placeholder, chart).should match(/fooBar/)
-    high_chart(@placeholder, chart).should match(/barFoo/)
+    expect(high_chart(@placeholder, chart)).to match(/fooBar/)
+    expect(high_chart(@placeholder, chart)).to match(/barFoo/)
   end
 
   # issue #62 .js_code setting ignored
@@ -118,7 +148,7 @@ describe HighChartsHelper do
                    }
                }])
     }
-    high_chart(@placeholder, chart).should match(/"formatter": function\(\) {return this.value \+ ' W';}/)
+    expect(high_chart(@placeholder, chart)).to match(/"formatter": function\(\) {return this.value \+ ' W';}/)
   end
 
   it "should support js_code in Individual data label for each point" do
@@ -135,7 +165,7 @@ describe HighChartsHelper do
               :y => 54.4}
           ])
     }
-    high_chart(@placeholder, chart).should match(/"formatter": function\(\) {\ return this.x;\ }/)
+    expect(high_chart(@placeholder, chart)).to match(/"formatter": function\(\) {\ return this.x;\ }/)
   end
 
 end