apexcharts 0.1.6 → 0.1.7

data/lib/apexcharts/options/div_attributes.rb

@@ -1,10 +1,9 @@
 module ApexCharts
   class DivAttributes < ::SmartKv
     optional *%i[
-                  class
-                  id
-                  style
-                ]
+      class
+      id
+      style
+    ]
   end
 end
-

data/lib/apexcharts/options/fill.rb

@@ -1,12 +1,12 @@
 module ApexCharts
   class FillOptions < ::SmartKv
     optional *%i[
-                  colors
-                  gradient
-                  image
-                  opacity
-                  pattern
-                  type
-                ]
+      colors
+      gradient
+      image
+      opacity
+      pattern
+      type
+    ]
   end
 end

data/lib/apexcharts/options/grid.rb

@@ -1,15 +1,15 @@
 module ApexCharts
   class GridOptions < ::SmartKv
     optional *%i[
-                  borderColor
-                  column
-                  padding
-                  position
-                  row
-                  show
-                  strokeDashArray
-                  xaxis
-                  yaxis
-                ]
+      borderColor
+      column
+      padding
+      position
+      row
+      show
+      strokeDashArray
+      xaxis
+      yaxis
+    ]
   end
 end

data/lib/apexcharts/options/legend.rb

@@ -1,24 +1,27 @@
 module ApexCharts
   class LegendOptions < ::SmartKv
     optional *%i[
-                  containerMargin
-                  floating
-                  fontFamily
-                  fontSize
-                  formatter
-                  horizontalAlign
-                  itemMargin
-                  labels
-                  markers
-                  offsetX
-                  offsetY
-                  onItemClick
-                  onItemHover
-                  position
-                  show
-                  showForSingleSeries
-                  textAnchor
-                  verticalAlign
-                ]
+      containerMargin
+      floating
+      fontFamily
+      fontSize
+      formatter
+      height
+      horizontalAlign
+      itemMargin
+      labels
+      markers
+      offsetX
+      offsetY
+      onItemClick
+      onItemHover
+      position
+      show
+      showForNullSeries
+      showForSingleSeries
+      showForZeroSeries
+      textAnchor
+      width
+    ]
   end
 end

data/lib/apexcharts/options/markers.rb

@@ -1,18 +1,18 @@
 module ApexCharts
   class MarkersOptions < ::SmartKv
     optional *%i[
-                  colors
-                  discrete
-                  fillOpacity
-                  hover
-                  offsetX
-                  offsetY
-                  radius
-                  shape
-                  size
-                  strokeColor
-                  strokeOpacity
-                  strokeWidth
-                ]
+      colors
+      discrete
+      fillOpacity
+      hover
+      offsetX
+      offsetY
+      radius
+      shape
+      size
+      strokeColor
+      strokeOpacity
+      strokeWidth
+    ]
   end
 end

data/lib/apexcharts/options/no_data.rb

@@ -1,12 +1,12 @@
 module ApexCharts
   class NoDataOptions < ::SmartKv
     optional *%i[
-                  align
-                  offsetX
-                  offsetY
-                  style
-                  text
-                  verticalAlign
-                ]
+      align
+      offsetX
+      offsetY
+      style
+      text
+      verticalAlign
+    ]
   end
 end

data/lib/apexcharts/options/plot_options.rb

@@ -1,12 +1,12 @@
 module ApexCharts
   class PlotOptions < ::SmartKv
     optional *%i[
-                  bar
-                  candlestick
-                  heatmap
-                  pie
-                  radar
-                  radialBar
-                ]
+      bar
+      candlestick
+      heatmap
+      pie
+      radar
+      radialBar
+    ]
   end
 end

data/lib/apexcharts/options/root.rb

@@ -6,36 +6,36 @@ require_relative 'states'
 module ApexCharts
   class RootOptions < ::SmartKv
     optional *%i[
-                  annotations
-                  brushTarget
-                  chart
-                  chartId
-                  colors
-                  dataLabels
-                  fill
-                  grid
-                  group
-                  labels
-                  legend
-                  markers
-                  noData
-                  plotOptions
-                  responsive
-                  series
-                  states
-                  stroke
-                  subtitle
-                  theme
-                  title
-                  tooltip
-                  var
-                  xaxis
-                  xtitle
-                  xtype
-                  yaxis
-                  ytitle
-                  ytype
-                ],
+      annotations
+      brushTarget
+      chart
+      chartId
+      colors
+      dataLabels
+      fill
+      grid
+      group
+      labels
+      legend
+      markers
+      noData
+      plotOptions
+      responsive
+      series
+      states
+      stroke
+      subtitle
+      theme
+      title
+      tooltip
+      var
+      xaxis
+      xtitle
+      xtype
+      yaxis
+      ytitle
+      ytype
+    ],
              *DivAttributes.optional_keys,
              *ChartOptions.optional_keys,
              *StrokeOptions.optional_keys,

data/lib/apexcharts/options/states.rb

