chart_js 1.0.1pre → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7f13b0859e5ac864e7cccebeced78fd8d346760f
-  data.tar.gz: 81b71502bcd6a500b2059f62adac77c4e1497483
+SHA256:
+  metadata.gz: e954b9160710621bd2ab2e31e6b331bd3a91d5b51034aa34067d64cc1fd505f7
+  data.tar.gz: 62d724692b5cc246de04e93077cc1d913a0897d3aa3a8409c2204d28066b059b
 SHA512:
-  metadata.gz: 37a8343901fee4db6a17bb7f7bb9f8835446a386a99802e37c47b096c709f9d6648455008185012df14c1cf124cc71123dde7ba9a80b36bd80cb67c65a469b67
-  data.tar.gz: b28bd3c2f1f3f0ac4e47828a1e1f65fa8398bdcac9c14ea1f62ace9b99c5a9ee12346c02e15c90aad5282f074ba7bb201a27ea8c1ac9e49097d547e2fb3230f9
+  metadata.gz: 63eeb922760959d2211eaefbb3afb6734d2df3796fd92cb51d92ae341f1ad899886ea950f23c03ed55c19904dbaafa8bbd29b4c6d4f1f133f13a779070dd5745
+  data.tar.gz: a659fa4048fe4169464055f8d242b6045812035fce1631bf2fffd4becc9c607c1cf5cbfef5c6f81b3e8e47773cec8e77b23f9c96edd5ece78680476dc04b0927

data/README.md

@@ -4,9 +4,7 @@
 
 ## Installation
 
-This gem is still in development. Install with `--pre`.
-
-    $ gem install chart_js --pre
+    $ gem install chart_js
 
 ## Usage
 

data/chart_js.gemspec

@@ -17,11 +17,12 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  # spec.bindir        = "exe"
+  # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pry", "~> 0.12"
 end

data/examples/bar_chart_2.rb

@@ -0,0 +1,14 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+
+ChartJS.bar do
+  file "example.html"
+  data do
+    labels ["a", "b", "c"]
+    dataset "Example" do
+      color :random
+      data [1, 2, 3]
+    end 
+  end
+end

data/examples/bar_chart_event_stream.rb

@@ -0,0 +1,35 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+require "willow_run"
+require "sinatra"
+
+set :bind, '0.0.0.0'
+set :port, 3141
+
+get "/update_source", provides: 'text/event-stream' do 
+  stream(:keep_open) do |out|
+    loop do
+      out << ChartJS.data do
+        { label: Time.now.strftime("%r"), value: WillowRun::Status.new.getinfo.agrctlrssi }
+      end
+      sleep 2
+    end
+  end
+end
+
+get "/" do
+  chart = ChartJS.bar do
+    data do
+      labels Array.new
+      dataset WillowRun::Status.new.getinfo.ssid do
+        color :random
+        data Array.new
+      end
+    end 
+    event_stream "/update_source" do
+      push
+    end
+  end
+  chart.to_html
+end

data/examples/doughnut_chart.rb

@@ -0,0 +1,33 @@
+## path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+ChartJS.doughnut do
+	file "example.html"
+	data do
+		dataset "a" do
+			color :random
+			data 1
+		end
+		dataset "b" do
+			color :random
+			data 2
+		end
+		dataset "c" do
+			color :random
+			data 3
+		end
+	end
+end
+#ChartJS.doughnut do
+#	file "example.html"
+#	data do
+#		dataset "Good" do
+#			color "#5cb85c"
+#			data 20
+#		end 
+#		dataset "Bad" do
+#			color "#d9534f"
+#			data 4
+#		end 
+#	end
+#end

data/examples/line_chart_2.rb

@@ -0,0 +1,14 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+
+ChartJS.line do
+  file "example.html"
+  data do
+    labels ["a", "b", "c"]
+    dataset "Example" do
+      color :random
+      data [1, 2, 3]
+    end 
+  end
+end

data/examples/line_chart_event_stream.rb

