swagchart 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50cb24ac13690119021c8ccf54150f0a899933a
-  data.tar.gz: 224b0d54724f4150d6482ee47b50c710f7fe8e41
+  metadata.gz: 2c5d21471ee4516f2b8024db7323fc791add9ff4
+  data.tar.gz: 58ca0c97ccb96fcdcc96865a1263d24ef1d8009d
 SHA512:
-  metadata.gz: 8aba1feb3a8ddf4f6a4b8f31baa2ea0c64233f3cda53f9e52fc0a986b6bc024dfc6b468e007ebc381120626a7b9eb2dae3b87bf134a40e7b2a4295d471c3b894
-  data.tar.gz: 3f2f57951567c41f1d64b3060c1f5b4ce5ddda9e4a7528899be0790bbfbfd7f1f21119782f4db6632d252012232951c1bb0a678cc833bb456c3bbdb325fb930e
+  metadata.gz: 2cbe5e3eeb86fb57d1a72029c8825cc756e031cb239d0a54d2c75d78a1002a4516f1f5b2523e6ccfd3359b1b5228101bfa89af828aabf422d4fc1176cfda3da7
+  data.tar.gz: f1b066aa02bfd5999510573aba7beb2a67cc99c6a6f6c754b1883c1144c5ed84458adc26c6998ebe87164fe85e57c1940e84179859a138b16e17619187c9ad9a

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/README.md

@@ -1,10 +1,12 @@
 # Swagchart
 