@@ -1,9 +1,9 @@
 module ApexCharts
   class StatesOptions < ::SmartKv
     optional *%i[
-                  active
-                  hover
-                  normal
-                ]
+      active
+      hover
+      normal
+    ]
   end
 end

data/lib/apexcharts/options/stroke.rb

@@ -1,12 +1,12 @@
 module ApexCharts
   class StrokeOptions < ::SmartKv
     optional *%i[
-                  colors
-                  curve
-                  dashArray
-                  lineCap
-                  show
-                  width
-                ]
+      colors
+      curve
+      dashArray
+      lineCap
+      show
+      width
+    ]
   end
 end

data/lib/apexcharts/options/subtitle.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require_relative 'title'
 
 module ApexCharts
   class SubtitleOptions < TitleOptions
-    optional *%i[ ]
+    optional
   end
 end

data/lib/apexcharts/options/theme.rb

@@ -1,8 +1,8 @@
 module ApexCharts
   class ThemeOptions < ::SmartKv
     optional *%i[
-                  monochrome
-                  palette
-                ]
+      monochrome
+      palette
+    ]
   end
 end

data/lib/apexcharts/options/title.rb

@@ -1,13 +1,13 @@
 module ApexCharts
   class TitleOptions < ::SmartKv
     optional *%i[
-                  align
-                  floating
-                  margin
-                  offsetX
-                  offsetY
-                  style
-                  text
-                ]
+      align
+      floating
+      margin
+      offsetX
+      offsetY
+      style
+      text
+    ]
   end
 end

data/lib/apexcharts/options/tooltip.rb

@@ -1,22 +1,22 @@
 module ApexCharts
   class TooltipOptions < ::SmartKv
     optional *%i[
-                  custom
-                  enabled
-                  fillSeriesColor
-                  fixed
-                  followCursor
-                  intersect
-                  inverseOrder
-                  items
-                  marker
-                  onDatasetHover
-                  shared
-                  style
-                  theme
-                  x
-                  y
-                  z
-                ]
+      custom
+      enabled
+      fillSeriesColor
+      fixed
+      followCursor
+      intersect
+      inverseOrder
+      items
+      marker
+      onDatasetHover
+      shared
+      style
+      theme
+      x
+      y
+      z
+    ]
   end
 end

data/lib/apexcharts/options/x_axis.rb

@@ -3,10 +3,10 @@ require_relative 'axis'
 module ApexCharts
   class XAxisOptions < AxisOptions
     optional *%i[
-                  categories
-                  position
-                  range
-                  tickPlacement
-                ]
+      categories
+      position
+      range
+      tickPlacement
+    ]
   end
 end

data/lib/apexcharts/options/y_axis.rb

@@ -3,13 +3,13 @@ require_relative 'axis'
 module ApexCharts
   class YAxisOptions < AxisOptions
     optional *%i[
-                  decimalsInFloat
-                  forceNiceScale
-                  logarithmic
-                  opposite
-                  seriesName
-                  show
-                  showAlways
-                ]
+      decimalsInFloat
+      forceNiceScale
+      logarithmic
+      opposite
+      seriesName
+      show
+      showAlways
+    ]
   end
 end

data/lib/apexcharts/options_builder.rb

@@ -19,14 +19,17 @@ require_relative 'options/y_axis'
 
 module ApexCharts
   class OptionsBuilder
+    include Utils::Hash
+    include Utils::DateTime
+
     attr_reader :built
 
-    def initialize(x_sample, options)
-      @options = Utils::Hash.camelize_keys(options)
+    def initialize(sample, options)
+      @options = camelize_keys(options)
       if options[:plotOptions]&.[](:bar)&.[](:horizontal)
-        @ytype = Utils::DateTime.type(x_sample)
+        @ytype = type(sample)
       else
-        @xtype = Utils::DateTime.type(x_sample)
+        @xtype = type(sample)
       end
       @built = {}
     end
@@ -36,6 +39,10 @@ module ApexCharts
 
       build_chart
       build_div
+      build_general_options
+    end
+
+    def build_general_options
       build_annotations
       build_colors
       build_data_labels
@@ -69,25 +76,18 @@ module ApexCharts
 
     def build_annotations
       annotations = @options.delete :annotations
-      @built[:annotations] = if annotations.is_a? Hash
-                               AnnotationsOptions.check annotations.compact
-                             end
+      @built[:annotations] = (
+        AnnotationsOptions.check annotations.compact if annotations.is_a? Hash
+      )
     end
 
     def build_chart
-      @built[:chart] = if target = @options.delete(:brushTarget)
-                         {
-                           brush: {
-                             enabled: true,
-                             target: target.to_s
-                           },
-                           selection: {
-                             enabled: true
-                           }
-                         }
-                       else
-                         {}
-                       end
+      @built[:chart] =
+        if target = @options.delete(:brushTarget)
+          {brush: {enabled: true, target: target.to_s}, selection: {enabled: true}}
+        else
+          {}
+        end
 
       @built[:chart].merge!({
         id: @options[:chartId] || @options[:id],
@@ -102,9 +102,10 @@ module ApexCharts
       }.compact)
 
       chart = @options.delete :chart
