iruby-chartkick 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b39050caa3f7e3d2a9b1859b0a3ddd21c851eb9d0afc39e59e03364b2b61417
-  data.tar.gz: b3fac3e8b089bc3dcf2766a84a7544a40b2f6bd569f652445db0bf291b979053
+  metadata.gz: a78992ca43fcea6c314ac7077715a188c746c70348421e1f250fe29c94d189cd
+  data.tar.gz: cb831487f58bd14401306e246c26bb64fec4747c00f90caca9be0f9a76c470da
 SHA512:
-  metadata.gz: 4bb0ceffc6ce1d7a0febdc9c82ed4a75cb1b26c610f9e0d53654a232b6e26048a594a5a231e67e3c4dc8fc300311a0066d7372c81b354f1b6799042467f41892
-  data.tar.gz: 391b51c7cfc00469515ab17b3dfbff7ac15b79580a47b249d396e5a37253a04017e0f5129eab568efa5f9e9c69ffd1b4f930b64b5775e98888d5a8490e64560f
+  metadata.gz: 3b26b52e8bb5cef58f5f08530836a1bce7a087d0d0613997c584c9637ff843d169697824085efe94653a88e679490ff5bd0e74ab4968e22992a6817d43d3a4e7
+  data.tar.gz: 5da7b82186832677bd1a1bbf6f9fa50a92855832998c128fb4c36dbbd8984a961586c427d0297f7ea3cfb45e979183e8bf370b25e901964f0f8b8de3ca1ec285

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+### HEAD (not released yet)
+
+### v0.2.0
+
+* Support for area charts
+* Support for scatter plots
+* Support for timeline
+* Support for geo charts
+* Support for column charts
+* Support keyword arguments for charts like heigth, width etc.
+
+### v0.1.0
+
+* Initial version
+* Support for line chart, bar chart and pie chart

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iruby-chartkick (0.1.0)
+    iruby-chartkick (0.2.0)
       chartkick
       iruby
 

data/lib/iruby/chartkick.rb

@@ -5,20 +5,45 @@ require "iruby/chartkick/version"
 require "iruby/chartkick/base_chart"
 require "iruby/chartkick/line_chart"
 require "iruby/chartkick/bar_chart"
+require "iruby/chartkick/column_chart"
 require "iruby/chartkick/pie_chart"
+require "iruby/chartkick/area_chart"
+require "iruby/chartkick/scatter_chart"
+require "iruby/chartkick/geo_chart"
+require "iruby/chartkick/timeline"
 
 module IRuby
   module Chartkick
-    def line_chart(data)
-      LineChart.new(data).plot
+    def line_chart(data, **args)
+      LineChart.new(data).plot(**args)
     end
 
-    def bar_chart(data)
-      BarChart.new(data).plot
+    def bar_chart(data, **args)
+      BarChart.new(data).plot(**args)
     end
 
-    def pie_chart(data)
-      PieChart.new(data).plot
+    def column_chart(data, **args)
+      ColumnChart.new(data).plot(**args)
+    end
+
+    def pie_chart(data, **args)
+      PieChart.new(data).plot(**args)
+    end
+
+    def area_chart(data, **args)
+      AreaChart.new(data).plot(**args)
+    end
+
+    def scatter_chart(data, **args)
+      ScatterChart.new(data).plot(**args)
+    end
+
+    def geo_chart(data, **args)
+      GeoChart.new(data).plot(**args)
+    end
+
+    def timeline(data, **args)
+      Timeline.new(data).plot(**args)
     end
   end
 end

data/lib/iruby/chartkick/area_chart.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module IRuby
+  module Chartkick
+    class AreaChart < IRuby::Chartkick::BaseChart
+      def plot(*args)
+        ::IRuby.html(js_prefix + area_chart(@data, **ArgumentModifier[args, self]))
+      end
+    end
+  end
+end

data/lib/iruby/chartkick/bar_chart.rb

@@ -2,8 +2,8 @@
 module IRuby
   module Chartkick
     class BarChart < IRuby::Chartkick::BaseChart
-      def plot
-        ::IRuby.html(js_prefix + bar_chart(@data, id: randomized_dom_id))
+      def plot(*args)
+        ::IRuby.html(js_prefix + bar_chart(@data, **ArgumentModifier[args, self]))
       end
     end
   end

data/lib/iruby/chartkick/base_chart.rb

@@ -4,19 +4,29 @@ module IRuby
     class BaseChart
       include ::Chartkick::Helper
 
