apexcharts 0.1.8 → 0.1.9

data/lib/apex_charts/config/default_options.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ApexCharts
+  module Config
+    module DefaultOptions
+      def default_options=(options)
+        @default_options =
+          ApexCharts::OptionsBuilder.new(nil, options).build_general_options
+      end
+
+      def default_options
+        @default_options ||= {}
+      end
+    end
+  end
+end

data/lib/{apexcharts/config.rb → apex_charts/configuration.rb}

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 require_relative 'config/default_options'
 
 module ApexCharts
   class << self
-    def helper_prefix
-      @@helper_prefix ||= ENV['APEXCHARTS_PREFIX']
-    end
+    attr_writer :helper_prefix
 
-    def helper_prefix=(prefix)
-      @@helper_prefix = prefix
+    def helper_prefix
+      @helper_prefix ||= ENV['APEXCHARTS_PREFIX']
     end
 
     def configure
@@ -15,11 +15,11 @@ module ApexCharts
     end
 
     def config
-      @@config ||= Configuration.new
+      @config ||= Configuration.new
     end
   end
 
   class Configuration
-    include DefaultOptions
+    include ApexCharts::Config::DefaultOptions
   end
 end

data/lib/{apexcharts → apex_charts}/helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'config'
+require_relative 'configuration'
 require_relative 'utils'
 require_relative 'series'
 require_relative 'options_builder'
