swagchart 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b195020d0d5716403429724c981e4243df25f45
-  data.tar.gz: 774ce360b2016c044846c359df628a523c3ae736
+  metadata.gz: a0b90ec9a585d353f053ee64cf5c3e7cfa4f11fa
+  data.tar.gz: 9d6698e336db48e4f0bdd24664331c203b8f7b94
 SHA512:
-  metadata.gz: 63460ea5b0cba468c0d32e8c9e1686116c92155ef433288375d743a9edc93de41b4768a319e06b1e1af656c006a94045c1213c6539778865919a50d3c573090c
-  data.tar.gz: 4a2af2e69191d320c28963a2a5b58c1a64a81bd4f9ce6f0b8c2b3de82d6eb29daf66b62e943e6594d3a1718198ccfd6b25524a818e8c8fc21ecfd00dd8158623
+  metadata.gz: f4f9bf2efd57e5d1b14249918b8580982f23754890f07aaec7b958b82720bad7e31f1777ca73ba2e9df1197da870740e0244d2af9e84dd6756b518fb729950d5
+  data.tar.gz: b6517a1a50e024544766edb7af8b893f53555dc2bcc00c133bae3e244da98496c3e6f8c46dd7ba77c4b0baba960cc4842a6428af72c85ddd5daf30375d7c9b3f

data/Gemfile.lock

@@ -1,19 +1,22 @@
 PATH
   remote: .
   specs:
