google_visualr 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c88fe21d2f73a9ff8649ebed58f1d4fa3f0fed
-  data.tar.gz: af80bbfdd2a8fd5c2010808539eacab84075c02b
+  metadata.gz: 762cd55fa47b092ed0ce4efbe9dfa17d37e787f8
+  data.tar.gz: 92c5ef41f18dcb711fa9b9a4a42d539a57a9adb6
 SHA512:
-  metadata.gz: e13dce7e588c8bbb3c301f4f37aec87ac4515b05b3fbfbf8a5372897df9340c029a194b0c2654ceeb8ff1da59a7c187aee432070baa70bb61eec2695b4ceb90f
-  data.tar.gz: 386981a3b3e7c448fa9842d1430ad43af1204366dc1131aceb7372fbcd2741b1eb7388c0a2105e37c2b88b4ad6a445ef4770152b9d379a3592be3925c37dfd8e
+  metadata.gz: 39bc89ba661c876461e9245758f7b06308df4967841f02146086294299a2524f28c4e94e7adcd8fe0fe36fe0ecaae9a6a4a2a1164162d6893cd5976a0e66e2a7
+  data.tar.gz: f01987a2e6f447dfebf6bd4347f4a6bcc8b51a3f40a43558bc9cd3984c43e8b46b903e9f7f4375388e8da2e0d2e1b7f909e24c73bce7aa54544fa1c3b63ce6c1

data/README.md

