lazy_high_charts 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c28742599a93e17c58897651cec1e87dbb69f473
-  data.tar.gz: 04d1a0564b935ba4b55f32cd921eda9cf61a09e7
+  metadata.gz: f5bbd30727f041d725287ddc99426ca728f86c1f
+  data.tar.gz: f352a46256674acb86897ea76e04033a5d2fa035
 SHA512:
-  metadata.gz: 14023de4da68ab6b5ed3b770c648e9c95244922609b24b732bf4bfc9beaf0892c749436226c652a890e7e16dfd0c73acf7223daf3f80b8ce50965dc21f55ad92
-  data.tar.gz: 65c5e078d571d344f15f9d69da69659dc9aee691382e97dd2943d821e202b67a85d4a1aeef46db35b20e67ebe4a82d83c91bb9c03ef65cd77c7cbbff4a147ec7
+  metadata.gz: b1b2c1ef228afe7aef43fff3839f1edf99d11b4a07f9f7876e67367270b4d4169ed79d543ba1923caa2842dabb53a498b4e5e47a40e104fec68c013226ac0ee1
+  data.tar.gz: d446f3a1b9dcb9414210ebb9dbbde9605bde6d46774051d850f23f4e5288b94894349a55786c00ce307ffa7fc4aed0d7eb357885ef76b2f3eeda53fd4fd6c040

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# VERSION 1.5.5
+  * Mon Oct 19, 2015
+    1. Support for HighChart global settings.
+    [#149](https://github.com/michelson/lazy_high_charts/issues/149)
+    2. Minor code refactorings.
+
 # VERSION 1.5.4
   * Fri May 21
     1. Include ActionView::Helpers::TagHelper to the layout helper to avoid method conflict in object.
@@ -5,14 +11,14 @@
 # VERSION 1.5.3
   * Fri Apr 18
     1. update HighChart js lib to latest.
-    
+
 # VERSION 1.5.2
   * Sun Mar 11, 2014
     1. Merge some requirement tweaks to use gem in NON-Rails contexts
 
 # VERSION 1.5.1
   * Sun Dec 22, 2013
-    1. Share highcharts:update rake task for gem and rails host app 
+    1. Share highcharts:update rake task for gem and rails host app
 
 # VERSION 1.5.0
   * Sun Jul 21, 2013

data/GEM_VERSION

@@ -1 +1 @@
-1.5.4
+1.5.5

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 group :test, :development do # This causes the plugins to NOT load
   gem 'webrat', '~> 0.7'
-  gem 'rspec', '~> 2.0'
+  gem 'rspec', '~> 3.4'
   gem 'rails', '>= 3.2'
   gem 'guard-rspec'
   gem 'rb-fsevent', '~> 0.9.1'

data/README.md

@@ -1,5 +1,7 @@
 # LazyHighCharts
 
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/michelson/lazy_high_charts?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 This gem provides a simple and extremely flexible way to use HighCharts from ruby code.
 Tested on Ruby on Rails, Sinatra and Nanoc, but it should work with others too.
 
@@ -40,6 +42,19 @@ then run
 bundle install
 ```
 
+and add this in the application.js
+
+```js
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
+//= require turbolinks
+
+//= require highcharts/highcharts
+//= require highcharts/highcharts-more
+//= require highcharts/highstock
+```
+
 to install it.
 
 ## Usage:
@@ -47,26 +62,48 @@ to install it.
 ### Controller code:
 ```ruby
 @chart = LazyHighCharts::HighChart.new('graph') do |f|
-  f.title(:text => "Population vs GDP For 5 Big Countries [2009]")
-  f.xAxis(:categories => ["United States", "Japan", "China", "Germany", "France"])
-  f.series(:name => "GDP in Billions", :yAxis => 0, :data => [14119, 5068, 4985, 3339, 2656])
-  f.series(:name => "Population in Millions", :yAxis => 1, :data => [310, 127, 1340, 81, 65])
+  f.title(text: "Population vs GDP For 5 Big Countries [2009]")
+  f.xAxis(categories: ["United States", "Japan", "China", "Germany", "France"])
+  f.series(name: "GDP in Billions", yAxis: 0, data: [14119, 5068, 4985, 3339, 2656])
+  f.series(name: "Population in Millions", yAxis: 1, data: [310, 127, 1340, 81, 65])
 
   f.yAxis [
-    {:title => {:text => "GDP in Billions", :margin => 70} },
-    {:title => {:text => "Population in Millions"}, :opposite => true},
+    {title: {text: "GDP in Billions", margin: 70} },
+    {title: {text: "Population in Millions"}, opposite: true},
   ]
 
-  f.legend(:align => 'right', :verticalAlign => 'top', :y => 75, :x => -50, :layout => 'vertical',)
-  f.chart({:defaultSeriesType=>"column"})
+  f.legend(align: 'right', verticalAlign: 'top', y: 75, x: -50, layout: 'vertical')
+  f.chart({defaultSeriesType: "column"})
+end
+
+@chart_globals = LazyHighCharts::HighChartGlobals.new do |f|
+  f.global(useUTC: false)
+  f.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
+  )
+  f.lang(thousandsSep: ",")
+  f.colors(["#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354"])
 end
 ```
 
 ### View Helpers:
 ```ruby
