highcharts-js-rails 0.0.3 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,22 @@
-## v0.0.1 (2011-10-13) ##
+## v0.1.0 (2012-03-17) ##
 
-* First release
+* Near-complete rewrite of the entire gem. Now accepts all major Highcharts options, providing convenient help throughout the way.
+* Bump dependency on railties to 3.1.
+* Read the updated README to learn how to change your implementation to support the 0.1.x tree.
+
+## v0.0.3 (2012-02-19) ##
+
+* We should not be hiding credit to Highcharts.com on the charts.
+* Fix core lib/ file name to load correctly.
+* Fix Rails.env sourcing.
+
+## v0.0.2 (2012-02-19) ##
+
+* Whitespace now conforms to Rails conventions.
+* require action_view in Highcharts::Base.
+* Add line breaks after closing bracket (]) when not running in production environment.
+* Privatize methods that are not being used outside of the class.
+
+## v0.0.1 (2012-02-19) ##
+
+* First release.

data/README.md

@@ -3,83 +3,55 @@ Highcharts JS Rails
 
 Easily configure a Highcharts JS chart for use in a Rails application.
 
-Currently you are able to do the following:
-
-* Configure multiple axes and series on a single chart
-* Set a specific graph type for each individual series of data (available options include area, areaspline, bar, column, line, pie, scatter or spline) - default is line
-* Customize the tooltip for the graph
-* Configure the location and design of the legend
-* Set the tick interval for a specific axis
-
-Options
+All major options in Highcharts are available to be used with Highcharts JS Rails. However, the exporting and navigation options are not yet built in. You will need to do those manually.
+
+The Highcharts class's methods match up to the corresponding Highcharts options. Take a look at http://www.highcharts.com/ref/ for the full reference.
+
+Many have a default option assigned to them. Those that have one are listed below:
+
+* chart: renderTo (String)
+* credits: enabled (Boolean)
+* legend: enabled (Boolean)
+* plotOptions.marker: enabled (Boolean)
+* subtitle: text (String)
+* title: text (String)
+* xAxis: categories (Array)
+* xAxis.events: setExtremes (function)
+* xAxis.labels: enabled (Boolean)
+* xAxis.title: text (String)
+* yAxis: title (String)
+* yAxis.events: setExtremes (function)
+* yAxis.stackLabels: enabled (Boolean)
+* yAxis.labels: enabled (Boolean)
+* yAxis.title: text (String)
+
+xAxis Notes
 -------
 
-To instantiate a new chart:
-
-`chart = Highcharts::Chart.new`
-
-The Highcharts::Chart class can receive a hash of the following options:
-
-* container: string (required)
-* title: string (required)
-* subtitle: string
-* xAxes: hash or array of hashes (required)
-* yAxes: hash or array of hashes (required)
-* legend: hash
-* series: hash or array of hashes (required)
-* tooltip: string
-
-Both the `xAxes` and `yAxes` options can be either a single hash (meaning there is only one axis) or an array of hashes (for multiple-axis charts). Each hash can include the following options:
-
-* title: string
-* categories: array
-* tickInterval: integer
-* min: integer
-* max: integer
-* labels: hash
-* opposite: boolean
-
-The `categories` option's array of values will be automatically formatted based on its class.
-The `tickInterval` option is only necessary if you want to override automatic tickInterval creation. If the option is not passed, the tickInterval will be calculated based on the amount of data passed to the attached `series`.
-The `labels` option can receive a set of options that includes `prepend` and `append`.
+* The `categories` option's array of values will be automatically formatted based on its class unless you pass :skip_category_formatting => true.
+* The `tickInterval` option is only necessary if you want to override automatic tickInterval creation. If the option is not passed or :auto is passed, the tickInterval will be calculated based on the number of categories passed.
 
-The `legend` option for the Highcharts::Chart class can receive a hash of the following options:
-
-* layout: string (possible values can be horizontal or vertical - default is horizontal)
-* align: string
-* verticalAlign: string
-* x: integer
-* y: integer
-* borderWidth: integer
-
-The `series` option for the Highcharts::Chart class can receive a hash of the following options:
-
-* name: string
-* type: string (possible values can be area, areaspline, bar, column, line, pie, scatter or spline - default is line)
-* xAxis: integer (the index of the xAxis this series should be attached to)
-* yAxis: integer (the index of the yAxis this series should be attached to)
-* data: array
-
-The `data` option's array of values will be automatically formatted as a float, if necessary. 
+For the xAxis, yAxis, and series options, you must pass an array of hashes. Each of those hashes will be converted into the appropriate set of options.
 
 Example
 --------
 
 Ruby:
 
