amcharts.rb 3.4.7.4 → 3.4.7.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDM5ZjUxNGRkNzk3ZWFiMGY2NzZhYzdhN2ZmYjM1YWVkNTYyMjE3Yg==
+    MDUwZmRkNjllMmI0ZWEzZGU3NDc2NDM3MzkyYjYzYzk3MzZjMDcwOA==
   data.tar.gz: !binary |-
-    NTIzMzYyN2RhYzk4YWU3ZTMzYjA5Mjc4NzYwNDE4ZjI0OTNiOTY4ZQ==
+    YThhNjE5YWVhODcwNTg2MDczMDNhMTU0Y2QxOWFlYjAzMGQ4NGRkMw==
 SHA512:
   metadata.gz: !binary |-
-    MGJhM2M5YTJjN2M4NTU4YWMxZjE1YmViMDkwMWFiOGU0Yjg0OWE5NGQzZWNm
-    NTY3OWU1MjM1OGQ4Nzg5MWFhNDdjZTFhZjBmMGE1MTE1ZDNiNDc3ZjliNzA2
-    NGE5NmVmZGU5ZDhkM2E5YWVkMThlODQ2YzQ1Njg3ZGJhZDhiMDY=
+    YWU0M2Y4M2Q4ZjQzZWM4M2QzZDJmODI0NjY0YmNjMDA0ZjIxYjEzZjU5NmZi
+    MGZkOTBmMzc1MmU1Y2U5YTE3MGFkNjdiNjBhMTRiMTYzY2E2NjdiOTY4ZTJl
+    ZGZjYzE5MGZjNzExZWYzZTgyZWU4MzdmODQyMTY5NmVjNDUzY2Y=
   data.tar.gz: !binary |-
-    YjRiOWMyNzhjODA2NWRjNGFiNDU5ZDA3NTZkZjEwODIxYjBmMDg1Y2RkOWQy
-    MDQzOTQ2ZWFhODVlNGVlMDU3YjcwODkxYzVjYzE1NDgwNmE3NTVhNTc5NmRl
-    NmY0NmY4OTg0OWNlZmZlYTBkYjczYTFjNWM4NGMyMTVkOTNhOWE=
+    MmVkMzQ1OThkMjRmNTI5NzM1ZThkOGNkNGFiNTA5YWQ3NWU2M2RmNmQwNTcy
+    MjM1ZjI5MThmYzk5YmM5OWIwMzcwNmNhMDFiYzJkMWNhY2U0NGU4OTAwNDE1
+    MDM5ZDAyOTQxZWFkNjZhODFiM2Y5MDM4YTJkMzQwMGVkNGUxZmQ=

data/app/views/amcharts/_label.erb

@@ -0,0 +1,10 @@
+chart.addLabel(
+  <%= builder.to_js x %>, <%= builder.to_js y %>, <%= builder.to_js text %>,
+  <%= builder.to_js options[:align] %>,
+  <%= builder.to_js options[:size] %>,
+  <%= builder.to_js options[:color] %>,
+  <%= builder.to_js options[:rotation] %>,
+  <%= builder.to_js options[:alpha] %>,
+  <%= builder.to_js options[:bold] %>,
+  <%= builder.to_js options[:url] %>
+);

data/app/views/amcharts/chart_builder.erb

@@ -30,6 +30,7 @@ AmCharts.ready(function() {
   <% builder.render_component(chart.scrollbar, name: :chart_scrollbar) %>
 
   <% builder.render_title %>
+  <% builder.render_labels %>
 
   <% builder.render_listeners %>
 

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, :export
+    attr_reader :titles, :labels, :graphs, :legends, :data, :settings, :listeners, :legend_div, :export
 
     def initialize(*data, &block)
       @data = data.flatten
@@ -26,11 +26,13 @@ module AmCharts
       @settings = Settings.new
       @export = nil
       @titles = []
+      @labels = []
       update_settings(&block) if block_given?
     end
 
     def update_settings(&block)
       instance_exec(self, &block)
+      self
     end
 
     # Allow data to be loaded from a remote source
@@ -71,7 +73,11 @@ module AmCharts
     alias_method :exportable!, :export
 
     def add_title(text, options = {})
-      @titles << [text, options.reverse_merge(size: 13, bold: true, alpha: 1, color: '#000000')]
+      @titles << [text, options.reverse_merge(size: 13, bold: true, alpha: 1, color: '#000')]
+    end
+
+    def add_label(text, x, y, options = {})
+      @labels << [text, x, y, options.reverse_merge(size: 11, align: 'left', color: '#000', rotation: 0, alpha: 1, bold: false)]
     end
 
     def width=(w)

data/lib/amcharts/chart_builder.rb

@@ -72,6 +72,12 @@ module AmCharts
       end
     end
 
+    def render_labels
+      chart.labels.each do |(text, x, y, options)|
+        concat render_js('label', locals: { text: text, x: x, y: y, options: options })
+      end
+    end
+
     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 })

data/lib/amcharts/chart_builder/function.rb

@@ -1,6 +1,15 @@
 module AmCharts
   class ChartBuilder
-    class Function < Literal
+    class Function
+      attr_reader :name, :body
+
+      def initialize(name, body = nil)
+        @name, @body = name, body
+      end
+
+      def to_json
+        body.nil? ? name.to_s : "function #{name}() { #{body} }"
+      end
     end
   end
 end

data/lib/amcharts/settings.rb

@@ -13,8 +13,8 @@ module AmCharts
       @settings = hash.with_indifferent_access
     end
 
-    def function(name)
-      ChartBuilder::Function.new(name)
+    def function(name, body = nil)
+      ChartBuilder::Function.new(name, body)
     end
 
     def literal(name)

data/lib/amcharts/version.rb

@@ -1,3 +1,3 @@
 module AmCharts
-  VERSION = "3.4.7.4"
+  VERSION = "3.4.7.5"
 end

data/spec/chart_spec.rb

@@ -42,5 +42,9 @@ describe AmCharts::Chart do
       subject.update_settings { |c| c.foo = :baz }
       subject.settings[:foo].should == :baz
     end
+
+    it "should return the chart" do
+      subject.update_settings{}.should == subject
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amcharts.rb
 version: !ruby/object:Gem::Version
-  version: 3.4.7.4
+  version: 3.4.7.5
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -153,6 +153,7 @@ files:
 - app/views/amcharts/_data.erb
 - app/views/amcharts/_data_source.erb
 - app/views/amcharts/_export.erb
+- app/views/amcharts/_label.erb
 - app/views/amcharts/_legend.erb
 - app/views/amcharts/_listener.erb
 - app/views/amcharts/_object.erb