@@ -0,0 +1,46 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+require "willow_run"
+require "sinatra"
+
+set :bind, '0.0.0.0'
+set :port, 3141
+
+get "/update_source", provides: 'text/event-stream' do 
+  stream(:keep_open) do |out|
+    loop do
+      out << ChartJS.data do
+        { label: Time.now.strftime("%r"), 
+          value: WillowRun::Status.new.getinfo.agrctlrssi 
+          color: "##{SecureRandom.hex(6)}"
+        }
+      end
+      sleep 5
+    end
+  end
+end
+
+get "/" do
+  chart = ChartJS.build do
+    type "line"
+    data do
+      labels Array.new
+      dataset WillowRun::Status.new.getinfo.ssid do
+        color Array.new
+        data Array.new
+        point do
+          radius 0
+          hit_radius 3
+        end
+        line do
+          tension :false
+        end
+      end
+    end 
+    event_stream "/update_source" do
+      push
+    end
+  end
+  chart.to_html
+end

data/examples/pie_chart.rb

@@ -0,0 +1,21 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+
+ChartJS.pie do
+  file "example.html"
+  data do
+    dataset "a" do
+      color :random
+      data 1
+    end
+    dataset "b" do
+      color :random
+      data 2
+    end
+    dataset "c" do
+      color :random
+      data 3
+    end
+  end
+end

data/examples/radar_chart_2.rb

@@ -0,0 +1,14 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+
+ChartJS.radar do
+  file "example.html"
+  data do
+    labels ["a", "b", "c"]
+    dataset "Example" do
+      color :random
+      data [1, 2, 3]
+    end 
+  end
+end

data/examples/wifi_signal_chart.rb

@@ -0,0 +1,39 @@
+# path setting magic for example directory only
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require "chart_js"
+require "willow_run"
+require "sinatra"
+
+get "/update_source", provides: 'text/event-stream' do 
+  stream(:keep_open) do |out|
+    loop do
+      out << ChartJS.data do
+        { label: Time.now.strftime("%r"), data: WillowRun::Status.new.getinfo.agrctlrssi }
+      end
+      sleep 2
+    end
+  end
+end
+
+get "/" do
+  chart = ChartJS.line do
+    data do
+      labels Array.new
+      dataset WillowRun::Status.new.getinfo.ssid do
+        color :random
+        data Array.new
+        point do
+          radius 0
+          hit_radius 2
+        end
+        line do
+          tension :false
+        end
+      end
+    end 
+    event_stream "/update_source" do
+      push
+    end
+  end
+  chart.to_html
+end

data/lib/chart_js.rb

@@ -1,21 +1,88 @@
+# coding: utf-8
+# This file is part of ChartJS
+# See https://github.com/picatz/chart_js for more information.
+# Copyright (C) 2017 Kent 'picat' Gruber
+# This program is published under MIT license.
+
 require "chart_js/version"
 require "chart_js/chart/chart"
-require "chart_js/chart/charts"
 
+# Chart JS is a simple yet flexible JavaScript charting library. This
+# gem is a Ruby Domain Specific Language which allows you to easily
+# build charts without touching a single line of JavaScript or HTML.
+# @author Kent 'picat' Gruber
 module ChartJS
+  # NOTE: I did not write every word of this inline documentation and credit
+  # much of it to to people over at http://www.chartjs.org/
+
+  # Build a chart, do some stuff!
   def self.build(&block)
     Chart.new(&block)
   end
-  
+
+  # A line chart is a way of plotting data points on a line. Often,
+  # it is used to show trend data, or the comparison of two data sets.
   def self.line(&block)
-    Charts.line(&block)
+    chart = Chart.new
+    chart.type('line')
+    chart.build(&block)
   end
 
+  # A radar chart is a way of showing multiple data points and
+  # the variation between them. They are often useful for
+  # comparing the points of two or more different data sets.
   def self.radar(&block)
-    Charts.radar(&block)
+    chart = Chart.new
+    chart.type('radar')
+    chart.build(&block)
+  end
+
+  # Pie charts are probably one of the most commonly used charts.
+  # They are divided into segments, the arc of each segment
+  # shows the proportional value of each piece of data. They are
+  # excellent at showing the relational proportions between data.
+  def self.pie(&block)
+    chart = Chart.new
+    chart.type('pie')
+    chart.build(&block)
   end
