jparker-ruby-googlechart 0.6.0 → 0.6.1

data/CHANGELOG

@@ -0,0 +1,18 @@
+== 0.0.1 2008-05-14
+
+* Initial release
+
+== 0.5.0 2008-11-08
+
+* Code cleanup, improved tests
+* First working gem release
+
+== 0.6.0 2008-11-12
+
+* Continued cleanup
+* Changed data scaling behavior with negative values
+
+== 0.6.1 2008-11-12
+
+* Gem cleanup (switched from newgem + hoe to echoe)
+* Fixed data scaling bug with all-zero data

data/{README.txt → README.rdoc}

@@ -1,8 +1,8 @@
-= ruby-googlechart
+== ruby-googlechart
 
 * http://github.com/jparker/ruby-googlechart
 
-== DESCRIPTION:
+== DESCRIPTION
 
 ruby-googlechart is a ruby library which provides object-oriented
 access to the Google Charts API.
@@ -13,33 +13,52 @@ libraries are more mature and may be better suited to your needs:
 * http://googlecharts.rubyforge.org/
 * http://code.google.com/p/gchartrb/
 
-== FEATURES/PROBLEMS:
+== FEATURES
 
-* Limited support for Line and Bar charts
+* Line charts (line, XY, sparkline)
+* Bar charts (horizontal, vertical, grouped, stacked)
 
-== SYNOPSIS:
+== SYNOPSIS
+  
+  require 'google_chart'
   
   url = GoogleChart.Line(:data => [1, nil, 2, 8, 1])
+  url = GoogleChart.Bar(:data => [5, 23, 6, 14])
   
-  url = GoogleChart.Line do |c|
-    c.type     = :line
-    c.size     = '800x375'
+  url = GoogleChart.Bar do |c|
+    c.axes     = {:x => %w[Q1 Q2 Q3 Q4], :y => 0..400}
     c.data     = [335, 285, 240, 220, 160, 175, 200, 205]
-    c.scale    = 0..400
     c.encoding = :extended
-    c.title    = 'Chart Title'
+    c.scale    = 0..400
+    c.size     = '800x375'
+    c.style    = :dash
+    c.title    = "Are You Pondering What I'm Pondering?"
+    c.type     = :line
   end
+  url = GoogleChart.Bar do |c|
+    c.horizontal = true
+    c.grouped    = true
+    c.data       = [[5, 6, 7, 8], [23, 14, 17, 16]]
+    c.encoding   = :text
+    c.title      = 'Lorem Ipsum Dolor'
+  end
+  
+  chart = GoogleChart::LineChart.new
+  chart.type  = :sparkline
+  chart.size  = '75x25'
+  chart.data  = [1, 1, 2, 3, 5, 8, 13]
+  chart.color = 'ff0000'
+  url = chart.to_url
 
-== REQUIREMENTS:
+== REQUIREMENTS
 
-* newgem >= 1.0.3
-* hoe >= 1.8.0
+* Low standards
 
-== INSTALL:
+== INSTALL
 
 * sudo gem install jparker-ruby-googlechart -s http://gems.github.com/
 
-== LICENSE:
+== LICENSE
 
 (The MIT License)
 
