apexcharts 0.1.4 → 0.1.5

data/lib/apexcharts/charts/bubble.rb

@@ -1,20 +1,19 @@
-module Apexcharts
-  class BubbleChart < CartesianChart
+# frozen_string_literal: true
+
+module ApexCharts
+  class BubbleChart < BaseChart
     def chart_type
       'bubble'
     end
 
-    def mixed_series
-    end
-
-  protected
+  private
 
     def sanitize_data(data)
-      Apexcharts::BubbleSeries.new(data).sanitized
+      ApexCharts::BubbleSeries.new(data).sanitized
     end
 
     def x_sample
-      @series[:series][0][:data][0][0]
+      series[:series][0][:data][0][0]
     end
   end
 end

data/lib/apexcharts/charts/candlestick.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ApexCharts
+  class CandlestickChart < CartesianChart
+    def chart_type
+      'candlestick'
+    end
+  end
+end

data/lib/apexcharts/charts/cartesian.rb

@@ -1,21 +1,29 @@
+# frozen_string_literal: true
+
 require_relative 'features/annotations'
+require_relative 'features/mixable'
 
-module Apexcharts
-  class CartesianChart
+module ApexCharts
+  class CartesianChart < BaseChart
     include Annotations
+    include Mixable
 
     def initialize bindings, data, options={}, &block
       @bindings = bindings
-      options = {**options, **more_options}
+      options = Utils::Hash.deep_merge(
+                  Utils::Hash.camelize_keys(options),
+                  Utils::Hash.camelize_keys(more_options)
+                )
+
       build_instance_variables if @bindings
 
       instance_eval &block if block_given?
 
       options[:annotations] = @annotations if @annotations
       @series = sanitize_data(data)
