apexcharts 0.1.7 → 0.1.11

data/lib/apex_charts/options/dry_schema/root_options.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require_relative 'schema'
+require_relative 'helper_options'
+require_relative 'chart_options'
+require_relative 'stroke_options'
+require_relative 'states_options'
+
+module ApexCharts::Options
+  module DrySchema
+    class RootOptions < Schema
+      define do
+        optional(:annotations)
+        optional(:chart)
+        optional(:colors)
+        optional(:dataLabels)
+        optional(:fill)
+        optional(:grid)
+        optional(:labels)
+        optional(:legend)
+        optional(:markers)
+        optional(:noData)
+        optional(:plotOptions)
+        optional(:responsive)
+        optional(:series)
+        optional(:states)
+        optional(:stroke)
+        optional(:subtitle)
+        optional(:theme)
+        optional(:title)
+        optional(:tooltip)
+        optional(:xaxis)
+        optional(:yaxis)
+
+        (HelperOptions.keys + ChartOptions.keys +
+         StrokeOptions.keys + StatesOptions.keys).each do |key|
+          optional(key)
+        end
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/schema.rb

@@ -0,0 +1,32 @@
+require 'dry/schema'
+
+Dry::Schema.config.validate_keys = true
+
+module ApexCharts::Options
+  module DrySchema
+    class Schema < ::Dry::Schema::Params
+      class << self
+        def check(hash)
+          return hash if production?
+
+          schema = new[hash]
+          if schema.failure?
+            raise schema.errors.to_h.inspect
+          else
+            hash
+          end
+        end
+
+        def keys
+          definition.send(:key_map).map{|key| key.name.to_sym }
+        end
+
+      private
+
+        def production?
+          (ENV['APP_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV']) == "production"
+        end
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/states_options.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative 'states_options/filter'
+
+module ApexCharts::Options
+  module DrySchema
+    class StatesOptions < Schema
+      define do
+        optional(:active).hash do
+          optional(:allowMultipleDataPointsSelection) { bool? }
+          optional(:filter).hash(Filter)
+        end
+        optional(:hover).hash do
+          optional(:filter).hash(Filter)
+        end
+        optional(:normal).hash do
+          optional(:filter).hash(Filter)
+        end
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/states_options/filter.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    Filter = ::Dry::Schema.Params do
+      optional(:type) { str? }
+      optional(:value) { int? | float? }
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/stroke_options.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    class StrokeOptions < Schema
+      define do
+        optional(:colors) { array? & each { str? } }
+        optional(:curve) {
+          included_in?(%w[smooth straight stepline]) |
+            (array? & each {
+              included_in? %w[smooth straight stepline]
+            })
+        }
+        optional(:dashArray) { int? | float? | (array? & each { int? | float? }) }
+        optional(:lineCap) { included_in? %w[butt square round] }
+        optional(:show) { bool? }
+        optional(:width) { int? | float? | (array? & each { int? | float? }) }
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/theme_options.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    class ThemeOptions < Schema
+      define do
+        optional(:mode).value(included_in?: %w[light dark])
+        optional(:monochrome).hash do
+          optional(:enabled) { bool? }
+          optional(:color) { str? }
+          optional(:shadeTo).value(included_in?: %w[light dark])
+          optional(:shadeIntensity) { int? | float? }
+        end
+        optional(:palette) { str? }
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/title_subtitle_options.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    class TitleSubtitleOptions < Schema
+      define do
+        optional(:align) { included_in? %w[left center right] }
+        optional(:floating) { bool? }
+        optional(:margin) { int? | float? }
+        optional(:offsetX) { int? | float? }
+        optional(:offsetY) { int? | float? }
+        optional(:style).hash do
+          optional(:color) { str? }
+          optional(:fontFamily) { str? }
+          optional(:fontSize) { str? }
+          optional(:fontWeight) { str? | int? | float? }
+        end
+        optional(:text) { str? }
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/tooltip_options.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    class TooltipOptions < Schema
+      define do
+        optional(:custom)
+        optional(:enabled)
+        optional(:enabledOnSeries)
+        optional(:fillSeriesColor)
+        optional(:fixed)
+        optional(:followCursor)
+        optional(:intersect)
+        optional(:inverseOrder)
+        optional(:items)
+        optional(:marker)
+        optional(:onDatasetHover)
+        optional(:shared)
+        optional(:style)
+        optional(:theme)
+        optional(:x)
+        optional(:y)
+        optional(:z)
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/x_axis_options.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    class XAxisOptions < Schema
+      define do
+        optional(:axisBorder)
+        optional(:axisTicks)
+        optional(:categories)
+        optional(:overwriteCategories)
+        optional(:crosshairs)
+        optional(:floating)
+        optional(:decimalsInFloat)
+        optional(:labels)
+        optional(:max)
+        optional(:min)
+        optional(:position)
+        optional(:range)
+        optional(:tickAmount)
+        optional(:tickPlacement)
+        optional(:title)
+        optional(:tooltip)
+        optional(:type)
+        optional(:offsetX)
+        optional(:offsetY)
+        optional(:sorted)
+      end
+    end
+  end
+end