+<%= high_chart_globals(@chart_globals) %>
 <%= high_chart("some_id", @chart) %>
 ```
 
+`high_chart_globals` is optional. Use it to set the global options of all charts that are currently displayed on the page. More info [here](http://api.highcharts.com/highcharts#global).
+
 ###Demo projects:
 
 [Nanoc App](spec/dummy_nanoc/README.md)
@@ -76,7 +113,7 @@ end
 [Sinatra App](spec/dummy_sinatra/README.md)
 
 
-### Update to latest js library. Aditional command line
+### Update to latest js library. Additional command line
 
   To update to the current highcharts.js directly from http://code.highcharts.com/",  you can always run 
 
@@ -97,7 +134,7 @@ We're open to any contribution. It has to be tested properly though.
 * Test your changes. We won't accept any untested contributions (except if they're not testable).
 * Create an [issue](https://github.com/michelson/lazy_high_charts/issues) with a link to your commits.
 
-Thanks for all [contributers](https://github.com/michelson/lazy_high_charts/contributors)
+Thanks for all [contributors](https://github.com/michelson/lazy_high_charts/contributors)
 
 ## Maintainers
 * Deshi Xiao [github/xiaods](https://github.com/xiaods)

data/lazy_high_charts.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3"
 
-  s.add_dependency "bundler", ">= 1.0"
+  s.add_development_dependency "bundler", ">= 1.0"
   s.add_dependency "hash-deep-merge"
 
   s.description = <<-DESC

data/lib/lazy_high_charts.rb

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), *%w[lazy_high_charts core_ext string])
 require File.join(File.dirname(__FILE__), *%w[lazy_high_charts options_key_filter])
 require File.join(File.dirname(__FILE__), *%w[lazy_high_charts layout_helper])
 require File.join(File.dirname(__FILE__), *%w[lazy_high_charts high_chart])
+require File.join(File.dirname(__FILE__), *%w[lazy_high_charts high_chart_globals])
 if defined?(::Rails::Railtie)
   require File.join(File.dirname(__FILE__), *%w[lazy_high_charts railtie])
   require File.join(File.dirname(__FILE__), *%w[lazy_high_charts engine]) if ::Rails.version.to_s >= '3.1'

data/lib/lazy_high_charts/high_chart.rb

@@ -34,7 +34,6 @@ module LazyHighCharts
       self.subtitle({})
     end
 
-
     # Pass other methods through to the javascript high_chart object.
     #
     # For instance: <tt>high_chart.grid(:color => "#699")</tt>
@@ -66,11 +65,13 @@ module LazyHighCharts
     #
     # @return [Hash] options JSON options hash
     def full_options
-      options_collection = [generate_json_from_hash(OptionsKeyFilter.filter(self.options))]
-      options_collection << %|"series": [#{generate_json_from_array(self.data)}]|
-      <<-EOJS
-      { #{options_collection.join(', ')} }
-      EOJS
+      options_collection_as_string self
+    end
+
+    def to_json
+      data = self.options.clone
+      data[:series] = self.series_data.clone
+      data
     end
 
     private
@@ -82,7 +83,7 @@ module LazyHighCharts
     end
 
     def series_options
-      @options.reject { |k, v| SERIES_OPTIONS.include?(k.to_s) == false }
+      @options.reject { |k, _| SERIES_OPTIONS.include?(k.to_s) == false }
     end
 
     def merge_options(name, opts)

data/lib/lazy_high_charts/high_chart_globals.rb

@@ -0,0 +1,29 @@
+module LazyHighCharts
+  class HighChartGlobals
+  	include LayoutHelper
+
+  	attr_accessor :options
+
+  	def initialize
+  	  self.tap do |chart_globals|
+        chart_globals.options ||= {}
+        yield chart_globals if block_given?
+      end
+  	end
+
+  	# Pass other methods through to the high_chart_globals object.
+    #
+    # For instance: <tt>high_chart_globals.global(:useUTC => false)</tt>
+    def method_missing(meth, opts = {})
+      if meth.to_s == 'to_ary'
+        super
+      end
+      merge_options meth, opts      
+    end
+
+    def merge_options(name, opts)
+      @options.merge! name => opts
+    end
+
+  end
+end

data/lib/lazy_high_charts/layout_helper.rb

@@ -16,6 +16,10 @@ module LazyHighCharts
       high_graph_stock(placeholder, object, &block).concat(content_tag("div", "", object.html_options))
     end
 
+    def high_chart_globals(object)
+      build_globals_html_output(object)
+    end
+
     def high_graph(placeholder, object, &block)
       build_html_output("Chart", placeholder, object, &block)
     end
@@ -24,59 +28,27 @@ module LazyHighCharts
       build_html_output("StockChart", placeholder, object, &block)
     end
 
-    def build_html_output(type, placeholder, object, &block)
-      options_collection = [generate_json_from_hash(OptionsKeyFilter.filter(object.options))]
-      options_collection << %|"series": [#{generate_json_from_array(object.series_data)}]|
+    private
 
+    def build_html_output(type, placeholder, object, &block)
       core_js =<<-EOJS
-        var options = { #{options_collection.join(',')} };
+        var options = #{options_collection_as_string(object)};
         #{capture(&block) if block_given?}
         window.chart_#{placeholder.underscore} = new Highcharts.#{type}(options);
       EOJS
 
-      if defined?(request) && request.respond_to?(:xhr?) && request.xhr?
-        graph =<<-EOJS
-        <script type="text/javascript">
-        (function() {
-          #{core_js}
-        })()
-        </script>
-        EOJS
-      elsif defined?(Turbolinks) && request.headers["X-XHR-Referer"]
-        graph =<<-EOJS
-        <script type="text/javascript">
-        (function() {
-          var f = function(){
-            document.removeEventListener('page:load', f, true);
-            #{core_js}
-          };
-          document.addEventListener('page:load', f, true);
-        })()
-        </script>
-        EOJS
-      else
-        graph =<<-EOJS
-        <script type="text/javascript">
-        (function() {
-          var onload = window.onload;
-          window.onload = function(){
-            if (typeof onload == "function") onload();
-            #{core_js}
-          };
-        })()
-        </script>
-        EOJS
-      end
+      encapsulate_js core_js
+    end
 
-      if defined?(raw)
-        return raw(graph)
-      else
-        return graph
-      end
+    def build_globals_html_output(object)
+      options_collection = [generate_json_from_hash(OptionsKeyFilter.filter(object.options))]
 
-    end
+      core_js =<<-EOJS
+        Highcharts.setOptions({ #{options_collection.join(',')} });
+      EOJS
 
-    private
+      encapsulate_js core_js
+    end
 
     def generate_json_from_hash hash
       hash.each_pair.map do |key, value|
@@ -101,6 +73,65 @@ module LazyHighCharts
       array.map { |value| generate_json_from_value(value) }.join(",")
     end
 
+    def request_is_xhr?
+      defined?(request) && request.respond_to?(:xhr?) && request.xhr?
+    end
+
+    def request_is_referrer?
+      defined?(request) && request.respond_to?(:headers) && request.headers["X-XHR-Referer"]
+    end
+
+    def options_collection_as_string object
+      options_collection = [generate_json_from_hash(OptionsKeyFilter.filter(object.options))]
+      options_collection << %|"series": [#{generate_json_from_array(object.series_data)}]|
+      "{ #{options_collection.join(',')} }"
+    end
+
+    def encapsulate_js(core_js)
+      if request_is_xhr?
+        js_output = "#{js_start} #{core_js} #{js_end}"
+      elsif defined?(Turbolinks) && request_is_referrer?
+        js_output =<<-EOJS
+        #{js_start}
+          var f = function(){
+            document.removeEventListener('page:load', f, true);
+            #{core_js}
+          };
+          document.addEventListener('page:load', f, true);
+        #{js_end}
+        EOJS
+      else
+        js_output =<<-EOJS
+        #{js_start}
+          var onload = window.onload;
+          window.onload = function(){
+            if (typeof onload == "function") onload();
+            #{core_js}
+          };
+        #{js_end}
+        EOJS
+      end
+
+      if defined?(raw)
+        return raw(js_output)
+      else
+        return js_output
+      end
+    end
+
+    def js_start
+      <<-EOJS
+        <script type="text/javascript">
+        (function() {
+      EOJS
+    end
+
+    def js_end
+      <<-EOJS
+        })()
+        </script>
+      EOJS
+    end
   end
 end
 

data/lib/lazy_high_charts/options_key_filter.rb

@@ -1,39 +1,42 @@
-#
 # 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
-
-    def self.date_to_js_code date
-      "Date.UTC(#{date.year}, #{date.month - 1}, #{date.day})".js_code
-    end
+    FILTER_MAP = {
+      :pointInterval => [:milliseconds],
+      :pointStart => [:date_to_js_code]
+    }
 
-    def self.filter options
-      new_options = options.map do |k, v|
-        if v.is_a? ::Hash
-          v = filter v
-        else
-          FILTER_MAP.each_pair do |method, matchers|
-            v = method.call(v) if matchers.include?(k)
+    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
-        [k, v]
       end
-      Hash[new_options]
-    end
 
-    FILTER_MAP = {
-        method(:milliseconds) => [:pointInterval],
-        method(:date_to_js_code) => [:pointStart]
-    }
+      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
+    end
   end
-end
+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,90 @@ 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(){')
+        expect(high_chart(@placeholder, @chart)).to 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 match(/onload = window.onload;/)
+        expect(high_chart(@placeholder, @chart)).to match(/if \(typeof onload == "function"\)\s*onload\(\)/)
       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 +109,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 +122,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 +130,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 +138,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 +152,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 +169,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

data/spec/options_key_filter_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe LazyHighCharts::OptionsKeyFilter do
   it "should filter :pointInterval from seconds to milliseconds" do
     hash = LazyHighCharts::OptionsKeyFilter.filter(pointInterval: 1)
-    hash[:pointInterval].should == 1000
+    expect(hash[:pointInterval]).to eq(1000)
   end
 
   describe "filters :pointStart from a Date to a JavaScript compatible string" do
@@ -13,16 +13,16 @@ describe LazyHighCharts::OptionsKeyFilter do
     end
 
     it "should be the correct string" do
-      @value.should == "Date.UTC(2012, 8, 13)"
+      expect(@value).to eq("Date.UTC(2012, 8, 13)")
     end
 
     it "should be js_code" do
-      @value.js_code.should be_true
+      expect(@value.js_code).to be_truthy
     end
   end
 
   it "should filter keys recursively" do
     hash = LazyHighCharts::OptionsKeyFilter.filter({something: {another_thing: {pointInterval: 2}}})
-    hash[:something][:another_thing][:pointInterval].should == 2000
+    expect(hash[:something][:another_thing][:pointInterval]).to eq(2000)
   end
-end
+end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
-require "active_support/core_ext"
+require 'active_support/core_ext'
 
 
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/lazy_high_charts'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_high_charts
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Miguel Michelson
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hash-deep-merge
   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'
 description: |2
@@ -50,9 +50,9 @@ extra_rdoc_files:
 - README.md
 - CHANGELOG.md
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - GEM_VERSION
 - Gemfile
@@ -66,6 +66,7 @@ files:
 - lib/lazy_high_charts/core_ext/string.rb
 - lib/lazy_high_charts/engine.rb
 - lib/lazy_high_charts/high_chart.rb
+- lib/lazy_high_charts/high_chart_globals.rb
 - lib/lazy_high_charts/layout_helper.rb
 - lib/lazy_high_charts/options_key_filter.rb
 - lib/lazy_high_charts/railtie.rb
@@ -136,6 +137,7 @@ files:
 - spec/dummy_sinatra/config.ru
 - spec/dummy_sinatra/views/index.erb
 - spec/dummy_sinatra/views/layout.erb
+- spec/high_chart_globals_spec.rb
 - spec/high_chart_spec.rb
 - spec/lazy_high_charts_spec.rb
 - spec/options_key_filter_spec.rb
@@ -155,22 +157,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: rubyist way to render variant chart by highcharts without write javascript