apexcharts 0.1.9 → 0.2.0

data/lib/apex_charts/options_builder.rb

@@ -1,28 +1,11 @@
 # frozen_string_literal: true
 
-require 'smart_kv'
-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_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 ApexCharts::Utils::Hash
     include ApexCharts::Utils::DateTime
 
-    attr_reader :built
+    attr_accessor :built
 
     def initialize(sample, options)
       @options = camelize_keys(options)
@@ -35,8 +18,6 @@ module ApexCharts
     end
 
     def build_options
-      Options::RootOptions.check @options
-
       build_chart
       build_div
       build_general_options
@@ -46,11 +27,13 @@ module ApexCharts
       build_annotations
       build_colors
       build_data_labels
+      build_defer
       build_fill
       build_grid
       build_labels
       build_legend
       build_markers
+      build_module
       build_no_data
       build_plot_options
       build_responsive
@@ -66,7 +49,7 @@ module ApexCharts
     end
 
     def build_div
-      @built[:div] = {
+      built[:div] = {
         id: @options.delete(:id),
         var: @options.delete(:var),
         class: @options.delete(:class),
@@ -76,20 +59,23 @@ module ApexCharts
 
     def build_annotations
       annotations = @options.delete :annotations
-      @built[:annotations] = (
-        Options::AnnotationsOptions.check annotations.compact if annotations.is_a? Hash
+      built[:annotations] = (
+        annotations.compact if annotations.is_a? Hash
       )
     end
 
     def build_chart
-      @built[: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
 
-      @built[:chart].merge!({
+      built[:chart].merge!({
         id: @options[:chartId] || @options[:id],
         group: @options.delete(:group),
         height: @options.delete(:height) { target ? 180 : 400 },
@@ -105,203 +91,234 @@ module ApexCharts
 
       return unless chart.is_a? Hash
 
-      @built[:chart].merge! Options::ChartOptions.check(chart.compact)
+      built[:chart].merge! chart.compact
     end
 
     def build_colors
       colors = @options.delete :colors
       colors &&= Array(colors)
-      @built[:colors] = colors
+      built[:colors] = colors
     end
 
     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
-                              Options::DataLabelsOptions.check data_labels.compact
-                            end
+      built[:dataLabels] = if [true, false].include? data_labels
+                             {enabled: data_labels}
+                           elsif data_labels.is_a? Hash
+                             data_labels.compact
+                           end
+    end
+
+    def build_defer
+      defer = @options.delete :defer
+      built[:defer] = defer == true
+    end
+
+    def build_module
+      omodule = @options.delete :module
+      built[:module] = omodule == true
     end
 
     def build_fill
       fill = @options.delete :fill
-      @built[:fill] = if fill.is_a? String
-                        {type: fill}
-                      elsif fill.is_a? Hash
-                        Options::FillOptions.check fill.compact
-                      end
+      built[:fill] = case fill
+                     when String
+                       {type: fill}
+                     when Hash
+                       fill.compact
+                     end
     end
 
     def build_grid
       grid = @options.delete :grid
-      @built[:grid] = if [true, false].include? grid
-                        {show: grid}
-                      elsif grid.is_a? Hash
-                        Options::GridOptions.check grid.compact
-                      end
+      built[:grid] = if [true, false].include? grid
+                       {show: grid}
+                     elsif grid.is_a? Hash
+                       grid.compact
+                     end
     end
 
     def build_labels
       labels = @options.delete :labels
       labels &&= Array(labels)
-      @built[:labels] = labels
+      built[:labels] = labels
     end
 
     def build_legend
       legend = @options.delete :legend
-      @built[:legend] = if [true, false].include? legend
-                          {show: legend}
-                        elsif legend.is_a? String
-                          {show: true, position: legend}
-                        elsif legend.is_a? Hash
-                          Options::LegendOptions.check legend.compact
-                        end
+      built[:legend] = if [true, false].include? legend
+                         {show: legend}
+                       elsif legend.is_a? String
+                         {show: true, position: legend}
+                       elsif legend.is_a? Hash
+                         legend.compact
+                       end
     end
 
     def build_markers
       markers = @options.delete :markers
-      @built[:markers] = if markers.is_a? String
-                           {shape: markers}
-                         elsif markers.is_a? Hash
-                           Options::MarkersOptions.check markers.compact
-                         end
+      built[:markers] = case markers
+                        when String
+                          {shape: markers}
+                        when Hash
+                          markers.compact
+                        end
     end
 
     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
-                          Options::NoDataOptions.check no_data.compact
-                        end
+      built[:noData] = case no_data
+                       when String
+                         {text: no_data}
+                       when Hash
+                         no_data.compact
+                       end
     end
 
     def build_plot_options
       plot_options = @options.delete :plotOptions
       return unless plot_options.is_a? Hash
 
-      @built[:plotOptions] =
-        Options::PlotOptions.check plot_options.compact
+      built[:plotOptions] =
+        plot_options.compact
     end
 
     def build_responsive
       responsive = @options.delete :responsive
       responsive &&= responsive.is_a?(Hash) ? [responsive] : Array(responsive)
-      @built[:responsive] = responsive
+      built[:responsive] = responsive
     end
 
     def build_states
-      @built[:states] = {
+      built[:states] = {
         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
-      @built[:states].merge! Options::StatesOptions.check(states.compact) if states.is_a? Hash
+      built[:states].merge! states.compact if states.is_a? Hash
 
-      @built[:states] = nil if @built[:states].empty?
+      built[:states] = nil if built[:states].empty?
     end
 
     def build_stroke
       curve = @options.delete :curve
-      @built[:stroke] = {curve: curve}.compact
+      built[:stroke] = {curve: curve}.compact
 
       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! Options::StrokeOptions.check(stroke.compact)
+        built[:stroke].merge! stroke.compact
       end
 
-      @built[:stroke] = nil if @built[:stroke].empty?
+      built[:stroke] = nil if built[:stroke].empty?
     end
 
     def build_subtitle
       subtitle = @options.delete(:subtitle)
-      @built[:subtitle] = if subtitle.is_a? String
-                            {text: subtitle}
-                          elsif subtitle.is_a? Hash
-                            Options::TitleSubtitleOptions.check subtitle.compact
-                          end
+      built[:subtitle] = case subtitle
+                         when String
+                           {text: subtitle}
+                         when Hash
+                           subtitle.compact
+                         end
     end
 
     def build_theme
       theme = @options.delete(:theme)
-      @built[:theme] = if theme.is_a? String
-                         case theme
-                         when 'random'
-                           resolve_theme(Theme::Local.all_palettes.sample)
-                         when 'monochrome'
-                           {monochrome: {enabled: true}}
-                         else
-                           resolve_theme(theme)
-                         end
-                       elsif theme.is_a? Hash
-                         Options::ThemeOptions.check theme.compact
-                       end
+      built[:theme] = case theme
+                      when String
+                        case theme
+                        when 'random'
+                          resolve_theme(Theme.all_palettes.sample)
+                        when 'monochrome'
+                          {monochrome: {enabled: true}}
+                        else
+                          resolve_theme(theme)
+                        end
+                      when Hash
+                        theme.compact
+                      end
     end
 
     def build_title
       title = @options.delete(:title)
-      @built[:title] = if title.is_a? String
-                         {text: title}
-                       elsif title.is_a? Hash
-                         Options::TitleSubtitleOptions.check title.compact
-                       end
+      built[:title] = case title
+                      when String
+                        {text: title}
+                      when Hash
+                        title.compact
+                      end
     end
 
     def build_tooltip
       tooltip = @options.delete :tooltip
-      @built[:tooltip] = if [true, false].include? tooltip
-                           {enabled: tooltip}
-                         elsif tooltip.is_a? Hash
-                           Options::TooltipOptions.check tooltip.compact
-                         end
+      built[:tooltip] = if [true, false].include? tooltip
+                          {enabled: tooltip}
+                        elsif tooltip.is_a? Hash
+                          tooltip.compact
+                        end
     end
 
     def build_xaxis
       xaxis = @options.delete :xaxis
-      @built[:xaxis] = {
+      built[:xaxis] = {
         type: @options.delete(:xtype) { @xtype },
         title: {
           text: @options.delete(:xtitle)
         }.compact
       }.compact
-      @built[:xaxis].delete(:title) if @built[:xaxis][:title].empty?
+      built[:xaxis].delete(:title) if built[:xaxis][:title].empty?
 
-      if xaxis.is_a? String
-        @built[:xaxis][:title] = {text: xaxis}
-      elsif xaxis.is_a? Hash
-        Options::XAxisOptions.check xaxis
-        @built[:xaxis].merge! xaxis
+      case xaxis
+      when String
+        built[:xaxis][:title] = {text: xaxis}
+      when Hash
+        built[:xaxis].merge! xaxis
       end
 
-      @built[:xaxis] = nil if @built[:xaxis].empty?
+      built[:xaxis] = nil if built[:xaxis].empty?
     end
 
     def build_yaxis
       yaxis = @options.delete :yaxis
-      @built[:yaxis] = [{
-        type: @options.delete(:ytype) { @ytype },
-        title: {
-          text: @options.delete(:ytitle)
+
+      case yaxis
+      when Array
+        built[:yaxis] = yaxis
+      when Hash
+        built[:yaxis] = {
+          type: @options.delete(:ytype) { @ytype },
+          title: {
+            text: @options.delete(:ytitle)
+          }.compact
         }.compact
-      }.compact]
-      @built[:yaxis][0].delete(:title) if @built[:yaxis][0][:title].empty?
-
-      if yaxis.is_a? String
-        @built[:yaxis][0][:title] = {text: yaxis}
-      elsif yaxis.is_a? Hash
-        Options::YAxisOptions.check yaxis
-        @built[:yaxis][0].merge! yaxis
+        built[:yaxis].delete(:title) if built[:yaxis][:title].empty?
+        built[:yaxis].merge! yaxis
+      when String
+        built[:yaxis] = {
+          type: @options.delete(:ytype) { @ytype },
+          title: {
+            text: yaxis
+          }
+        }.compact
+      when NilClass
+        built[:yaxis] = if ytitle = @options.delete(:ytitle)
+                          {title: {text: ytitle}}
+                        else
+                          {}
+                        end
       end
 
-      @built[:yaxis] = nil if @built[:yaxis].all?(&:empty?)
+      built[:yaxis] = nil if built[:yaxis].all?(&:empty?)
     end
 
+  private
+
     def enabled(options)
       boolean_to_hash(options) do |opts|
         {enabled: opts}
@@ -319,9 +336,10 @@ module ApexCharts
     end
 
     def filter_type_hash(state)
-      if state.is_a? String
+      case state
+      when String
         {filter: {type: state}}
-      elsif state.is_a? Hash
+      when Hash
         state.compact
       end
     end
@@ -329,10 +347,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

data/lib/apex_charts/renderer.rb

@@ -1,31 +1,13 @@
 # frozen_string_literal: true
 
 require 'json'
+require_relative 'version'
 
 module ApexCharts
   class Renderer
     class << self
-      def render_default(options)
-        renderer = new options
-
-        html = if renderer.id_number == '1' && !ApexCharts.config.default_options.empty?
-                 renderer.window_apex
-               else
-                 ''
-               end
-        html + <<~HTML
-          <div id="#{renderer.element_id}" class="#{renderer.css_class}" style="#{renderer.style}"></div>
-          <script type="text/javascript">
-            var #{renderer.variable} = new ApexCharts(document.querySelector("##{renderer.element_id}"), #{substitute_function_object(renderer.options.to_json)});
-            #{renderer.variable}.render();
-          </script>
-        HTML
-      end
-
-      def substitute_function_object(json)
-        json.gsub(%r[{"function":{"args":"(?<args>.*?)","body":"(?<body>.*?)"}}]) do
-          "function(#{$~&.[](:args)}){#{$~&.[](:body)}}"
-        end
+      def render(options)
+        new(options).render
       end
     end
 
@@ -35,6 +17,57 @@ module ApexCharts
       @options = options
     end
 
+    def render
+      html = ''
+      html = window_apex if id_number == '1' && !ApexCharts.config.default_options.empty?
+
+      chart_rendering = <<~JS
+        var #{variable} = new ApexCharts(document.querySelector("##{element_id}"), #{substitute_function_object(options.to_json)});
+        #{variable}.render();
+      JS
+
+      html += <<~HTML
+        <div id="#{element_id}" class="#{css_class}" style="#{style}"></div>
+        #{script(defer(chart_rendering))}
+      HTML
+    end
+
+    def defer(js)
+      if defer?
+        <<~DEFERRED
+          (function() {
+            var createChart = function() {
+              #{indent(js)}
+            };
+            if (window.addEventListener) {
+              window.addEventListener("load", createChart, true);
+            } else if (window.attachEvent) {
+              window.attachEvent("onload", createChart);
+            } else {
+              createChart();
+            }
+          })();
+        DEFERRED
+      else
+        js
+      end
+    end
+
+    def substitute_function_object(json)
+      json.gsub(/{"function":{"args":"(?<args>.*?)","body":"(?<body>.*?)"}}/) do
+        body = "\"#{$LAST_MATCH_INFO&.[](:body)}\"".undump
+        "function(#{$LAST_MATCH_INFO&.[](:args)}){#{body}}"
+      end
+    end
+
+    def defer?
+      @defer ||= options.delete(:defer)
+    end
+
+    def module?
+      @module ||= options.delete(:module)
+    end
+
     def attributes
       @attributes ||= options.delete(:div) { {} }
     end
@@ -64,11 +97,22 @@ module ApexCharts
     end
 
     def window_apex
-      <<~HTML
-        <script type="text/javascript">
-          window.Apex = #{ApexCharts.config.default_options.to_json}
+      script("window.Apex = #{ApexCharts.config.default_options.to_json}")
+    end
+
+    def script(js)
+      type = module? ? 'module' : 'text/javascript'
+      <<~SCRIPT
+        <script type="#{type}" apexcharts-rb="#{RELEASE}" >
+        #{js}
         </script>
-      HTML
+      SCRIPT
+    end
+
+    def indent(content, times=2)
+      content.lines.map.with_index do |line, index|
+        (index.zero? ? '' : '  ' * times) + line
+      end.join
     end
   end
 end

data/lib/apex_charts/series/bubble_series.rb

@@ -20,9 +20,8 @@ module ApexCharts::Series
           end
 
         when Hash
-          if data_value = data[:data]
-            [data] if array_of_threes?(data_value)
-          end
+          data_value = data[:data]
+          [data] if data_value && array_of_threes?(data_value)
 
         end
 

data/lib/apex_charts/series/cartesian_series.rb

@@ -15,7 +15,8 @@ module ApexCharts::Series
     def sample
       return if empty?
 
-      sanitized[:series][0][:data][0][:x]
+      first_data = sanitized[:series][0][:data][0]
+      first_data.is_a?(Hash) ? first_data[:x] : first_data
     end
 
   private
@@ -75,7 +76,12 @@ module ApexCharts::Series
     end
 
     def array_of_array_to_array_of_xy(data)
-      data.map {|d| {x: d.first, y: d.last} }
+      case data.first
+      when Array
+        data.map {|d| {x: d.first, y: d.last} }
+      else
+        data
+      end
     end
   end
 end

data/lib/apex_charts/theme.rb

@@ -39,22 +39,6 @@ module ApexCharts
       end
     end
 
-    class Local
-      module LocalClassMethods
-        include ClassMethods
-
-        def custom_palettes
-          Theme.palettes.merge(super)
-        end
-
-        def palettes
-          Thread.current[:_ApexCharts_Palettes_] ||= {}
-        end
-      end
-
-      extend LocalClassMethods
-    end
-
     extend ClassMethods
   end
 end

data/lib/apex_charts/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module ApexCharts
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
+  RELEASE = '0.2.0'
 end