-      if chart.is_a? Hash
-        @built[:chart].merge! ChartOptions.check(chart.compact)
-      end
+
+      return unless chart.is_a? Hash
+
+      @built[:chart].merge! ChartOptions.check(chart.compact)
     end
 
     def build_colors
@@ -116,11 +117,12 @@ module ApexCharts
     def build_data_labels
       data_labels = @options.delete :dataLabels
       return if data_labels.nil?
+
       @built[:dataLabels] = if [true, false].include? data_labels
-                               {enabled: data_labels}
-                             elsif data_labels.is_a? Hash
-                               DataLabelsOptions.check data_labels.compact
-                             end
+                              {enabled: data_labels}
+                            elsif data_labels.is_a? Hash
+                              DataLabelsOptions.check data_labels.compact
+                            end
     end
 
     def build_fill
@@ -170,17 +172,15 @@ module ApexCharts
     def build_no_data
       no_data = @options.delete :noData
       @built[:noData] = if no_data.is_a? String
-                           {text: no_data}
-                         elsif no_data.is_a? Hash
-                           NoDataOptions.check no_data.compact
-                         end
+                          {text: no_data}
+                        elsif no_data.is_a? Hash
+                          NoDataOptions.check no_data.compact
+                        end
     end
 
     def build_plot_options
       plot_options = @options.delete :plotOptions
-      @built[:plotOptions] = if plot_options.is_a? Hash
-                                PlotOptions.check plot_options.compact
-                              end
+      @built[:plotOptions] = (PlotOptions.check plot_options.compact if plot_options.is_a? Hash)
     end
 
     def build_responsive
@@ -191,15 +191,13 @@ module ApexCharts
 
     def build_states
       @built[:states] = {
-        normal: filter_type_hash(@options.delete :normal),
-        hover: filter_type_hash(@options.delete :hover),
-        active: filter_type_hash(@options.delete :active)
+        normal: filter_type_hash(@options.delete(:normal)),
+        hover: filter_type_hash(@options.delete(:hover)),
+        active: filter_type_hash(@options.delete(:active))
       }.compact
 
       states = @options.delete :states
-      if states.is_a? Hash
-        @built[:states].merge! StatesOptions.check(states.compact)
-      end
+      @built[:states].merge! StatesOptions.check(states.compact) if states.is_a? Hash
 
       @built[:states] = nil if @built[:states].empty?
     end
@@ -210,7 +208,7 @@ module ApexCharts
 
       stroke = @options.delete :stroke
       if [true, false].include? stroke
-        @built[:stroke].merge!({show: stroke})
+        @built[:stroke].merge!(show: stroke)
       elsif stroke.is_a? Hash
         @built[:stroke].merge! StrokeOptions.check(stroke.compact)
       end
@@ -264,14 +262,12 @@ module ApexCharts
     def build_xaxis
       xaxis = @options.delete :xaxis
       @built[:xaxis] = {
-        type: @options.delete(:xtype){ @xtype },
+        type: @options.delete(:xtype) { @xtype },
         title: {
           text: @options.delete(:xtitle)
         }.compact
       }.compact
-      if @built[:xaxis][:title].empty?
-        @built[:xaxis].delete(:title)
-      end
+      @built[:xaxis].delete(:title) if @built[:xaxis][:title].empty?
 
       if xaxis.is_a? String
         @built[:xaxis][:title] = {text: xaxis}
@@ -279,19 +275,19 @@ module ApexCharts
         XAxisOptions.check xaxis
         @built[:xaxis].merge! xaxis
       end
+
+      @built[:xaxis] = nil if @built[:xaxis].empty?
     end
 
     def build_yaxis
       yaxis = @options.delete :yaxis
       @built[:yaxis] = [{
-        type: @options.delete(:ytype){ @ytype },
+        type: @options.delete(:ytype) { @ytype },
         title: {
           text: @options.delete(:ytitle)
         }.compact
       }.compact]
-      if @built[:yaxis][0][:title].empty?
-        @built[:yaxis][0].delete(:title)
-      end
+      @built[:yaxis][0].delete(:title) if @built[:yaxis][0][:title].empty?
 
       if yaxis.is_a? String
         @built[:yaxis][0][:title] = {text: yaxis}
@@ -299,26 +295,19 @@ module ApexCharts
         YAxisOptions.check yaxis
         @built[:yaxis][0].merge! yaxis
       end
-    end
 
-    def type(x)
-      if DateTime.iso8601(x).iso8601 == x
-        'datetime'
-      elsif Date.iso8601(x).iso8601 = x
-        'datetime'
-      end
-    rescue
-      'numeric'
+      @built[:yaxis] = nil if @built[:yaxis].all?(&:empty?)
     end
 
     def enabled(options)
-      boolean_to_hash(options) do |options|
-        {enabled: options}
+      boolean_to_hash(options) do |opts|
+        {enabled: opts}
       end
     end
 
     def boolean_to_hash(options)
       return if options.nil?
+
       if [true, false].include? options
         yield(options)
       elsif options.is_a?(Hash)