apexcharts 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 911c4f7abf6adcf9da0230826af3f658b6281a6ed2e5a56079240c4a124e0e3d
-  data.tar.gz: 865dbe2ef98854e98c6a66af3c6e81195a1124dcfd85117a3d38cac5c5d39e32
+  metadata.gz: a866b4e6545c50cf331fe31f383f8493ee2caf991e7e034654a011cd41d824ac
+  data.tar.gz: fd243a66fa09eb5ccbb7c9255dd536e6948f7b0f22d496986cd2788d966aec31
 SHA512:
-  metadata.gz: 70632205846e3a684dc892bb047fac617b92e9eba36173d53ac7da298e84c401d0b73dce3d628f451533aae024fd2972b89f120d6698e0d49a3d4cd915e19246
-  data.tar.gz: 17524c53370e02d38af478600d18455d979821d97cf6a45d01f6a2bb0ac3c0ead50f58e0264dadb9cf5ed0dbe55a9d9c3ea27ef2dc59b38749651d3b663537e1
+  metadata.gz: 40c1bf094d88f7bc524fefab6be0dc424454f552a490e83cd58df176dd236cdf799681a0e46af74548f176761681a6e69ab82fd67b7c1f9d2f5286f88b5aa3b1
+  data.tar.gz: 0cf54ed3c2d01f5991bdc1578c8a5b2af829fe2f936eb86d76a8d96f19629219119b70eefd56cd7fd25b5c8df0bc04083883825168f3e8f8c01c304f024c8d27

data/README.md

@@ -37,7 +37,8 @@ and I'll get the data in this format:
   ..
 }
 ```
-PS: `Property` can be any model you have and `inactive` and `active` is just a normal scope.  
+PS: `Property` can be any model you have and `inactive` and `active` 
+are just some normal ActiveRecord scopes.  
 
 Example options used for cartesian charts:
 
@@ -100,9 +101,9 @@ Example options used for cartesian charts:
 ![Example Scatter Chart](images/scatter_chart.png)
 
 
-#### Mixed Chart
+#### Mixed Charts
 
-You can mix charts by using `mixed_chart` or `combo_chart` methods. For example:  
+You can mix charts by using `mixed_charts` or `combo_charts` methods. For example:  
 Given that:
 ```ruby
 @total_properties = Property.group_by_week(:created_at).count
@@ -115,21 +116,21 @@ and
 ```
 you can do this:
 ```erb
-<%= combo_chart({**options, theme: 'palette4', stacked: false, data_labels: false}) do %>
+<%= combo_charts({**options, theme: 'palette4', stacked: false, data_labels: false}) do %>
   <% line_chart(total_series) %>
   <% area_chart(series.last) %>
   <% column_chart(series.first) %>
 <% end %>
 ```
-![Example Mixed Chart](images/mixed_chart.gif)
+![Example Mixed Charts](images/mixed_charts.gif)
 
 
-#### Syncing Chart
+#### Syncing Charts
 
-You can synchronize charts by using `syncing_chart` or `synchronized_chart` methods. For example:
+You can synchronize charts by using `syncing_charts` or `synchronized_charts` methods. For example:
 ```erb
-<%= syncing_chart(chart: {toolbar: false}, height: 250, style: 'display: inline-block; width: 32%;') do %>
-  <% mixed_chart(theme: 'palette4', data_labels: false) do %>
+<%= syncing_charts(chart: {toolbar: false}, height: 250, style: 'display: inline-block; width: 32%;') do %>
+  <% mixed_charts(theme: 'palette4', data_labels: false) do %>
     <% line_chart({name: "Total", data: @total_properties}) %>
     <% area_chart({name: "Active", data: @active_properties}) %>
   <% end %>