@@ -0,0 +1,159 @@
+# GoogleVisualr
+
+[![Gem Version](http://img.shields.io/gem/v/google_visualr.svg?style=flat-square)](https://rubygems.org/gems/google_visualr)
+[![Build Status](http://img.shields.io/travis/winston/google_visualr.svg?style=flat-square)](https://travis-ci.org/winston/google_visualr)
+[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](https://github.com/winston/google_visualr/blob/master/MIT-LICENSE)
+
+GoogleVisualr, is a wrapper around the [Google Charts](https://developers.google.com/chart/) that allows anyone to create beautiful charts with just plain Ruby. You don't have to write any JavaScript at all.
+
+It's good for any Ruby (Rails/Sinatra) setup, and you can handle the entire charting logic in Ruby.
+
+Please refer to the [GoogleVisualr API Reference site](http://googlevisualr.heroku.com/) for a complete list of Google charts that you can create with GoogleVisualr.
+
+## tl:dr
+
+* In your model or controller, write Ruby code to create your chart (e.g. Area Chart, Bar Chart etc).
+* Configure your chart with any of the options as listed in Google's API Docs. E.g. [Area Chart](http://code.google.com/apis/chart/interactive/docs/gallery/areachart.html#Configuration_Options).
+* In your view, call `chart.to_js(div_id)` and that renders JavaScript into the HTML output.
+* You get your awesome Google chart, and you didn't write any JavaScript!
+
+## Limitations
+
+GoogleVisualr is not a 100% complete wrapper for Google Chart Tools.
+
+`Methods` and `Events` as described in Google's API Docs - for use after a chart has been rendered, 
+are not implemented because they feel more natural being written as JavaScript functions, within the views or .js files.
+
+## Install
+
+Assuming you are on Rails 3/4, include the gem in your Gemfile.
+
+    gem "google_visualr", ">= 2.5"
+
+## Basics
+
+This is a basic implementation of `GoogleVisualr::DataTable` and `GoogleVisualr::AreaChart`.
+
+For detailed documentation, please refer to the [GoogleVisualr API Reference](http://googlevisualr.heroku.com/) or [read the source](https://github.com/winston/google_visualr_app).
+
+---
+
+In your Rails layout, load Google Ajax API in the head tag, at the very top.
+
+    <script src='https://www.google.com/jsapi'></script>
+
+In your Rails controller, initialize a GoogleVisualr::DataTable object with an empty constructor.
+
+    data_table = GoogleVisualr::DataTable.new
+
+Populate data_table with column headers, and row values.
+
+	# Add Column Headers
+	data_table.new_column('string', 'Year' )
+	data_table.new_column('number', 'Sales')
+	data_table.new_column('number', 'Expenses')
+
+	# Add Rows and Values
+	data_table.add_rows([
+		['2004', 1000, 400],
+		['2005', 1170, 460],
+		['2006', 660, 1120],
+		['2007', 1030, 540]
+	])
+
+Create a GoogleVisualr::AreaChart with data_table and configuration options.
+
+	option = { width: 400, height: 240, title: 'Company Performance' }
+	@chart = GoogleVisualr::Interactive::AreaChart.new(data_table, option)
+
+In your Rails view, render the Google chart.
+
+	<div id='chart'></div>
+	<%= render_chart(@chart, 'chart') %>
+
+## Chart Initializer
+
+The initializer of `GoogleVisualr::<ChartName>` takes in two parameters: `data_table` and `options`.
+
+### `data_table` 
+
+`data_table` is an instance of `GoogleVisualr::DataTable` and contains headers and rows of data.
+
+### `options`
+
+`options` is a hash of configuration options for the Google chart (e.g. width, height, colors etc). 
+
+The available configuration options are exactly the same as those specified in Google's API Docs.
+
+For example: 
+- [Configuration options for AreaChart](https://developers.google.com/chart/interactive/docs/gallery/areachart#configuration-options)
+- [Configuration options for BarChart](https://developers.google.com/chart/interactive/docs/gallery/barchart#configuration-options)
+ 
+At the same time, you can also specify `version`, `language` and `material` as configuration options.
+
+#### `version`
+
+The default version of Google Charts library loaded is `1.0`. 
+
+However, some charts (e.g. Gantt Charts) require the latest version of the Google Charts library,
+so you will have to specify `version` as `1.1` in the configuration options 
+
+```
+....
+@chart = GoogleVisualr::GanttChart.new(data_table, { version: '1.1' })
+```
+
+[Read more about it on Google's API Docs](https://developers.google.com/chart/interactive/docs/basic_load_libs).
+
+#### `language` 
+
+The default locale of all Google Charts is `en`.
+ 
+You can override this default by specifying `language` in the configuration options.
+
+```
+....
+@chart = GoogleVisualr::BarChart.new(data_table, { language: 'ja' })
+```
+
+[Read more about it on Google's API Docs](https://developers.google.com/chart/interactive/docs/library_loading_enhancements#loadwithlocale).
+
+#### `material`
+
+Google has also enabled `Material` design for some charts:
+
+> In 2014, Google announced guidelines intended to support a common look and feel across its properties and apps (such as Android apps) that run on Google platforms. We call this effort Material Design. We'll be providing "Material" versions of all our core charts; you're welcome to use them if you like how they look.
+
+To use material design, you will have to specify `material` as `true` 
+in the configuration options.
+
+```
+....
+@chart = GoogleVisualr::BarChart.new(data_table, { material: true })
+```
+
+## Listeners
+
+For an example usage of `listeners`, please refer to [this comment](https://github.com/winston/google_visualr/issues/36#issuecomment-9880256).
+
+Besides `listeners` you can now also redraw charts in your JavaScript maunally by calling `draw_<element id>()` function. See [this commit](https://github.com/winston/google_visualr/commit/e5554886bd83f56dd31bbc543fdcf1e24523776a) for more details.
+
+## Support
+
+Please submit all feedback, bugs and feature-requests to [GitHub Issues Tracker](http://github.com/winston/google_visualr/issues).
+
+Feel free to fork the project, make improvements or bug fixes and submit pull requests (with tests!).
+
+## Who's Using GoogleVisualr?
+
+I would like to collect some data about who's using this Gem. [Please drop me a line](mailto:winstonyw+googlevisualr@gmail.com).
+
+## Author
+
+GoogleVisualr is maintained by [Winston Teo](mailto:winstonyw+googlevisualr@gmail.com).
+
+Who is Winston Teo? [You should follow Winston on Twitter](http://www.twitter.com/winstonyw), or find out more on [WinstonYW](http://www.winstonyw.com).
+
+## License
+
+Copyright © 2015 Winston Teo Yong Wei. Free software, released under the MIT license.

data/Rakefile

@@ -2,11 +2,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-# RSpec Tasks
 require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ['--options', '.rspec']
-end
-
-task :default => :spec
+task test: :spec
+task default: :spec

data/lib/google_visualr.rb

@@ -14,31 +14,33 @@ require "#{lib_path}/google_visualr/formatters"
 # Interactive Charts
 
 ## Main
+require "#{lib_path}/google_visualr/interactive/annotated_time_line"
+require "#{lib_path}/google_visualr/interactive/annotation_chart"
 require "#{lib_path}/google_visualr/interactive/area_chart"
 require "#{lib_path}/google_visualr/interactive/bar_chart"
 require "#{lib_path}/google_visualr/interactive/bubble_chart"
+require "#{lib_path}/google_visualr/interactive/calendar"
 require "#{lib_path}/google_visualr/interactive/candlestick_chart"
 require "#{lib_path}/google_visualr/interactive/column_chart"
 require "#{lib_path}/google_visualr/interactive/combo_chart"
+require "#{lib_path}/google_visualr/interactive/gantt_chart"
 require "#{lib_path}/google_visualr/interactive/gauge"
 require "#{lib_path}/google_visualr/interactive/geo_chart"
 require "#{lib_path}/google_visualr/interactive/geo_map"
 require "#{lib_path}/google_visualr/interactive/histogram"
+require "#{lib_path}/google_visualr/interactive/intensity_map"
 require "#{lib_path}/google_visualr/interactive/line_chart"
+require "#{lib_path}/google_visualr/interactive/map"
+require "#{lib_path}/google_visualr/interactive/motion_chart"
+require "#{lib_path}/google_visualr/interactive/org_chart"
 require "#{lib_path}/google_visualr/interactive/pie_chart"
+require "#{lib_path}/google_visualr/interactive/sankey"
 require "#{lib_path}/google_visualr/interactive/scatter_chart"
 require "#{lib_path}/google_visualr/interactive/stepped_area_chart"
 require "#{lib_path}/google_visualr/interactive/table"
-require "#{lib_path}/google_visualr/interactive/tree_map"
-
-
-## Additional
-require "#{lib_path}/google_visualr/interactive/annotated_time_line"
-require "#{lib_path}/google_visualr/interactive/intensity_map"
-require "#{lib_path}/google_visualr/interactive/map"
-require "#{lib_path}/google_visualr/interactive/motion_chart"
-require "#{lib_path}/google_visualr/interactive/org_chart"
 require "#{lib_path}/google_visualr/interactive/timeline"
+require "#{lib_path}/google_visualr/interactive/tree_map"
+require "#{lib_path}/google_visualr/interactive/word_tree"
 
 # Image Charts
 require "#{lib_path}/google_visualr/image/spark_line"

data/lib/google_visualr/base_chart.rb

@@ -1,19 +1,43 @@
 module GoogleVisualr
 
   class BaseChart
-    include GoogleVisualr::Packages
     include GoogleVisualr::ParamHelpers
 
-    attr_accessor :data_table, :listeners
+    DEFAULT_VERSION = "1.0".freeze
+
+    attr_accessor :data_table, :listeners, :version, :language, :material
 
     def initialize(data_table, options={})
-      @data_table = data_table
+      @data_table  = data_table
+      @listeners   = []
+      @version     = options.delete(:version)  || DEFAULT_VERSION
+      @language    = options.delete(:language) || "en"
+      @material    = options.delete(:material) || false
       send(:options=, options)
-      @listeners  = []
+    end
+
+    def package_name
+      self.class.to_s.split("::").last.downcase
+    end
+
+    def class_name
+      self.class.to_s.split("::").last
+    end
+
+    def chart_class
+      if material
+        "charts"
+      else
+        "visualization"
+      end
     end
 
     def chart_name
-      class_name
+      if material
+        class_name.gsub!("Chart", "")
+      else
+        class_name
+      end
     end
 
     def chart_function_name(element_id)
@@ -50,7 +74,7 @@ module GoogleVisualr
     # Parameters:
     #  *div_id            [Required] The ID of the DIV element that the Google Chart should be rendered in.
     def load_js(element_id)
-      "\n  google.load('visualization','1', {packages: ['#{package_name}'], callback: #{chart_function_name(element_id)}});"
+      "\n  google.load('visualization', '#{version}', {packages: ['#{package_name}'], language: '#{language}', callback: #{chart_function_name(element_id)}});"
     end
 
     # Generates JavaScript function for rendering the chart.
@@ -61,7 +85,7 @@ module GoogleVisualr
       js = ""
       js << "\n  function #{chart_function_name(element_id)}() {"
       js << "\n    #{@data_table.to_js}"
-      js << "\n    var chart = new google.visualization.#{chart_name}(document.getElementById('#{element_id}'));"
+      js << "\n    var chart = new google.#{chart_class}.#{chart_name}(document.getElementById('#{element_id}'));"
       @listeners.each do |listener|
         js << "\n    google.visualization.events.addListener(chart, '#{listener[:event]}', #{listener[:callback]});"
       end

data/lib/google_visualr/interactive/annotation_chart.rb

@@ -0,0 +1,11 @@
+module GoogleVisualr
+  module Interactive
+
+    # https://developers.google.com/chart/interactive/docs/gallery/annotationchart
+    class AnnotationChart < BaseChart
+      # For Configuration Options, please refer to:
+      # https://developers.google.com/chart/interactive/docs/gallery/annotationchart#configuration-options
+    end
+
+  end
+end

data/lib/google_visualr/interactive/bar_chart.rb

@@ -5,6 +5,22 @@ module GoogleVisualr
     class BarChart < BaseChart
       include GoogleVisualr::Packages::CoreChart
 
+      def package_name
+        if material
+          "bar"
+        else
+          super
+        end
+      end
+
+      def chart_name
+        if material
+          "Bar"
+        else
+          super
+        end
+      end
+
       # For Configuration Options, please refer to:
       # http://code.google.com/apis/chart/interactive/docs/gallery/barchart.html#Configuration_Options
     end

data/lib/google_visualr/interactive/calendar.rb

@@ -0,0 +1,11 @@
+module GoogleVisualr
+  module Interactive
+
+    # https://developers.google.com/chart/interactive/docs/gallery/calendar
+    class Calendar < BaseChart
+      # For Configuration Options, please refer to:
+      # https://developers.google.com/chart/interactive/docs/gallery/calendar#configuration-options
+    end
+
+  end
+end

data/lib/google_visualr/interactive/column_chart.rb

@@ -5,6 +5,22 @@ module GoogleVisualr
     class ColumnChart < BaseChart
       include GoogleVisualr::Packages::CoreChart
 
+      def package_name
+        if material
+          "bar"
+        else
+          super
+        end
+      end
+
+      def chart_name
+        if material
+          "Bar"
+        else
+          super
+        end
+      end
+
       # For Configuration Options, please refer to:
       # http://code.google.com/apis/chart/interactive/docs/gallery/columnchart.html#Configuration_Options
     end

data/lib/google_visualr/interactive/gantt_chart.rb

@@ -0,0 +1,16 @@
+module GoogleVisualr
+  module Interactive
+
+    # https://developers.google.com/chart/interactive/docs/gallery/ganttchart
+    class GanttChart < BaseChart
+
+      def package_name
+        "gantt"
+      end
+
+      # For Configuration Options, please refer to:
+      # https://developers.google.com/chart/interactive/docs/gallery/ganttchart#configuration-options
+    end
+
+  end
+end

data/lib/google_visualr/interactive/line_chart.rb

@@ -5,6 +5,14 @@ module GoogleVisualr
     class LineChart < BaseChart
       include GoogleVisualr::Packages::CoreChart
 
+      def package_name
+        if material
+          "line"
+        else
+          super
+        end
+      end
+
       # For Configuration Options, please refer to:
       # http://code.google.com/apis/chart/interactive/docs/gallery/linechart.html#Configuration_Options
     end

data/lib/google_visualr/interactive/sankey.rb

@@ -0,0 +1,11 @@
+module GoogleVisualr
+  module Interactive
+
+    # https://developers.google.com/chart/interactive/docs/gallery/sankey
+    class Sankey < BaseChart
+      # For Configuration Options, please refer to:
+      # https://developers.google.com/chart/interactive/docs/gallery/sankey#configuration-options
+    end
+
+  end
+end

data/lib/google_visualr/interactive/scatter_chart.rb

@@ -5,6 +5,14 @@ module GoogleVisualr
     class ScatterChart < BaseChart
       include GoogleVisualr::Packages::CoreChart
 
+      def package_name
+        if material
+          "scatter"
+        else
+          super
+        end
+      end
+
       # For Configuration Options, please refer to:
       # http://code.google.com/apis/chart/interactive/docs/gallery/scatterchart.html#Configuration_Options
     end

data/lib/google_visualr/interactive/word_tree.rb

@@ -0,0 +1,11 @@
+module GoogleVisualr
+  module Interactive
+
+    # https://developers.google.com/chart/interactive/docs/gallery/wordtree
+    class WordTree < BaseChart
+      # For Configuration Options, please refer to:
+      # https://developers.google.com/chart/interactive/docs/gallery/wordtree#a-simple-example
+    end
+
+  end
+end

data/lib/google_visualr/packages.rb

@@ -1,15 +1,5 @@
 module GoogleVisualr
-
   module Packages
-
-    def package_name
-      self.class.to_s.split("::").last.downcase
-    end
-
-    def class_name
-      self.class.to_s.split('::').last
-    end
-
     module CoreChart
       def package_name
         "corechart"
@@ -105,5 +95,4 @@ module GoogleVisualr
       end
     end
   end
-
 end

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/spec/dummy/config/environments/development.rb

@@ -1,26 +1,30 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
+  # Only use best-standards-support built into browsers.
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  config.assets.debug = true
+end

data/spec/dummy/config/environments/production.rb

@@ -1,49 +1,84 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  if Rails.version >= "4.2.0"
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor  = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Whether to fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Generate digests for assets URLs.
+  config.assets.digest = true
 
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [:subdomain, :uuid]
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  # config.assets.precompile += %w( search.js )
 
-  # Enable threaded mode
-  # config.threadsafe!
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end

data/spec/dummy/config/environments/test.rb

@@ -1,35 +1,41 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  if Rails.version >= "4.2.0"
+    config.serve_static_files = true
+  else
+    config.serve_static_assets = true
+  end
+  config.static_cache_control = "public, max-age=3600"
+
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

data/spec/google_visualr/base_chart_spec.rb

@@ -10,12 +10,59 @@ describe GoogleVisualr::BaseChart do
   describe "#initialize" do
     it "works" do
       @chart.data_table.should == @dt
+      @chart.version.should    == GoogleVisualr::BaseChart::DEFAULT_VERSION
+      @chart.material.should   == false
       @chart.options.should    == { "legend" => "Test Chart", "width" => 800, "is3D" => true }
     end
+
+    it "accepts version attribute" do
+      @chart = GoogleVisualr::BaseChart.new(@dt, version: "1.1")
+      @chart.version.should    == "1.1"
+    end
+
+    it "accepts language attribute" do
+      @chart = GoogleVisualr::BaseChart.new(@dt, language: "ja")
+      @chart.language.should    == "ja"
+    end
+
+    it "accepts material attribute" do
+      @chart = GoogleVisualr::BaseChart.new(@dt, material: true)
+      @chart.material.should   == true
+    end
+  end
+
+  describe "#package_name" do
+    it "returns class name (without module) and downcased" do
+      @chart.package_name.should == "basechart"
+    end
+  end
+
+  describe "#class_name" do
+    it "returns class name (without module)" do
+      @chart.class_name.should == "BaseChart"
+    end
+  end
+
+  describe "#chart_class" do
+    it "returns 'charts' when material is true" do
+      @chart.material = true
+      @chart.chart_class.should == "charts"
+    end
+
+    it "returns 'charts' when material is false" do
+      @chart.material = false
+      @chart.chart_class.should == "visualization"
+    end
   end
 
   describe "#chart_name" do
-    it "returns class name (less module)" do
+    it "returns class name (less module) when material is true" do
+      @chart.material = true
+      @chart.chart_name.should == "Base"
+    end
+
+    it "returns class name (less module) when material is false" do
+      @chart.material = false
       @chart.chart_name.should == "BaseChart"
     end
   end
@@ -51,12 +98,26 @@ describe GoogleVisualr::BaseChart do
       js.should include("<script")
     end
 
+    it "generates JS of a different locale" do
+      @chart.language = "ja"
+
+      js = @chart.to_js("body")
+      js.should == base_chart_js("body", "ja")
+    end
+
     it "generates JS with listeners" do
       @chart.add_listener("select", "function() {test_event(chart);}")
 
       js = @chart.to_js("body")
       js.should == base_chart_with_listener_js("body")
     end
+
+    it "generates JS for material charts" do
+      @chart.material = true
+
+      js = @chart.to_js("body")
+      js.should == material_chart("body")
+    end
   end
 
 end

data/spec/google_visualr/data_table_spec.rb

@@ -321,7 +321,9 @@ describe GoogleVisualr::DataTable do
 
         it "returns a valid json string when there are apostrophes in v or f" do
           cell = GoogleVisualr::DataTable::Cell.new( { :v => "I'm \"Winston\"", :f => "Winston<div style='color:red; font-style:italic'>Nice Guy</div>" } )
-          cell.to_js.should == "{v: \"I'm \\\"Winston\\\"\", f: \"Winston<div style='color:red; font-style:italic'>Nice Guy</div>\"}"
+          expected = "{v: \"I'm \\\"Winston\\\"\", f: \"Winston<div style='color:red; font-style:italic'>Nice Guy</div>\"}"
+
+          expect(normalize_javascript(cell.to_js)).to eq expected
         end
       end
     end

data/spec/spec_helper.rb

@@ -8,6 +8,18 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 # Load Support Files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+module JavaScriptHelper
+  def normalize_javascript(input)
+    dupped = input.dup
+
+    dupped.gsub!(/\\u003E/i, ">")
+    dupped.gsub!(/\\u003C/i, "<")
+
+    dupped
+  end
+end
+
 RSpec.configure do |config|
   # some (optional) config here
+  include JavaScriptHelper
 end

data/spec/support/common.rb

@@ -13,28 +13,27 @@ def data_table
   GoogleVisualr::DataTable.new(:cols => @cols, :rows => @rows)
 end
 
-def base_chart(data_table=data_table)
+def base_chart(data_table = data_table())
   GoogleVisualr::BaseChart.new(data_table, { :legend => "Test Chart", :width => 800, :is3D => true })
 end
 
-
-def base_chart_js_without_script_tag(div_class="div_class")
-  js =  "\n  google.load('visualization','1', {packages: ['basechart'], callback: draw_#{div_class}});"
+def base_chart_js_without_script_tag(div_class = "div_class", language = "en")
+  js =  "\n  google.load('visualization', '1.0', {packages: ['basechart'], language: '#{language}', callback: draw_#{div_class}});"
   js << "\n  function draw_#{div_class}() {"
   js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
   js << "\n    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
   js << "\n  };"
 end
 
-def base_chart_js(div_class="div_class")
+def base_chart_js(div_class = "div_class", language = "en")
   js =  "\n<script type='text/javascript'>"
-  js << base_chart_js_without_script_tag(div_class)
+  js << base_chart_js_without_script_tag(div_class, language)
   js << "\n</script>"
 end
 
-def base_chart_with_listener_js(div_class="div_class")
+def base_chart_with_listener_js(div_class = "div_class")
   js =  "\n<script type='text/javascript'>"
-  js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: draw_#{div_class}});"
+  js << "\n  google.load('visualization', '1.0', {packages: ['basechart'], language: 'en', callback: draw_#{div_class}});"
   js << "\n  function draw_#{div_class}() {"
   js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
   js << "\n    google.visualization.events.addListener(chart, 'select', function() {test_event(chart);});"
@@ -42,3 +41,13 @@ def base_chart_with_listener_js(div_class="div_class")
   js << "\n  };"
   js << "\n</script>"
 end
+
+def material_chart(div_class = "div_class")
+  js =  "\n<script type='text/javascript'>"
+  js << "\n  google.load('visualization', '1.0', {packages: ['basechart'], language: 'en', callback: draw_#{div_class}});"
+  js << "\n  function draw_#{div_class}() {"
+  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: \"2004\"}, {v: 1000}, {v: 400}]);data_table.addRow([{v: \"2005\"}, {v: 1200}, {v: 450}]);data_table.addRow([{v: \"2006\"}, {v: 1500}, {v: 600}]);data_table.addRow([{v: \"2007\"}, {v: 800}, {v: 500}]);\n    var chart = new google.charts.Base(document.getElementById('#{div_class}'));"
+  js << "\n    chart.draw(data_table, {legend: \"Test Chart\", width: 800, is3D: true});"
+  js << "\n  };"
+  js << "\n</script>"
+end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: google_visualr
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Winston Teo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.5
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
+date: 2015-08-27 00:00:00.000000000 Z
+dependencies: []
 description: This Ruby gem, GoogleVisualr, is a wrapper around the Google Chart Tools
   that allows anyone to create the same beautiful charts with just Ruby; you don't
   have to write any JavaScript at all.
@@ -62,7 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - lib/google_visualr.rb
 - lib/google_visualr/app/helpers/view_helper.rb
@@ -75,12 +33,15 @@ files:
 - lib/google_visualr/image/pie_chart.rb
 - lib/google_visualr/image/spark_line.rb
 - lib/google_visualr/interactive/annotated_time_line.rb
+- lib/google_visualr/interactive/annotation_chart.rb
 - lib/google_visualr/interactive/area_chart.rb
 - lib/google_visualr/interactive/bar_chart.rb
 - lib/google_visualr/interactive/bubble_chart.rb
+- lib/google_visualr/interactive/calendar.rb
 - lib/google_visualr/interactive/candlestick_chart.rb
 - lib/google_visualr/interactive/column_chart.rb
 - lib/google_visualr/interactive/combo_chart.rb
+- lib/google_visualr/interactive/gantt_chart.rb
 - lib/google_visualr/interactive/gauge.rb
 - lib/google_visualr/interactive/geo_chart.rb
 - lib/google_visualr/interactive/geo_map.rb
@@ -91,11 +52,13 @@ files:
 - lib/google_visualr/interactive/motion_chart.rb
 - lib/google_visualr/interactive/org_chart.rb
 - lib/google_visualr/interactive/pie_chart.rb
+- lib/google_visualr/interactive/sankey.rb
 - lib/google_visualr/interactive/scatter_chart.rb
 - lib/google_visualr/interactive/stepped_area_chart.rb
 - lib/google_visualr/interactive/table.rb
 - lib/google_visualr/interactive/timeline.rb
 - lib/google_visualr/interactive/tree_map.rb
+- lib/google_visualr/interactive/word_tree.rb
 - lib/google_visualr/packages.rb
 - lib/google_visualr/param_helpers.rb
 - lib/google_visualr/version.rb

data/README.markdown

@@ -1,157 +0,0 @@
-# GoogleVisualr
-
-[<img src="https://secure.travis-ci.org/winston/google_visualr.png?branch=master" alt="Build Status" />](http://travis-ci.org/winston/google_visualr)
-
-GoogleVisualr, is a wrapper around the [Google Chart Tools](http://code.google.com/apis/chart/interactive/docs/) that allows anyone to create beautiful charts with just plain Ruby. You don't have to write any JavaScript at all.
-
-It's good for any Ruby (Rails/Sinatra) setup, and you can handle the entire charting logic in Ruby.
-
-Please refer to the [GoogleVisualr API Reference site](http://googlevisualr.heroku.com/) for a complete list of Google charts that you can create with GoogleVisualr.
-
-## tl:dr
-
-* In your model or controller, write Ruby code to create your chart (e.g. Area Chart, Bar Chart etc).
-* Configure your chart with any of the options as listed in Google's API Docs. E.g. [Area Chart](http://code.google.com/apis/chart/interactive/docs/gallery/areachart.html#Configuration_Options).
-* In your view, call `chart.to_js(div_id)` and that will insert JavaScript into the final HTML output.
-* You get your awesome Google chart, and you didn't write any JavaScript!
-
-## Limitations
-
-GoogleVisualr is created solely for the aim of simplifying the display of a chart, and not the interactions.
-
-Hence, do note that GoogleVisualr is not a 100% complete wrapper for Google Chart Tools.
-
-E.g., Methods and Events as described in Google's API Docs - for use after a chart has been rendered, are not implemented because they feel more natural being written as JavaScript functions, within the views or .js files.
-
-## Install
-
-Assuming you are on Rails 3, include the gem in your Gemfile.
-
-    gem "google_visualr", ">= 2.1"
-
-## Basics
-
-This is a basic implementation of the GoogleVisualr::DataTable and GoogleVisualr::AreaChart classes.
-
-For detailed documentation and advanced implementations, please refer to the [GoogleVisualr API Reference](http://googlevisualr.heroku.com/) or read the source.
-
----
-
-In your Rails layout, load Google Ajax API in the head tag, at the very top.
-
-    <script src='https://www.google.com/jsapi'></script>
-
-In your Rails controller, initialize a GoogleVisualr::DataTable object with an empty constructor.
-
-    data_table = GoogleVisualr::DataTable.new
-
-Populate data_table with column headers, and row values.
-
-	# Add Column Headers
-	data_table.new_column('string', 'Year' )
-	data_table.new_column('number', 'Sales')
-	data_table.new_column('number', 'Expenses')
-
-	# Add Rows and Values
-	data_table.add_rows([
-		['2004', 1000, 400],
-		['2005', 1170, 460],
-		['2006', 660, 1120],
-		['2007', 1030, 540]
-	])
-
-Create a GoogleVisualr::AreaChart with data_table and configuration options.
-
-	option = { width: 400, height: 240, title: 'Company Performance' }
-	@chart = GoogleVisualr::Interactive::AreaChart.new(data_table, option)
-
-In your Rails view, render the Google chart.
-
-	<div id='chart'></div>
-	<%= render_chart(@chart, 'chart') %>
-
-## Listeners
-
-For an example usage of `listeners`, please refer to [this comment](https://github.com/winston/google_visualr/issues/36#issuecomment-9880256).
-
-Besides `listeners` you can now also redraw charts in your JavaScript maunally by calling `draw_<element id>()` function. See [this commit](https://github.com/winston/google_visualr/commit/e5554886bd83f56dd31bbc543fdcf1e24523776a) for more details.
-
-## Support
-
-Please submit all feedback, bugs and feature-requests to [GitHub Issues Tracker](http://github.com/winston/google_visualr/issues).
-
-Feel free to fork the project, make improvements or bug fixes and submit pull requests (with tests!).
-
-## Who's Using GoogleVisualr?
-
-I would like to collect some data about who's using this Gem. [Please drop me a line](mailto:winstonyw+googlevisualr@gmail.com).
-
-## Change Log
-
-<em>Version 2.4.0</em>
-
-* [Pull Request 75](https://github.com/winston/google_visualr/pull/75) Add Histogram chart.
-
-<em>Version 2.3.0</em>
-
-* [Issue 69](https://github.com/winston/google_visualr/pull/69) Support generating chart Javascript without `<script>` tag
-* Split `base_chart#to_js` into 3 methods - `to_js`, `load_js` and `draw_js` which can be used on their own.
-
-<em>Version 2.2.0</em>
-
-* [Issue 64](https://github.com/winston/google_visualr/pull/64) Works with Turbolinks.
-* [Issue 65](https://github.com/winston/google_visualr/pull/65) Add InteractiveTimeline chart.
-
-<em>Version 2.1.9</em>
-
-* [Issue 61](https://github.com/winston/google_visualr/issues/45) Add MIT license to gemspec.
-
-<em>Version 2.1.8</em>
-
-* [Issue 45](https://github.com/winston/google_visualr/issues/45) Support for redrawing chart from JS.
-
-<em>Version 2.1.7</em>
-
-* [Issue 56](https://github.com/winston/google_visualr/issues/56) Typecast to proper JSON strings.
-
-<em>Version 2.1.6</em>
-
-* [Issue 54](https://github.com/winston/google_visualr/issues/54) Allow apostrophes in labels.
-* [Pull Request 55](https://github.com/winston/google_visualr/pull/55) Added support to accept BigDecimal as number.
-
-<em>Version 2.1.5</em>
-
-* [Pull Request 48](https://github.com/winston/google_visualr/pull/48) Fixed bug with Listener event registration.
-
-<em>Version 2.1.4</em>
-
-* [Pull Request 39](https://github.com/winston/google_visualr/pull/39) Added ability to use Listeners.
-* [Pull Request 40](https://github.com/winston/google_visualr/pull/40) Allowed decoupling of class name and chart name.
-
-<em>Version 2.1.3</em>
-
-* Added support for Bubble Chart.
-* [Pull Request 37](https://github.com/winston/google_visualr/pull/37) Added support for Stepped Area Chart.
-
-<em>Version 2.1.2</em>
-
-* [Pull Request 28](https://github.com/winston/google_visualr/pull/28) Removed InstanceMethods as it's deprecated in Rails 3.2.x.
-* [Pull Request 26](https://github.com/winston/google_visualr/pull/26) Added 3 more image charts and #uri method to all image charts.
-
-<em>Version 2.1.1</em>
-
-* Added support for `role` and `pattern` attributes in `#new_column` and `#new_columns` methods.
-
-<em>Version 2.1.0</em>
-
-* Added `#render_chart` as a helper method in Rails views.
-
-## Author
-
-GoogleVisualr is maintained by [Winston Teo](mailto:winstonyw+googlevisualr@gmail.com).
-
-Who is Winston Teo? [You should follow Winston on Twitter](http://www.twitter.com/winstonyw), or find out more on [WinstonYW](http://www.winstonyw.com) and [LinkedIn](http://sg.linkedin.com/in/winstonyw).
-
-## License
-
-Copyright © 2012 Winston Teo Yong Wei. Free software, released under the MIT license.