apexcharts 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 709e9e394138ca8ede2eec0fa33a175b3e08ccaa764907c53fc6c72db067e3d5
-  data.tar.gz: ea1a5e008282d9edc581da80d06a61c743fbf130f91cdbfea659bb450489d5a9
+  metadata.gz: e97e5e996cb05991f345e7cf9c6591aab1405925b2b92643f518687017923170
+  data.tar.gz: 5a64c5b2a09074483ab53abcbcaed281efe8241ae83978d04e48e0486c1bf5b5
 SHA512:
-  metadata.gz: 561565108337e05159effd5c8c353765b6f4ac1b4741d2b8f520d3a3c8698f697ec0abb359debcaca14ae1ff32fa2ae8c8efe7ab2171377356a3293a2e81a0f2
-  data.tar.gz: 79413ca860115ccf2e9e729b40af747865bf93252ac7ae90c29260a33be0702f05c9780b32ac65fd34e43005c84aabf5c1265d9551ddfc6835212f7338cfc5ab
+  metadata.gz: 438e96dcecf8766666b1b1d48bfa7f0a134ee3ee70d14a6309850ef9e47ea28633bf68101b3c11a90f92cabdece41da05e3e599b3523a2de3295470133c980e1
+  data.tar.gz: 1677bef319ca1190860641f188e0914f29400709f96d9afc42a3f4cb833671865227c61ae9d22cfec7c2ae14af88cfa78f47a0328e91f4c60809d1bbdcf7db46

data/README.md

@@ -25,6 +25,10 @@
   <a href='http://clayallsopp.github.io/readme-score/?url=styd/apexcharts.rb'>
     <img src='http://readme-score-api.herokuapp.com/score.svg?url=styd/apexcharts.rb' alt='README Score' />
   </a>
+  <br />
+  <a href='https://ko-fi.com/setyadi' target='_blank'>
+    <img height='36' style='border:0px;height:36px;' src='https://cdn.ko-fi.com/cdn/kofi4.png?v=2' border='0' alt='Buy Me a Coffee at ko-fi.com' />
+  </a>
 </p>
 
 
@@ -46,7 +50,7 @@ Organization/Company                                                   | Use Cas
 <img src="/images/users/ventrata.png" width="180" height="40" />       | Ticket sales for clients (visitor attractions and tour operators)
 
 > If your organization/company uses ApexCharts.RB in production, please comment on
