apexcharts 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5fe55affbc927ac35a3b09eda054fc58b4d628559b856b09745a40995435a3
-  data.tar.gz: 33e80f6bc63b97751eb8d9bb9cfa0ee394c4a857178d8b23ee1b484ab2d31317
+  metadata.gz: 737afc5c5ce435bfa18cfe6b7d00f51ffd74c040f8f5f51728dec1711a2514fc
+  data.tar.gz: e46f31763675b25c6cf0f010a16423aa2e6249240302af88e793f65277c7a816
 SHA512:
-  metadata.gz: 2d4a235395e45ba368b5355611fd43a0118442195f5709ee4f978f293f9f6d422b253690a83a33d0782ea91387a3841eeaa3f4406af16bb5ec9c6fd924166b32
-  data.tar.gz: 0c55734ce94cd4ed1536b6f7e0b468b77579844431f0780ac97bd8e097ab27b876e50bbfe9b8e9cf6f8801eb50b750870ac9badee625480047962a38ac330aef
+  metadata.gz: a4d469bb0d6ccb22595939a9e5305ce8cfb75db59c2e54db786d937c10cf1f07d0cfe342238ab3289fbebad2149b7e3eee0df5c20fcea17230c9eb45fb8b0cee
+  data.tar.gz: 67de41d4a272ee5ed1cfd200c20e9d2b2a95300c00d03463a9561000481655af329f6629f1a6a3d1443ef92bffbc33f4593247f983943faa58eae78cbd3e559f

data/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="images/placeholder.png" height="80">
+  <img src="images/apexcharts.rb.png" height="150" />
 </p>
 
 <p align="center">
@@ -39,8 +39,11 @@
 
 ## Trusted By
 
-<img src="images/users/bilendo.png" title="Use case: enterprise dashboards to visualize account receivables data" width="202" height="40" />
-<img src="images/users/ventrata.png" title="Use case: ticket sales for clients (visitor attractions and tour operators)" width="180" height="40" />
+Organization/Company                                                   | Use Case
+-----------------------------------------------------------------------|------------------------------------------------------------------
+<img src="/images/users/copient-health.png" width="143" height="40" /> | Reports/charts related to Operating Room utilization statistics
+<img src="/images/users/bilendo.png" width="202" height="40" />        | Enterprise dashboards to visualize account receivables data
+<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).
@@ -49,7 +52,7 @@
 ## Supported By
 
 <a href="https://www.jetbrains.com/?from=ApexCharts.RB">
-  <img src="images/supporters/jetbrains.svg" title="Grants 1 License for All Products Pack (worth US$649.00/year)" width="120" height="120" />
+  <img src="images/supporters/jetbrains.svg" title="Grants 1 License for All Products Pack" width="120" height="120" />
 </a>
 
 
@@ -58,7 +61,7 @@
 This README might not be for the version you use.  
 Choose the right README:
 
