amcharts.rb 3.4.7.2 → 3.4.7.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmJlMzQ3NWNjYWY3NTQxMWJiOTc5ZWJjYzkzMWYzMTBhZjg5OWM2NQ==
+    NGUwZDE5ZDNkOGZhYWFmZDQ3NDY4YWExODUzMGJmZDcxMzkzZGMzYw==
   data.tar.gz: !binary |-
-    NjcxOGRiMmMzNDY5NGFkM2E0OGQyZWNmMWY5MDE5Nzk5YmI0ZjQ4NA==
+    ZTMzZWE0ZDgxMWNkMTYyNjYxZGIzZjEzM2NhYzgzOWYyZGFkYzQzYw==
 SHA512:
   metadata.gz: !binary |-
-    NDFiZDJiZGI4M2MyMzUzMWE2MmQwNzgxNjU2Y2IxNzYwNDFhMmNkODMyZWVj
-    OWU4YThiMmE2Y2I0NThjMzkzYTBiNWE3ZmMwZWNjNThmOTEzNWUwMDZiM2Nm
-    NGRmNDk3YTYwNzU5M2E5Mjg2ODUxNjNhY2UxYzcxYjgwYmQ2NDc=
+    MTMyYmM1N2U4YTE5OTg5ZmU1MjZhYTc1YzY2Y2U3YTVmNGY2NzNmZTJkM2U0
+    ODExMDMwMDEyOWJkZDQ1ZjBjMDg0NDcxMzA5ZDFmYmNlMTk0ZjZjN2Y3OWZh
+    N2Y1NTk0YTIwYjFhMDY1NjNkYzQ3ZTI0OTA4MDQzNmQxZjQ3NDk=
   data.tar.gz: !binary |-
-    MDQzYmI5N2ZmMWM0Y2E0YWE5Y2M3NTFkYjE4MjVhZmQxZTk2MDA1MGVkMGU4
-    Y2ExNWEwNWM3OTYyOTgyMWI3ZGYzNTI4MTVkNjg0NWU3NThkMzI4YzQ1NGQ2
-    NTJiYjY5NGRhYzNhOGYwMzUxMGMyNzdjZWUzZDdmODc3MDFhNGQ=
+    OTU2NTIyM2UwYjg3MzllNjMyOTJjZjcxZGIwMTg5MzExM2RhOWQwZTM5ODI2
+    MmFmZWU0NzM4NjZjZWZlNjhlM2VhYjcxNDExNTFjZDljN2FmOGExNTY1NTQ0
+    YjNhNTkwNDQ4OTczODViNjc5ZGUzZTVlYmU1NWI4NTc0NmFhMmQ=

data/app/assets/javascripts/amcharts/helpers.js

