apexcharts 0.1.6 → 0.1.7

data/lib/apexcharts/charts/base.rb

@@ -1,34 +1,35 @@
 module ApexCharts
   class BaseChart
-    attr_reader :options, :series
+    include Utils::Hash
 
-    def initialize data, options={}
-      @series = sanitize_data(data)
-      @options = Utils::Hash.deep_merge(
-                   build_options(x_sample, options),
-                   Utils::Hash.camelize_keys(
-                     {**@series, chart: {type: chart_type}}.compact
-                   )
-                 )
+    attr_reader :options, :series, :sample
+
+    def initialize(data, options={})
+      @series = build_series(data)
+      @options = build_options(options)
     end
 
     def render
-      ApexCharts::Renderer.render_default(options)
+      Renderer.render_default(options)
     end
 
-    def chart_type
-    end
+    def chart_type; end
 
   protected
 
-    def build_options(x_sample, options)
-      ApexCharts::OptionsBuilder.new(x_sample, options).build_options
+    def build_series(data)
+      series_object = series_type.new(data)
+      @sample = series_object.sample
+      series_object.sanitized
     end
 
-    def x_sample
-      series[:series][0][:data][0][:x]
+    def build_options(options)
+      deep_merge(
+        OptionsBuilder.new(sample, options).build_options,
+        camelize_keys(
+          {**@series, chart: {type: chart_type}}.compact
+        )
+      )
     end
   end
 end
-
-

data/lib/apexcharts/charts/bubble.rb

@@ -6,14 +6,8 @@ module ApexCharts
       'bubble'
     end
 
-  private
-
-    def sanitize_data(data)
-      ApexCharts::BubbleSeries.new(data).sanitized
-    end
-
-    def x_sample
-      series[:series][0][:data][0][0]
+    def series_type
+      BubbleSeries
     end
   end
 end

data/lib/apexcharts/charts/cartesian.rb

@@ -2,67 +2,69 @@
 
 require_relative 'features/annotations'
 require_relative 'features/mixable'
+require_relative '../utils/hash'
 
 module ApexCharts
   class CartesianChart < BaseChart
     include Annotations
     include Mixable
+    include Utils::Hash
 
-    def initialize bindings, data, options={}, &block
-      @bindings = bindings
-      options = Utils::Hash.deep_merge(
-                  Utils::Hash.camelize_keys(options),
-                  Utils::Hash.camelize_keys(more_options)
-                )
+    def initialize(outer_self, data, options={}, &block)
+      @outer_self = outer_self
+      options = deep_merge(
+        camelize_keys(options),
+        camelize_keys(more_options)
+      )
 
-      build_instance_variables if @bindings
+      build_instance_variables if @outer_self
 
       instance_eval &block if block_given?
 
       options[:annotations] = @annotations if @annotations
-      @series = sanitize_data(data)
-      @options = Utils::Hash.deep_merge(
-                   build_options(x_sample, options),
-                   Utils::Hash.camelize_keys(
-                     {**@series, chart: {type: chart_type}}.compact
-                   )
-                 )
-
-      get_selection_range if brush?
+      @series = build_series(data)
+      @options = build_options(options)
+
+      build_selection_range if brush?
+    end
+
+    def series_type
+      CartesianSeries
     end
 
     def more_options
       {}
     end
 
-    def method_missing method, *args, &block
-      if @bindings
-        @bindings.send method, *args, &block
+    def method_missing(method, *args, &block)
+      if @outer_self.respond_to?(method)
+        @outer_self.send method, *args, &block
       else
         super
       end
     end
 
+    def respond_to_missing?(method, *args)
+      @outer_self.respond_to?(method) || super
+    end
+
   protected
 
     def build_instance_variables
-      (@bindings.instance_variables - instance_variables).each do |i|
-        instance_variable_set(i, @bindings.instance_variable_get(i))
+      (@outer_self.instance_variables - instance_variables).each do |i|
+        instance_variable_set(i, @outer_self.instance_variable_get(i))
       end
     end
 
