Added HighMap

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

@@ -3,8 +3,10 @@
 
 module LazyHighCharts
   def self.init_script(
-    dependent_js=['highstock.js', 'highcharts-more.js', 'modules/exporting.js',
-                  'highcharts-3d.js', 'modules/data.js']
+    dependent_js=['highstock.js', 'map.js', 'modules/highcharts-more.js',
+                  'modules/exporting.js', 'modules/tilemap.js', 'highcharts-3d.js',
+                  'modules/data.js', 'modules/europe.js', 'modules/us-all.js',
+                  'modules/world.js']
   )
     # Highstock is based on Highcharts, meaning it has all the core
     # functionality of Highcharts, plus some additional features. So
@@ -49,6 +51,8 @@ def to_html(placeholder=random_canvas_id)
 
     def show_in_iruby(placeholder=random_canvas_id)
       # TODO : placeholder pass, in plot#div
+      LazyHighCharts.init_iruby(options.delete(:modules).collect { |module_js| 'modules/' + module_js }) unless
+      options[:modules].nil?
       IRuby.html to_html_iruby(placeholder)
     end
 

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

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)

lib/tasks/high_charts.rake

@@ -11,14 +11,14 @@ end
 
 namespace :highcharts do
   desc "Update highcharts.js from latest Builds on Highcharts codebase: http://code.highcharts.com/"
-  task :update => [:core, :stock]
+  task :update => [:core, :stock, :map]
   task :core do
     say "Grabbing Core from Highcharts codebase..." do
       sh "mkdir -p lib/daru/view/adapters/js/highcharts_js/modules/"
       sh "mkdir -p lib/daru/view/adapters/js/highcharts_js/adapters/"
 
       sh "curl -# http://code.highcharts.com/highcharts.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/highcharts.js"
-      sh "curl -# http://code.highcharts.com/highcharts-more.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/highcharts-more.js"
+      sh "curl -# http://code.highcharts.com/highcharts-more.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/highcharts-more.js"
       sh "curl -# http://code.highcharts.com/highcharts-3d.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/highcharts-3d.js"
 
       # Modules
@@ -36,6 +36,7 @@ namespace :highcharts do
       sh "curl -# http://code.highcharts.com/modules/offline-exporting.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/offline-exporting.js"
       sh "curl -# http://code.highcharts.com/modules/solid-gauge.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/solid-gauge.js"
       sh "curl -# http://code.highcharts.com/modules/treemap.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/treemap.js"
+      sh "curl -# http://code.highcharts.com/modules/tilemap.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/tilemap.js"
 
       sh "curl -# http://code.highcharts.com/adapters/mootools-adapter.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/adapters/mootools-adapter.js"
       sh "curl -# http://code.highcharts.com/adapters/prototype-adapter.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/adapters/prototype-adapter.js"
@@ -51,10 +52,22 @@ namespace :highcharts do
       sh "curl -# http://code.highcharts.com/stock/highstock.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/highstock.js"
       sh "curl -# http://code.highcharts.com/stock/highcharts-more.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/stock/highcharts-more.js"
       sh "curl -# http://code.highcharts.com/stock/modules/exporting.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/stock/modules/exporting.js"
-      sh "curl -# http://code.highcharts.com/stock/modules/funnel.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/stock/modules/funnel.js"
+      sh "curl -# http://code.highcharts.com/stock/modules/funnel.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/funnel.js"
       sh "curl -# http://code.highcharts.com/stock/adapters/mootools-adapter.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/stock/adapters/mootools-adapter.js"
       sh "curl -# http://code.highcharts.com/stock/adapters/prototype-adapter.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/stock/adapters/prototype-adapter.js"
     end
   end
 
+  task :map do
+    say "Grabbing HighMaps JS from Upstream..." do
+
+      sh "curl -# http://code.highcharts.com/maps/highmaps.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/highmaps.js"
+      sh "curl -# http://code.highcharts.com/maps/modules/map.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/map.js"
+      sh "curl -# http://code.highcharts.com/mapdata/countries/us/us-all.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/us-all.js"
+      sh "curl -# http://code.highcharts.com/mapdata/countries/gb/gb-all.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/gb-all.js"
+      sh "curl -# http://code.highcharts.com/mapdata/custom/europe.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/europe.js"
+      sh "curl -# http://code.highcharts.com/mapdata/custom/world.js -L --compressed -o lib/daru/view/adapters/js/highcharts_js/modules/world.js"
+    end  
+  end
+
 end