Added HighMaps

lib/daru/view/adapters/highcharts/display.rb

@@ -3,7 +3,7 @@
 
 module LazyHighCharts
   def self.init_script(
-    dependent_js=['highstock.js', 'highcharts-more.js', 'modules/exporting.js',
+    dependent_js=['highstock.js', 'map.js', 'modules/exporting.js',
                   'highcharts-3d.js', 'modules/data.js']
   )
     # Highstock is based on Highcharts, meaning it has all the core
@@ -33,22 +33,25 @@ class HighChart
     #
     def to_html(placeholder=random_canvas_id)
       chart_hash_must_be_present
+      script = load_modules('web_frameworks')
       # Helps to denote either of the three classes.
       chart_class = extract_chart_class
       # When user wants to plot a HighMap
       if chart_class == 'Map'
-        high_map(placeholder, self)
+        script << high_map(placeholder, self)
       # When user wants to plot a HighStock
       elsif chart_class == 'StockChart'
-        high_stock(placeholder, self)
+        script << high_stock(placeholder, self)
       # When user wants to plot a HighChart
       elsif chart_class == 'Chart'
-        high_chart(placeholder, self)
+        script << high_chart(placeholder, self)
       end
+      script
     end
 
     def show_in_iruby(placeholder=random_canvas_id)
       # TODO : placeholder pass, in plot#div
+      load_modules('iruby')
       IRuby.html to_html_iruby(placeholder)
     end
 
@@ -61,6 +64,17 @@ def to_html_iruby(placeholder=random_canvas_id)
       high_chart_iruby(extract_chart_class, placeholder, self)
     end
 
+    # @return load the dependent modules of the chart
+    def load_modules(type)
+      modules = options.delete(:modules).collect { |module_js| 'modules/' + module_js } unless
+      options[:modules].nil?
+      if type == 'iruby'
+        LazyHighCharts.init_iruby(modules) unless modules.nil?
+      elsif type == 'web_frameworks'
+        modules.nil? ? '' : LazyHighCharts.init_script(modules)
+      end
+    end
+
     # @return [String] the class of the chart
     def extract_chart_class
       # Provided by user and can take two values ('stock' or 'map').

lib/daru/view/adapters/highcharts/iruby_notebook.rb

@@ -9,7 +9,7 @@ def self.generate_init_code(dependent_js)
 
   # Enable to show plots on IRuby notebook
   def self.init_iruby(
-    dependent_js=['highstock.js', 'highcharts-more.js', 'modules/exporting.js',
+    dependent_js=['highstock.js', 'map.js', 'modules/exporting.js',
                   'highcharts-3d.js', 'modules/data.js']
   )
     # TODO: include highstock.js for highstock and modules/*.js files for
@@ -18,6 +18,9 @@ def self.init_iruby(
     # Highstock.js includes the highcharts.js, so only one of them required.
     # see: https://www.highcharts.com/errors/16
     #
+    # Using Highmaps as a plugin for HighCharts so using map.js instead of
+    # highmaps.js
+    #
     # , 'modules/exporting.js' : for the exporting button
     # data.js for getting data as csv or html table.
     # 'highcharts-more.js' : for arearange and some other chart type

lib/daru/view/adapters/highcharts/layout_helper_iruby.rb

@@ -8,6 +8,14 @@ def high_chart_iruby(chart_class, placeholder, object, &block)
       ).concat(content_tag('div', '', object.html_options))
     end
 
+    def high_map(placeholder, object, &block)
+      object.html_options[:id] = placeholder
+      object.options[:chart][:renderTo] = placeholder
+      build_html_output(
+        'Map', placeholder, object, &block
+      ).concat(content_tag('div', '', object.html_options))
+    end
+
     private
 
     def build_html_output_iruby(type, placeholder, object, &block)