-    def sanitize_data(data)
-      ApexCharts::CartesianSeries.new(data).sanitized
-    end
-
     def brush?
       @options[:chart][:brush]&.[](:enabled) && \
         !@options[:chart][:selection]&.[](:xaxis)
     end
 
-    def get_selection_range
-      first_x = @series[:series].last[:data].first[:x]
-      last_x = @series[:series].last[:data].last[:x]
+    def build_selection_range
+      last_data = @series[:series].last[:data]
+      first_x = last_data.first[:x]
+      last_x = last_data.last[:x]
       @options[:chart][:selection][:xaxis] = {
         min: handle_time(twenty_percent_before_last_x(first_x, last_x)),
         max: handle_time(last_x)
@@ -78,4 +80,3 @@ module ApexCharts
     end
   end
 end
-

data/lib/apexcharts/charts/donut.rb

@@ -7,4 +7,3 @@ module ApexCharts
     end
   end
 end
-

data/lib/apexcharts/charts/features/annotations.rb

@@ -3,36 +3,35 @@ module ApexCharts
     def annotation(axis, value:, text:, color: nil, **options)
       @annotations ||= {}
 
-      unless [:xaxis, :yaxis, :points].include? axis
-        raise "unrecognized axis: #{axis}"
-      end
+      raise "unrecognized axis: #{axis}" unless %i[xaxis yaxis points].include? axis
+
       @annotations[axis] ||= []
       @annotations[axis] << annotation_value(axis, value).merge(
-                                   if axis == :points
-                                     {marker: {size: 8, fillColor: 'white', strokeColor: color, radius: 2}, **options}
-                                   else
-                                     {borderColor: color, fillColor: color, opacity: 0.2}
-                                   end
-                                 ).merge(
-                                   annotation_label(text, color, **options)
-                                 )
+        if axis == :points
+          {marker: {size: 8, fillColor: 'white', strokeColor: color, radius: 2}, **options}
+        else
+          {borderColor: color, fillColor: color, opacity: 0.2}
+        end
+      ).merge(
+        annotation_label(text, color, **options)
+      )
     end
 
-    def x_annotation **args
+    def x_annotation(**args)
       annotation :xaxis, **args
     end
 
-    def y_annotation **args
+    def y_annotation(**args)
       annotation :yaxis, **args
     end
 
-    def point_annotation **args
+    def point_annotation(**args)
       annotation :points, **args
     end
 
   private
 
-    def annotation_value axis, value
+    def annotation_value(axis, value)
       axis = axis.to_s.delete_suffix('axis').to_sym
       case value
       when Range
@@ -48,7 +47,7 @@ module ApexCharts
         end
       else
         if axis == :points
-          value.map!{ |x| Utils::DateTime.convert(x) }
+          value.map! {|x| Utils::DateTime.convert(x) }
           {x: value.first, y: value.last}
         else
           value = Utils::DateTime.convert(value)
@@ -57,7 +56,7 @@ module ApexCharts
       end
     end
 
