@@ -10,8 +10,9 @@ == 0.6.0 2008-11-12 * Continued cleanup -* Fixed data scaling bugs +* 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 CHANGELOG @@ -81,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. \ No newline at end of file +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. README.rdoc @@ -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) lib/google_chart/data.rb @@ -9,11 +9,11 @@ Gem::Specification.new do |s| 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 = ["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.txt"] - s.files = ["History.txt", "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", "License.txt", "Manifest", "Rakefile", "README.txt", "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.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.txt"] + 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} ruby-googlechart.gemspec @@ -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 test/google_chart/test_data.rb b4d063a586411649ea91eee3f53f14568cb31a13 John Parker jparker@urgetopunt.com http://github.com/jparker/ruby-googlechart/commit/0571b6045f50694707b8b037fc97e54e96a078b2 0571b6045f50694707b8b037fc97e54e96a078b2 2008-11-12T22:56:53-08:00 2008-11-12T22:56:53-08:00 Fixed data scaling bug with all-zero data 6a8c35a5bc9feced74949b3bc9a74d80578d2cb9 John Parker jparker@urgetopunt.com