+      ArgumentModifier = ->(args, callee) do
+        modified = args.inject({}) do |sum, item|
+          item.each do |k, v|
+            sum[k] = v
+          end
+          sum
+        end
+        modified[:id] = callee.randomized_dom_id
+        modified
+      end
+
       def initialize(data)
         @data = data
       end
 
       def js_prefix
-        <<-JS
-          <script type="text/javascript">
-            #{adapter_javascript}
-          </script>
-          <script type="text/javascript">
-            #{chartkick_javascript}
-          </script>
-        JS
+        javascripts.map do |js|
+          <<-JS
+            <script type="text/javascript">
+              #{js}
+            </script>
+          JS
+        end.join("\n")
       end
 
       def javascripts
@@ -27,7 +37,7 @@ module IRuby
       end
 
       def adapter_javascript
-        adapter_js_path = File.join(File.dirname(__FILE__), "..", "..", "..", "vendor", "assets", "javascripts", "adapter.js")
+        adapter_js_path = File.join(File.dirname(__FILE__), "..", "..", "..", "vendor", "assets", "javascripts", "google_charts_loader.js")
         File.read(adapter_js_path)
       end
 

data/lib/iruby/chartkick/column_chart.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module IRuby
+  module Chartkick
+    class ColumnChart < IRuby::Chartkick::BaseChart
+      def plot(*args)
+        ::IRuby.html(js_prefix + column_chart(@data, **ArgumentModifier[args, self]))
+      end
+    end
+  end
+end

data/lib/iruby/chartkick/geo_chart.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module IRuby
+  module Chartkick
+    class GeoChart < IRuby::Chartkick::BaseChart
+      def plot(*args)
+        ::IRuby.html(js_prefix + geo_chart(@data, **ArgumentModifier[args, self]))
+      end
+    end
+  end
+end

data/lib/iruby/chartkick/line_chart.rb

@@ -2,8 +2,8 @@
 module IRuby
   module Chartkick
     class LineChart < IRuby::Chartkick::BaseChart
-      def plot
-        ::IRuby.html(js_prefix + line_chart(@data, id: randomized_dom_id))
+      def plot(*args)
+        ::IRuby.html(js_prefix + line_chart(@data, **ArgumentModifier[args, self]))
       end
     end
   end

data/lib/iruby/chartkick/pie_chart.rb

@@ -2,8 +2,8 @@
 module IRuby
   module Chartkick
     class PieChart < IRuby::Chartkick::BaseChart
-      def plot
-        ::IRuby.html(js_prefix + pie_chart(@data, id: randomized_dom_id))
+      def plot(*args)
+        ::IRuby.html(js_prefix + pie_chart(@data, **ArgumentModifier[args, self]))
       end
     end
   end

data/lib/iruby/chartkick/scatter_chart.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module IRuby
+  module Chartkick
+    class ScatterChart < IRuby::Chartkick::BaseChart
+      def plot(*args)
+        ::IRuby.html(js_prefix + scatter_chart(@data, **ArgumentModifier[args, self]))
+      end
+    end
+  end
+end

data/lib/iruby/chartkick/timeline.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module IRuby
+  module Chartkick
+    class Timeline < IRuby::Chartkick::BaseChart
+      def plot(*args)
+        ::IRuby.html(js_prefix + timeline(@data, **ArgumentModifier[args, self]))
+      end
+    end
+  end
+end

data/lib/iruby/chartkick/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module IRuby
   module Chartkick
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iruby-chartkick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - 'Robin Neumann
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iruby
@@ -93,6 +93,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -102,13 +103,18 @@ files:
 - bin/setup
 - iruby-chartkick.gemspec
 - lib/iruby/chartkick.rb
+- lib/iruby/chartkick/area_chart.rb
 - lib/iruby/chartkick/bar_chart.rb
 - lib/iruby/chartkick/base_chart.rb
+- lib/iruby/chartkick/column_chart.rb
+- lib/iruby/chartkick/geo_chart.rb
 - lib/iruby/chartkick/line_chart.rb
 - lib/iruby/chartkick/pie_chart.rb
+- lib/iruby/chartkick/scatter_chart.rb
+- lib/iruby/chartkick/timeline.rb
 - lib/iruby/chartkick/version.rb
-- vendor/assets/javascripts/adapter.js
 - vendor/assets/javascripts/chartkick.js
+- vendor/assets/javascripts/google_charts_loader.js
 homepage: https://github.com/Absolventa/iruby-chartkick
 licenses: []
 metadata: {}