@@ -137,7 +138,7 @@ You can synchronize charts by using `syncing_chart` or `synchronized_chart` meth
   <% line_chart({name: "Inactive", data: @active_properties}, theme: 'palette8') %>
 <% end %>
 ```
-![Example Syncing Chart](images/syncing_chart.gif)
+![Example Syncing Charts](images/syncing_charts.gif)
 
 
 #### Brush Chart
@@ -146,7 +147,7 @@ You can synchronize charts by using `syncing_chart` or `synchronized_chart` meth
 <%= area_chart(total_series, {
   **options, chart_id: 'the-chart', xtitle: nil, theme: 'palette2'
 }) %>
-<%= mixed_chart(brush_target: 'the-chart', theme: 'palette7') do %>
+<%= mixed_charts(brush_target: 'the-chart', theme: 'palette7') do %>
   <% column_chart(series.first) %>
   <% line_chart(series.last) %>
 <% end %>
@@ -154,6 +155,36 @@ You can synchronize charts by using `syncing_chart` or `synchronized_chart` meth
 ![Example Brush Chart](images/brush_chart.gif)
 
 
+#### Heatmap Chart
+
+```erb
+<% heatmap_series = 17.downto(10).map do |n|
+  {
+    name: "#{n}:00",
+    data: 15.times.map do |i|
+      ["W#{i+1}", rand(90)]
+    end.to_h
+  }
+end %>
+<%= heatmap_chart(heatmap_series) %>
+```
+![Example Heatmap Chart](images/heatmap_chart.png)
+
+
+#### Bubble Chart
+
+```erb
+<% bubble_series = (1..4).map do |n|
+  {
+    name: "Bubble#{n}",
+    data: 20.times.map{[rand(750),rand(10..60),rand(70)]}
+  }
+end %>
+<%= bubble_chart(bubble_series, data_labels: false, theme: 'palette6') %>
+```
+![Example Bubble Chart](images/bubble_chart.png)
+
+
 #### Annotations
 
 All cartesian charts can have annotations, for example:

data/lib/apexcharts/charts.rb

@@ -4,6 +4,8 @@ require_relative 'charts/area'
 require_relative 'charts/bar'
 require_relative 'charts/column'
 require_relative 'charts/scatter'
+require_relative 'charts/heatmap'
+require_relative 'charts/bubble'
 require_relative 'charts/mixed'
 require_relative 'charts/syncing'
 require_relative 'charts/polar'

data/lib/apexcharts/charts/bubble.rb

@@ -0,0 +1,20 @@
+module Apexcharts
+  class BubbleChart < CartesianChart
+    def chart_type
+      'bubble'
+    end
+
+    def mixed_series
+    end
+
+  protected
+
+    def sanitize_data(data)
+      Apexcharts::BubbleSeries.new(data).sanitized
+    end
+
+    def x_sample
+      @series[:series][0][:data][0][0]
+    end
+  end
+end

data/lib/apexcharts/charts/cartesian.rb

@@ -15,7 +15,7 @@ module Apexcharts
       @series = sanitize_data(data)
       @options = Utils::Hash.camelize_keys(
                    Utils::Hash.deep_merge(
-                     build_options(@series[:series][0][:data][0][:x], options),
+                     build_options(x_sample, options),
                      {**@series, chart: {type: chart_type}}.compact
                    )
                  )
@@ -59,7 +59,7 @@ module Apexcharts
       end
     end
 
-  private
+  protected
 
     def build_instance_variables
       (@bindings.instance_variables - instance_variables).each do |i|
@@ -96,6 +96,10 @@ module Apexcharts
     def handle_time(input)
       Utils::DateTime.convert(input)
     end
+
+    def x_sample
+      @series[:series][0][:data][0][:x]
+    end
   end
 end
 

data/lib/apexcharts/charts/heatmap.rb

@@ -0,0 +1,10 @@
+module Apexcharts
+  class HeatmapChart < CartesianChart
+    def chart_type
+      'heatmap'
+    end
+
+    def mixed_series
+    end
+  end
+end

data/lib/apexcharts/charts/mixed.rb

@@ -1,5 +1,5 @@
 module Apexcharts
-  class MixedChart
+  class MixedCharts
     include Annotations
 
     def initialize bindings, options={}, &block

data/lib/apexcharts/charts/polar.rb

@@ -29,7 +29,7 @@ module Apexcharts
       HTML
     end
 
-  private
+  protected
 
     def sanitize_data(data)
       Apexcharts::PolarSeries.new(data).sanitized

data/lib/apexcharts/charts/syncing.rb

@@ -1,5 +1,5 @@
 module Apexcharts
-  class SyncingChart
+  class SyncingCharts
     def initialize bindings, options={}, &block
       @bindings = bindings
       @html = ""
@@ -42,12 +42,12 @@ module Apexcharts
       @html += ScatterChart.new(bindings, data, @options.merge(options), &block).render
     end
 
-    def mixed_chart options={}, &block
+    def mixed_charts options={}, &block
       options[:id] = apexcharts_id
       bindings = eval "self", block.binding
-      @html += MixedChart.new(bindings, @options.merge(options), &block).render
+      @html += MixedCharts.new(bindings, @options.merge(options), &block).render
     end
-    alias_method :combo_chart, :mixed_chart
+    alias_method :combo_charts, :mixed_charts
 
     def render
       @html

data/lib/apexcharts/helper.rb

@@ -30,17 +30,27 @@ module Apexcharts
       draw_chart(ScatterChart.new(bindings, *prepare_series_and_options(series, options), &block))
     end
 
-    def mixed_chart options={}, &block
+    def heatmap_chart series, options={}, &block
+      bindings = eval("self", block.binding) if block_given?
+      draw_chart(HeatmapChart.new(bindings, *prepare_series_and_options(series, options), &block))
+    end
+
+    def bubble_chart series, options={}, &block
+      bindings = eval("self", block.binding) if block_given?
+      draw_chart(BubbleChart.new(bindings, *prepare_series_and_options(series, options), &block))
+    end
+
+    def mixed_charts options={}, &block
       bindings = eval("self", block.binding)
-      draw_chart(MixedChart.new(bindings, deep_copy(options), &block))
+      draw_chart(MixedCharts.new(bindings, deep_copy(options), &block))
     end
-    alias_method :combo_chart, :mixed_chart
+    alias_method :combo_charts, :mixed_charts
 
-    def syncing_chart options={}, &block
+    def syncing_charts options={}, &block
       bindings = eval("self", block.binding)
-      draw_chart(SyncingChart.new(bindings, deep_copy(options), &block))
+      draw_chart(SyncingCharts.new(bindings, deep_copy(options), &block))
     end
-    alias_method :synchronized_chart, :syncing_chart
+    alias_method :synchronized_charts, :syncing_charts
 
     def pie_chart series, options={}
       draw_chart(PieChart.new(*prepare_series_and_options(series, options)))

data/lib/apexcharts/series.rb

@@ -1,2 +1,3 @@
 require_relative 'series/cartesian'
+require_relative 'series/bubble'
 require_relative 'series/polar'

data/lib/apexcharts/series/bubble.rb

@@ -0,0 +1,37 @@
+module Apexcharts
+  class BubbleSeries
+    attr_reader :sanitized
+
+    def initialize(data)
+      data = deep_copy(data)
+      @sanitized = case data
+                   when Array
+                     if array_of_threes?(data)
+                       [{data: data}]
+                     else
+                       data
+                     end
+
+                   when Hash
+                     if data_value = data[:data]
+                       if array_of_threes?(data_value)
+                         [data]
+                       end
+                     end
+
+                   end
+
+      @sanitized = {series: @sanitized}
+    end
+
+    def deep_copy(data)
+      Marshal.load(Marshal.dump(data))
+    end
+
+    def array_of_threes?(data)
+      return false if data.empty?
+      data.all?{|d| d.length == 3 }
+    end
+  end
+end
+

data/lib/apexcharts/series/cartesian.rb

@@ -4,26 +4,71 @@ module Apexcharts
 
     def initialize(data)
       data = deep_copy(data)
-      if data.is_a?(Array)
-        if (data.to_h rescue nil)
-          @sanitized = [data.to_h]
-        else
-          @sanitized = data.map(&:to_h)
-        end
-      else
-        @sanitized = [data]
-      end
-
-      unless sanitized[0][:data]
-        @sanitized = sanitized.map{|a| {data: a} }
-      end
-
-      @sanitized = {series: sanitized.each {|a| a[:data] = a[:data].map{|k,v| {x: k, y: v} } } }
+      @sanitized = case data
+                   when Array
+                     if array_of_pairs?(data)
+                       case first_data = data[0]
+                       when Array
+                         [
+                           {
+                             data: array_of_array_to_array_of_xy(data)
+                           }
+                         ]
+
+                       when Hash
+                         if first_data[:data]
+                           data.each{|h| h[:data] = array_of_array_to_array_of_xy(h[:data]) }
+                           data
+                         end
+
+                       end
+
+                     else
+                       data.map(&:to_h)
+
+                     end
+
+                   when Hash
+                     if data_value = data[:data]
+                       if array_of_pairs?(data_value)
+                         data[:data] = array_of_array_to_array_of_xy(data_value)
+                         [data]
+                       end
+
+                     else
+                       if data[:x] && data[:y]
+                         [{data: [data]}]
+
+                       else
+                         [
+                           {
+                             data: data.map do |k,v|
+                                     {x: k, y: v}
+                                   end
+                           }
+                         ]
+
+                       end
+
+                     end
+
+                   end
+
+      @sanitized = {series: @sanitized}
     end
 
     def deep_copy(data)
       Marshal.load(Marshal.dump(data))
     end
+
+    def array_of_pairs?(data)
+      return false if data.empty?
+      data.all?{|d| d.length == 2 }
+    end
+
+    def array_of_array_to_array_of_xy(data)
+      data.map{|d| {x: d.first, y: d.last} }
+    end
   end
 end
 

data/lib/apexcharts/version.rb

@@ -1,3 +1,3 @@
 module Apexcharts
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apexcharts
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Adrian Setyadi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smart_kv
@@ -93,10 +93,12 @@ files:
 - lib/apexcharts/charts.rb
 - lib/apexcharts/charts/area.rb
 - lib/apexcharts/charts/bar.rb
+- lib/apexcharts/charts/bubble.rb
 - lib/apexcharts/charts/cartesian.rb
 - lib/apexcharts/charts/column.rb
 - lib/apexcharts/charts/donut.rb
 - lib/apexcharts/charts/features/annotations.rb
+- lib/apexcharts/charts/heatmap.rb
 - lib/apexcharts/charts/line.rb
 - lib/apexcharts/charts/mixed.rb
 - lib/apexcharts/charts/pie.rb
@@ -127,6 +129,7 @@ files:
 - lib/apexcharts/options/y_axis.rb
 - lib/apexcharts/options_builder.rb
 - lib/apexcharts/series.rb
+- lib/apexcharts/series/bubble.rb
 - lib/apexcharts/series/cartesian.rb
 - lib/apexcharts/series/polar.rb
 - lib/apexcharts/support/rails.rb