apexcharts 0.1.4 → 0.1.5

data/lib/apexcharts/options/data_labels.rb

@@ -1,12 +1,12 @@
-module Apexcharts
+module ApexCharts
   class DataLabelsOptions < ::SmartKv
     optional *%i[
-                  drop_shadow  dropShadow
+                  dropShadow
                   enabled
-                  offset_x     offsetX
-                  offset_y     offsetY
+                  offsetX
+                  offsetY
                   style
-                  text_anchor  textAnchor
+                  textAnchor
                 ]
   end
 end

data/lib/apexcharts/options/div_attributes.rb

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   class DivAttributes < ::SmartKv
     optional *%i[
                   class

data/lib/apexcharts/options/fill.rb

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   class FillOptions < ::SmartKv
     optional *%i[
                   colors

data/lib/apexcharts/options/grid.rb

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

data/lib/apexcharts/options/legend.rb

@@ -1,24 +1,24 @@
-module Apexcharts
+module ApexCharts
   class LegendOptions < ::SmartKv
     optional *%i[
-                  container_margin        containerMargin
+                  containerMargin
                   floating
-                  font_family             fontFamily
-                  font_size               fontSize
+                  fontFamily
+                  fontSize
                   formatter
-                  horizontal_align        horizontalAlign
-                  item_margin             itemMargin
+                  horizontalAlign
+                  itemMargin
                   labels
                   markers
-                  offset_x                offsetX
-                  offset_y                offsetY
-                  on_item_click           onItemClick
-                  on_item_hover           onItemHover
+                  offsetX
+                  offsetY
+                  onItemClick
+                  onItemHover
                   position
                   show
-                  show_for_single_series  showForSingleSeries
-                  text_anchor             textAnchor
-                  vertical_align          verticalAlign
+                  showForSingleSeries
+                  textAnchor
+                  verticalAlign
                 ]
   end
 end

data/lib/apexcharts/options/markers.rb

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

data/lib/apexcharts/options/no_data.rb

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

data/lib/apexcharts/options/plot_options.rb

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

data/lib/apexcharts/options/root.rb

@@ -3,23 +3,23 @@ require_relative 'chart'
 require_relative 'stroke'
 require_relative 'states'
 
-module Apexcharts
+module ApexCharts
   class RootOptions < ::SmartKv
     optional *%i[
                   annotations
-                  brush_target
+                  brushTarget
                   chart
-                  chart_id
+                  chartId
                   colors
-                  data_labels   dataLabels
+                  dataLabels
                   fill
                   grid
                   group
                   labels
                   legend
                   markers
-                  no_data       noData
-                  plot_options  plotOptions
+                  noData
+                  plotOptions
                   responsive
                   series
                   states

data/lib/apexcharts/options/states.rb

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   class StatesOptions < ::SmartKv
     optional *%i[
                   active

data/lib/apexcharts/options/stroke.rb

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

data/lib/apexcharts/options/subtitle.rb

@@ -1,6 +1,6 @@
 require_relative 'title'
 
-module Apexcharts
+module ApexCharts
   class SubtitleOptions < TitleOptions
     optional *%i[ ]
   end

data/lib/apexcharts/options/theme.rb

@@ -1,4 +1,4 @@
-module Apexcharts
+module ApexCharts
   class ThemeOptions < ::SmartKv
     optional *%i[
                   monochrome

data/lib/apexcharts/options/title.rb

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

data/lib/apexcharts/options/tooltip.rb

@@ -1,16 +1,16 @@
-module Apexcharts
+module ApexCharts
   class TooltipOptions < ::SmartKv
     optional *%i[
                   custom
                   enabled
-                  fill_series_color  fillSeriesColor
+                  fillSeriesColor
                   fixed
-                  follow_cursor      followCursor
+                  followCursor
                   intersect
-                  inverse_order      inverseOrder
+                  inverseOrder
                   items
                   marker
-                  on_dataset_hover   onDatasetHover
+                  onDatasetHover
                   shared
                   style
                   theme

data/lib/apexcharts/options/x_axis.rb

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

data/lib/apexcharts/options/y_axis.rb

@@ -1,15 +1,15 @@
 require_relative 'axis'
 
-module Apexcharts
+module ApexCharts
   class YAxisOptions < AxisOptions
     optional *%i[
-                  decimals_in_float  decimalsInFloat
-                  force_nice_scale   forceNiceScale
+                  decimalsInFloat
+                  forceNiceScale
                   logarithmic
                   opposite
-                  series_name        seriesName
+                  seriesName
                   show
-                  show_always        showAlways
+                  showAlways
                 ]
   end
 end

data/lib/apexcharts/options_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'smart_kv'
 require_relative 'options/root'
 require_relative 'options/annotations'
@@ -15,7 +17,7 @@ require_relative 'options/tooltip'
 require_relative 'options/x_axis'
 require_relative 'options/y_axis'
 
-module Apexcharts
+module ApexCharts
   class OptionsBuilder
     THEME_PALETTES = ["palette1", "palette2", "palette3", "palette4", "palette5", 
                       "palette6", "palette7", "palette8", "palette9", "palette10"]
@@ -23,8 +25,8 @@ module Apexcharts
     attr_reader :built
 
     def initialize(x_sample, options)
-      @options = options
-      if options[:plot_options]&.[](:bar)&.[](:horizontal)
+      @options = Utils::Hash.camelize_keys(options)
+      if options[:plotOptions]&.[](:bar)&.[](:horizontal)
         @ytype = Utils::DateTime.type(x_sample)
       else
         @xtype = Utils::DateTime.type(x_sample)
@@ -38,6 +40,7 @@ module Apexcharts
       build_chart
       build_div
       build_annotations
+      build_colors
       build_data_labels
       build_fill
       build_grid
@@ -75,7 +78,7 @@ module Apexcharts
     end
 
     def build_chart
-      @built[:chart] = if target = @options.delete(:brush_target)
+      @built[:chart] = if target = @options.delete(:brushTarget)
                          {
                            brush: {
                              enabled: true,
@@ -90,7 +93,7 @@ module Apexcharts
                        end
 
       @built[:chart].merge!({
-        id: @options[:chart_id] || @options[:id],
+        id: @options[:chartId] || @options[:id],
         group: @options.delete(:group),
         height: @options.delete(:height) { target ? 180 : 400 },
         width: @options.delete(:width),
@@ -98,9 +101,7 @@ module Apexcharts
         animations: enabled(@options.delete(:animations)),
         sparkline: enabled(@options.delete(:sparkline)),
         background: @options.delete(:background),
-        fore_color: @options.delete(:fore_color) do
-                      @options.delete(:foreColor)
-                    end
+        foreColor: @options.delete(:foreColor)
       }.compact)
 
       chart = @options.delete :chart
@@ -109,12 +110,16 @@ module Apexcharts
       end
     end
 
+    def build_colors
+      colors = @options.delete :colors
+      colors &&= Array(colors)
+      @built[:colors] = colors
+    end
+
     def build_data_labels
-      data_labels = @options.delete :data_labels do
-                      @options.delete :dataLabels
-                    end
+      data_labels = @options.delete :dataLabels
       return if data_labels.nil?
-      @built[:data_labels] = if [true, false].include? data_labels
+      @built[:dataLabels] = if [true, false].include? data_labels
                                {enabled: data_labels}
                              elsif data_labels.is_a? Hash
                                DataLabelsOptions.check data_labels.compact
@@ -141,12 +146,8 @@ module Apexcharts
 
     def build_labels
       labels = @options.delete :labels
-      @built[:labels] = if labels.nil?
-                        elsif labels.is_a? Array
-                          labels
-                        else
-                          [labels]
-                        end
+      labels &&= Array(labels)
+      @built[:labels] = labels
     end
 
     def build_legend
@@ -170,8 +171,8 @@ module Apexcharts
     end
 
     def build_no_data
-      no_data = @options.delete :no_data
-      @built[:no_data] = if no_data.is_a? String
+      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
@@ -179,22 +180,16 @@ module Apexcharts
     end
 
     def build_plot_options
-      plot_options = @options.delete :plot_options do
-                       @options.delete :plotOptions
-                     end
-      @built[:plot_options] = if plot_options.is_a? Hash
+      plot_options = @options.delete :plotOptions
+      @built[:plotOptions] = if plot_options.is_a? Hash
                                 PlotOptions.check plot_options.compact
                               end
     end
 
     def build_responsive
       responsive = @options.delete :responsive
-      @built[:responsive] = if responsive.nil?
-                            elsif responsive.is_a? Array
-                              responsive
-                            else
-                              [responsive]
-                            end
+      responsive &&= responsive.is_a?(Hash) ? [responsive] : Array(responsive)
+      @built[:responsive] = responsive
     end
 
     def build_states
@@ -237,7 +232,7 @@ module Apexcharts
 
     def build_theme
       theme = @options.delete(:theme)
-      @built[:theme] = if theme.is_a?(String)
+      @built[:theme] = if theme.is_a? String
                          case theme
                          when 'random'
                            {palette: THEME_PALETTES.sample}
@@ -246,7 +241,7 @@ module Apexcharts
                          else
                            {palette: theme}
                          end
-                       elsif theme.is_a?(Hash)
+                       elsif theme.is_a? Hash
                          ThemeOptions.check theme.compact
                        end
     end
@@ -277,6 +272,9 @@ module Apexcharts
           text: @options.delete(:xtitle)
         }.compact
       }.compact
+      if @built[:xaxis][:title].empty?
+        @built[:xaxis].delete(:title)
+      end
 
       if xaxis.is_a? String
         @built[:xaxis][:title] = {text: xaxis}
@@ -294,6 +292,9 @@ module Apexcharts
           text: @options.delete(:ytitle)
         }.compact
       }.compact]
+      if @built[:yaxis][0][:title].empty?
+        @built[:yaxis][0].delete(:title)
+      end
 
       if yaxis.is_a? String
         @built[:yaxis][0][:title] = {text: yaxis}