@@ -62,4 +81,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,25 +1,14 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/google_chart'
+require 'rubygems'
+require 'rake'
+require 'echoe'
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('ruby-googlechart', GoogleChart::VERSION) do |p|
-  p.developer('John Parker', 'jparker@urgetopunt.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  p.rubyforge_name       = p.name # TODO this is default value
-  # p.extra_deps         = [
-  #   ['activesupport','>= 2.0.2'],
-  # ]
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+Echoe.new('ruby-googlechart', '0.6.1') do |p|
+  p.description     = 'Ruby wrapper around the Google Charts API'
+  p.url             = 'http://github.com/jparker/ruby-googlechart'
+  p.author          = 'John Parker'
+  p.email           = 'jparker@urgetopunt.com'
+  p.ignore_pattern  = %w[tmp/* script/*]
+  # p.development_dependencies = []
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
-
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each {|ext| load ext }

data/lib/google_chart/data.rb

@@ -35,7 +35,11 @@ module GoogleChart
     
     def normalize(set, encoding_max)
       min, max = scale.min, scale.max
-      set.map {|e| (e.to_f - min) / (max - min) * encoding_max if e }
+      if min != max
+        set.map {|e| (e.to_f - min) / (max - min) * encoding_max if e }
+      else
+        set
+      end
     end
     
     def simple_encode(data)

data/lib/google_chart.rb

@@ -18,8 +18,6 @@ require 'google_chart/bar_chart'
 require 'google_chart/line_chart'
 
 module GoogleChart
-  VERSION = '0.6.0'
-  
   def self.Line(options = {}, &block)
     GoogleChart::LineChart.new(options, &block).to_url
   end

data/ruby-googlechart.gemspec

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby-googlechart}
+  s.version = "0.6.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["John Parker"]
+  s.date = %q{2008-11-12}
+  s.description = %q{Ruby wrapper around the Google Charts API}
+  s.email = %q{jparker@urgetopunt.com}
+  s.extra_rdoc_files = ["CHANGELOG", "lib/google_chart/abstract_chart.rb", "lib/google_chart/axis.rb", "lib/google_chart/bar_chart.rb", "lib/google_chart/bar_style.rb", "lib/google_chart/color.rb", "lib/google_chart/data.rb", "lib/google_chart/grid_line.rb", "lib/google_chart/legend.rb", "lib/google_chart/line_chart.rb", "lib/google_chart/line_style.rb", "lib/google_chart/range_marker.rb", "lib/google_chart/title.rb", "lib/google_chart.rb", "README.rdoc"]
+  s.files = ["CHANGELOG", "lib/google_chart/abstract_chart.rb", "lib/google_chart/axis.rb", "lib/google_chart/bar_chart.rb", "lib/google_chart/bar_style.rb", "lib/google_chart/color.rb", "lib/google_chart/data.rb", "lib/google_chart/grid_line.rb", "lib/google_chart/legend.rb", "lib/google_chart/line_chart.rb", "lib/google_chart/line_style.rb", "lib/google_chart/range_marker.rb", "lib/google_chart/title.rb", "lib/google_chart.rb", "Manifest", "Rakefile", "README.rdoc", "ruby-googlechart.gemspec", "test/google_chart/test_abstract_chart.rb", "test/google_chart/test_axis.rb", "test/google_chart/test_bar_chart.rb", "test/google_chart/test_bar_style.rb", "test/google_chart/test_color.rb", "test/google_chart/test_data.rb", "test/google_chart/test_grid_line.rb", "test/google_chart/test_legend.rb", "test/google_chart/test_line_chart.rb", "test/google_chart/test_line_style.rb", "test/google_chart/test_range_marker.rb", "test/google_chart/test_title.rb", "test/test_google_chart.rb", "test/test_helper.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/jparker/ruby-googlechart}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ruby-googlechart", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{ruby-googlechart}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Ruby wrapper around the Google Charts API}
+  s.test_files = ["test/google_chart/test_abstract_chart.rb", "test/google_chart/test_axis.rb", "test/google_chart/test_bar_chart.rb", "test/google_chart/test_bar_style.rb", "test/google_chart/test_color.rb", "test/google_chart/test_data.rb", "test/google_chart/test_grid_line.rb", "test/google_chart/test_legend.rb", "test/google_chart/test_line_chart.rb", "test/google_chart/test_line_style.rb", "test/google_chart/test_range_marker.rb", "test/google_chart/test_title.rb", "test/test_google_chart.rb", "test/test_helper.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/test/google_chart/test_data.rb

@@ -29,10 +29,20 @@ class TestData < Test::Unit::TestCase
       assert_match(/\bchd=s:JP,YH\b/, @chart.to_url)
     end
     
-    should 'encode missing data' do
-      @chart.data = [50, nil, 33]
+    should 'encode floating point data' do
+      @chart.data = [49.5, 33.4]
       @chart.scale = 0..61
-      assert_match(/\bchd=s:y_h\b/, @chart.to_url)
+      assert_match(/\bchd=s:yh\b/, @chart.to_url)
+    end
+    
+    should 'encode all zeros with "A"' do
+      @chart.data = [0, 0, 0]
+      assert_match(/\bchd=s:AAA\b/, @chart.to_url)
+    end
+    
+    should 'encode unchanging non-zero data with "9"' do
+      @chart.data = [1, 1, 1]
+      assert_match(/\bchd=s:999\b/, @chart.to_url)
     end
     
     should 'encode out-of-bounds data' do
@@ -41,10 +51,10 @@ class TestData < Test::Unit::TestCase
       assert_match(/\bchd=s:998BAA/, @chart.to_url)
     end
     
-    should 'encode floating point data' do
-      @chart.data = [49.5, 33.4]
+    should 'encode missing data' do
+      @chart.data = [50, nil, 33]
       @chart.scale = 0..61
-      assert_match(/\bchd=s:yh\b/, @chart.to_url)
+      assert_match(/\bchd=s:y_h\b/, @chart.to_url)
     end
   end
   
@@ -68,10 +78,20 @@ class TestData < Test::Unit::TestCase
       assert_match(/\bchd=e:jpyh,JPYH\b/, @chart.to_url)
     end
     
-    should 'encode missing data' do
-      @chart.data = [2281, nil, 3233]
+    should 'encode floating point data' do
+      @chart.data = [2281.49, 3232.50]
       @chart.scale = 0..4095
-      assert_match(/\bchd=e:jp__yh\b/, @chart.to_url)
+      assert_match(/\bchd=e:jpyh\b/, @chart.to_url)
+    end
+    
+    should 'encode all zeros with "AA"' do
+      @chart.data = [0, 0, 0]
+      assert_match(/\bchd=e:AAAAAA\b/, @chart.to_url)
+    end
+    
+    should 'encode unchanging non-zero data with ".."' do
+      @chart.data = [1, 1, 1]
+      assert_match(/\bchd=e:\.{6}/, @chart.to_url)
     end
     
     should 'encode out-of-bounds data' do
@@ -80,10 +100,10 @@ class TestData < Test::Unit::TestCase
       assert_match(/\bchd=e:\.\.\.\.\.-ABAAAA\b/, @chart.to_url)
     end
     
-    should 'encode floating point data' do
-      @chart.data = [2281.49, 3232.50]
+    should 'encode missing data' do
+      @chart.data = [2281, nil, 3233]
       @chart.scale = 0..4095
-      assert_match(/\bchd=e:jpyh\b/, @chart.to_url)
+      assert_match(/\bchd=e:jp__yh\b/, @chart.to_url)
     end
   end
   
@@ -107,10 +127,20 @@ class TestData < Test::Unit::TestCase
       assert_match(/\bchd=t:6,14\|5,23\b/, @chart.to_url)
     end
     
-    should 'encode missing data' do
-      @chart.data = [6, nil, 14]
+    should 'rounds floating point data to the nearest tenth' do
+      @chart.data = [5.95, 14.01, 5.23]
       @chart.scale = 0..100
-      assert_match(/\bchd=t:6,-1,14\b/, @chart.to_url)
+      assert_match(/\bchd=t:6,14,5.2\b/, @chart.to_url)
+    end
+    
+    should 'encode all zeros with "0"' do
+      @chart.data = [0, 0, 0]
+      assert_match(/\bchd=t:0,0,0\b/, @chart.to_url)
+    end
+    
+    should 'encode unchanging non-zero data with "100"' do
+      @chart.data = [1, 1, 1]
+      assert_match(/\bchd=t:100,100,100\b/, @chart.to_url)
     end
     
     should 'encode out-of-bounds data' do
@@ -119,10 +149,10 @@ class TestData < Test::Unit::TestCase
       assert_match(/\bchd=t:100,100,99,1,0,0\b/, @chart.to_url)
     end
     
-    should 'rounds floating point data to the nearest tenth' do
-      @chart.data = [5.95, 14.01, 5.23]
+    should 'encode missing data' do
+      @chart.data = [6, nil, 14]
       @chart.scale = 0..100
-      assert_match(/\bchd=t:6,14,5.2\b/, @chart.to_url)
+      assert_match(/\bchd=t:6,-1,14\b/, @chart.to_url)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jparker-ruby-googlechart
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - John Parker
@@ -9,52 +9,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-11 00:00:00 -08:00
+date: 2008-11-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: echoe
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.3
+        version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
-description: ruby-googlechart is a ruby library which provides object-oriented access to the Google Charts API
+description: Ruby wrapper around the Google Charts API
 email: jparker@urgetopunt.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-files: 
-- History.txt
-- Manifest.txt
-- Rakefile
-- README.txt
+- CHANGELOG
+- lib/google_chart/abstract_chart.rb
+- lib/google_chart/axis.rb
+- lib/google_chart/bar_chart.rb
+- lib/google_chart/bar_style.rb
+- lib/google_chart/color.rb
+- lib/google_chart/data.rb
+- lib/google_chart/grid_line.rb
+- lib/google_chart/legend.rb
+- lib/google_chart/line_chart.rb
+- lib/google_chart/line_style.rb
+- lib/google_chart/range_marker.rb
+- lib/google_chart/title.rb
 - lib/google_chart.rb
+- README.rdoc
+files: 
+- CHANGELOG
 - lib/google_chart/abstract_chart.rb
 - lib/google_chart/axis.rb
 - lib/google_chart/bar_chart.rb
@@ -67,12 +57,35 @@ files:
 - lib/google_chart/line_style.rb
 - lib/google_chart/range_marker.rb
 - lib/google_chart/title.rb
-has_rdoc: false
+- lib/google_chart.rb
+- Manifest
+- Rakefile
+- README.rdoc
+- ruby-googlechart.gemspec
+- test/google_chart/test_abstract_chart.rb
+- test/google_chart/test_axis.rb
+- test/google_chart/test_bar_chart.rb
+- test/google_chart/test_bar_style.rb
+- test/google_chart/test_color.rb
+- test/google_chart/test_data.rb
+- test/google_chart/test_grid_line.rb
+- test/google_chart/test_legend.rb
+- test/google_chart/test_line_chart.rb
+- test/google_chart/test_line_style.rb
+- test/google_chart/test_range_marker.rb
+- test/google_chart/test_title.rb
+- test/test_google_chart.rb
+- test/test_helper.rb
+has_rdoc: true
 homepage: http://github.com/jparker/ruby-googlechart
 post_install_message: 
 rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Ruby-googlechart
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -85,18 +98,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: ruby-googlechart
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Ruby wrapper for the Google Charts API
+summary: Ruby wrapper around the Google Charts API
 test_files: 
-- test/test_helper.rb
-- test/test_google_chart.rb
 - test/google_chart/test_abstract_chart.rb
 - test/google_chart/test_axis.rb
 - test/google_chart/test_bar_chart.rb
@@ -109,3 +120,5 @@ test_files:
 - test/google_chart/test_line_style.rb
 - test/google_chart/test_range_marker.rb
 - test/google_chart/test_title.rb
+- test/test_google_chart.rb
+- test/test_helper.rb

data/History.txt

@@ -1,6 +0,0 @@
-== 0.0.1 2008-05-14
-
-* 1 major enhancement:
-  * Initial release
-  * Bar chart support
-  * Line chart support

data/Manifest.txt

@@ -1,52 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-PostInstall.txt
-README.txt
-Rakefile
-TODO.txt
-config/hoe.rb
-config/requirements.rb
-lib/google_chart.rb
-lib/google_chart/axes.rb
-lib/google_chart/bar.rb
-lib/google_chart/bar_styles.rb
-lib/google_chart/base.rb
-lib/google_chart/colors.rb
-lib/google_chart/data.rb
-lib/google_chart/grid_lines.rb
-lib/google_chart/legends.rb
-lib/google_chart/line.rb
-lib/google_chart/line_styles.rb
-lib/google_chart/range_markers.rb
-lib/google_chart/sizes.rb
-lib/google_chart/titles.rb
-ruby-googlechart.gemspec
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
-test/google_chart/test_axes.rb
-test/google_chart/test_bar.rb
-test/google_chart/test_bar_styles.rb
-test/google_chart/test_base.rb
-test/google_chart/test_colors.rb
-test/google_chart/test_data.rb
-test/google_chart/test_grid_lines.rb
-test/google_chart/test_legends.rb
-test/google_chart/test_line.rb
-test/google_chart/test_line_styles.rb
-test/google_chart/test_range_markers.rb
-test/google_chart/test_sizes.rb
-test/google_chart/test_titles.rb
-test/test_google_chart.rb
-test/test_helper.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.html.erb