-    def annotation_label text, color, **options
+    def annotation_label(text, color, **options)
       {
         label: {
           borderColor: color,

data/lib/apexcharts/charts/features/mixable.rb

@@ -3,9 +3,8 @@
 module ApexCharts
   module Mixable
     def mixed_series
-      series[:series].each{|d| d.merge!(type: chart_type) }
+      series[:series].each {|d| d.merge!(type: chart_type) }
       series[:series]
     end
   end
 end
-

data/lib/apexcharts/charts/heatmap.rb

@@ -6,10 +6,8 @@ module ApexCharts
       'heatmap'
     end
 
-  private
-
-    def sanitize_data(data)
-      ApexCharts::CartesianSeries.new(data).sanitized
+    def series_type
+      CartesianSeries
     end
   end
 end

data/lib/apexcharts/charts/mixed.rb

@@ -3,9 +3,10 @@
 module ApexCharts
   class MixedCharts < BaseChart
     include Annotations
+    include Utils::Hash
 
-    def initialize bindings, options={}, &block
-      @bindings = bindings
+    def initialize(outer_self, options={}, &block)
+      @outer_self = outer_self
       @series = {series: []}
       options[:id] ||= apexcharts_id
       build_instance_variables
@@ -13,50 +14,58 @@ module ApexCharts
       instance_eval &block
 
       options[:annotations] = @annotations if @annotations
-      @options = Utils::Hash.deep_merge(
-                   build_options(x_sample, options),
-                   Utils::Hash.camelize_keys(
-                     {chart: {type: 'area'}, **@series}
-                   )
-                 )
-
-      get_selection_range if brush?
+      @options = build_options(options)
+
+      build_selection_range if brush?
+    end
+
+    def line_chart(data, options={}, &block)
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @series[:series] +=
+        LineChart.new(outer_self, data, options, &block).mixed_series
     end
 
-    def line_chart data, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      @series[:series] += LineChart.new(bindings, data, options, &block).mixed_series
+    def area_chart(data, options={}, &block)
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @series[:series] +=
+        AreaChart.new(outer_self, data, options, &block).mixed_series
     end
 
-    def area_chart data, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      @series[:series] += AreaChart.new(bindings, data, options, &block).mixed_series
+    def bar_chart(data, options={}, &block)
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @series[:series] +=
+        BarChart.new(outer_self, data, options, &block).mixed_series
     end
 
-    def bar_chart data, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      @series[:series] += BarChart.new(bindings, data, options, &block).mixed_series
+    def column_chart(data, options={}, &block)
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @series[:series] +=
+        ColumnChart.new(outer_self, data, options, &block).mixed_series
     end
 
-    def column_chart data, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      @series[:series] += ColumnChart.new(bindings, data, options, &block).mixed_series
+    def scatter_chart(data, options={}, &block)
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @series[:series] +=
+        ScatterChart.new(outer_self, data, options, &block).mixed_series
     end
 
-    def scatter_chart data, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      @series[:series] += ScatterChart.new(bindings, data, options, &block).mixed_series
+    def method_missing(method, *args, &block)
+      if @outer_self.respond_to?(method)
+        @outer_self.send method, *args, &block
+      else
+        super
+      end
     end
 
-    def method_missing method, *args, &block
-      @bindings.send method, *args, &block
+    def respond_to_missing?(method, *args)
+      @outer_self.respond_to?(method) || super
     end
 
   private
 
     def build_instance_variables
-      (@bindings.instance_variables - instance_variables).each do |i|
-        instance_variable_set(i, @bindings.instance_variable_get(i))
+      (@outer_self.instance_variables - instance_variables).each do |i|
+        instance_variable_set(i, @outer_self.instance_variable_get(i))
       end
     end
 
@@ -65,9 +74,10 @@ module ApexCharts
         !@options[:chart][:selection]&.[](:xaxis)
     end
 
-    def get_selection_range
-      first_x = @series[:series].last[:data].first[:x]
-      last_x = @series[:series].last[:data].last[:x]
+    def build_selection_range
+      last_data = @series[:series].last[:data]
+      first_x = last_data.first[:x]
+      last_x = last_data.last[:x]
       @options[:chart][:selection][:xaxis] = {
         min: handle_time(twenty_percent_before_last_x(first_x, last_x)),
         max: handle_time(last_x)

data/lib/apexcharts/charts/pie.rb

@@ -7,4 +7,3 @@ module ApexCharts
     end
   end
 end
-

data/lib/apexcharts/charts/polar.rb

@@ -1,14 +1,7 @@
 module ApexCharts
   class PolarChart < BaseChart
-
-  protected
-
-    def sanitize_data(data)
-      ApexCharts::PolarSeries.new(data).sanitized
-    end
-
-    def x_sample
+    def series_type
+      PolarSeries
     end
   end
 end
-

data/lib/apexcharts/charts/radar.rb

@@ -6,10 +6,8 @@ module ApexCharts
       'radar'
     end
 
-  private
-
-    def sanitize_data(data)
-      ApexCharts::CartesianSeries.new(data).sanitized
+    def series_type
+      CartesianSeries
     end
   end
 end

data/lib/apexcharts/charts/radial_bar.rb

@@ -7,4 +7,3 @@ module ApexCharts
     end
   end
 end
-

data/lib/apexcharts/charts/syncing.rb

@@ -2,9 +2,9 @@
 
 module ApexCharts
   class SyncingCharts
-    def initialize bindings, options={}, &block
-      @bindings = bindings
-      @html = ""
+    def initialize(outer_self, options={}, &block)
+      @outer_self = outer_self
+      @html = ''
       build_instance_variables
       @options = options
       @options[:group] ||= apexcharts_group
@@ -14,40 +14,46 @@ module ApexCharts
       @options[:annotations] = @annotations if @annotations
     end
 
-    def line_chart data, options={}, &block
+    def line_chart(data, options={}, &block)
       options[:id] = apexcharts_id
-      bindings = eval("self", block.binding) if block_given?
-      @html += LineChart.new(bindings, data, @options.merge(options), &block).render
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @html +=
+        LineChart.new(outer_self, data, @options.merge(options), &block).render
     end
 
-    def area_chart data, options={}, &block
+    def area_chart(data, options={}, &block)
       options[:id] = apexcharts_id
-      bindings = eval("self", block.binding) if block_given?
-      @html += AreaChart.new(bindings, data, @options.merge(options), &block).render
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @html +=
+        AreaChart.new(outer_self, data, @options.merge(options), &block).render
     end
 
-    def bar_chart data, options={}, &block
+    def bar_chart(data, options={}, &block)
       options[:id] = apexcharts_id
-      bindings = eval("self", block.binding) if block_given?
-      @html += BarChart.new(bindings, data, @options.merge(options), &block).render
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @html +=
+        BarChart.new(outer_self, data, @options.merge(options), &block).render
     end
 
-    def column_chart data, options={}, &block
+    def column_chart(data, options={}, &block)
       options[:id] = apexcharts_id
-      bindings = eval("self", block.binding) if block_given?
-      @html += ColumnChart.new(bindings, data, @options.merge(options), &block).render
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @html +=
+        ColumnChart.new(outer_self, data, @options.merge(options), &block).render
     end
 
-    def scatter_chart data, options={}, &block
+    def scatter_chart(data, options={}, &block)
       options[:id] = apexcharts_id
-      bindings = eval("self", block.binding) if block_given?
-      @html += ScatterChart.new(bindings, data, @options.merge(options), &block).render
+      outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+      @html +=
+        ScatterChart.new(outer_self, data, @options.merge(options), &block).render
     end
 
-    def mixed_charts options={}, &block
+    def mixed_charts(options={}, &block)
       options[:id] = apexcharts_id
-      bindings = eval "self", block.binding
-      @html += MixedCharts.new(bindings, @options.merge(options), &block).render
+      outer_self = eval('self', block.binding, __FILE__, __LINE__)
+      @html +=
+        MixedCharts.new(outer_self, @options.merge(options), &block).render
     end
     alias_method :combo_charts, :mixed_charts
 
@@ -55,15 +61,23 @@ module ApexCharts
       @html
     end
 
-    def method_missing method, *args, &block
-      @bindings.send method, *args, &block
+    def method_missing(method, *args, &block)
+      if @outer_self.respond_to? method, *args
+        @outer_self.send method, *args, &block
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method, *args)
+      @outer_self.respond_to? method, *args || super
     end
 
   private
 
     def build_instance_variables
-      (@bindings.instance_variables - instance_variables).each do |i|
-        instance_variable_set(i, @bindings.instance_variable_get(i))
+      (@outer_self.instance_variables - instance_variables).each do |i|
+        instance_variable_set(i, @outer_self.instance_variable_get(i))
       end
     end
   end