-    swagchart (1.0.0)
+    swagchart (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.3.2)
-    rake (10.2.2)
+    minitest (5.9.0)
+    rake (11.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
-  minitest
-  rake
+  minitest (~> 5.9.0)
+  rake (~> 11.1.2)
   swagchart!
+
+BUNDLED WITH
+   1.11.2

data/lib/swagchart/helper.rb

@@ -5,84 +5,77 @@ require 'securerandom'
 
 module Swagchart
   module Helper
-
-    def default_chart_options(opts={})
+    def default_chart_options(opts = nil)
+      @default_chart_options ||= {}
+      return @default_chart_options unless opts
       @default_chart_options = opts
     end
 
-    def chart(type, data, opts={}, &block)
+    def chart(type, data, opts = {}, &block)
       opts[:options] ||= {}
-      opts[:options] = (@default_chart_options || {}).merge(opts[:options])
+      opts[:options] = default_chart_options.merge(opts[:options])
       @google_visualization_included ||= false
       type = camelize(type.to_s)
-      opts[:columns] = opts[:columns].split(',').map(&:strip) if opts[:columns].is_a?(String)
       data = data.to_a if data.is_a?(Hash)
-      if data.respond_to?(:first) && data.first.is_a?(Hash)
-        data = hash_array_to_data_table(data)
-        opts.delete(:columns)
-      elsif data.respond_to?(:unshift) && data.respond_to?(:first) && opts[:columns]
-        data.unshift opts.delete(:columns)
+      if opts[:columns]
+        opts[:columns] = opts[:columns].split(',').map(&:strip) if opts[:columns].is_a?(String)
+        data.unshift opts[:columns]
       end
       chart_id = ERB::Util.html_escape(opts.delete(:chart_id) || "chart_#{SecureRandom.uuid}")
-      style = 'height:320px;' #dirty hack right here .. you can override that with your style though
+      style = 'height:320px;' # dirty hack right here .. you can override that with your style though
       style << ERB::Util.html_escape(opts.delete(:style)) if opts[:style]
       html = ''
-      unless @google_visualization_included #we only need to include this once
+      unless @google_visualization_included # we only need to include this once
         html << jsapi_includes_template
         @google_visualization_included = true
       end
       options = opts.delete(:options) || {}
-      html << chart_template(id: chart_id, type: type, style: style, options: options, data: data)
+      html << chart_template(id: chart_id, type: type, style: style, options: options, data: data, columns: opts[:columns])
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
 
     private
 
-    def hash_array_to_data_table(ha)
-      cols = ha.first.keys
-      rows = ha.map{|r| cols.reduce([]){|s,e| s<<r[e]} }
-      [cols, *rows]
-    end
-
     def camelize(str)
       str.split('_').each(&:capitalize!).join('')
     end
 
-    def autocast_data_template
+    def autocast_data_template(opts = {})
       js = ''
       js << 'if(Array.isArray(data) && !Array.isArray(data[0])){'
       js << 'var keys=[], vals=[], row=[]; for(var k in data[0]){keys.push(k)}; for(var d in data){row=[]; for(var k in keys){row.push(data[d][keys[k]])}; vals.push(row)}; vals.unshift(keys); data = vals;'
-      js << '}else{data.unshift(Array(data[0].length).join(".").split("."));}'
+      js << '}'
+      js << 'else{data.unshift(Array(data[0].length).join(".").split("."));}' unless opts[:columns]
       js << "for(var i=0;i<data.length;i++){for(var j=0;j<data[i].length;j++){if(typeof data[i][j] === 'string'){"
       js << 'var pd = Date.parse(data[i][j]); if(!isNaN(pd)){data[i][j] = new Date(pd)};'
-      js << "}}};"
+      js << '}}};console.log(data);'
       js
     end
 
-    def chart_template(opts={})
+    def chart_template(opts = {})
       html = "<div id='#{opts[:id]}' style='#{opts[:style]}'>Loading...</div>"
-      html << "<script type='text/javascript'>"
-      html << "google.setOnLoadCallback(function(){"
+      html << '<script type="text/javascript">'
+      html << 'google.setOnLoadCallback(function(){'
       chart_js = chart_js_template(opts)
       html << (opts[:data].is_a?(String) ? async_ajax_load_wrapper(opts[:data], chart_js) : chart_js)
-      html << "});</script>"
+      html << '});</script>'
       html
     end
 
-    def chart_js_template(opts={})
+    def chart_js_template(opts = {})
       js = ''
-      js << "var data = #{opts[:data]};" unless opts[:data].is_a?(String)
-      js << autocast_data_template
-      js << "var dt = google.visualization.arrayToDataTable(data);"
+      js << "var data = #{opts[:data].to_json};" unless opts[:data].is_a?(String)
+      js << autocast_data_template(opts)
+      js << 'var dt = google.visualization.arrayToDataTable(data);'
       js << "new google.visualization.#{opts[:type]}(document.getElementById('#{opts[:id]}')).draw(dt, #{opts[:options].to_json});"
       js
     end
 
     def async_ajax_load_wrapper(url, js_code)
-      js = "var xhr = new XMLHttpRequest();"
-      js << "xhr.onreadystatechange = function(){"
-      js << "if(xhr.readyState === 4) { if(xhr.status>=200 && xhr.status<400){"
-      js << "var data = JSON.parse(xhr.responseText);"
+      js = 'var xhr = new XMLHttpRequest();'
+      js << 'xhr.onreadystatechange = function(){'
+      js << 'if(xhr.readyState === 4) { if(xhr.status>=200 && xhr.status<400){'
+      js << 'var data = JSON.parse(xhr.responseText);'
       js << js_code
       js << "}else{ console.log('Could not load data from #{url}. Status ' + xhr.status); }}};"
       js << "xhr.open('GET', '#{url}'); xhr.send(null);"
@@ -94,10 +87,9 @@ module Swagchart
       html << "google.load('visualization', '1');"
       html << "google.load('visualization', '1', {packages: ["
       html << "'corechart', 'geochart', 'map', 'treemap', 'annotatedtimeline','sankey', 'orgchart', 'calendar', 'gauge', 'timeline'"
-      html << "]});"
-      html << "</script>"
+      html << ']});'
+      html << '</script>'
       html
     end
-
   end
 end

data/lib/swagchart/version.rb

@@ -1,3 +1,3 @@
 module Swagchart
-  VERSION = "1.1.2"
+  VERSION = '1.2.0'.freeze
 end

data/swagchart.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'swagchart/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "swagchart"
+  spec.name          = 'swagchart'
   spec.version       = Swagchart::VERSION
-  spec.authors       = ["pachacamac", "naema"]
-  spec.email         = []
-  spec.description   = %q{Use Google Charts easily within your Rails or Sinatra project or anywhere really}
-  spec.summary       = %q{Small Wrapper Around Google CHARTS}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['pachacamac']
+  spec.email         = ['pachacamac@inboxalias.com']
+  spec.description   = 'Use Google Charts easily within your Rails or Sinatra project or anywhere really'
+  spec.summary       = 'Small Wrapper Around Google CHARTS'
+  spec.homepage      = 'https://github.com/pachacamac/swagchart'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'minitest', '~> 5.9'
+  spec.add_development_dependency 'rake', '~> 11.1'
 end

data/test/swagchart_test.rb

@@ -5,31 +5,57 @@ class TestSwagchart < Minitest::Test
   include Swagchart::Helper
 
   def test_no_random_exceptions
+    assert chart(:line_chart, [{y: 23, x: 42}, {y: 666, x: 999}])
     assert chart(:line_chart, [[23, 42], [666, 999]], columns: ['x', 'y'])
     assert chart(:line_chart, [[23, 42], [666, 999]], columns: ['x', 'y'], style: 'width:100%;')
     assert chart(:bar_chart, [['x', 'y'],[23, 42], [666, 999]])
     assert chart('GeoMap', [{'Country'=>'Germany', 'Population'=>8600000}, {'Country'=>'France', 'Population'=>6500000}])
   end
 
-  def test_time_object_literals
-    t = Time.parse('2014-12-24 13:37:04')
-    raw_chart = chart(:line_chart, [[t, 42], [t+3600, 999]], columns: ['x', 'y'])
-    assert raw_chart.include?('new Date(2014,11,24,13,37,4)') #month starts at 0 in js
-    assert raw_chart.include?('new Date(2014,11,24,14,37,4)')
-  end
+  # def test_annotations
+  #   c = chart(
+  #     :line_chart,
+  #     [[0, nil, nil, 5], [1, 'foo', 'Foobar', 2], [2, nil, nil, 6], [3, 'bar', 'Barfoo', 3], [4, nil, nil, 8]],
+  #     #[{y: 0, x: 5}, {y: 1, x: 2}, {y: 2, x: 6}, {y: 3, x: 3}, {y: 4, x: 8}],
+  #     columns: ['y', {type: 'string', role: 'annotation'}, {type: 'string', role: 'annotationText'}, 'foo'],
+  #     options: {annotations: {style: 'line'}}
+  #   )
+  #   c = "<script type='text/javascript' src='http://www.google.com/jsapi'></script>\n#{c}"
+  #   File.write('/tmp/chart.html', c)
+  #   `see /tmp/chart.html`
+  # end
 
-  def test_date_object_literals
-    d1, d2 = Date.new(2014, 12, 24), Date.new(2014, 12, 31)
-    raw_chart = chart(:line_chart, [[d1, 42], [d2, 999]], columns: ['x', 'y'])
-    assert raw_chart.include?('new Date(2014,11,24)')
-    assert raw_chart.include?('new Date(2014,11,31)')
-  end
+  # def test_normal_chart
+  #   c = chart(
+  #     :line_chart,
+  #     [{y: 1, x: 2},{y: 2, x: 7},{y: 3, x: 4}],
+  #   )
+  #   c = "<script type='text/javascript' src='http://www.google.com/jsapi'></script>\n#{c}"
+  #   File.write('/tmp/chart.html', c)
+  #   `see /tmp/chart.html`
+  # end
 
-  def test_datetime_object_literals
-    dt = Time.parse('2014-12-24 13:37:04').to_datetime
-    raw_chart = chart(:line_chart, [[dt, 42]], columns: ['x', 'y'])
-    assert raw_chart.include?('new Date(2014,11,24,13,37,4)')
-  end
+  # not relevant anymore since it's parsed in JS
+
+  # def test_time_object_literals
+  #   t = Time.parse('2014-12-24 13:37:04')
+  #   raw_chart = chart(:line_chart, [[t, 42], [t+3600, 999]], columns: ['x', 'y'])
+  #   assert raw_chart.include?('new Date(2014,11,24,13,37,4)') #month starts at 0 in js
+  #   assert raw_chart.include?('new Date(2014,11,24,14,37,4)')
+  # end
+
+  # def test_date_object_literals
+  #   d1, d2 = Date.new(2014, 12, 24), Date.new(2014, 12, 31)
+  #   raw_chart = chart(:line_chart, [[d1, 42], [d2, 999]], columns: ['x', 'y'])
+  #   assert raw_chart.include?('new Date(2014,11,24)')
+  #   assert raw_chart.include?('new Date(2014,11,31)')
+  # end
+
+  # def test_datetime_object_literals
+  #   dt = Time.parse('2014-12-24 13:37:04').to_datetime
+  #   raw_chart = chart(:line_chart, [[dt, 42]], columns: ['x', 'y'])
+  #   assert raw_chart.include?('new Date(2014,11,24,13,37,4)')
+  # end
 
   # def test_chart_output
   #   puts chart('GeoMap', [{'Country'=>'Germany', 'Population'=>8600000}, {'Country'=>'France', 'Population'=>6500000}], columns: ['x', 'y'], :hAxis => {title: 'Year'}, style:'width:100%;')

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagchart
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - pachacamac
-- naema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,36 +25,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.9'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 description: Use Google Charts easily within your Rails or Sinatra project or anywhere
   really
-email: []
+email:
+- pachacamac@inboxalias.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -75,7 +75,7 @@ files:
 - swagchart.gemspec
 - test/swagchart_test.rb
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/pachacamac/swagchart
 licenses:
 - MIT
 metadata: {}
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Small Wrapper Around Google CHARTS