-```
-chart = Highcharts::Chart.new(
-  :container => 'graph',
-  :title => "Highcharts Example",
-  :xAxes => {:categories => ['October 12', 'October 13', 'October 14']},
-  :yAxes => [{:title => 'Impressions', :min => 0}],
-  :series => [{:name => 'Impressions', :yAxis => 0, :type => 'line', :data => [100000, 122000, 127000]}],
-  :legend => {:layout => 'vertical', :align => 'right', :verticalAlign => 'top', :x => -10, :y => 100, :borderWidth => 0},
-  :tooltip => "'<b>' + this.series.name + '</b><br/>' + this.x + ': ' + this.y"
-)
-<%= chart %>
+```ruby
+chart = Highcharts.new
+chart.chart({:renderTo => 'graph'})
+chart.title('Highcharts Example')
+chart.xAxis([{:categories => ['October 12', 'October 13', 'October 14']}])
+chart.yAxis([{:title => 'Impressions', :min => 0}])
+chart.series([{:name => 'Impressions', :yAxis => 0, :type => 'line', :data => [100000, 122000, 127000]}])
+chart.legend({:layout => 'vertical', :align => 'right', :verticalAlign => 'top', :x => -10, :y => 100, :borderWidth => 0})
+chart.tooltip({:formatter => "function(){ return '<b>' + this.series.name + '</b><br/>' + this.x + ': ' + this.y; }"})
 ```
 
 HTML/ERB:
 
-`<div id="graph" style="width: 400px; height: 200px;"></div>`
+```html+erb
+<%= chart %>
+<div id="graph" style="width: 400px; height: 200px;"></div>
+```

data/highcharts-js-rails.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'actionpack', '~> 3.0'
-  s.add_dependency 'railties', '~> 3.0'
+  s.add_dependency 'railties', '~> 3.1'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

data/lib/highcharts-js-rails.rb

@@ -1,3 +1,26 @@
-require 'rails'
-
-%w(base axis chart legend plot_options rails series version).each {|f| require "highcharts/#{f}"}
+require 'highcharts'
+require 'highcharts/base'
+require 'highcharts/axis'
+require 'highcharts/axis/events'
+require 'highcharts/axis/plot_bands'
+require 'highcharts/axis/plot_lines'
+require 'highcharts/axis/stack_labels'
+require 'highcharts/axis/x'
+require 'highcharts/axis/y'
+require 'highcharts/chart'
+require 'highcharts/color'
+require 'highcharts/credits'
+require 'highcharts/labels'
+require 'highcharts/legend'
+require 'highcharts/plot_options'
+require 'highcharts/plot_options/plot_type'
+require 'highcharts/plot_options/plot_type/events'
+require 'highcharts/plot_options/plot_type/marker'
+require 'highcharts/plot_options/plot_type/marker/states'
+require 'highcharts/plot_options/plot_type/states'
+require 'highcharts/plot_options/plot_type/states/hover'
+require 'highcharts/point'
+require 'highcharts/point/events'
+require 'highcharts/title'
+require 'highcharts/tooltip'
+require 'highcharts/engine'

data/lib/highcharts.rb

@@ -0,0 +1,74 @@
+require 'action_view'
+
+class Highcharts < ActionView::Base
+  include ActionView::Helpers
+
+  attr_reader :options, :base_options, :default_options, :custom_options
+
+  def initialize
+    @options = {}
+
+    @base_options = %w(labels lang loading)
+    @default_options = %w(chart colors credits legend point series symbols title tooltip)
+    @custom_options = {
+      'plotOptions' => 'PlotOptions',
+      'subtitle' => 'Title',
+      'xAxis' => 'Axis::X',
+      'yAxis' => 'Axis::Y'
+    }
+  end
+
+  def inspect
+    "#<#{self.class}:0x#{object_id} #{options.inspect}>"
+  end
+
+  def method_missing(method, *args)
+    # We only want to allow the base + custom options to be constantized and instantiated
+    if (base_options + default_options + custom_options.keys).include?(method.to_s)
+      # If there are arguments passed to this method, we want to set the option.
+      if args.length > 0
+        # For xAxis, yAxis, and series, we need to take the array that is passed as the option
+        # and for each value, instantiate a new class.
+        @options[method] = if %w(xAxis yAxis series).include?(method.to_s)
+          args.first.collect {|v| determine_method_class(method).constantize.new(v)}
+        # For all others, just instantiate the class with the original arguments.
+        else
+          determine_method_class(method).constantize.new(*args)
+        end
+      # Otherwise, just return the option's value.
+      else
+        options[method]
+      end
+    else
+      raise NoMethodError
+    end
+  end
+
+  # Called by default when you output the final chart. Spits out jQuery-encapsulated Highcharts JavaScript.
+  # <% chart = Highcharts.new -%>
+  # <%= chart %>
+  def to_s
+    javascript_tag "$(function(){" +
+      "new Highcharts.Chart({" +
+        to_json +
+      "})" +
+    "});"
+  end
+
+  private
+    # Only to be used in the #to_s method of a Highcharts instance. Because the standard #to_json method
+    # will not work the correct way (introspecting on the class and failing to simply call #to_json on each
+    # subsequent class), we have to do it ourselves.
+    def to_json
+      options.collect {|k, v| "\"#{k}\":#{v.is_a?(Array) ? "[{#{v.collect(&:to_json).join('},{')}}]" : "{#{v.to_json}}"}"}.join(',')
+    end
+
+    # Figure out which class a specific method should map too. Ones within the base_options array will be Highcharts::Base.
+    # Ones within the default_options array will be, if the method is title, Highcharts::Title.
+    # When the method is within the custom_options array, it will be the corresponding value. For plotOptions, it will be Highcharts::PlotOptions.
+    def determine_method_class(method)
+      method = method.to_s
+      "Highcharts::#{base_options.include?(method) ? 'Base' : default_options.include?(method) ? method.capitalize : custom_options[method]}"
+    end
+
+end

data/lib/highcharts/axis.rb

@@ -1,49 +1,4 @@
-module Highcharts
-  class Axis < Base
-
-    attr_accessor :title, :categories, :tickInterval, :min, :max, :labels, :opposite
-
-    def to_s
-      "{" +
-        [render_title, render_categories, render_tickInterval, render_options(:objects => 'min max opposite'), render_labels].flatten.compact.join(',') +
-      "}"
-    end
-
-    private
-      def render_title
-        title.present? ? "title: {text: '#{title}'}" : nil
-      end
-
-      def render_categories
-        return nil unless categories.present?
-        "categories: [#{categories.collect {|c| "'#{format_category(c)}'"}.join(', ')}]" # need to encapsulate each category in quotes and format it before joining them with a comma
-      end
-
-      def render_tickInterval
-        return tickInterval if tickInterval.present?
-        return nil unless categories.present?
-        "tickInterval: #{(Math.sqrt(categories.length) < 5 ? 1 : Math.sqrt(categories.length)).floor}"
-      end
-
-      def format_category(category)
-        case category
-        when Date
-          category.strftime("%b. %d")
-        when Time
-          category.strftime("%H:%M")
-        when DateTime
-          category.strftime("%b. %d, %H:%M")
-        else
-          category.to_s
-        end
-      end
-
-      def render_labels
-        return nil unless labels.present?
-        "labels: {" +
-          "formatter: function(){ return '#{labels[:prepend]}' + this.value + '#{labels[:append]}'; }" +
-        "}"
-      end
-
+class Highcharts
+  class Axis
   end
 end

data/lib/highcharts/axis/events.rb

@@ -0,0 +1,13 @@
+class Highcharts
+  class Axis
+    class Events < Base
+
+      def initialize(opts = {})
+        @default = :setExtremes
+        @skip_quotation = :setExtremes
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/axis/plot_bands.rb

@@ -0,0 +1,14 @@
+class Highcharts
+  class Axis
+    class PlotBands < Base
+
+      def initialize(opts = {})
+        @suboptions = {
+          :label => 'Base'
+        }
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/axis/plot_lines.rb

@@ -0,0 +1,14 @@
+class Highcharts
+  class Axis
+    class PlotLines < Base
+
+      def initialize(opts = {})
+        @suboptions = {
+          :label => 'Base'
+        }
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/axis/stack_labels.rb

@@ -0,0 +1,13 @@
+class Highcharts
+  class Axis
+    class StackLabels < Base
+
+      def initialize(opts = {})
+        @default = :enabled
+        @skip_quotation = :formatter
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/axis/x.rb

@@ -0,0 +1,59 @@
+class Highcharts
+  class Axis
+    class X < Base
+
+      attr_reader :skip_category_formatting
+
+      def initialize(opts = {})
+        @default = :categories
+        @suboptions = {
+          :events => 'Axis::Events',
+          :labels => 'Labels',
+          :plotBands => 'Axis::PlotBands',
+          :plotLines => 'Axis::PlotLines',
+          :title => 'Title'
+        }
+        # Check to see if we want to skip automatic formatting of categories.
+        @skip_category_formatting = true if opts.delete(:skip_category_formatting)
+        super
+      end
+
+      def to_json
+        @options[:categories] = options[:categories].collect {|c| format_category(c)} if options[:categories].present? && !skip_category_formatting
+        automate_tick_interval if options[:tickInterval] == :auto || options[:tickInterval].blank?
+        super
+      end
+
+      private
+        # The tickInterval option for an Axis can be automatically calculated by highcharts-js-rails.
+        # Either pass :auto to the :tickInterval option, or do not include the option.
+        # This will only be calculated if the :categories option is passed to the Axis.
+        def automate_tick_interval
+          @options[:tickInterval] = (Math.sqrt(options[:categories].length) < 5 ? 1 : Math.sqrt(options[:categories].length)).floor if options[:categories].present?
+        end
+
+        # Used in the #to_json method to cleanly format the categories for this axis. Depending on the class
+        # of the category, we will return a differently formatted string. Currently supports:
+        #
+        #   Date
+        #   Time
+        #   DateTime
+        #
+        # If the class of the category is none of the above, #to_s is returned.
+        # You can prevent this by passing :skip_category_formatting => true to the Axis options.
+        def format_category(category)
+          case category
+          when Date
+            category.strftime("%b. %d")
+          when Time || DateTime
+          #   category.strftime("%H:%M")
+          # when DateTime
+            category.strftime("%b. %d, %H:%M")
+          else
+            category.to_s
+          end
+        end
+
+    end
+  end
+end

data/lib/highcharts/axis/y.rb

@@ -0,0 +1,20 @@
+class Highcharts
+  class Axis
+    class Y < Base
+
+      def initialize(opts = {})
+        @default = :title
+        @suboptions = {
+          :events => 'Axis::Events',
+          :labels => 'Labels',
+          :plotBands => 'Axis::PlotBands',
+          :plotLines => 'Axis::PlotLines',
+          :stackLabels => 'Axis::StackLabels',
+          :title => 'Title'
+        }
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/base.rb

@@ -1,20 +1,51 @@
-require 'action_view'
+require 'rails'
 
-module Highcharts
-  class Base < ActionView::Base
+class Highcharts
+  class Base
 
-    def initialize(*args)
-      args.extract_options!.each {|arg, value| self.send("#{arg}=", value)}
-    end
+    attr_reader :options, :default, :skip_quotation, :suboptions
+
+    def initialize(opts = {})
+      @options = opts
+      @suboptions ||= {}
 
-    def render_options(args)
-      attrs = []
-      args.each do |t, a|
-        a.split.each do |option|
-          attrs << "#{option}: #{t == :objects ? send(option) : "'#{send(option)}'"}" if send(option).present?
+      # We want to make sure that options in the end is actually a Hash of options, or an Array of hashes of options.
+      # When default is defined in a subclass and the passed options are not a Hash or Array, we want to replace options
+      # with a Hash where the only key/value pair is the default key and the options value.
+      if !options.is_a?(Hash) || (options.is_a?(Array) && !options.first.is_a?(Hash))
+        if default.present?
+          @options = {default => options}
+        else
+          raise ArgumentError, "You must pass a Hash to #{self.class}. You passed #{options.inspect}"
         end
       end
-      attrs
+      # If there is an option that is available as a suboption to the current class,
+      # let's set the option to an instance of that subclass.
+      options.each do |k, v|
+        @options[k] = "Highcharts::#{suboptions[k]}".constantize.new(v) if suboptions.keys.include?(k)
+      end
+    end
+
+    def inspect
+      "#<#{self.class}:0x#{object_id} #{options.inspect}>"
+    end
+
+    # This method is used in the parent class, Highcharts, in order to render the options in a JavaScript-friendly (JSON) format.
+    def to_json
+      json = options.collect do |k, v|
+        "\"#{k}\":" +
+        (suboptions.keys.include?(k) && !v.is_a?(Array) ? '{' : '') +
+        (v.is_a?(Array) && suboptions.keys.include?(k) ? "[{#{v.collect(&:to_json).join('},{')}}]" : check_quotation(k, v.to_json)) +
+        (suboptions.keys.include?(k) && !v.is_a?(Array) ? '}' : '')
+      end
+      json.join(',')
+    end
+
+    # This method is used in #to_json to remove the first and last characters from an option's value.
+    # In the end this removes the encapsulating quotation marks (") from a specific option, provided
+    # it is included in the current class's skip_quotation array.
+    def check_quotation(key, json)
+      skip_quotation.present? && Array.wrap(skip_quotation).include?(key) ? json[1..-2] : json
     end
 
   end

data/lib/highcharts/chart.rb

@@ -1,81 +1,10 @@
-module Highcharts
+class Highcharts
   class Chart < Base
-    include ActionView::Helpers
 
-    attr_accessor :container, :title, :subtitle, :plot_options, :xAxes, :yAxes, :legend, :series, :tooltip
-
-    def to_s
-      check_required_fields
-
-      javascript_tag do
-        safe_concat("$(function(){" +
-          "new Highcharts.Chart({" +
-            render_all +
-          "})" +
-        "});")
-      end
+    def initialize(opts = {})
+      @default = :renderTo
+      super
     end
 
-    private
-      def render_all
-        content = [render_container, render_titles, render_plot_options, render_axes, render_series, render_legend, render_tooltip].flatten.compact.join(",")
-        if ::Rails.env.production?
-          content
-        else
-          content.gsub(/(,|{|\[)/, "\\1\n").gsub(/(}|\])/, "\n\\1")
-        end
-      end
-
-      def check_required_fields
-        %w(container title series).each do |required_argument|
-          raise ArgumentError, ":#{required_argument} must be passed" if send(required_argument).blank? || (send(required_argument).is_a?(Array) && send(required_argument).length == 0)
-        end
-      end
-
-      def render_container
-        "chart: {renderTo: '#{container}'}"
-      end
-
-      def render_titles
-        %w(title subtitle).collect do |t|
-          "#{t}: {text: '#{send(t)}'}" if send(t).present?
-        end
-      end
-
-      def render_plot_options
-        return nil unless plot_options.present?
-        "plotOptions: {" +
-          Array.wrap(plot_options).collect {|po| PlotOptions.new(po)}.join(',') +
-        "}"
-      end
-
-      def render_axes
-        result = %w(x y).collect do |axis|
-          return nil unless send("#{axis}Axes").present?
-          "#{axis}Axis: [" +
-            Array.wrap(send("#{axis}Axes")).collect {|a| Axis.new(a)}.join(',') +
-          "]"
-        end
-        result.compact.join(",")
-      end
-
-      def render_legend
-        return nil unless legend.present?
-        Legend.new(legend)
-      end
-
-      def render_series
-        "series: [" +
-          Array.wrap(series).collect {|s| Series.new(s)}.join(',') +
-        "]"
-      end
-
-      def render_tooltip
-        return nil unless tooltip.present?
-        "tooltip: {" +
-          "formatter: function(){ return #{tooltip}; }" +
-        "}"
-      end
-
   end
 end

data/lib/highcharts/color.rb

@@ -0,0 +1,15 @@
+class Highcharts
+  class Colors < Base
+
+    attr_reader :colors
+
+    def initialize(options)
+      @colors = Array.wrap(options)
+    end
+
+    def to_json
+      colors.to_json
+    end
+
+  end
+end

data/lib/highcharts/credits.rb

@@ -0,0 +1,10 @@
+class Highcharts
+  class Credits < Base
+
+    def initialize(opts = {})
+      @default = :enabled
+      super
+    end
+
+  end
+end

data/lib/highcharts/engine.rb

@@ -0,0 +1,4 @@
+module Highcharts
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/highcharts/labels.rb

@@ -0,0 +1,11 @@
+class Highcharts
+  class Labels < Base
+
+    def initialize(opts = {})
+      @default = :enabled
+      @skip_quotation = :formatter
+      super
+    end
+
+  end
+end

data/lib/highcharts/legend.rb

@@ -1,15 +1,11 @@
-module Highcharts
+class Highcharts
   class Legend < Base
 
-    attr_accessor :layout, :align, :verticalAlign, :x, :y, :borderWidth
-
-    def to_s
-      rendered_options = render_options(:strings => 'layout align verticalAlign', :objects => 'x y borderWidth')
-      return nil if rendered_options.length == 0
-      "legend: {" +
-        rendered_options.join(',') +
-      "}"
+    def initialize(opts = {})
+      @default = :enabled
+      @skip_quotation = :labelFormatter
+      super
     end
 
   end
-end
+end

data/lib/highcharts/plot_options.rb

@@ -1,24 +1,20 @@
-module Highcharts
+class Highcharts
   class PlotOptions < Base
 
-    attr_accessor :type, :data_labels, :legend
-
-    def to_s
-      "#{type}: {" +
-        [render_data_labels, render_legend].flatten.compact.join(',') +
-      "}"
+    def initialize(opts = {})
+      @suboptions = {
+        :area => 'PlotOptions::PlotType',
+        :areaspline => 'PlotOptions::PlotType',
+        :bar => 'PlotOptions::PlotType',
+        :column => 'PlotOptions::PlotType',
+        :line => 'PlotOptions::PlotType',
+        :pie => 'PlotOptions::PlotType',
+        :series => 'PlotOptions::PlotType',
+        :scatter => 'PlotOptions::PlotType',
+        :spline => 'PlotOptions::PlotType'
+      }
+      super
     end
 
-    private
-      def render_data_labels
-        "dataLabels: {" +
-          "enabled: #{data_labels == false ? 'false' : 'true'}" +
-        "}"
-      end
-
-      def render_legend
-        "showInLegend: #{legend ? 'true' : 'false'}"
-      end
-
   end
 end

data/lib/highcharts/plot_options/plot_type.rb

@@ -0,0 +1,18 @@
+class Highcharts
+  class PlotOptions
+    class PlotType < Base
+
+      def initialize(opts = {})
+        @suboptions = {
+          :dataLabels => 'Labels',
+          :events => 'PlotOptions::PlotType::Events',
+          :marker => 'PlotOptions::PlotType::Marker',
+          :point => 'Point',
+          :states => 'PlotOptions::PlotType::States'
+        }
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/plot_options/plot_type/events.rb

@@ -0,0 +1,14 @@
+class Highcharts
+  class PlotOptions
+    class PlotType
+      class Events < Base
+
+        def initialize(opts = {})
+          @skip_quotation = [:click, :checkboxClick, :hide, :legendItemClick, :mouseOver, :mouseOut, :show]
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/highcharts/plot_options/plot_type/marker.rb

@@ -0,0 +1,17 @@
+class Highcharts
+  class PlotOptions
+    class PlotType
+      class Marker < Base
+
+        def initialize(opts = {})
+          @default = :enabled
+          @suboptions = {
+            :states => 'PlotOptions::PlotType::Marker::States'
+          }
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/highcharts/plot_options/plot_type/marker/states.rb

@@ -0,0 +1,19 @@
+class Highcharts
+  class PlotOptions
+    class PlotType
+      class Marker
+        class States < Base
+
+          def initialize(opts = {})
+            @suboptions = {
+              :hover => 'Base',
+              :select => 'Base'
+            }
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/highcharts/plot_options/plot_type/states.rb

@@ -0,0 +1,16 @@
+class Highcharts
+  class PlotOptions
+    class PlotType
+      class States < Base
+
+        def initialize(opts = {})
+          @suboptions = {
+            :hover => 'PlotOptions::PlotType::States::Hover'
+          }
+          super
+        end
+
+      end
+    end
+  end
+end

data/lib/highcharts/plot_options/plot_type/states/hover.rb

@@ -0,0 +1,18 @@
+class Highcharts
+  class PlotOptions
+    class PlotType
+      class States
+        class Hover < Base
+
+          def initialize(opts = {})
+            @suboptions = {
+              :marker => 'Base'
+            }
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/highcharts/point.rb

@@ -0,0 +1,13 @@
+class Highcharts
+  class Point < Base
+
+    def initialize(opts = {})
+      @suboptions = {
+        :events => 'Point::Events',
+        :marker => 'Base'
+      }
+      super
+    end
+
+  end
+end

data/lib/highcharts/point/events.rb

@@ -0,0 +1,12 @@
+class Highcharts
+  class Point
+    class Events < Base
+
+      def initialize(opts = {})
+        @skip_quotation = [:click, :mouseOver, :mouseOut, :remove, :select, :unselect, :update]
+        super
+      end
+
+    end
+  end
+end

data/lib/highcharts/series.rb

@@ -1,20 +1,10 @@
-module Highcharts
+class Highcharts
   class Series < Base
 
-    attr_accessor :name, :type, :xAxis, :yAxis, :data
-
-    def to_s
-      rendered_options = render_options(:strings => 'name type', :objects => 'xAxis yAxis')
-      return nil if rendered_options.length == 0
-      "{" +
-        [rendered_options, render_data].flatten.compact.join(',') +
-      "}"
+    def to_json
+      @options[:data] = options[:data].collect(&:to_f)
+      super
     end
 
-    private
-      def render_data
-        "data: #{data.first.is_a?(Array) ? data : data.collect(&:to_f)}"
-      end
-
   end
 end

data/lib/highcharts/title.rb

@@ -0,0 +1,10 @@
+class Highcharts
+  class Title < Base
+
+    def initialize(opts = {})
+      @default = :text
+      super
+    end
+
+  end
+end

data/lib/highcharts/tooltip.rb

@@ -0,0 +1,11 @@
+class Highcharts
+  class Tooltip < Base
+
+    def initialize(opts = {})
+      @default = :enabled
+      @skip_quotation = :formatter
+      super
+    end
+
+  end
+end

data/lib/highcharts/version.rb

@@ -1,3 +1,3 @@
 module Highcharts
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/spec/highcharts/base_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe "Highcharts" do
 
-  it "should initialize and set args to their corresponding accessors" do
-  end
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcharts-js-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-03-17 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &70118123745480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70118123745480
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70118123744980 !ruby/object:Gem::Requirement
+  requirement: &70364668687900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70118123744980
+  version_requirements: *70364668687900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70118123744600 !ruby/object:Gem::Requirement
+  requirement: &70364668687480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118123744600
+  version_requirements: *70364668687480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70118123744140 !ruby/object:Gem::Requirement
+  requirement: &70364668687020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118123744140
+  version_requirements: *70364668687020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70118123743720 !ruby/object:Gem::Requirement
+  requirement: &70364668686600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118123743720
+  version_requirements: *70364668686600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70118123743300 !ruby/object:Gem::Requirement
+  requirement: &70364668686180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118123743300
+  version_requirements: *70364668686180
 description: Easily configure a Highcharts JS chart for use in a Rails application
 email:
 - agrobbin@gmail.com
@@ -88,18 +77,38 @@ files:
 - .rspec
 - CHANGELOG.md
 - Gemfile
-- LICENSE
 - README.md
 - Rakefile
 - highcharts-js-rails.gemspec
+- lib/LICENSE
 - lib/highcharts-js-rails.rb
+- lib/highcharts.rb
 - lib/highcharts/axis.rb
+- lib/highcharts/axis/events.rb
+- lib/highcharts/axis/plot_bands.rb
+- lib/highcharts/axis/plot_lines.rb
+- lib/highcharts/axis/stack_labels.rb
+- lib/highcharts/axis/x.rb
+- lib/highcharts/axis/y.rb
 - lib/highcharts/base.rb
 - lib/highcharts/chart.rb
+- lib/highcharts/color.rb
+- lib/highcharts/credits.rb
+- lib/highcharts/engine.rb
+- lib/highcharts/labels.rb
 - lib/highcharts/legend.rb
 - lib/highcharts/plot_options.rb
-- lib/highcharts/rails.rb
+- lib/highcharts/plot_options/plot_type.rb
+- lib/highcharts/plot_options/plot_type/events.rb
+- lib/highcharts/plot_options/plot_type/marker.rb
+- lib/highcharts/plot_options/plot_type/marker/states.rb
+- lib/highcharts/plot_options/plot_type/states.rb
+- lib/highcharts/plot_options/plot_type/states/hover.rb
+- lib/highcharts/point.rb
+- lib/highcharts/point/events.rb
 - lib/highcharts/series.rb
+- lib/highcharts/title.rb
+- lib/highcharts/tooltip.rb
 - lib/highcharts/version.rb
 - spec/highcharts/base_spec.rb
 - spec/spec_helper.rb

data/lib/highcharts/rails.rb

@@ -1,6 +0,0 @@
-module Highcharts
-  module Rails
-    class Engine < ::Rails::Engine
-    end
-  end
-end