apexcharts 0.1.5 → 0.1.10

data/lib/apex_charts/charts.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ApexCharts::Charts
+  %w[
+    base cartesian line area bar column scatter
+    candlestick heatmap bubble radar polar pie donut
+  ].each do |type|
+    autoload :"#{type.capitalize}Chart", "apex_charts/charts/#{type}_chart.rb"
+  end
+
+  autoload :RangeBarChart, 'apex_charts/charts/range_bar_chart.rb'
+  autoload :RadialBarChart, 'apex_charts/charts/radial_bar_chart.rb'
+
+  autoload :MixedCharts, 'apex_charts/charts/mixed_charts.rb'
+  autoload :SyncingCharts, 'apex_charts/charts/syncing_charts.rb'
+end

data/lib/{apexcharts/charts/area.rb → apex_charts/charts/area_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class AreaChart < CartesianChart
     def chart_type
       'area'

data/lib/{apexcharts/charts/bar.rb → apex_charts/charts/bar_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class BarChart < CartesianChart
     def chart_type
       'bar'

data/lib/apex_charts/charts/base_chart.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module ApexCharts::Charts
+  class BaseChart
+    include ApexCharts::Utils::Hash
+
+    attr_reader :options, :series, :sample
+
+    def initialize(data, options={})
+      @series = build_series(data)
+      @options = build_options(options)
+    end
+
+    def render
+      ApexCharts::Renderer.render(options)
+    end
+
+    def chart_type; end
+
+  protected
+
+    def build_series(data)
+      series_object = series_type.new(data)
+      @sample = series_object.sample
+      series_object.sanitized
+    end
+
+    def build_options(options)
+      deep_merge(
+        ApexCharts::OptionsBuilder.new(sample, options).build_options,
+        camelize_keys(
+          {**@series, chart: {type: chart_type}}.compact
+        )
+      )
+    end
+  end
+end

data/lib/apex_charts/charts/bubble_chart.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ApexCharts::Charts
+  class BubbleChart < BaseChart
+    def chart_type
+      'bubble'
+    end
+
+    def series_type
+      ApexCharts::Series::BubbleSeries
+    end
+  end
+end

data/lib/{apexcharts/charts/candlestick.rb → apex_charts/charts/candlestick_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class CandlestickChart < CartesianChart
     def chart_type
       'candlestick'

data/lib/apex_charts/charts/cartesian_chart.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative 'features/annotations'
+require_relative 'features/mixable'
+require_relative '../utils/hash'
+
+module ApexCharts::Charts
+  class CartesianChart < BaseChart
+    include Features::Annotations
+    include Features::Mixable
+    include ApexCharts::Utils::Hash
+
+    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 @outer_self
+
+      instance_eval &block if block_given?
+
+      options[:annotations] = @annotations if @annotations
+      @series = build_series(data)
+      @options = build_options(options)
+
+      build_selection_range if brush?
+    end
+
+    def series_type
+      ApexCharts::Series::CartesianSeries
+    end
+
+    def more_options
+      {}
+    end
+
+    def method_missing(method, *args, &block)
+      if @outer_self.respond_to?(method, true)
+        @outer_self.send method, *args, &block
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method, *args)
+      @outer_self.respond_to?(method, true) || super
+    end
+
+  protected
+
+    def build_instance_variables
+      (@outer_self.instance_variables - instance_variables).each do |i|
+        instance_variable_set(i, @outer_self.instance_variable_get(i))
+      end
+    end
+
+    def brush?
+      @options[:chart][:brush]&.[](:enabled) &&
+        !@options[:chart][:selection]&.[](:xaxis)
+    end
+
+    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)
+      }
+    end
+
+    def twenty_percent_before_last_x(first, last)
+      last - (0.2 * (last - first))
+    end
+
+    def handle_time(input)
+      ApexCharts::Utils::DateTime.convert(input)
+    end
+  end
+end

data/lib/{apexcharts/charts/column.rb → apex_charts/charts/column_chart.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Charts
   class ColumnChart < BarChart
     def more_options
       {plot_options: {bar: {horizontal: false}}}

data/lib/{apexcharts/charts/donut.rb → apex_charts/charts/donut_chart.rb}

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class DonutChart < PolarChart
     def chart_type
       'donut'
     end
   end
 end
-

data/lib/{apexcharts → apex_charts}/charts/features/annotations.rb

@@ -1,42 +1,43 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Charts::Features
   module Annotations
     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
-        value = Utils::DateTime.convert_range(value)
+        value = ApexCharts::Utils::DateTime.convert_range(value)
 
         case axis
         when :x
@@ -48,16 +49,16 @@ module ApexCharts
         end
       else
         if axis == :points
-          value.map!{ |x| Utils::DateTime.convert(x) }
+          value.map! {|x| ApexCharts::Utils::DateTime.convert(x) }
           {x: value.first, y: value.last}
         else
-          value = Utils::DateTime.convert(value)
+          value = ApexCharts::Utils::DateTime.convert(value)
           {axis => value}
         end
       end
     end
 
-    def annotation_label text, color, **options
+    def annotation_label(text, color, **options)
       {
         label: {
           borderColor: color,
@@ -70,6 +71,6 @@ module ApexCharts
       }
     end
 
-    include Utils::Hash
+    include ApexCharts::Utils::Hash
   end
 end

data/lib/{apexcharts → apex_charts}/charts/features/mixable.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts::Features
   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 → apex_charts/charts/heatmap_chart.rb}

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class HeatmapChart < BaseChart
     def chart_type
       'heatmap'
     end
 
-  private
-
-    def sanitize_data(data)
-      ApexCharts::CartesianSeries.new(data).sanitized
+    def series_type
+      ApexCharts::Series::CartesianSeries
     end
   end
 end

data/lib/{apexcharts/charts/line.rb → apex_charts/charts/line_chart.rb}

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

data/lib/apex_charts/charts/mixed_charts.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require_relative 'features/annotations'
+
+module ApexCharts::Charts
+  class MixedCharts < BaseChart
+    include Features::Annotations
+    include ApexCharts::Utils::Hash
+
+    def initialize(outer_self, options={}, &block)
+      @outer_self = outer_self
+      @series = {series: []}
+      options[:id] ||= apexcharts_id
+      build_instance_variables
+
+      instance_eval &block
+
+      options[:annotations] = @annotations if @annotations
+      @options = build_options(options)
+
+      build_selection_range if brush?
+    end
+
+    def chart_type
+      'area' # chosen default
+    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 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 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 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 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 method_missing(method, *args, &block)
+      if @outer_self.respond_to?(method, true)
+        @outer_self.send method, *args, &block
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method, *args)
+      @outer_self.respond_to?(method, true) || super
+    end
+
+  private
+
+    def build_instance_variables
+      (@outer_self.instance_variables - instance_variables).each do |i|
+        instance_variable_set(i, @outer_self.instance_variable_get(i))
+      end
+    end
+
+    def brush?
+      @options[:chart][:brush]&.[](:enabled) &&
+        !@options[:chart][:selection]&.[](:xaxis)
+    end
+
+    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)
+      }
+    end
+
+    def twenty_percent_before_last_x(first, last)
+      last - (0.2 * (last - first))
+    end
+
+    def handle_time(input)
+      ApexCharts::Utils::DateTime.convert(input)
+    end
+  end
+end

data/lib/{apexcharts/charts/pie.rb → apex_charts/charts/pie_chart.rb}

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class PieChart < PolarChart
     def chart_type
       'pie'
     end
   end
 end
-