-> [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.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
 
@@ -249,13 +252,18 @@ Given:
 <%
   require 'date'
 
-  def ohlc(ary)
-    [rand(ary.min..ary.max), ary.max, ary.min, rand(ary.min..ary.max)]
+  def candlestick_data
+    @acc = rand(6570..6650)
+    60.times.map {|i| [Date.today - 60 + i, ohlc] }.to_h
   end
 
-  candlestick_data = 50.times.map do |i|
-    [Date.today - 50 + i, ohlc(Array.new(2){ rand(6570..6650) })]
-  end.to_h
+  def ohlc
+    open = @acc + rand(-20..20)
+    high = open + rand(0..100)
+    low = open - rand(0..100)
+    @acc = close = open + rand(-((high-low)/3)..((high-low)/2))
+    [open, high, low, close]
+  end
 
   candlestick_options = {
     plot_options: {
@@ -275,9 +283,6 @@ You can make candlestick chart with this:
 ```
 ![Example Candlestick Chart](images/candlestick_chart.gif)
 
-Real life candlestick chart probably don't look like that.
-That's because I just use random sets of numbers as the data.
-
 
 #### Mixed Charts
 
@@ -626,6 +631,12 @@ use it like so:
 <%= area_chart series, tooltip: {y: {formatter: function(val) { return '$' + parseFloat(val).toLocaleString() }}} %>
 ```
 
+Or, without the _functionable-json_ gem, use function as object as follows:
+
+```erb
+<%= area_chart series, tooltip: {y: {formatter: {function: {args: "val", body: "return '$' + parseFloat(val).toLocaleString();"}} }} %>
+```
+
 
 ## Reusable Custom Palette
 
@@ -692,7 +703,7 @@ Besides setting the environtment variable, if you just want a quick prefix, you
 do this on your _Gemfile_:
 
 ```ruby
-gem 'apexcharts', require: 'apexcharts/prefix_with_apex'
+gem 'apexcharts', require: 'apex_charts/prefix_with_apex'
 ```
 
 and you'll get `apex_line_chart`, `apex_area_chart`, etc.
@@ -878,18 +889,16 @@ The gem is available as open source under the terms of the
 [MIT License](https://opensource.org/licenses/MIT).
 
 
-## Like the charts?
-
-Consider donating to the author of [ApexCharts.JS] to support his awesome library.
-This project wouldn't be possible without it.
+## Articles
 
-Become a sponsor on [Patreon](https://patreon.com/junedchhipa).  
-One time donation on [PayPal](https://paypal.me/junedchhipa)
+- [Rails em 8 minutos: Criando gráficos incríveis com ApexCharts](https://onebitcode.com/graficos-incriveis-no-ruby-on-rails/)
+- [【Rails】 5分でApexChart.jsを導入する方法](https://qiita.com/syukan3/items/aa741df278f628087a3c)
 
 
 [ApexCharts.JS]: https://github.com/apexcharts/apexcharts.js
 
 
+[v0.1.9]: https://github.com/styd/apexcharts.rb/blob/v0.1.9/README.md
 [v0.1.8]: https://github.com/styd/apexcharts.rb/blob/v0.1.8/README.md
 [v0.1.7]: https://github.com/styd/apexcharts.rb/blob/v0.1.7/README.md
 [v0.1.6]: https://github.com/styd/apexcharts.rb/blob/v0.1.6/README.md

data/lib/apex_charts/charts.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ApexCharts::Charts
+  %w[
+    base cartesian line area bar column scatter
+    candlestick heatmap bubble radar polar pie donut
+  ].each do |type|
+    autoload :"#{type.capitalize}Chart", "apex_charts/charts/#{type}_chart.rb"
+  end
+
+  autoload :RangeBarChart, 'apex_charts/charts/range_bar_chart.rb'
+  autoload :RadialBarChart, 'apex_charts/charts/radial_bar_chart.rb'
+
+  autoload :MixedCharts, 'apex_charts/charts/mixed_charts.rb'
+  autoload :SyncingCharts, 'apex_charts/charts/syncing_charts.rb'
+end

data/lib/{apexcharts/charts/area.rb → apex_charts/charts/area_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class AreaChart < CartesianChart
     def chart_type
       'area'

data/lib/{apexcharts/charts/bar.rb → apex_charts/charts/bar_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class BarChart < CartesianChart
     def chart_type
       'bar'

data/lib/{apexcharts/charts/base.rb → apex_charts/charts/base_chart.rb}

@@ -1,6 +1,8 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Charts
   class BaseChart
-    include Utils::Hash
+    include ApexCharts::Utils::Hash
 
     attr_reader :options, :series, :sample
 
@@ -10,7 +12,7 @@ module ApexCharts
     end
 
     def render
-      Renderer.render_default(options)
+      ApexCharts::Renderer.render_default(options)
     end
 
     def chart_type; end
@@ -25,7 +27,7 @@ module ApexCharts
 
     def build_options(options)
       deep_merge(
-        OptionsBuilder.new(sample, options).build_options,
+        ApexCharts::OptionsBuilder.new(sample, options).build_options,
         camelize_keys(
           {**@series, chart: {type: chart_type}}.compact
         )

data/lib/{apexcharts/charts/bubble.rb → apex_charts/charts/bubble_chart.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class BubbleChart < BaseChart
     def chart_type
       'bubble'
     end
 
     def series_type
-      BubbleSeries
+      ApexCharts::Series::BubbleSeries
     end
   end
 end

data/lib/{apexcharts/charts/candlestick.rb → apex_charts/charts/candlestick_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class CandlestickChart < CartesianChart
     def chart_type
       'candlestick'

data/lib/{apexcharts/charts/cartesian.rb → apex_charts/charts/cartesian_chart.rb}

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'features/annotations'
+require_relative 'features/mixable'
 require_relative '../utils/hash'
 
-module ApexCharts
+module ApexCharts::Charts
   class CartesianChart < BaseChart
-    include Annotations
-    include Mixable
-    include Utils::Hash
+    include Features::Annotations
+    include Features::Mixable
+    include ApexCharts::Utils::Hash
 
     def initialize(outer_self, data, options={}, &block)
       @outer_self = outer_self
@@ -27,7 +29,7 @@ module ApexCharts
     end
 
     def series_type
-      CartesianSeries
+      ApexCharts::Series::CartesianSeries
     end
 
     def more_options
@@ -74,7 +76,7 @@ module ApexCharts
     end
 
     def handle_time(input)
-      Utils::DateTime.convert(input)
+      ApexCharts::Utils::DateTime.convert(input)
     end
   end
 end

data/lib/{apexcharts/charts/column.rb → apex_charts/charts/column_chart.rb}

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Charts
   class ColumnChart < BarChart
     def more_options
       {plot_options: {bar: {horizontal: false}}}

data/lib/{apexcharts/charts/donut.rb → apex_charts/charts/donut_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class DonutChart < PolarChart
     def chart_type
       'donut'

data/lib/{apexcharts → apex_charts}/charts/features/annotations.rb

@@ -1,4 +1,6 @@
-module ApexCharts
+# frozen_string_literal: true
+
+module ApexCharts::Charts::Features
   module Annotations
     def annotation(axis, value:, text:, color: nil, **options)
       @annotations ||= {}
@@ -35,7 +37,7 @@ module ApexCharts
       axis = axis.to_s.delete_suffix('axis').to_sym
       case value
       when Range
-        value = Utils::DateTime.convert_range(value)
+        value = ApexCharts::Utils::DateTime.convert_range(value)
 
         case axis
         when :x
@@ -47,10 +49,10 @@ module ApexCharts
         end
       else
         if axis == :points
-          value.map! {|x| Utils::DateTime.convert(x) }
+          value.map! {|x| ApexCharts::Utils::DateTime.convert(x) }
           {x: value.first, y: value.last}
         else
-          value = Utils::DateTime.convert(value)
+          value = ApexCharts::Utils::DateTime.convert(value)
           {axis => value}
         end
       end
@@ -69,6 +71,6 @@ module ApexCharts
       }
     end
 
-    include Utils::Hash
+    include ApexCharts::Utils::Hash
   end
 end

data/lib/{apexcharts → apex_charts}/charts/features/mixable.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts::Features
   module Mixable
     def mixed_series
       series[:series].each {|d| d.merge!(type: chart_type) }

data/lib/{apexcharts/charts/heatmap.rb → apex_charts/charts/heatmap_chart.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class HeatmapChart < BaseChart
     def chart_type
       'heatmap'
     end
 
     def series_type
-      CartesianSeries
+      ApexCharts::Series::CartesianSeries
     end
   end
 end

data/lib/{apexcharts/charts/line.rb → apex_charts/charts/line_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class LineChart < CartesianChart
     def chart_type
       'line'

data/lib/{apexcharts/charts/mixed.rb → apex_charts/charts/mixed_charts.rb}

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-module ApexCharts
+require_relative 'features/annotations'
+
+module ApexCharts::Charts
   class MixedCharts < BaseChart
-    include Annotations
-    include Utils::Hash
+    include Features::Annotations
+    include ApexCharts::Utils::Hash
 
     def initialize(outer_self, options={}, &block)
       @outer_self = outer_self
@@ -93,7 +95,7 @@ module ApexCharts
     end
 
     def handle_time(input)
-      Utils::DateTime.convert(input)
+      ApexCharts::Utils::DateTime.convert(input)
     end
   end
 end

data/lib/{apexcharts/charts/pie.rb → apex_charts/charts/pie_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class PieChart < PolarChart
     def chart_type
       'pie'

data/lib/apex_charts/charts/polar_chart.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ApexCharts::Charts
+  class PolarChart < BaseChart
+    def series_type
+      ApexCharts::Series::PolarSeries
+    end
+  end
+end

data/lib/{apexcharts/charts/radar.rb → apex_charts/charts/radar_chart.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class RadarChart < BaseChart
     def chart_type
       'radar'
     end
 
     def series_type
-      CartesianSeries
+      ApexCharts::Series::CartesianSeries
     end
   end
 end

data/lib/{apexcharts/charts/radial_bar.rb → apex_charts/charts/radial_bar_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class RadialBarChart < PolarChart
     def chart_type
       'radialBar'

data/lib/{apexcharts/charts/range_bar.rb → apex_charts/charts/range_bar_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class RangeBarChart < BarChart
     def chart_type
       'rangeBar'

data/lib/{apexcharts/charts/scatter.rb → apex_charts/charts/scatter_chart.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class ScatterChart < CartesianChart
     def chart_type
       'scatter'

data/lib/{apexcharts/charts/syncing.rb → apex_charts/charts/syncing_charts.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ApexCharts
+module ApexCharts::Charts
   class SyncingCharts
     def initialize(outer_self, options={}, &block)
       @outer_self = outer_self

data/lib/{apexcharts → apex_charts}/colors.rb

@@ -17,7 +17,8 @@ module ApexCharts
     def clean(colors)
       colors = colors.respond_to?(:to_set) ? colors.to_a.flatten : Array(colors)
       colors.map do |color|
-        raise "unrecognized color #{color}" unless color.tap(&:upcase!)[/^#[0-9A-F]{6}/]
+        color = color.upcase
+        raise "unrecognized color #{color}" unless color[/^#[0-9A-F]{6}/]
 
         color
       end