-  
-  def self.bar(&block)
-    Charts.bar(&block)
+
+  # Doughnut charts are probably one of the most commonly used charts.
+  # They are divided into segments, the arc of each segment
+  # shows the proportional value of each piece of data. They are
+  # excellent at showing the relational proportions between data but
+  # with a big'O hole in the middle.
+  def self.doughnut(&block)
+    chart = Chart.new
+    chart.type('doughnut')
+    chart.build(&block)
+  end
+
+  # A bar chart provides a way of showing data values represented
+  # as vertical bars. It is sometimes used to show trend data,
+  # and the comparison of multiple data sets side by side.
+  def self.bar(type = :vertical, &block)
+    chart = Chart.new
+    case type
+    when :vertical
+      chart.type('bar')
+    when :horizontal
+      chart.type('horizontalBar')
+    end
+    chart.build(&block)
+  end
+
+  # Need to send some server-side event data? You found your method. Optionally, it'll
+  # even call the "to_json" on the object your sending ( if it accepts
+  # that method call ); otherwise you should really only send
+  # JSON that is already formatted. Otherwise it'll just send the plaintext.
+  #
+  # Live life the way you want to.
+  def self.data(json: false, &block)
+    if json
+      "data: #{block.call} \r\n\n"
+    else
+      "data: #{block.call.to_json} \r\n\n"
+    end
   end
 end

data/lib/chart_js/chart/bar_chart/bar_chart.rb

@@ -44,7 +44,7 @@ module ChartJS
       @opts = Opts.new.build(&block)
     end
 
-    def cdn(version: "2.6.0", min: true)
+    def cdn(version: "2.9.3", min: true)
       if min
         "<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/#{version}/Chart.min.js\"></script>"
       else
@@ -67,13 +67,13 @@ module ChartJS
             var ctx = document.getElementById(\"#{id}\").getContext(\"2d\");
             new Chart(ctx, config);
           };
-      </script>" 
+      </script>"
     end
 
     def to_html(width: "60%", heigth: width, head: true, cdn: head, version: "2.6.0", body: true, id: random_id, script: true)
       str = []
       if cdn
-        str << "<head>#{cdn(version: version)}</head>" 
+        str << "<head>#{cdn(version: version)}</head>"
       end
       str << "<body>" if body
       str << "<div id=\"canvas-holder\" style=\"width:#{width} heigth:#{heigth}\">"

data/lib/chart_js/chart/chart.rb

@@ -3,16 +3,19 @@ require "securerandom"
 require_relative "data.rb"
 require_relative "opts.rb"
 require_relative "file.rb"
+require_relative "event_stream.rb"
 
 module ChartJS
 
   class Chart
 
     def initialize(&block)
-      @type = nil
-      @data = nil
-      @opts = nil
-      @file = false
+      @type      = nil
+      @data      = nil
+      @opts      = nil
+      @file      = false
+      @stream    = false
+      @chart_obj = 'chart' + SecureRandom.uuid.gsub("-","")
       build(&block) if block_given?
     end
 
@@ -26,7 +29,21 @@ module ChartJS
     end
 
     def to_h
-      { type: @type, data: @data.to_h, options: @opts.to_h }
+      case type
+      when 'pie'
+        { type: @type, data: @data.to_h(:pie), options: @opts.to_h }
+      when 'doughnut'
+        { type: @type, data: @data.to_h(:pie), options: @opts.to_h }
+      when 'line'
+        data = @data.to_h(false)
+        data['datasets'].each do |set|
+          set['fill'] = false unless set['fill']
+        end
+        #data['fill'] = false unless data['fill']
+        { type: @type, data: data, options: @opts.to_h }
+      else
+        { type: @type, data: @data.to_h(false), options: @opts.to_h }
+      end
     end
 
     def to_json(type = :pretty)
@@ -49,7 +66,7 @@ module ChartJS
       @opts = Opts.new.build(&block)
     end
 
-    def cdn(version: "2.6.0", min: true)
+    def cdn(version: "2.9.3", min: true)
       if min
         "<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/#{version}/Chart.min.js\"></script>"
       else
@@ -61,31 +78,42 @@ module ChartJS
       "##{SecureRandom.hex(3)}"
     end
 