-      @options = Utils::Hash.camelize_keys(
-                   Utils::Hash.deep_merge(
-                     build_options(x_sample, options),
+      @options = Utils::Hash.deep_merge(
+                   build_options(x_sample, options),
+                   Utils::Hash.camelize_keys(
                      {**@series, chart: {type: chart_type}}.compact
                    )
                  )
@@ -23,34 +31,10 @@ module Apexcharts
       get_selection_range if brush?
     end
 
-    def chart_type
-    end
-
     def more_options
       {}
     end
 
-    def mixed_series
-      @series[:series].each{|d| d.merge!(type: chart_type) }
-      @series[:series]
-    end
-
-    def render
-      attributes = @options.delete(:div) { {} }
-      variable = attributes.delete(:var) { "chart#{attributes[:id]&.[](/\d+/)}" }
-      element_id = attributes.delete(:id)
-      css_class = attributes.delete(:class)
-      height = "#{@options[:chart][:height].to_i}px"
-      style = "height: #{height}; #{attributes.delete(:style)}"
-      html =<<~HTML
-        <div id="#{element_id}" class="#{css_class}" style="#{style}"></div>
-        <script type="text/javascript">
-          var #{variable} = new ApexCharts(document.querySelector("##{element_id}"), #{@options.to_json});
-          #{variable}.render();
-        </script>
-      HTML
-    end
-
     def method_missing method, *args, &block
       if @bindings
         @bindings.send method, *args, &block
@@ -68,11 +52,7 @@ module Apexcharts
     end
 
     def sanitize_data(data)
-      Apexcharts::CartesianSeries.new(data).sanitized
-    end
-
-    def build_options(x_sample, options)
-      Apexcharts::OptionsBuilder.new(x_sample, options).build_options
+      ApexCharts::CartesianSeries.new(data).sanitized
     end
 
     def brush?
@@ -96,10 +76,6 @@ module Apexcharts
     def handle_time(input)
       Utils::DateTime.convert(input)
     end
-
-    def x_sample
-      @series[:series][0][:data][0][:x]
-    end
   end
 end
 

data/lib/apexcharts/charts/column.rb

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   class ColumnChart < BarChart
     def more_options
       {plot_options: {bar: {horizontal: false}}}

data/lib/apexcharts/charts/donut.rb

@@ -1,4 +1,6 @@
-module Apexcharts
+# frozen_string_literal: true
+
+module ApexCharts
   class DonutChart < PolarChart
     def chart_type
       'donut'

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

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   module Annotations
     def annotation(axis, value:, text:, color: nil, **options)
       @annotations ||= {}

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ApexCharts
+  module Mixable
+    def mixed_series
+      series[:series].each{|d| d.merge!(type: chart_type) }
+      series[:series]
+    end
+  end
+end
+

data/lib/apexcharts/charts/heatmap.rb

@@ -1,10 +1,15 @@
-module Apexcharts
-  class HeatmapChart < CartesianChart
+# frozen_string_literal: true
+
+module ApexCharts
+  class HeatmapChart < BaseChart
     def chart_type
       'heatmap'
     end
 
-    def mixed_series
+  private
+
+    def sanitize_data(data)
+      ApexCharts::CartesianSeries.new(data).sanitized
     end
   end
 end

data/lib/apexcharts/charts/line.rb

@@ -1,4 +1,6 @@
-module Apexcharts
+# frozen_string_literal: true
+
+module ApexCharts
   class LineChart < CartesianChart
     def chart_type
       'line'

data/lib/apexcharts/charts/mixed.rb

@@ -1,5 +1,7 @@
-module Apexcharts
-  class MixedCharts
+# frozen_string_literal: true
+
+module ApexCharts
+  class MixedCharts < BaseChart
     include Annotations
 
     def initialize bindings, options={}, &block
@@ -11,9 +13,9 @@ module Apexcharts
       instance_eval &block
 
       options[:annotations] = @annotations if @annotations
-      @options = Utils::Hash.camelize_keys(
-                   Utils::Hash.deep_merge(
-                     build_options(@series[:series][0][:data][0][:x], options),
+      @options = Utils::Hash.deep_merge(
+                   build_options(x_sample, options),
+                   Utils::Hash.camelize_keys(
                      {chart: {type: 'area'}, **@series}
                    )
                  )
@@ -46,22 +48,6 @@ module Apexcharts
       @series[:series] += ScatterChart.new(bindings, data, options, &block).mixed_series
     end
 
-    def render
-      attributes = @options.delete(:div)
-      variable = attributes.delete(:var) || "chart#{attributes[:id][/\d+/]}"
-      element_id = attributes.delete(:id)
-      css_class = attributes.delete(:class)
-      height = "#{@options[:chart][:height].to_i}px"
-      style = "height: #{height};#{attributes.delete(:style)}"
-      html =<<~HTML
-        <div id="#{element_id}" class="#{css_class}" style="#{style}"></div>
-        <script type="text/javascript">
-          var #{variable} = new ApexCharts(document.querySelector("##{element_id}"), #{@options.to_json});
-          #{variable}.render();
-        </script>
-      HTML
-    end
-
     def method_missing method, *args, &block
       @bindings.send method, *args, &block
     end
@@ -74,10 +60,6 @@ module Apexcharts
       end
     end
 
-    def build_options(x_sample, options)
-      Apexcharts::OptionsBuilder.new(x_sample, options).build_options
-    end
-
     def brush?
       @options[:chart][:brush]&.[](:enabled) && \
         !@options[:chart][:selection]&.[](:xaxis)

data/lib/apexcharts/charts/pie.rb

@@ -1,4 +1,6 @@
-module Apexcharts
+# frozen_string_literal: true
+
+module ApexCharts
   class PieChart < PolarChart
     def chart_type
       'pie'

data/lib/apexcharts/charts/polar.rb

@@ -1,42 +1,13 @@
-module Apexcharts
-  class PolarChart
-    def initialize data, options={}
-      @series = sanitize_data(data)
-      @options = Utils::Hash.camelize_keys(
-                   Utils::Hash.deep_merge(
-                     build_options(options),
-                     {**@series, chart: {type: chart_type}}.compact
-                   )
-                 )
-    end
-
-    def chart_type
-    end
-
-    def render
-      attributes = @options.delete(:div) { {} }
-      variable = attributes.delete(:var) { "chart#{attributes[:id]&.[](/\d+/)}" }
-      element_id = attributes.delete(:id)
-      css_class = attributes.delete(:class)
-      height = "#{@options[:chart][:height].to_i}px"
-      style = "height: #{height}; #{attributes.delete(:style)}"
-      html =<<~HTML
-        <div id="#{element_id}" class="#{css_class}" style="#{style}"></div>
-        <script type="text/javascript">
-          var #{variable} = new ApexCharts(document.querySelector("##{element_id}"), #{@options.to_json});
-          #{variable}.render();
-        </script>
-      HTML
-    end
+module ApexCharts
+  class PolarChart < BaseChart
 
   protected
 
     def sanitize_data(data)
-      Apexcharts::PolarSeries.new(data).sanitized
+      ApexCharts::PolarSeries.new(data).sanitized
     end
 
-    def build_options(options)
-      Apexcharts::OptionsBuilder.new(nil, options).build_options
+    def x_sample
     end
   end
 end

data/lib/apexcharts/charts/radar.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ApexCharts
+  class RadarChart < BaseChart
+    def chart_type
+      'radar'
+    end
+
+  private
+
+    def sanitize_data(data)
+      ApexCharts::CartesianSeries.new(data).sanitized
+    end
+  end
+end

data/lib/apexcharts/charts/radial_bar.rb

@@ -1,4 +1,6 @@
-module Apexcharts
+# frozen_string_literal: true
+
+module ApexCharts
   class RadialBarChart < PolarChart
     def chart_type
       'radialBar'

data/lib/apexcharts/charts/scatter.rb

@@ -1,4 +1,6 @@
-module Apexcharts
+# frozen_string_literal: true
+
+module ApexCharts
   class ScatterChart < CartesianChart
     def chart_type
       'scatter'

data/lib/apexcharts/charts/syncing.rb

@@ -1,4 +1,6 @@
-module Apexcharts
+# frozen_string_literal: true
+
+module ApexCharts
   class SyncingCharts
     def initialize bindings, options={}, &block
       @bindings = bindings

data/lib/apexcharts/helper.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require_relative 'series'
 require_relative 'options_builder'
 require_relative 'utils'
+require_relative 'renderer'
 require_relative 'charts'
 
-module Apexcharts
+module ApexCharts
   module Helper
     def line_chart series, options={}, &block
       bindings = eval("self", block.binding) if block_given?
@@ -30,14 +33,22 @@ module Apexcharts
       draw_chart(ScatterChart.new(bindings, *prepare_series_and_options(series, options), &block))
     end
 
-    def heatmap_chart series, options={}, &block
+    def candlestick_chart series, options={}, &block
       bindings = eval("self", block.binding) if block_given?
-      draw_chart(HeatmapChart.new(bindings, *prepare_series_and_options(series, options), &block))
+      draw_chart(CandlestickChart.new(bindings, *prepare_series_and_options(series, options), &block))
     end
+    alias_method :ohlc_chart, :candlestick_chart
 
-    def bubble_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(BubbleChart.new(bindings, *prepare_series_and_options(series, options), &block))
+    def heatmap_chart series, options={}
+      draw_chart(HeatmapChart.new(*prepare_series_and_options(series, options)))
+    end
+
+    def bubble_chart series, options={}
+      draw_chart(BubbleChart.new(*prepare_series_and_options(series, options)))
+    end
+
+    def radar_chart series, options={}
+      draw_chart(RadarChart.new(*prepare_series_and_options(series, options)))
     end
 
     def mixed_charts options={}, &block

data/lib/apexcharts/options/annotations.rb

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   class AnnotationsOptions < ::SmartKv
     optional *%i[
                   points

data/lib/apexcharts/options/axis.rb

@@ -1,14 +1,14 @@
-module Apexcharts
+module ApexCharts
   class AxisOptions < ::SmartKv
     optional *%i[
-                  axis_border  axisBorder
-                  axis_ticks   axisTicks
+                  axisBorder
+                  axisTicks
                   crosshairs
                   floating
                   labels
                   max
                   min
-                  tick_amount  tickAmount
+                  tickAmount
                   title
                   tooltip
                   type

data/lib/apexcharts/options/chart.rb

@@ -1,19 +1,21 @@
-module Apexcharts
+module ApexCharts
   class ChartOptions < ::SmartKv
-    optional *%i[ animations
+    optional *%i[
+                  animations
                   background
                   brush
-                  default_locale  defaultLocale
-                  drop_shadow     dropShadow
+                  defaultLocale
+                  dropShadow
                   events
-                  font_family     fontFamily
-                  fore_color      foreColor
+                  fontFamily
+                  foreColor
                   height
                   id
                   locales
+                  parentHeightOffset
                   selection
                   sparkline
-                  stack_type      stackType
+                  stackType
                   stacked
                   toolbar
                   type