+[![Gem Version](https://badge.fury.io/rb/swagchart.svg)](http://badge.fury.io/rb/swagchart) ![Installs](http://img.shields.io/gem/dt/swagchart.svg)
+
 Get your swag on with this incredibly easy to use wrapper around [Googles Chart API](https://developers.google.com/chart/).
 
 In case you haven't noticed, Swagchart is just an acronym for **S**.imple **W**.rapper **A**.round **G**.oogle **Chart**.
 
-Swagchart is highly inspired by [Chartkick](https://github.com/ankane/chartkick) but making use of Googles new ChartWrapper class which allows a more flexible and direct interaction.
+Swagchart is highly inspired by [Chartkick](https://github.com/ankane/chartkick) ~~but making use of Googles new ChartWrapper class which allows a more flexible and direct interaction.~~ (the code is still in there and you can enable it if you want to .. look at lib/swagchart/helper.rb .. but unfortunately ChartWrapper doesn't allow many charts so I switched back to the classic approach by default).
 
 You can still create beautiful Javascript charts with one line of Ruby. In fact now you can pretty much use all the fancy chart types from [Googles Chart API](https://developers.google.com/chart/interactive/docs/gallery).
 
@@ -24,12 +26,6 @@ Pie chart
 <%= chart 'PieChart', Goal.group(:name).count %>
 ```
 
-~~Keep in mind that camelize is only available with activesupport. Use the camelized chart names ... i.e. "LineChart" instead of "line_chart"~~
-
-:thought_balloon: ... Note to self: Include more examples ... 
-
-
-
 ### Data
 
 Pass data as a Array, Hash or "DataTable"
@@ -49,7 +45,19 @@ Pass data as a Array, Hash or "DataTable"
 Multiple series just work automatically
 
 ```erb
-<%= chart :line_chart [[1,2,4],[2,3,8],[3,4,16],[4,5,32]], columns: ['x', 'Series 1', 'Series 2'] %>
+<%= chart :line_chart, [[1,2,4],[2,3,8],[3,4,16],[4,5,32]], columns: ['x', 'Series 1', 'Series 2'] %>
+```
+
+No need to define columns if you don't want to
+
+```erb
+<%= chart :line_chart, [[1,2,4],[2,3,8],[3,4,16],[4,5,32]] %>
+```
+
+:sparkles: Now brand new: Instead of actual data you can just provide an URL from where the data will be retrieved via an Ajax Get request
+
+```erb
+<%= chart :line_chart, '/api/line-chart-data' %>
 ```
 
 If you want to use times or dates, do so. They have to be a time or date object!

data/lib/swagchart/engine.rb

@@ -2,6 +2,11 @@ module Swagchart
   class Engine < ::Rails::Engine
 
     initializer "helper" do |app|
+
+      ActiveSupport.on_load(:action_controller) do
+        include Helper
+      end
+
       ActiveSupport.on_load(:action_view) do
         include Helper
       end

data/lib/swagchart/helper.rb

@@ -5,7 +5,13 @@ require 'erb'
 module Swagchart
   module Helper
 
+    def default_chart_options(opts={})
+      @default_chart_options = opts
+    end
+
     def chart(type, data, opts={}, &block)
+      opts[:options] ||= {}
+      opts[:options] = (@default_chart_options || {}).merge(opts[:options])
       @google_visualization_included ||= false
       @chart_counter ||= 0
       type = camelize(type.to_s)
@@ -14,15 +20,8 @@ module Swagchart
       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)
-        if opts[:columns]
-          data.unshift opts.delete(:columns)
-        elsif !data.first.find{|e| !e.is_a?(String) && !e.is_a?(Symbol) }
-          # Do nothing! This should already be in a DataTable format.
-          # First row seems to only define column names.
-        else
-          data.unshift Array.new(data.first.size, '')
-        end
+      elsif data.respond_to?(:unshift) && data.respond_to?(:first) && opts[:columns]
+        data.unshift opts.delete(:columns)
       end
       chart_id = ERB::Util.html_escape(opts.delete(:chart_id) || "chart_#{@chart_counter += 1}")
       style = 'height:320px;' #dirty hack right here .. you can override that with your style though
@@ -33,7 +32,7 @@ module Swagchart
         @google_visualization_included = true
       end
       options = opts.delete(:options) || {}
-      html << classic_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)
       html.respond_to?(:html_safe) ? html.html_safe : html
     end
 
@@ -49,63 +48,54 @@ module Swagchart
       str.split('_').each(&:capitalize!).join('')
     end
 
-    # This finds and replaces some string representations of
-    # Ruby objects to their JavaScript equivalents.
-    # Yes it's dirty and using Ruby 2.x refinements to replace the
-    # to_s methods of those objects only in this module would
-    # be simply awesome, but refinements dont work in Ruby 1.x.
-    # TODO: Check if refinements are available and do either the
-    #       right or the dirty thing.
-    def ruby_to_js_conversions(str)
-      str.to_s.gsub(/["'](\d\d\d\d-\d\d-\d\d.*?)["']/){"new Date(Date.parse('#{$1}'))"}
-              .gsub(/\bnil\b/, 'null')
-      #drx = /#<Date: (\d\d\d\d)-(\d\d)-(\d\d).*?>/
-      #dtrx= /#<DateTime: (\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)\+\d\d:\d\d .*?>/
-      #trx = /(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d) \+\d\d\d\d/
-      #blk = ->(s){v=$~.captures.map(&:to_i); v[1]-=1; "new Date(#{v.join(',')})"}
-      #str.to_s.gsub(dtrx, &blk).gsub(drx, &blk).gsub(trx, &blk)
+    def autocast_data_template
+      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 << 'if(data[i][j].match(/\d\d\d\d-\d\d-\d\d.*?/)){data[i][j] = new Date(Date.parse(data[i][j]));}'
+      js << "else if(data[i][j] == 'nil'){data[i][j] = null;}"
+      js << "}}};"
+      js << "data.unshift(Array(data[0].length).join('.').split('.'));"
+      js
     end
 
-    def classic_template(opts={})
-<<HTML
-<div id='#{opts[:id]}' style='#{opts[:style]}'>Loading...</div>
-<script type='text/javascript'>
-google.setOnLoadCallback(function(){
-  new google.visualization.#{opts[:type]}(document.getElementById('#{opts[:id]}')).draw(
-    google.visualization.arrayToDataTable(
-      #{ruby_to_js_conversions(opts[:data])}
-    ), #{opts[:options].to_json});
-});
-</script>
-HTML
+    def chart_template(opts={})
+      html = "<div id='#{opts[:id]}' style='#{opts[:style]}'>Loading...</div>"
+      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
     end
 
-    def chartwrapper_template(opts={})
-<<HTML
-<div id='#{opts[:id]}' style='#{opts[:style]}'>Loading...</div>
-<script type='text/javascript'>
-  google.setOnLoadCallback(function(){
-    new google.visualization.ChartWrapper({
-      chartType: '#{opts[:type]}',
-      containerId: '#{opts[:id]}',
-      options: #{opts[:options].to_json},
-      dataTable: #{ruby_to_js_conversions(opts[:data])}
-    }).draw();
-  });
-</script>
-HTML
+    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 << "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 << js_code
+      js << "}else{ console.log('Could not load data from #{url}. Status ' + xhr.status); }}};"
+      js << "xhr.open('GET', '#{url}'); xhr.send(null);"
+      js
     end
 
     def jsapi_includes_template
-<<HTML
-<script type='text/javascript'>
-  google.load('visualization','1');
-  google.load('visualization', '1', {packages: [
-    'corechart', 'geochart', 'map', 'treemap', 'annotatedtimeline',
-    'sankey', 'orgchart', 'calendar', 'gauge'
-  ]});
-</script>
-HTML
+      html =  "<script type='text/javascript'>"
+      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
     end
+
   end
 end

data/lib/swagchart/version.rb

@@ -1,3 +1,3 @@
 module Swagchart
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swagchart
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - pachacamac
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Small Wrapper Around Google CHARTS