-    def random_id
-      SecureRandom.uuid
+    def chart_obj(value = nil)
+      return @chart_obj if value.nil?
+      @chart_obj = value
+    end
+
+    def random_id(force: false)
+      return @id unless @id.nil? or force
+      @id = SecureRandom.uuid
+    end
+
+
+    def event_stream(path, chart: chart_obj, &block)
+      @stream = EventStream.new(path, chart)
+      @stream.build(&block) if block_given?
     end
 
-    def script(config: to_json, id: random_id, chart_name: id)
+    def script(config: to_json, id: random_id, chart: chart_obj)
       "<script>
           var config = #{config}
-          window.onload = function() {
-            var ctx = document.getElementById(\"#{id}\").getContext(\"2d\");
-            var #{chart_name} = new Chart(ctx, config);
-          };
-      </script>" 
+          var ctx = document.getElementById(\"#{id}\").getContext(\"2d\");
+          var #{chart} = new Chart(ctx, config);
+      </script>"
     end
 
-    def to_html(width: "60%", heigth: width, head: true, cdn: head, version: "2.6.0", body: true, id: random_id, script: true, chart_name: id)
+    def to_html(width: "60%", heigth: width, head: true, cdn: head, version: "2.6.0", body: true, id: random_id, script: true, chart: chart_obj, stream: true)
       str = []
       if cdn
-        str << "<head>#{cdn(version: version)}</head>" 
+        str << "<head>#{cdn(version: version)}</head>"
       end
       str << "<body>" if body
       str << "<div id=\"canvas-holder\" style=\"width:#{width} heigth:#{heigth}\">"
       str << "<canvas id=\"#{id}\"/>"
       str << "</div>"
       str << "</body>" if body
-      str << script(id: id, chart_name: chart_name) if script
+      str << script(id: id, chart: chart) if script
+      str << @stream.to_html if @stream && stream
       str.join("\n")
     end
 

data/lib/chart_js/chart/data.rb

@@ -1,14 +1,17 @@
 require_relative "dataset.rb"
+require_relative "helpers/dates.rb"
 
 module ChartJS
 
   class Data
 
+    include Helpers::Dates
+
     def initialize
       @container = Hash.new
       @datasets  = Hash.new
     end
-    
+
     def build(&block)
       instance_eval(&block)
       self
@@ -23,13 +26,34 @@ module ChartJS
       @datasets[label] = Dataset.new(label, &block)
     end
 
-    def to_h
-      cont = @container.dup
-      cont['datasets'] = []
-      @datasets.each do |_, data|
-        cont['datasets'] << data.to_h
+    def to_h(type)
+      case type
+      when :pie
+        @container  
+        @container['labels'] = Array.new
+        @container['datasets'] = Array.new
+        @container['datasets'] << Hash.new
+        @datasets.each do |label, data|
+          @container['labels'] << label
+          data.to_h.each do |key, value|
+            if @container['datasets'][0][key].is_a? Array
+              @container['datasets'][0][key] << value
+            else
+              @container['datasets'][0][key] = Array.new
+              @container['datasets'][0][key] << value
+            end
+          end
+        end
+        @container  
+      else
+        cont = @container.dup
+        cont['datasets'] = []
+        @datasets.each do |_, data|
+          cont['datasets'] << data.to_h
+        end
+        cont
+
       end
-      cont
     end
 
   end

data/lib/chart_js/chart/dataset.rb

@@ -9,7 +9,7 @@ module ChartJS
 
     def initialize(label, &block)
       @container = Hash.new
-      fill(false)
+      #fill(false)
       label(label)
       build(&block)
     end

data/lib/chart_js/chart/dataset/line.rb

@@ -10,7 +10,32 @@ module ChartJS
       instance_eval(&block)
       @container 
     end
+
+    def stepped(value = true)
+      @container['steppedLine'] = case value
+      when true # Step-before Interpolation -> eq "before"
+        true
+      when false # No Step Interpolation
+        false
+      when :before || "before"
+        "before"
+      when :after || "after"
+        "after"
+      else
+        raise "Oops."
+      end
+    end
     
+    def tension(value = 1)
+      if value.is_a? Integer
+        @container['lineTension'] = value
+      elsif value == "flase" ||  value == :false
+        @container['lineTension'] = 0
+      else
+        raise "Oops"
+      end
+    end
+
   end
 
 end

data/lib/chart_js/chart/event_stream.rb

@@ -0,0 +1,68 @@
+require_relative 'event_streams/event_streams'
+
+module ChartJS
+
+	class EventStream 
+
+		def to_html(source: @path, chart: @chart)
+			str = ""
+      str << "<script>\n"
+      str << "var source = new EventSource('#{path}');\n"
+      str << "var json;\n"
+      str << @counter if @counter
+      str << @push.to_s if @push
+		  str << @pop     if @pop
+      str << @raw     if @raw
+      str << "</script>\n"
+		end
+
+    def push(dataset: 0, chart: @chart, &block)
+      @push = EventStreams.push(dataset: dataset, chart: @chart, &block)
+    end
+   
+    #def count(dataset: 0, chart: @chart, &block)
+
+
+    #end
+
+    def raw(chart: @chart, str: nil, file: nil, without_source: true, update: true)
+      @raw = ""
+      @raw = @raw + "source.onmessage = function(e) { json = JSON.parse(e.data);"
+      return @raw if str.nil? and file.nil?
+      @raw = @raw + str unless str.nil?
+      @raw = @raw + File.readlines(file) unless file.nil?
+      @rar = @raw + "#{chart}.update();" if update
+      @raw = @raw + "};"
+    end
+    
+    def counter(dataset:, chart: @chart, counter: "counter")
+      str = ""
+      str << "var #{counter} = 0;\n"
+			str << "source.onmessage = function(e) { #{counter} += 1 };\n"
+    end
+
+    def chart(chart_obj = nil)
+      return @chart if chart_obj.nil?
+      @chart = chart_obj
+    end
+
+		def initialize(path, chart)
+      @push = nil
+      chart(chart)
+			path(path)
+      build(block) if block_given?
+		end
+  
+    def build(&block)
+			instance_eval(&block)
+      self
+    end
+
+		def path(value = nil)
+			return @path if value.nil?
+			@path = value
+		end
+
+	end
+
+end

data/lib/chart_js/chart/event_streams/event_streams.rb

@@ -0,0 +1,11 @@
+require_relative 'push'
+
+module ChartJS
+
+  module EventStreams
+    def self.push(chart:, dataset:, &block)
+      Push.new(chart: chart, dataset: dataset, &block)
+    end
+  end
+
+end

data/lib/chart_js/chart/event_streams/push.rb

@@ -0,0 +1,80 @@
+module ChartJS
+
+  module EventStreams
+    class Push
+      def initialize(chart:, dataset:, &block)
+        @str = ""
+        @chart = chart
+        dataset(dataset)
+        @str << "source.onmessage = function(e) { \n"
+        @str << "json = JSON.parse(e.data);\n"
+        base(json: 'data', dataset: dataset, chart: chart)
+        @str << "if(json.label){ #{chart}.data.labels.push(json.label); }\n"
+        @str << "#{chart}.update();\n"
+        build(&block) if block_given?
+        @str << "\n};"
+      end
+
+      def build(&block)
+        instance_eval(&block)
+        self
+      end
+
+      def dataset(value = nil)
+        return @dataset || 0 if value.nil?
+        @dataset = value 
+      end
+
+      def point(type, chart: @chart, dataset: @dataset)
+        case type
+        when :hit_radius
+          base(json: 'pointHitRadius',        dataset: dataset, chart: chart)
+        when :style
+          base(json: 'point_style',           dataset: dataset, chart: chart)
+        when :border
+          color :border,        chart: chart, dataset: dataset
+          base(json: 'pointBorder',           dataset: dataset, chart: chart)
+          base(json: 'pointBorderWidth',      dataset: dataset, chart: chart)
+        when :radius
+          base(json: 'pointRadius',           dataset: dataset, chart: chart)
+        when :hover_radius
+          base(json: 'pointHoverRadius',      dataset: dataset, chart: chart)
+        else
+          point :hit_radius,    chart: chart, dataset: dataset
+          point :style,         chart: chart, dataset: dataset
+          point :border,        chart: chart, dataset: dataset
+          point :hover_radius,  chart: chart, dataset: dataset
+        end
+      end
+
+      def color(type, chart: @chart, dataset: @dataset)
+        case type
+        when :background
+          base(json: 'backgroundColor',           dataset: dataset, chart: chart)
+        when :border
+          base(json: 'borderColor',               dataset: dataset, chart: chart)
+        when :point
+          base(json: 'pointBackgroundColor',      dataset: dataset, chart: chart)
+          base(json: 'pointBorderColor',          dataset: dataset, chart: chart)
+          base(json: 'pointHoverBackgroundColor', dataset: dataset, chart: chart)
+          base(json: 'pointHoverBorderColor',     dataset: dataset, chart: chart)
+          base(json: 'pointHoverBorderColor',     dataset: dataset, chart: chart)
+          base(json: 'pointHoverBorderColor',     dataset: dataset, chart: chart)
+        else
+          color :background,  chart: chart, dataset: dataset
+          color :border,      chart: chart, dataset: dataset
+          color :point,       chart: chart, dataset: dataset
+        end
+      end
+
+      def base(json:, chart:, dataset:, raw: false)
+        @str << "if(json.#{json}){ #{chart}.data.datasets[#{dataset}].#{json}.push(json.#{json}); }\n"
+      end
+
+      def to_s
+        @str
+      end
+    end
+  end
+
+end

data/lib/chart_js/chart/helpers/dates.rb

@@ -0,0 +1,54 @@
+require 'date'
+
+module ChartJS
+
+  module Helpers
+
+    module Dates
+      WORK_DAYS = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']
+      MONDAY_TO_SUNDAY = WORK_DAYS + ['Saturday', 'Sunday']
+
+      def days_of_the_week(abrv: false)
+        days = if abrv
+                 Date::DAYNAMES
+               else
+                 Date::ABBR_DAYNAMES
+               end
+        return days unless block_given?
+        days.each do |day|
+          yield day
+        end
+      end
+
+      def work_days
+        return WORK_DAYS unless block_given?
+        WORK_DAYS.each do |day|
+          yield day
+        end 
+      end
+
+      alias monday_to_friday work_days
+
+      def monday_to_sunday
+        return MONDAY_TO_SUNDAY unless block_given?
+        MONDAY_TO_SUNDAY.each do |day|
+          yield day
+        end
+      end
+
+      def months_of_the_year(abrv: false)
+        months = if abrv
+                   Date::MONTHNAMES.reject(&:nil?)
+                 else
+                   Date::ABBR_MONTHNAMES.reject(&:nil?)
+                 end
+        return months unless block_given?
+        months.each do |month|
+          yield month
+        end
+      end
+    end
+
+  end
+
+end

data/lib/chart_js/chart/line_chart/line_chart.rb

@@ -44,7 +44,7 @@ module ChartJS
       @opts = Opts.new.build(&block)
     end
 
-    def cdn(version: "2.6.0", min: true)
+    def cdn(version: "2.9.3", min: true)
       if min
         "<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/#{version}/Chart.min.js\"></script>"
       else
@@ -70,13 +70,13 @@ module ChartJS
           //  var ctx = document.getElementById(\"#{id}\").getContext(\"2d\");
           //  var #{chart_name.gsub("-","_")} = new Chart(ctx, config);
           //};
-      </script>" 
+      </script>"
     end
 
     def to_html(width: "60%", heigth: width, head: true, cdn: head, version: "2.6.0", body: true, id: random_id, script: true, chart_name: "line_chart")
       str = []
       if cdn
-        str << "<head>#{cdn(version: version)}</head>" 
+        str << "<head>#{cdn(version: version)}</head>"
       end
       str << "<body>" if body
       str << "<div id=\"canvas-holder\" style=\"width:#{width} heigth:#{heigth}\">"

data/lib/chart_js/chart/opts.rb

@@ -1,18 +1,25 @@
-require_relative "dataset.rb"
-
 module ChartJS
 
-  class Options 
+  class Opts 
 
     def initialize
       @container = Hash.new
     end
-    
+
     def build(&block)
       instance_eval(&block)
       @container
     end
 
+    def cutout(value = nil)
+      return @container['cutoutPercentage'] if value.nil?
+      @container['cutoutPercentage'] = value
+    end
+
+    def to_h
+      @container
+    end
+
   end
 
 end

data/lib/chart_js/chart/radar_chart/radar_chart.rb

@@ -6,7 +6,7 @@ require_relative "file.rb"
 
 module ChartJS
 
-  class RadarChart 
+  class RadarChart
 
     def initialize(&block)
       @type = "radar"
@@ -44,7 +44,7 @@ module ChartJS
       @opts = Opts.new.build(&block)
     end
 
-    def cdn(version: "2.6.0", min: true)
+    def cdn(version: "2.9.3", min: true)
       if min
         "<script src=\"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/#{version}/Chart.min.js\"></script>"
       else
@@ -67,13 +67,13 @@ module ChartJS
             var ctx = document.getElementById(\"#{id}\").getContext(\"2d\");
             new Chart(ctx, config);
           };
-      </script>" 
+      </script>"
     end
 
     def to_html(width: "60%", heigth: width, head: true, cdn: head, version: "2.6.0", body: true, id: random_id, script: true)
       str = []
       if cdn
-        str << "<head>#{cdn(version: version)}</head>" 
+        str << "<head>#{cdn(version: version)}</head>"
       end
       str << "<body>" if body
       str << "<div id=\"canvas-holder\" style=\"width:#{width} heigth:#{heigth}\">"

data/lib/chart_js/version.rb

@@ -1,3 +1,3 @@
 module ChartJS
-  VERSION = "1.0.1pre"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chart_js
 version: !ruby/object:Gem::Version
-  version: 1.0.1pre
+  version: 1.1.0
 platform: ruby
 authors:
 - Kent 'picat' Gruber
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 description: 
 email:
 - kgruber1@emich.edu
@@ -61,21 +75,26 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - chart_js.gemspec
 - examples/bar_chart.rb
+- examples/bar_chart_2.rb
+- examples/bar_chart_event_stream.rb
 - examples/build.rb
 - examples/debug.rb
+- examples/doughnut_chart.rb
 - examples/line_chart.rb
+- examples/line_chart_2.rb
+- examples/line_chart_event_stream.rb
+- examples/pie_chart.rb
 - examples/radar_chart.rb
+- examples/radar_chart_2.rb
 - examples/sinatra.rb
+- examples/wifi_signal_chart.rb
 - lib/chart_js.rb
 - lib/chart_js/chart/bar_chart/background.rb
 - lib/chart_js/chart/bar_chart/bar_chart.rb
@@ -95,7 +114,6 @@ files:
 - lib/chart_js/chart/bar_chart/point_border.rb
 - lib/chart_js/chart/bar_chart/point_hover.rb
 - lib/chart_js/chart/chart.rb
-- lib/chart_js/chart/charts.rb
 - lib/chart_js/chart/data.rb
 - lib/chart_js/chart/dataset.rb
 - lib/chart_js/chart/dataset/background.rb
@@ -104,7 +122,11 @@ files:
 - lib/chart_js/chart/dataset/point.rb
 - lib/chart_js/chart/dataset/point_border.rb
 - lib/chart_js/chart/dataset/point_hover.rb
+- lib/chart_js/chart/event_stream.rb
+- lib/chart_js/chart/event_streams/event_streams.rb
+- lib/chart_js/chart/event_streams/push.rb
 - lib/chart_js/chart/file.rb
+- lib/chart_js/chart/helpers/dates.rb
 - lib/chart_js/chart/line_chart/background.rb
 - lib/chart_js/chart/line_chart/border.rb
 - lib/chart_js/chart/line_chart/data.rb
@@ -156,12 +178,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A simple ruby DSL to build responive charts for the web using Chart.js

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.0
-before_install: gem install bundler -v 1.15.0

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "chart_js"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/chart_js/chart/charts.rb

@@ -1,22 +0,0 @@
-require "json"
-require "securerandom"
-require_relative "line_chart/line_chart.rb"
-require_relative "bar_chart/bar_chart.rb"
-require_relative "radar_chart/radar_chart.rb"
-
-module ChartJS
-  module Charts
-    def self.debug(&block)
-      Chart.new(&block)
-    end
-    def self.line(&block)
-      LineChart.new(&block)
-    end
-    def self.bar(&block)
-      BarChart.new(&block)
-    end
-    def self.radar(&block)
-      RadarChart.new(&block)
-    end
-  end
-end