google_visualr 2.1.5 → 2.1.6

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p194@google_visualr --create
+rvm use ruby-1.9.3-p327@google_visualr --create

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google_visualr (2.1.4)
+    google_visualr (2.1.6)
 
 GEM
   remote: http://rubygems.org/

data/README.rdoc

@@ -96,6 +96,10 @@ Please submit all feedback, bugs and feature-requests to {GitHub Issues Tracker}
 
 = Change Log
 
+<em>Version 2.1.6</em>
+* {Issue 54}[https://github.com/winston/google_visualr/issues/54] Allow apostrophes in labels.
+* {Pull Request 55}[https://github.com/winston/google_visualr/pull/55] Added support to accept BigDecimal as number.
+
 <em>Version 2.1.5</em>
 * {Pull Request 48}[https://github.com/winston/google_visualr/pull/48] Fixed bug with Listener event registration.
 

data/lib/google_visualr/data_table.rb

@@ -205,17 +205,13 @@ module GoogleVisualr
 
       @cols.each do |column|
         js << "data_table.addColumn("
-        if column[:role].nil?
-          js << column.map{ |key, value| "'#{value}'" }.join(", ")
-        else
-          js << "{" + column.map{ |key, value| "#{key}: '#{value}'" }.join(", ") + "}"
-        end
+        js << column.to_json
         js << ");"
       end
 
       @rows.each do |row|
         js << "data_table.addRow("
-        js << "[#{row.collect { |cell| cell.to_js }.join(", ")}]" unless row.empty?
+        js << "[#{row.map(&:to_js).join(", ")}]" unless row.empty?
         js << ");"
       end
 
@@ -243,7 +239,7 @@ module GoogleVisualr
         when type == "string"
           raise ArgumentError, "cell value '#{v}' is not a String", caller              unless v.is_a?(String)
         when type == "number"
-          raise ArgumentError, "cell value '#{v}' is not an Integer or a Float", caller unless v.is_a?(Integer)   || v.is_a?(Float)
+          raise ArgumentError, "cell value '#{v}' is not an Integer, Float or BigDecimal", caller unless v.is_a?(Integer) || v.is_a?(Float) || v.is_a?(BigDecimal)
         when type == "boolean"
           raise ArgumentError, "cell value '#{v}' is not a Boolean", caller             unless v.is_a?(TrueClass) || v.is_a?(FalseClass)
         when type == 'datetime'

data/lib/google_visualr/version.rb

@@ -1,3 +1,3 @@
 module GoogleVisualr
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

data/spec/google_visualr/data_table_spec.rb

@@ -205,6 +205,12 @@ describe GoogleVisualr::DataTable do
         it "raises an exception if value is not date" do
           assert_raises_exception(4, 'ABCD')
         end
+        
+        it "accepts BigDecimal as number" do
+          expect {
+            dt.set_cell(0, 1, BigDecimal.new(42))
+          }.to_not raise_exception(ArgumentError)
+        end
       end
 
       it "accepts 'nil' for all column types" do
@@ -238,21 +244,28 @@ describe GoogleVisualr::DataTable do
         dt.new_column('number', 'Total', '1')
         dt.add_row([1])
 
-        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn('number', 'Total', '1');data_table.addRow([{v: 1}]);"
+        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"number\",\"label\":\"Total\",\"id\":\"1\"});data_table.addRow([{v: 1}]);"
       end
 
       it "excludes :id and :label when these are not specified" do
         dt.new_column('number')
         dt.add_row([1])
 
-        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn('number');data_table.addRow([{v: 1}]);"
+        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"number\"});data_table.addRow([{v: 1}]);"
       end
 
       it "includes :role and :pattern when these are specified" do
         dt.new_column('string', nil, nil, 'interval', 'pattern')
         dt.add_row(['interval'])
 
-        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({type: 'string', role: 'interval', pattern: 'pattern'});data_table.addRow([{v: 'interval'}]);"
+        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"role\":\"interval\",\"pattern\":\"pattern\"});data_table.addRow([{v: 'interval'}]);"
+      end
+      
+      it "escapes labels with apostrophes properly" do
+        dt.new_column('number', 'Winston\'s')
+        dt.add_row([1])
+
+        dt.to_js.should == "var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"number\",\"label\":\"Winston's\"});data_table.addRow([{v: 1}]);"        
       end
     end
 

data/spec/support/common.rb

@@ -20,7 +20,7 @@ end
 def base_chart_js(div_class="div_class")
   js  = "\n<script type='text/javascript'>"
   js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: function() {"
-  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn('string', 'Year');data_table.addColumn('number', 'Sales');data_table.addColumn('number', 'Expenses');data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
+  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
   js << "\n    chart.draw(data_table, {legend: 'Test Chart', width: 800, is3D: true});"
   js << "\n  }});"
   js << "\n</script>"
@@ -29,7 +29,7 @@ end
 def base_chart_with_listener_js(div_class="div_class")
   js  = "\n<script type='text/javascript'>"
   js << "\n  google.load('visualization','1', {packages: ['basechart'], callback: function() {"
-  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn('string', 'Year');data_table.addColumn('number', 'Sales');data_table.addColumn('number', 'Expenses');data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
+  js << "\n    var data_table = new google.visualization.DataTable();data_table.addColumn({\"type\":\"string\",\"label\":\"Year\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Sales\"});data_table.addColumn({\"type\":\"number\",\"label\":\"Expenses\"});data_table.addRow([{v: '2004'}, {v: 1000}, {v: 400}]);data_table.addRow([{v: '2005'}, {v: 1200}, {v: 450}]);data_table.addRow([{v: '2006'}, {v: 1500}, {v: 600}]);data_table.addRow([{v: '2007'}, {v: 800}, {v: 500}]);\n    var chart = new google.visualization.BaseChart(document.getElementById('#{div_class}'));"
   js << "\n    google.visualization.events.addListener(chart, 'select', function() {test_event(chart);});"
   js << "\n    chart.draw(data_table, {legend: 'Test Chart', width: 800, is3D: true});"
   js << "\n  }});"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_visualr
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70104206018240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 1.1.5
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.1.5
+  version_requirements: *70104206018240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70104206017740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.11.0
+  version_requirements: *70104206017740
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70104206017280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,12 +43,7 @@ dependencies:
         version: 3.2.8
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.8
+  version_requirements: *70104206017280
 description: This Ruby gem, GoogleVisualr, is a wrapper around the Google Chart Tools
   that allows anyone to create the same beautiful charts with just Ruby; you don't
   have to write any JavaScript at all.
@@ -187,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: google_visualr
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper around the Google Chart Tools that allows anyone to create