-> [this issue](https://github.com/styd/apexcharts.rb/issues/34).
+> [this discussion](https://github.com/styd/apexcharts.rb/discussions/34).
 
 
 ## README Versions
@@ -54,8 +58,8 @@ Organization/Company                                                   | Use Cas
 This README might not be for the version you use.  
 Choose the right README:
 
-> [v0.1.11] | [v0.1.10] | [v0.1.9] | [v0.1.8] | [v0.1.7] | [v0.1.6] |
-> [v0.1.5] | [v0.1.4] | [v0.1.3] | [v0.1.2] | [v0.1.1]
+> [v0.2.0] | [v0.1.11] | [v0.1.10] | [v0.1.9] | [v0.1.8] | [v0.1.7] |
+> [v0.1.6] | [v0.1.5] | [v0.1.4] | [v0.1.3] | [v0.1.2] | [v0.1.1]
 
 ## Table of Contents
 
@@ -78,6 +82,7 @@ Choose the right README:
     - [Syncing Charts](#syncing-charts)
     - [Brush Chart](#brush-chart)
     - [Annotations](#annotations)
+    - [Multiple Y-Axes](#multiple-y-axes)
   - [Heatmap Chart](#heatmap-chart)
   - [Radar Chart](#radar-chart)
   - [Bubble Chart](#bubble-chart)
@@ -97,7 +102,7 @@ Choose the right README:
   - [Global Options](#global-options)
   - [Formatter Function](#formatter-function)
   - [Defer Chart Rendering](#defer-chart-rendering)
-- [Schema](#schema)
+  - [Render with a script whose type is module](#render-with-a-script-whose-type-is-module)
 - [Reusable Custom Palette](#reusable-custom-palette)
 - [Use Alongside Other Charting Libraries](#use-alongside-other-charting-libraries)
   - [Alongside Chartkick](#alongside-chartkick)
@@ -111,7 +116,7 @@ Choose the right README:
   - [Plain HTML+ERB (Without Framework)](#plain-htmlerb-without-framework)
 - [Contributing](#contributing)
 - [License](#license)
-- [Like the charts?](#like-the-charts)
+- [Articles](#articles)
 
 
 ## Usage
@@ -387,6 +392,52 @@ All cartesian charts can have annotations, for example:
 ![Example Area Chart with Annotations](images/chart_with_annotations.gif)
 
 
+#### Multiple Y-Axes
+
+There's no fancy shortcut for multiple Y axes yet, but it is allowed. Here is an example
+for that.
+
+```erb
+<% series = [
+    {
+      name: 'Income',
+      type: 'column',
+      data: [1.4, 2, 2.5, 1.5, 2.5, 2.8, 3.8, 4.6]
+    },
+    {
+      name: 'Cashflow',
+      type: 'column',
+      data: [1.1, 3, 3.1, 4, 4.1, 4.9, 6.5, 8.5]
+    },
+    {
+      name: 'Revenue',
+      data: [20, 29, 37, 36, 44, 45, 50, 58]
+    }
+  ]
+
+  xaxis = {
+    title: {text: 'Year'},
+    categories: [2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016]
+  }
+
+  yaxis = [
+    {title: {text: "Income"}},
+    {
+      title: {text: "Operating Cashflow"},
+      opposite: true,
+      seriesName: 'Cashflow'
+    },
+    {
+      title: {text: "Revenue"},
+      opposite: true,
+      seriesName: 'Revenue'
+    }
+  ]
+%>
+<%= line_chart(series, xaxis: xaxis, yaxis: yaxis) %>
+```
+![Example Chart with multiple Y-Axes](images/chart_with_multiple_y-axes.gif)
+
 ### Heatmap Chart
 
 ```erb
@@ -697,29 +748,22 @@ Or, without the _functionable-json_ gem, use function as object as follows:
 
 ### Defer Chart Rendering
 
-It's possible to defer chart rendering by passing the argument `defer: true` as options.
+It's possible to defer chart rendering by passing the argument `defer: true` as option.
 
 ```erb
 <%= line_chart series, defer: true %>
 ```
 
+### Render with a script whose type is module
 
-## Schema
+The charts are rendered by inserting a <script> block in the HTML. 
+In order to generate this <script> with `type="module"` use the
+option `module: true`.
 
-To use [dry-schema] as an alternative options schema, you can specify the following config
-before calling your charts:
-
-```ruby
-ApexCharts.config.schema = :dry_schema
+```erb
+<%= line_chart series, module: true %>
 ```
 
-or
-
-```ruby
-ApexCharts.configure do |config|
-  config.schema = :dry_schema
-end
-```
 
 ## Reusable Custom Palette
 
@@ -942,10 +986,9 @@ The gem is available as open source under the terms of the
 
 
 [ApexCharts.JS]: https://github.com/apexcharts/apexcharts.js
-[dry-schema]: https://github.com/dry-rb/dry-schema
 
 
-[Unreleased]: https://github.com/styd/apexcharts.rb/compare/v0.1.11...HEAD
+[v0.2.0]: https://github.com/styd/apexcharts.rb/blob/v0.2.0/README.md
 [v0.1.11]: https://github.com/styd/apexcharts.rb/blob/v0.1.11/README.md
 [v0.1.10]: https://github.com/styd/apexcharts.rb/blob/v0.1.10/README.md
 [v0.1.9]: https://github.com/styd/apexcharts.rb/blob/v0.1.9/README.md

data/lib/apex_charts/charts/box_plot_chart.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module ApexCharts::Charts
   class BoxPlotChart < CartesianChart

data/lib/apex_charts/configuration.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'config/default_options'
-require_relative 'config/schema'
 
 module ApexCharts
   class << self
@@ -22,6 +21,5 @@ module ApexCharts
 
   class Configuration
     include ApexCharts::Config::DefaultOptions
-    include ApexCharts::Config::Schema
   end
 end

data/lib/apex_charts/options_builder.rb

@@ -1,29 +1,11 @@
 # frozen_string_literal: true
 
-%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 ApexCharts::Utils::Hash
     include ApexCharts::Utils::DateTime
 
-    attr_reader :built
+    attr_accessor :built
 
     def initialize(sample, options)
       @options = camelize_keys(options)
@@ -36,8 +18,6 @@ module ApexCharts
     end
 
     def build_options
-      options_class(:Root).check @options
-
       build_chart
       build_div
       build_general_options
@@ -53,6 +33,7 @@ module ApexCharts
       build_labels
       build_legend
       build_markers
+      build_module
       build_no_data
       build_plot_options
       build_responsive
@@ -68,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),
@@ -78,15 +59,13 @@ module ApexCharts
 
     def build_annotations
       annotations = @options.delete :annotations
-      @built[:annotations] = (
-        if annotations.is_a? Hash
-          options_class(:Annotations).check annotations.compact
-        end
+      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},
@@ -96,7 +75,7 @@ module ApexCharts
           {}
         end
 
-      @built[:chart].merge!({
+      built[:chart].merge!({
         id: @options[:chartId] || @options[:id],
         group: @options.delete(:group),
         height: @options.delete(:height) { target ? 180 : 400 },
@@ -112,207 +91,230 @@ module ApexCharts
 
       return unless chart.is_a? Hash
 
-      @built[:chart].merge! options_class(:Chart).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_class(:DataLabels).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
+      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_class(:Fill).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_class(:Grid).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_class(:Legend).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_class(:Markers).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_class(:NoData).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_class(:Plot).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_class(:States).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_class(:Stroke).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_class(:TitleSubtitle).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.all_palettes.sample)
-                         when 'monochrome'
-                           {monochrome: {enabled: true}}
-                         else
-                           resolve_theme(theme)
-                         end
-                       elsif theme.is_a? Hash
-                         options_class(:Theme).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_class(:TitleSubtitle).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_class(:Tooltip).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_class(:XAxis).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_class(:YAxis).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
@@ -334,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
@@ -345,7 +348,7 @@ module ApexCharts
       if Theme::PALETTES.include? theme
         {palette: theme}
       elsif Theme.palette_names.include? theme
-        @built[:colors] = Theme.get_colors(theme)
+        built[:colors] = Theme.get_colors(theme)
         nil
       end
     end

data/lib/apex_charts/renderer.rb

@@ -54,9 +54,9 @@ module ApexCharts
     end
 
     def substitute_function_object(json)
-      json.gsub(%r[{"function":{"args":"(?<args>.*?)","body":"(?<body>.*?)"}}]) do
-        body = "\"#{$~&.[](:body)}\"".undump
-        "function(#{$~&.[](:args)}){#{body}}"
+      json.gsub(/{"function":{"args":"(?<args>.*?)","body":"(?<body>.*?)"}}/) do
+        body = "\"#{$LAST_MATCH_INFO&.[](:body)}\"".undump
+        "function(#{$LAST_MATCH_INFO&.[](:args)}){#{body}}"
       end
     end
 
@@ -64,6 +64,10 @@ module ApexCharts
       @defer ||= options.delete(:defer)
     end
 
+    def module?
+      @module ||= options.delete(:module)
+    end
+
     def attributes
       @attributes ||= options.delete(:div) { {} }
     end
@@ -97,8 +101,9 @@ module ApexCharts
     end
 
     def script(js)
+      type = module? ? 'module' : 'text/javascript'
       <<~SCRIPT
-        <script type="text/javascript" apexcharts-rb="#{RELEASE}">
+        <script type="#{type}" apexcharts-rb="#{RELEASE}" >
         #{js}
         </script>
       SCRIPT
@@ -106,7 +111,7 @@ module ApexCharts
 
     def indent(content, times=2)
       content.lines.map.with_index do |line, index|
-        (index == 0 ? '' : '  ' * times) + line
+        (index.zero? ? '' : '  ' * times) + line
       end.join
     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