data/lib/apex_charts/options/dry_schema/y_axis_options.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ApexCharts::Options
+  module DrySchema
+    class YAxisOptions < Schema
+      define do
+        optional(:axisBorder)
+        optional(:axisTicks)
+        optional(:crosshairs)
+        optional(:decimalsInFloat)
+        optional(:floating)
+        optional(:forceNiceScale)
+        optional(:labels)
+        optional(:logarithmic)
+        optional(:max)
+        optional(:min)
+        optional(:opposite)
+        optional(:reversed)
+        optional(:seriesName)
+        optional(:show)
+        optional(:showAlways)
+        optional(:showForNullSeries)
+        optional(:tickAmount)
+        optional(:title)
+        optional(:tooltip)
+        optional(:type)
+      end
+    end
+  end
+end

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

@@ -1,26 +1,27 @@
 # 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/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'
+%w(default dry_schema).each do |schema_dir|
+  require_relative "options/#{schema_dir}/root_options"
+  require_relative "options/#{schema_dir}/annotations_options"
+  require_relative "options/#{schema_dir}/data_labels_options"
+  require_relative "options/#{schema_dir}/fill_options"
+  require_relative "options/#{schema_dir}/grid_options"
+  require_relative "options/#{schema_dir}/legend_options"
+  require_relative "options/#{schema_dir}/markers_options"
+  require_relative "options/#{schema_dir}/no_data_options"
+  require_relative "options/#{schema_dir}/plot_options"
+  require_relative "options/#{schema_dir}/states_options"
+  require_relative "options/#{schema_dir}/title_subtitle_options"
+  require_relative "options/#{schema_dir}/theme_options"
+  require_relative "options/#{schema_dir}/tooltip_options"
+  require_relative "options/#{schema_dir}/x_axis_options"
+  require_relative "options/#{schema_dir}/y_axis_options"
+end
 
 module ApexCharts
   class OptionsBuilder
-    include Utils::Hash
-    include Utils::DateTime
+    include ApexCharts::Utils::Hash
+    include ApexCharts::Utils::DateTime
 
     attr_reader :built
 
@@ -35,7 +36,7 @@ module ApexCharts
     end
 
     def build_options
-      RootOptions.check @options
+      options_class(:Root).check @options
 
       build_chart
       build_div
@@ -46,6 +47,7 @@ module ApexCharts
       build_annotations
       build_colors
       build_data_labels
+      build_defer
       build_fill
       build_grid
       build_labels
@@ -77,14 +79,19 @@ module ApexCharts
     def build_annotations
       annotations = @options.delete :annotations
       @built[:annotations] = (
-        AnnotationsOptions.check annotations.compact if annotations.is_a? Hash
+        if annotations.is_a? Hash
+          options_class(:Annotations).check annotations.compact
+        end
       )
     end
 
     def build_chart
       @built[:chart] =
         if target = @options.delete(:brushTarget)
-          {brush: {enabled: true, target: target.to_s}, selection: {enabled: true}}
+          {
+            brush: {enabled: true, target: target.to_s},
+            selection: {enabled: true}
+          }
         else
           {}
         end
@@ -105,7 +112,7 @@ module ApexCharts
 
       return unless chart.is_a? Hash
 
-      @built[:chart].merge! ChartOptions.check(chart.compact)
+      @built[:chart].merge! options_class(:Chart).check(chart.compact)
     end
 
     def build_colors
@@ -121,16 +128,22 @@ 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_class(:DataLabels).check data_labels.compact
                             end
     end
 
+    def build_defer
+      defer = @options.delete :defer
+      @built[:defer] = defer == true
+    end
+
+
     def build_fill
       fill = @options.delete :fill
       @built[:fill] = if fill.is_a? String
                         {type: fill}
                       elsif fill.is_a? Hash
-                        FillOptions.check fill.compact
+                        options_class(:Fill).check fill.compact
                       end
     end
 
