apexcharts 0.1.6 → 0.1.7

data/lib/apexcharts/colors.rb

@@ -4,7 +4,7 @@ require 'set'
 
 module ApexCharts
   class Colors
-    def initialize colors
+    def initialize(colors)
       @color_set = Set.new(clean(colors))
     end
 
@@ -14,15 +14,13 @@ module ApexCharts
 
   private
 
-    def clean colors
+    def clean(colors)
       colors = colors.respond_to?(:to_set) ? colors.to_a.flatten : Array(colors)
       colors.map do |color|
-        unless color.tap{|c| c.upcase! }[/^#[0-9A-F]{6}/]
-          raise "unrecognized color #{color}"
-        end
+        raise "unrecognized color #{color}" unless color.tap(&:upcase!)[/^#[0-9A-F]{6}/]
+
         color
       end
     end
   end
 end
-

data/lib/apexcharts/config.rb

@@ -0,0 +1,25 @@
+require_relative 'config/default_options'
+
+module ApexCharts
+  class << self
+    def helper_prefix
+      @@helper_prefix ||= ENV['APEXCHARTS_PREFIX']
+    end
+
+    def helper_prefix=(prefix)
+      @@helper_prefix = prefix
+    end
+
+    def configure
+      block_given? ? yield(config) : config
+    end
+
+    def config
+      @@config ||= Configuration.new
+    end
+  end
+
+  class Configuration
+    include DefaultOptions
+  end
+end

data/lib/apexcharts/config/default_options.rb

@@ -0,0 +1,12 @@
+module ApexCharts
+  module DefaultOptions
+    def default_options=(options)
+      @default_options = OptionsBuilder.new(nil, options)
+                                       .build_general_options
+    end
+
+    def default_options
+      @default_options ||= {}
+    end
+  end
+end

data/lib/apexcharts/helper.rb

@@ -1,103 +1,169 @@
 # frozen_string_literal: true
 
+require_relative 'config'
+require_relative 'utils'
 require_relative 'series'
 require_relative 'options_builder'
-require_relative 'utils'
 require_relative 'renderer'
 require_relative 'charts'
+require_relative 'prefixer'
 require_relative 'theme'
 
 module ApexCharts
   module Helper
-    def line_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(LineChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-
-    def area_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(AreaChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-
-    def column_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(ColumnChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-
-    def bar_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(BarChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-
-    def range_bar_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(RangeBarChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-
-    def scatter_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(ScatterChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-
-    def candlestick_chart series, options={}, &block
-      bindings = eval("self", block.binding) if block_given?
-      draw_chart(CandlestickChart.new(bindings, *prepare_series_and_options(series, options), &block))
-    end
-    alias_method :ohlc_chart, :candlestick_chart
-
-    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
-      bindings = eval("self", block.binding)
-      draw_chart(MixedCharts.new(bindings, deep_copy(options), &block))
-    end
-    alias_method :combo_charts, :mixed_charts
-
-    def syncing_charts options={}, &block
-      bindings = eval("self", block.binding)
-      draw_chart(SyncingCharts.new(bindings, deep_copy(options), &block))
-    end
-    alias_method :synchronized_charts, :syncing_charts
-
-    def pie_chart series, options={}
-      draw_chart(PieChart.new(*prepare_series_and_options(series, options)))
-    end
-
-    def donut_chart series, options={}
-      draw_chart(DonutChart.new(*prepare_series_and_options(series, options)))
-    end
-
-    def radial_bar_chart series, options={}
-      draw_chart(RadialBarChart.new(*prepare_series_and_options(series, options)))
-    end
-    alias_method :circle_chart, :radial_bar_chart
-
-    def create_palette palette_name, colors
-      ApexCharts::Theme::Local.create palette_name, colors
-    end
-
-    def destroy_palette palette_name
-      ApexCharts::Theme::Local.destroy palette_name
+    extend Prefixer
+
+    with_prefix do
+      def line_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          LineChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+
+      def area_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          AreaChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+
+      def column_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          ColumnChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+
+      def bar_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          BarChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+
+      def range_bar_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          RangeBarChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+
+      def scatter_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          ScatterChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+
+      def candlestick_chart(series, options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
+        draw_chart(
+          CandlestickChart.new(
+            outer_self, *prepare_series_and_options(series, options), &block
+          )
+        )
+      end
+      alias_method :ohlc_chart, :candlestick_chart
+
+      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)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__)
+        draw_chart(
+          MixedCharts.new(
+            outer_self, deep_copy(options), &block
+          )
+        )
+      end
+      alias_method :combo_charts, :mixed_charts
+
+      def syncing_charts(options={}, &block)
+        outer_self = eval('self', block.binding, __FILE__, __LINE__)
+        draw_chart(
+          SyncingCharts.new(
+            outer_self, deep_copy(options), &block
+          )
+        )
+      end
+      alias_method :synchronized_charts, :syncing_charts
+
+      def pie_chart(series, options={})
+        draw_chart(
+          PieChart.new(
+            *prepare_series_and_options(series, options)
+          )
+        )
+      end
+
+      def donut_chart(series, options={})
+        draw_chart(
+          DonutChart.new(
+            *prepare_series_and_options(series, options)
+          )
+        )
+      end
+
+      def radial_bar_chart(series, options={})
+        draw_chart(
+          RadialBarChart.new(
+            *prepare_series_and_options(series, options)
+          )
+        )
+      end
+      alias_method :circle_chart, :radial_bar_chart
+    end
+
+    def create_palette(palette_name, colors)
+      Theme::Local.create palette_name, colors
+    end
+
+    def destroy_palette(palette_name)
+      Theme::Local.destroy palette_name
     end
 
   private
 
-    def draw_chart chart
+    def draw_chart(chart)
       chart = chart.render
       chart.respond_to?(:html_safe) ? chart.html_safe : chart
     end
 
-    def prepare_series_and_options series, options
+    def prepare_series_and_options(series, options)
       series = deep_copy(series)
       options = deep_copy(options)
       options[:id] ||= apexcharts_id
@@ -107,17 +173,15 @@ module ApexCharts
     def apexcharts_id
       @_apexcharts_id ||= 0
       @_apexcharts_id += 1
-      "chart-#{@_apexcharts_id}"
+      "#{ApexCharts.helper_prefix}chart-#{@_apexcharts_id}"
     end
 
     def apexcharts_group
       @_apexcharts_group ||= 0
       @_apexcharts_group += 1
-      "chart-group-#{@_apexcharts_group}"
+      "#{ApexCharts.helper_prefix}chart-group-#{@_apexcharts_group}"
     end
 
-    def deep_copy(options)
-      Marshal.load(Marshal.dump(options))
-    end
+    include Utils::Copy
   end
 end

data/lib/apexcharts/options/annotations.rb

@@ -1,10 +1,10 @@
 module ApexCharts
   class AnnotationsOptions < ::SmartKv
     optional *%i[
-                  points
-                  position
-                  xaxis
-                  yaxis
-                ]
+      points
+      position
+      xaxis
+      yaxis
+    ]
   end
 end

data/lib/apexcharts/options/axis.rb

@@ -1,17 +1,17 @@
 module ApexCharts
   class AxisOptions < ::SmartKv
     optional *%i[
-                  axisBorder
-                  axisTicks
-                  crosshairs
-                  floating
-                  labels
-                  max
-                  min
-                  tickAmount
-                  title
-                  tooltip
-                  type
-                ]
+      axisBorder
+      axisTicks
+      crosshairs
+      floating
+      labels
+      max
+      min
+      tickAmount
+      title
+      tooltip
+      type
+    ]
   end
 end

data/lib/apexcharts/options/chart.rb

@@ -1,26 +1,26 @@
 module ApexCharts
   class ChartOptions < ::SmartKv
     optional *%i[
-                  animations
-                  background
-                  brush
-                  defaultLocale
-                  dropShadow
-                  events
-                  fontFamily
-                  foreColor
-                  height
-                  id
-                  locales
-                  parentHeightOffset
-                  selection
-                  sparkline
-                  stackType
-                  stacked
-                  toolbar
-                  type
-                  width
-                  zoom
-                ]
+      animations
+      background
+      brush
+      defaultLocale
+      dropShadow
+      events
+      fontFamily
+      foreColor
+      height
+      id
+      locales
+      parentHeightOffset
+      selection
+      sparkline
+      stackType
+      stacked
+      toolbar
+      type
+      width
+      zoom
+    ]
   end
 end

data/lib/apexcharts/options/data_labels.rb

@@ -1,12 +1,14 @@
 module ApexCharts
   class DataLabelsOptions < ::SmartKv
     optional *%i[
-                  dropShadow
-                  enabled
-                  offsetX
-                  offsetY
-                  style
-                  textAnchor
-                ]
+      dropShadow
+      enabled
+      enabledOnSeries
+      formatter
+      offsetX
+      offsetY
+      style
+      textAnchor
+    ]
   end
 end