@@ -1,4 +1,10 @@
 AmCharts.RB.Helpers = {
+  create_unit: function(num, unit)
+  {
+    // If the number doesn't end with a unit already, add the given one
+    return num.toString().match(/\d$/) ? num + unit : num;
+  },
+
   add_container_if_needed: function(id, width, height)
   {
     var container = document.getElementById(id);
@@ -7,8 +13,8 @@ AmCharts.RB.Helpers = {
       container = document.createElement("DIV");
       container.className = 'chart';
       container.id = id;
-      container.style.width = width + 'px';
-      container.style.height = height + 'px';
+      if (width) container.style.width = this.create_unit(width, 'px');
+      container.style.height = this.create_unit(height, 'px');
 
       // Add the container before the last script
       var scripts = document.getElementsByTagName('script');
@@ -19,7 +25,7 @@ AmCharts.RB.Helpers = {
     return container;
   },
 
-  add_blanket: function(container, width, height)
+  add_blanket: function(container)
   {
     var wrapper = document.createElement("DIV"),
       blanket = document.createElement("DIV"),
@@ -29,8 +35,8 @@ AmCharts.RB.Helpers = {
 
     wrapper.className = 'chart-wrapper';
     wrapper.id = container.id + "_wrapper";
-    wrapper.style.width = width + 'px';
-    wrapper.style.minHeight = height + 'px';
+    wrapper.style.width = container.style.width;
+    wrapper.style.minHeight = container.style.height;
 
     container.style.width = '100%';
     blanket.className = 'chart-blanket';

data/app/helpers/amcharts/amcharts_helper.rb

@@ -4,7 +4,14 @@ module AmCharts
       # Load necessary JS and CSSfiles, without loading one more than once
       @loaded_amchart_files ||= { js: [], css: []}
 
-      js_files = ['amcharts', "amcharts/#{chart.type}"] - @loaded_amchart_files[:js]
+      js_files = ['amcharts', "amcharts/#{chart.type}"]
+
+      if chart.export?
+        js_files.concat(%w(amcharts/exporting/amexport amcharts/exporting/rgbcolor amcharts/exporting/canvg amcharts/exporting/filesaver))
+        js_files.concat(%w(amcharts/exporting/jspdf amcharts/exporting/jspdf.plugin.addimage)) if chart.export.pdf?
+      end
+
+      js_files -= @loaded_amchart_files[:js]
       css_files = ['amcharts'] - @loaded_amchart_files[:css]
 
       @loaded_amchart_files[:js] += js_files

data/app/views/amcharts/_data_source.erb

@@ -4,5 +4,5 @@ chart.remoteProvider = new AmCharts.RB.RemoteJSONProvider(chart, data_source, pa
   chart.remoteProvider.load();
 <% end %>
 <% if builder.chart.loading_indicator? %>
-  <%= builder.render_js 'listener', locals: { type: :dataUpdated, method: 'AmCharts.RB.Helpers.hide_loading_indicator' } %>
+  <%= builder.render_js 'listener', locals: { type: :dataUpdated, method: 'AmCharts.RB.Helpers.hide_loading_indicator', var_name: 'chart' } %>
 <% end %>

data/app/views/amcharts/_export.erb

@@ -0,0 +1,11 @@
+var exportConfig = {};
+<% builder.render_settings(export, 'exportConfig') %>
+<% export.menus.each.with_index do |m, i| %>
+  var menu = {};
+  <% if i == 0 %>
+    exportConfig.menuItems = [];
+  <% end %>
+  <% builder.render_settings(m, 'menu') %>
+  exportConfig.menuItems.push(menu);
+<% end %>
+chart.exportConfig = exportConfig;

data/app/views/amcharts/_legend.erb

@@ -1,4 +1,5 @@
 var legend = new AmCharts.AmLegend;
 <% builder.render_settings(legend, 'legend') %>
 <%= yield(legend, 'legend') rescue nil %>
+<% builder.render_listeners(legend, 'legend') %>
 chart.addLegend(legend, <%= builder.to_js(div) %>);

data/app/views/amcharts/_listener.erb

@@ -1 +1,5 @@
-chart.addListener(<%= builder.to_js(type.to_s) %>, function() { return <%= method %>.apply(null, [chart]) });
+<%= var_name %>.addListener(<%= builder.to_js(type.to_s) %>, function() {
+  args = Array.prototype.slice.call(arguments);
+  args.unshift(chart);
+  return <%= method %>.apply(null, args)
+});

data/app/views/amcharts/chart_builder.erb

@@ -1,6 +1,6 @@
 // If the container element doesn't already exist, create it
-var container = AmCharts.RB.Helpers.add_container_if_needed('<%= container %>', <%= chart.width %>, <%= chart.height %>);
-AmCharts.RB.Helpers.add_blanket(container, <%= chart.width %>, <%= chart.height %>)
+var container = AmCharts.RB.Helpers.add_container_if_needed('<%= container %>', <%= builder.to_js chart.width %>, <%= builder.to_js chart.height %>);
+AmCharts.RB.Helpers.add_blanket(container)
 <% if chart.loading_indicator? %>
   AmCharts.RB.Helpers.add_loading_indicator(container, <%= builder.to_js(:chart_data_loading) %>, '<%= escape_javascript asset_path('amcharts/loading.gif') %>');
 <% end %>
@@ -33,6 +33,8 @@ AmCharts.ready(function() {
 
   <% builder.render_listeners %>
 
+  <% builder.render_export %>
+
   chart.write('<%= container %>');
 
   <% builder.render_data_source %>

data/lib/amcharts.rb

@@ -3,17 +3,18 @@ require "amcharts/version"
 require_relative '../app/helpers/amcharts/amcharts_helper'
 
 module AmCharts
-  autoload :Axis,         'amcharts/axis'
-  autoload :Chart,        'amcharts/chart'
-  autoload :ChartBuilder, 'amcharts/chart_builder'
-  autoload :Cursor,       'amcharts/cursor'
-  autoload :DataSource,   'amcharts/data_source'
-  autoload :Graph,        'amcharts/graph'
-  autoload :Legend,       'amcharts/legend'
-  autoload :Listener,     'amcharts/listener'
-  autoload :ScrollBar,    'amcharts/scroll_bar'
-  autoload :Settings,     'amcharts/settings'
-  autoload :UsesSettings, 'amcharts/uses_settings'
+  autoload :Axis,           'amcharts/axis'
+  autoload :Chart,          'amcharts/chart'
+  autoload :ChartBuilder,   'amcharts/chart_builder'
+  autoload :Cursor,         'amcharts/cursor'
+  autoload :DataSource,     'amcharts/data_source'
+  autoload :ExportSettings, 'amcharts/export_settings'
+  autoload :Graph,          'amcharts/graph'
+  autoload :Legend,         'amcharts/legend'
+  autoload :Listener,       'amcharts/listener'
+  autoload :ScrollBar,      'amcharts/scroll_bar'
+  autoload :Settings,       'amcharts/settings'
+  autoload :UsesSettings,   'amcharts/uses_settings'
 
   ActiveSupport::Inflector.inflections do |inflect|
     inflect.acronym "AmCharts"

data/lib/amcharts/chart.rb

@@ -15,7 +15,7 @@ module AmCharts
 
     attr_accessor :data_provider, :data_source, :container
     attr_accessor :width, :height, :loading_indicator
-    attr_reader :titles, :graphs, :legends, :data, :settings, :listeners, :legend_div
+    attr_reader :titles, :graphs, :legends, :data, :settings, :listeners, :legend_div, :export
 
     def initialize(*data, &block)
       @data = data.flatten
@@ -24,6 +24,7 @@ module AmCharts
       @legends = Collection[Legend]
       @listeners = Collection[Listener]
       @settings = Settings.new
+      @export = ExportSettings.new
       @titles = []
       update_settings(&block) if block_given?
     end
@@ -58,6 +59,15 @@ module AmCharts
       "AmCharts.Am#{type.to_s.titleize}Chart()"
     end
 
+    def export?
+      !@export.empty?
+    end
+
+    def export(&block)
+      yield @export if block_given?
+      @export
+    end
+
     def add_title(text, options = {})
       @titles << [text, options.reverse_merge(size: 13, bold: true, alpha: 1, color: '#000000')]
     end

data/lib/amcharts/chart_builder.rb

@@ -72,12 +72,17 @@ module AmCharts
       end
     end
 
-    def render_listeners()
-      chart.listeners.each do |listener|
-        concat render_js('listener', locals: { type: listener.type, method: listener.method })
+    def render_listeners(object = chart, var_name = 'chart')
+      object.listeners.each do |listener|
+        concat render_js('listener', locals: { type: listener.type, method: listener.method, var_name: var_name })
       end
     end
 
+    def render_export
+      return if chart.export.empty?
+      concat render_js('export', object: chart.export)
+    end
+
   private
 
     def method_missing(*args, &block)

data/lib/amcharts/export_settings.rb

@@ -0,0 +1,48 @@
+require 'amcharts/uses_settings'
+
+module AmCharts
+  class ExportSettings
+    class Menu
+      include UsesSettings
+
+      def initialize(*)
+        super
+
+        if defined? Rails
+          @settings.icon ||= ActionController::Base.helpers.asset_path('amcharts/export.png')
+        end
+      end
+
+      def formats
+        formats = []
+        formats << @settings[:format].to_s.downcase.to_sym if @settings[:format]
+
+        if @settings[:items]
+          @settings[:items].each do |i|
+            formats << i[:format].to_s.downcase.to_sym if i[:format]
+          end
+        end
+
+        formats
+      end
+    end
+
+    attr_reader :settings, :menus
+
+    def initialize(&block)
+      @settings = Settings.new
+      @menus = Collection[Menu]
+      instance_exec(self, &block) if block_given?
+    end
+
+    def pdf?
+      return false if menus.empty?
+      menus.flat_map(&:formats).any?{ |f| f == :pdf }
+    end
+  private
+
+    def method_missing(name, *args, &block)
+      @settings.send(name, *args, &block)
+    end
+  end
+end

data/lib/amcharts/legend.rb

@@ -1,5 +1,17 @@
 module AmCharts
   class Legend
-    include UsesSettings
+    attr_reader :settings, :listeners
+
+    def initialize(&block)
+      @settings = Settings.new
+      @listeners = Collection[Listener]
+      instance_exec(self, &block) if block_given?
+    end
+
+  private
+
+    def method_missing(name, *args, &block)
+      @settings.send(name, *args, &block)
+    end
   end
 end

data/lib/amcharts/uses_settings.rb

@@ -1,3 +1,5 @@
+require 'amcharts/settings'
+
 module AmCharts
   module UsesSettings
     attr_reader :settings

data/lib/amcharts/version.rb

@@ -1,3 +1,3 @@
 module AmCharts
-  VERSION = "3.4.7.2"
+  VERSION = "3.4.7.3"
 end

data/vendor/assets/javascripts/amcharts/all.js

@@ -1,10 +1,10 @@
 /*
  *= require amcharts
- *= require amstock
- *= require funnel
- *= require gauge
- *= require pie
- *= require radar
- *= require serial
- *= require xy
+ *= require amcharts/amstock
+ *= require amcharts/funnel
+ *= require amcharts/gauge
+ *= require amcharts/pie
+ *= require amcharts/radar
+ *= require amcharts/serial
+ *= require amcharts/xy
 */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amcharts.rb
 version: !ruby/object:Gem::Version
-  version: 3.4.7.2
+  version: 3.4.7.3
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -152,6 +152,7 @@ files:
 - app/views/amcharts/_collection.erb
 - app/views/amcharts/_data.erb
 - app/views/amcharts/_data_source.erb
+- app/views/amcharts/_export.erb
 - app/views/amcharts/_legend.erb
 - app/views/amcharts/_listener.erb
 - app/views/amcharts/_object.erb
@@ -175,6 +176,7 @@ files:
 - lib/amcharts/chart_builder/literal.rb
 - lib/amcharts/cursor.rb
 - lib/amcharts/data_source.rb
+- lib/amcharts/export_settings.rb
 - lib/amcharts/graph.rb
 - lib/amcharts/legend.rb
 - lib/amcharts/listener.rb
@@ -194,6 +196,7 @@ files:
 - vendor/assets/images/amcharts/eraserIcon.gif
 - vendor/assets/images/amcharts/eraserIconH.gif
 - vendor/assets/images/amcharts/export.png
+- vendor/assets/images/amcharts/exportBlack.png
 - vendor/assets/images/amcharts/exportWhite.png
 - vendor/assets/images/amcharts/lens.png
 - vendor/assets/images/amcharts/lensWhite.png