@@ -139,7 +152,7 @@ module ApexCharts
       @built[:grid] = if [true, false].include? grid
                         {show: grid}
                       elsif grid.is_a? Hash
-                        GridOptions.check grid.compact
+                        options_class(:Grid).check grid.compact
                       end
     end
 
@@ -156,7 +169,7 @@ module ApexCharts
                         elsif legend.is_a? String
                           {show: true, position: legend}
                         elsif legend.is_a? Hash
-                          LegendOptions.check legend.compact
+                          options_class(:Legend).check legend.compact
                         end
     end
 
@@ -165,7 +178,7 @@ module ApexCharts
       @built[:markers] = if markers.is_a? String
                            {shape: markers}
                          elsif markers.is_a? Hash
-                           MarkersOptions.check markers.compact
+                           options_class(:Markers).check markers.compact
                          end
     end
 
@@ -174,13 +187,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_class(:NoData).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_class(:Plot).check plot_options.compact
     end
 
     def build_responsive
@@ -197,7 +213,7 @@ module ApexCharts
       }.compact
 
       states = @options.delete :states
-      @built[:states].merge! StatesOptions.check(states.compact) if states.is_a? Hash
+      @built[:states].merge! options_class(:States).check(states.compact) if states.is_a? Hash
 
       @built[:states] = nil if @built[:states].empty?
     end
@@ -210,7 +226,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_class(:Stroke).check(stroke.compact)
       end
 
       @built[:stroke] = nil if @built[:stroke].empty?
@@ -221,7 +237,7 @@ module ApexCharts
       @built[:subtitle] = if subtitle.is_a? String
                             {text: subtitle}
                           elsif subtitle.is_a? Hash
-                            SubtitleOptions.check subtitle.compact
+                            options_class(:TitleSubtitle).check subtitle.compact
                           end
     end
 
@@ -230,14 +246,14 @@ module ApexCharts
       @built[:theme] = if theme.is_a? String
                          case theme
                          when 'random'
-                           resolve_theme(Theme::Local.all_palettes.sample)
+                           resolve_theme(Theme.all_palettes.sample)
                          when 'monochrome'
                            {monochrome: {enabled: true}}
                          else
                            resolve_theme(theme)
                          end
                        elsif theme.is_a? Hash
-                         ThemeOptions.check theme.compact
+                         options_class(:Theme).check theme.compact
                        end
     end
 
@@ -246,7 +262,7 @@ module ApexCharts
       @built[:title] = if title.is_a? String
                          {text: title}
                        elsif title.is_a? Hash
-                         TitleOptions.check title.compact
+                         options_class(:TitleSubtitle).check title.compact
                        end
     end
 
@@ -255,7 +271,7 @@ module ApexCharts
       @built[:tooltip] = if [true, false].include? tooltip
                            {enabled: tooltip}
                          elsif tooltip.is_a? Hash
-                           TooltipOptions.check tooltip.compact
+                           options_class(:Tooltip).check tooltip.compact
                          end
     end
 
@@ -272,7 +288,7 @@ module ApexCharts
       if xaxis.is_a? String
         @built[:xaxis][:title] = {text: xaxis}
       elsif xaxis.is_a? Hash
-        XAxisOptions.check xaxis
+        options_class(:XAxis).check xaxis
         @built[:xaxis].merge! xaxis
       end
 
@@ -292,13 +308,15 @@ module ApexCharts
       if yaxis.is_a? String
         @built[:yaxis][0][:title] = {text: yaxis}
       elsif yaxis.is_a? Hash
-        YAxisOptions.check yaxis
+        options_class(:YAxis).check yaxis
         @built[:yaxis][0].merge! yaxis
       end
 
       @built[:yaxis] = nil if @built[:yaxis].all?(&:empty?)
     end
 
+  private
+
     def enabled(options)
       boolean_to_hash(options) do |opts|
         {enabled: opts}
@@ -326,10 +344,15 @@ module ApexCharts
     def resolve_theme(theme)
       if Theme::PALETTES.include? theme
         {palette: theme}
-      elsif Theme::Local.palette_names.include? theme
-        @built[:colors] = Theme::Local.get_colors(theme)
+      elsif Theme.palette_names.include? theme
+        @built[:colors] = Theme.get_colors(theme)
         nil
       end
     end
+
+    def options_class(name)
+      schema = ApexCharts.config.schema
+      ApexCharts.const_get "Options::#{schema}::#{name}Options"
+    end
   end
 end