@@ -17,7 +17,7 @@ module ApexCharts
       def line_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          LineChart.new(
+          ApexCharts::Charts::LineChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -26,7 +26,7 @@ module ApexCharts
       def area_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          AreaChart.new(
+          ApexCharts::Charts::AreaChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -35,7 +35,7 @@ module ApexCharts
       def column_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          ColumnChart.new(
+          ApexCharts::Charts::ColumnChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -44,7 +44,7 @@ module ApexCharts
       def bar_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          BarChart.new(
+          ApexCharts::Charts::BarChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -53,7 +53,7 @@ module ApexCharts
       def range_bar_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          RangeBarChart.new(
+          ApexCharts::Charts::RangeBarChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -62,7 +62,7 @@ module ApexCharts
       def scatter_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          ScatterChart.new(
+          ApexCharts::Charts::ScatterChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -71,7 +71,7 @@ module ApexCharts
       def candlestick_chart(series, options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__) if block_given?
         draw_chart(
-          CandlestickChart.new(
+          ApexCharts::Charts::CandlestickChart.new(
             outer_self, *prepare_series_and_options(series, options), &block
           )
         )
@@ -80,7 +80,7 @@ module ApexCharts
 
       def heatmap_chart(series, options={})
         draw_chart(
-          HeatmapChart.new(
+          ApexCharts::Charts::HeatmapChart.new(
             *prepare_series_and_options(series, options)
           )
         )
@@ -88,7 +88,7 @@ module ApexCharts
 
       def bubble_chart(series, options={})
         draw_chart(
-          BubbleChart.new(
+          ApexCharts::Charts::BubbleChart.new(
             *prepare_series_and_options(series, options)
           )
         )
@@ -96,7 +96,7 @@ module ApexCharts
 
       def radar_chart(series, options={})
         draw_chart(
-          RadarChart.new(
+          ApexCharts::Charts::RadarChart.new(
             *prepare_series_and_options(series, options)
           )
         )
@@ -105,7 +105,7 @@ module ApexCharts
       def mixed_charts(options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__)
         draw_chart(
-          MixedCharts.new(
+          ApexCharts::Charts::MixedCharts.new(
             outer_self, deep_copy(options), &block
           )
         )
@@ -115,7 +115,7 @@ module ApexCharts
       def syncing_charts(options={}, &block)
         outer_self = eval('self', block.binding, __FILE__, __LINE__)
         draw_chart(
-          SyncingCharts.new(
+          ApexCharts::Charts::SyncingCharts.new(
             outer_self, deep_copy(options), &block
           )
         )
@@ -124,7 +124,7 @@ module ApexCharts
 
       def pie_chart(series, options={})
         draw_chart(
-          PieChart.new(
+          ApexCharts::Charts::PieChart.new(
             *prepare_series_and_options(series, options)
           )
         )
@@ -132,7 +132,7 @@ module ApexCharts
 
       def donut_chart(series, options={})
         draw_chart(
-          DonutChart.new(
+          ApexCharts::Charts::DonutChart.new(
             *prepare_series_and_options(series, options)
           )
         )
@@ -140,7 +140,7 @@ module ApexCharts
 
       def radial_bar_chart(series, options={})
         draw_chart(
-          RadialBarChart.new(
+          ApexCharts::Charts::RadialBarChart.new(
             *prepare_series_and_options(series, options)
           )
         )

data/lib/{apexcharts/options/annotations.rb → apex_charts/options/annotations_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class AnnotationsOptions < ::SmartKv
     optional *%i[
       points

data/lib/{apexcharts/options/axis.rb → apex_charts/options/axis_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class AxisOptions < ::SmartKv
     optional *%i[
       axisBorder

data/lib/{apexcharts/options/chart.rb → apex_charts/options/chart_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class ChartOptions < ::SmartKv
     optional *%i[
       animations

data/lib/{apexcharts/options/data_labels.rb → apex_charts/options/data_labels_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class DataLabelsOptions < ::SmartKv
     optional *%i[
       dropShadow

data/lib/{apexcharts → apex_charts}/options/div_attributes.rb

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class DivAttributes < ::SmartKv
     optional *%i[
       class

data/lib/{apexcharts/options/fill.rb → apex_charts/options/fill_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class FillOptions < ::SmartKv
     optional *%i[
       colors

data/lib/{apexcharts/options/grid.rb → apex_charts/options/grid_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class GridOptions < ::SmartKv
     optional *%i[
       borderColor

data/lib/{apexcharts/options/legend.rb → apex_charts/options/legend_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class LegendOptions < ::SmartKv
     optional *%i[
       containerMargin

data/lib/{apexcharts/options/markers.rb → apex_charts/options/markers_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class MarkersOptions < ::SmartKv
     optional *%i[
       colors

data/lib/{apexcharts/options/no_data.rb → apex_charts/options/no_data_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class NoDataOptions < ::SmartKv
     optional *%i[
       align

data/lib/{apexcharts → apex_charts}/options/plot_options.rb

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class PlotOptions < ::SmartKv
     optional *%i[
       bar

data/lib/{apexcharts/options/root.rb → apex_charts/options/root_options.rb}

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'div_attributes'
-require_relative 'chart'
-require_relative 'stroke'
-require_relative 'states'
+require_relative 'chart_options'
+require_relative 'stroke_options'
+require_relative 'states_options'
 
-module ApexCharts
+module ApexCharts::Options
   class RootOptions < ::SmartKv
     optional *%i[
       annotations

data/lib/{apexcharts/options/states.rb → apex_charts/options/states_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class StatesOptions < ::SmartKv
     optional *%i[
       active

data/lib/{apexcharts/options/stroke.rb → apex_charts/options/stroke_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class StrokeOptions < ::SmartKv
     optional *%i[
       colors

data/lib/{apexcharts/options/theme.rb → apex_charts/options/theme_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class ThemeOptions < ::SmartKv
     optional *%i[
       monochrome

data/lib/{apexcharts/options/title.rb → apex_charts/options/title_subtitle_options.rb}

@@ -1,5 +1,7 @@
-module ApexCharts
-  class TitleOptions < ::SmartKv
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  class TitleSubtitleOptions < ::SmartKv
     optional *%i[
       align
       floating

data/lib/{apexcharts/options/tooltip.rb → apex_charts/options/tooltip_options.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Options
   class TooltipOptions < ::SmartKv
     optional *%i[
       custom

data/lib/{apexcharts/options/x_axis.rb → apex_charts/options/x_axis_options.rb}

@@ -1,6 +1,8 @@
-require_relative 'axis'
+# frozen_string_literal: true
 
-module ApexCharts
+require_relative 'axis_options'
+
+module ApexCharts::Options
   class XAxisOptions < AxisOptions
     optional *%i[
       categories

data/lib/{apexcharts/options/y_axis.rb → apex_charts/options/y_axis_options.rb}

@@ -1,6 +1,8 @@
-require_relative 'axis'
+# frozen_string_literal: true
 
-module ApexCharts
+require_relative 'axis_options'
+
+module ApexCharts::Options
   class YAxisOptions < AxisOptions
     optional *%i[
       decimalsInFloat

data/lib/{apexcharts → apex_charts}/options_builder.rb

@@ -1,26 +1,26 @@
 # frozen_string_literal: true
 
 require 'smart_kv'
-require_relative 'options/root'
-require_relative 'options/annotations'
-require_relative 'options/data_labels'
-require_relative 'options/fill'
-require_relative 'options/grid'
-require_relative 'options/legend'
-require_relative 'options/markers'
-require_relative 'options/no_data'
+require_relative 'options/root_options'
+require_relative 'options/annotations_options'
+require_relative 'options/data_labels_options'
+require_relative 'options/fill_options'
+require_relative 'options/grid_options'
+require_relative 'options/legend_options'
+require_relative 'options/markers_options'
+require_relative 'options/no_data_options'
 require_relative 'options/plot_options'
-require_relative 'options/states'
-require_relative 'options/subtitle'
-require_relative 'options/theme'
-require_relative 'options/tooltip'
-require_relative 'options/x_axis'
-require_relative 'options/y_axis'
+require_relative 'options/states_options'
+require_relative 'options/title_subtitle_options'
+require_relative 'options/theme_options'
+require_relative 'options/tooltip_options'
+require_relative 'options/x_axis_options'
+require_relative 'options/y_axis_options'
 
 module ApexCharts
   class OptionsBuilder
-    include Utils::Hash
-    include Utils::DateTime
+    include ApexCharts::Utils::Hash
+    include ApexCharts::Utils::DateTime
 
     attr_reader :built
 
@@ -35,7 +35,7 @@ module ApexCharts
     end
 
     def build_options
-      RootOptions.check @options
+      Options::RootOptions.check @options
 
       build_chart
       build_div
@@ -77,7 +77,7 @@ module ApexCharts
     def build_annotations
       annotations = @options.delete :annotations
       @built[:annotations] = (
-        AnnotationsOptions.check annotations.compact if annotations.is_a? Hash
+        Options::AnnotationsOptions.check annotations.compact if annotations.is_a? Hash
       )
     end
 
@@ -105,7 +105,7 @@ module ApexCharts
 
       return unless chart.is_a? Hash
 
-      @built[:chart].merge! ChartOptions.check(chart.compact)
+      @built[:chart].merge! Options::ChartOptions.check(chart.compact)
     end
 
     def build_colors
@@ -121,7 +121,7 @@ module ApexCharts
       @built[:dataLabels] = if [true, false].include? data_labels
                               {enabled: data_labels}
                             elsif data_labels.is_a? Hash
-                              DataLabelsOptions.check data_labels.compact
+                              Options::DataLabelsOptions.check data_labels.compact
                             end
     end
 
@@ -130,7 +130,7 @@ module ApexCharts
       @built[:fill] = if fill.is_a? String
                         {type: fill}
                       elsif fill.is_a? Hash
-                        FillOptions.check fill.compact
+                        Options::FillOptions.check fill.compact
                       end
     end
 
@@ -139,7 +139,7 @@ module ApexCharts
       @built[:grid] = if [true, false].include? grid
                         {show: grid}
                       elsif grid.is_a? Hash
-                        GridOptions.check grid.compact
+                        Options::GridOptions.check grid.compact
                       end
     end
 
@@ -156,7 +156,7 @@ module ApexCharts
                         elsif legend.is_a? String
                           {show: true, position: legend}
                         elsif legend.is_a? Hash
-                          LegendOptions.check legend.compact
+                          Options::LegendOptions.check legend.compact
                         end
     end
 
@@ -165,7 +165,7 @@ module ApexCharts
       @built[:markers] = if markers.is_a? String
                            {shape: markers}
                          elsif markers.is_a? Hash
-                           MarkersOptions.check markers.compact
+                           Options::MarkersOptions.check markers.compact
                          end
     end
 
@@ -174,13 +174,16 @@ module ApexCharts
       @built[:noData] = if no_data.is_a? String
                           {text: no_data}
                         elsif no_data.is_a? Hash
-                          NoDataOptions.check no_data.compact
+                          Options::NoDataOptions.check no_data.compact
                         end
     end
 
     def build_plot_options
       plot_options = @options.delete :plotOptions
-      @built[:plotOptions] = (PlotOptions.check plot_options.compact if plot_options.is_a? Hash)
+      return unless plot_options.is_a? Hash
+
+      @built[:plotOptions] =
+        Options::PlotOptions.check plot_options.compact
     end
 
     def build_responsive
@@ -197,7 +200,7 @@ module ApexCharts
       }.compact
 
       states = @options.delete :states
-      @built[:states].merge! StatesOptions.check(states.compact) if states.is_a? Hash
+      @built[:states].merge! Options::StatesOptions.check(states.compact) if states.is_a? Hash
 
       @built[:states] = nil if @built[:states].empty?
     end
@@ -210,7 +213,7 @@ module ApexCharts
       if [true, false].include? stroke
         @built[:stroke].merge!(show: stroke)
       elsif stroke.is_a? Hash
-        @built[:stroke].merge! StrokeOptions.check(stroke.compact)
+        @built[:stroke].merge! Options::StrokeOptions.check(stroke.compact)
       end
 
       @built[:stroke] = nil if @built[:stroke].empty?
@@ -221,7 +224,7 @@ module ApexCharts
       @built[:subtitle] = if subtitle.is_a? String
                             {text: subtitle}
                           elsif subtitle.is_a? Hash
-                            SubtitleOptions.check subtitle.compact
+                            Options::TitleSubtitleOptions.check subtitle.compact
                           end
     end
 
@@ -237,7 +240,7 @@ module ApexCharts
                            resolve_theme(theme)
                          end
                        elsif theme.is_a? Hash
-                         ThemeOptions.check theme.compact
+                         Options::ThemeOptions.check theme.compact
                        end
     end
 
@@ -246,7 +249,7 @@ module ApexCharts
       @built[:title] = if title.is_a? String
                          {text: title}
                        elsif title.is_a? Hash
-                         TitleOptions.check title.compact
+                         Options::TitleSubtitleOptions.check title.compact
                        end
     end
 
@@ -255,7 +258,7 @@ module ApexCharts
       @built[:tooltip] = if [true, false].include? tooltip
                            {enabled: tooltip}
                          elsif tooltip.is_a? Hash
-                           TooltipOptions.check tooltip.compact
+                           Options::TooltipOptions.check tooltip.compact
                          end
     end
 
@@ -272,7 +275,7 @@ module ApexCharts
       if xaxis.is_a? String
         @built[:xaxis][:title] = {text: xaxis}
       elsif xaxis.is_a? Hash
-        XAxisOptions.check xaxis
+        Options::XAxisOptions.check xaxis
         @built[:xaxis].merge! xaxis
       end
 
@@ -292,7 +295,7 @@ module ApexCharts
       if yaxis.is_a? String
         @built[:yaxis][0][:title] = {text: yaxis}
       elsif yaxis.is_a? Hash
-        YAxisOptions.check yaxis
+        Options::YAxisOptions.check yaxis
         @built[:yaxis][0].merge! yaxis
       end