googlecharts 1.5.1 → 1.5.2

data/Rakefile

@@ -1,20 +1,20 @@
-require 'rubygems'  
-require 'rake'
-
-begin  
-  require 'jeweler'  
-  Jeweler::Tasks.new do |gemspec|  
-    gemspec.name = "googlecharts"  
-    gemspec.summary = "Generate charts using Google API & Ruby"  
-    gemspec.description = "Generate charts using Google API & Ruby"  
-    gemspec.email = "mattaimonetti@gmail.com"  
-    gemspec.homepage = "http://googlecharts.rubyforge.org/"  
-    gemspec.authors = ["Matt Aimonetti"]  
-  end 
-  Jeweler::GemcutterTasks.new 
-rescue LoadError  
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
-end  
-  
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-
+require 'rubygems'  
+require 'rake'
+
+begin  
+  require 'jeweler'  
+  Jeweler::Tasks.new do |gemspec|  
+    gemspec.name = "googlecharts"  
+    gemspec.summary = "Generate charts using Google API & Ruby"  
+    gemspec.description = "Generate charts using Google API & Ruby"  
+    gemspec.email = "mattaimonetti@gmail.com"  
+    gemspec.homepage = "http://googlecharts.rubyforge.org/"  
+    gemspec.authors = ["Matt Aimonetti"]  
+  end 
+  Jeweler::GemcutterTasks.new 
+rescue LoadError  
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
+end  
+  
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
+

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/lib/gchart.rb

@@ -37,7 +37,7 @@ class Gchart
   :title_color, :title_size, :custom, :axis_with_labels, :axis_labels, :bar_width_and_spacing, :id, :alt, :klass,
   :range_markers, :geographical_area, :map_colors, :country_codes, :axis_range, :filename, :min, :max, :colors
 
-  attr_accessor :bg_type, :bg_color, :bg_angle, :chart_type, :chart_color, :chart_angle, :axis_range
+  attr_accessor :bg_type, :bg_color, :bg_angle, :chart_type, :chart_color, :chart_angle, :axis_range, :thickness, :new_markers, :grid_lines 
 
   attr_accessor :min_value, :max_value
   
@@ -90,6 +90,7 @@ class Gchart
     end
   end
 
+  
   def self.supported_types
     Gchart.types.join(' ')
   end
@@ -99,6 +100,14 @@ class Gchart
   def size=(size='300x200')
     @width, @height = size.split("x").map { |dimension| dimension.to_i }
   end
+  
+  def size=(size='300x200')
+    @width, @height = size.split("x").map { |dimension| dimension.to_i }
+  end
+  
+
+  
+
 
   def size
     "#{width}x#{height}"
@@ -242,7 +251,9 @@ class Gchart
   end
   
   def self.jstize(string)
-    string.gsub(' ', '+').gsub(/\[|\{|\}|\\|\^|\[|\]|\`|\]/) {|c| "%#{c[0].to_s.upcase}"}
+    # See discussion: http://github.com/mattetti/googlecharts/commit/9b5cfb93aa51aae06611057668e631cd515ec4f3#comment_51347
+    # string.gsub(' ', '+').gsub(/\[|\{|\}|\\|\^|\[|\]|\`|\]/) {|c| "%#{c[0].to_s.upcase}"}
+    string.gsub(' ', '+').gsub(/\[|\{|\}|\||\\|\^|\[|\]|\`|\]/) {|c| "%#{c[0].to_s.upcase}"}
   end    
   # load all the custom aliases
   require 'gchart/aliases'
@@ -396,6 +407,18 @@ class Gchart
 
   end
 
+  def set_line_thickness
+      "chls=#{thickness}"
+  end
+  
+  def set_line_markers
+      "chm=#{new_markers}"
+  end
+  
+  def set_grid_lines
+      "chg=#{grid_lines}"
+  end
+  
   def set_labels
     if legend.is_a?(Array)
       "chl=#{@legend.map{|label| "#{CGI::escape(label.to_s)}"}.join('|')}"
@@ -426,6 +449,8 @@ class Gchart
         "#{index}:|#{labels}"
       end
     end
+    count = labels_arr.length
+    
     "chxl=#{labels_arr.join('|')}"
   end
 
@@ -446,6 +471,10 @@ class Gchart
       nil
     end
   end
+  
+
+
+  
 
   def set_geographical_area
     "chtm=#{geographical_area}"
@@ -618,6 +647,10 @@ class Gchart
         set_title unless title.nil?
       when '@legend'
         set_legend unless legend.nil?
+      when '@thickness'
+        set_line_thickness
+      when '@new_markers'
+          set_line_markers
       when '@bg_color'
         set_colors
       when '@chart_color'
@@ -632,6 +665,8 @@ class Gchart
         set_axis_labels
       when '@range_markers'
         set_range_markers
+      when '@grid_lines'
+        set_grid_lines
       when '@geographical_area'
         set_geographical_area
       when '@country_codes'

data/website/stylesheets/screen.css

@@ -1,139 +1,139 @@
-body {
-  background-color: #E1D1F1;
-  font-family: "Georgia", sans-serif;
-  font-size: 16px;
-  line-height: 1.6em;
-  padding: 1.6em 0 0 0;
-  color: #333;
-}
-h1, h2, h3, h4, h5, h6 {
-  color: #444;
-}
-h1 { 
-  font-family: sans-serif;
-  font-weight: normal;
-  font-size: 4em;
-  line-height: 0.8em;
-  letter-spacing: -0.1ex;
-	margin: 5px;
-}
-li {
-  padding: 0;
-  margin: 0;
-  list-style-type: square;
-}
-a {
-  color: #5E5AFF;
-	background-color: #DAC;
-  font-weight: normal;
-  text-decoration: underline;
-}
-blockquote {
-  font-size: 90%;
-  font-style: italic;
-  border-left: 1px solid #111;
-  padding-left: 1em;
-}
-.caps {
-  font-size: 80%;
-}
-
-#main {
-  width: 45em;
-  padding: 0;
-  margin: 0 auto;
-}
-.coda {
-  text-align: right;
-  color: #77f;
-  font-size: smaller;
-}
-
-table {
-  font-size: 90%;
-  line-height: 1.4em;
-  color: #ff8;
-  background-color: #111;
-  padding: 2px 10px 2px 10px;
-	border-style: dashed;
-}
-
-th {
-	color: #fff;
-}
-
-td {
-  padding: 2px 10px 2px 10px;
-}
-
-.success {
-	color: #0CC52B;
-}
-
-.failed {
-	color: #E90A1B;
-}
-
-.unknown {
-	color: #995000;
-}
-pre, code {
-  font-family: monospace;
-  font-size: 90%;
-  line-height: 1.4em;
-  color: #ff8;
-  background-color: #111;
-  padding: 2px 10px 2px 10px;
-  overflow: auto;
-}
-.comment { color: #aaa; font-style: italic; }
-.keyword { color: #eff; font-weight: bold; }
-.punct { color: #eee; font-weight: bold; }
-.symbol { color: #0bb; }
-.string { color: #6b4; }
-.ident { color: #ff8; }
-.constant { color: #66f; }
-.regex { color: #ec6; }
-.number { color: #F99; }
-.expr { color: #227; }
-
-#version {
-  float: right;
-  text-align: right;
-  font-family: sans-serif;
-  font-weight: normal;
-  background-color: #B3ABFF;
-  color: #141331;
-  padding: 15px 20px 10px 20px;
-  margin: 0 auto;
-	margin-top: 15px;
-  border: 3px solid #141331;
-}
-
-#version .numbers {
-  display: block;
-  font-size: 4em;
-  line-height: 0.8em;
-  letter-spacing: -0.1ex;
-	margin-bottom: 15px;
-}
-
-#version p {
-  text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
-	margin: 0;
-	padding: 0;
-}
-
-#version a {
-  text-decoration: none;
-	color: #141331;
-	background-color: #B3ABFF;
-}
-
-.clickable {
-	cursor:	pointer; 
-	cursor:	hand;
-}
-
+body {
+  background-color: #E1D1F1;
+  font-family: "Georgia", sans-serif;
+  font-size: 16px;
+  line-height: 1.6em;
+  padding: 1.6em 0 0 0;
+  color: #333;
+}
+h1, h2, h3, h4, h5, h6 {
+  color: #444;
+}
+h1 { 
+  font-family: sans-serif;
+  font-weight: normal;
+  font-size: 4em;
+  line-height: 0.8em;
+  letter-spacing: -0.1ex;
+	margin: 5px;
+}
+li {
+  padding: 0;
+  margin: 0;
+  list-style-type: square;
+}
+a {
+  color: #5E5AFF;
+	background-color: #DAC;
+  font-weight: normal;
+  text-decoration: underline;
+}
+blockquote {
+  font-size: 90%;
+  font-style: italic;
+  border-left: 1px solid #111;
+  padding-left: 1em;
+}
+.caps {
+  font-size: 80%;
+}
+
+#main {
+  width: 45em;
+  padding: 0;
+  margin: 0 auto;
+}
+.coda {
+  text-align: right;
+  color: #77f;
+  font-size: smaller;
+}
+
+table {
+  font-size: 90%;
+  line-height: 1.4em;
+  color: #ff8;
+  background-color: #111;
+  padding: 2px 10px 2px 10px;
+	border-style: dashed;
+}
+
+th {
+	color: #fff;
+}
+
+td {
+  padding: 2px 10px 2px 10px;
+}
+
+.success {
+	color: #0CC52B;
+}
+
+.failed {
+	color: #E90A1B;
+}
+
+.unknown {
+	color: #995000;
+}
+pre, code {
+  font-family: monospace;
+  font-size: 90%;
+  line-height: 1.4em;
+  color: #ff8;
+  background-color: #111;
+  padding: 2px 10px 2px 10px;
+  overflow: auto;
+}
+.comment { color: #aaa; font-style: italic; }
+.keyword { color: #eff; font-weight: bold; }
+.punct { color: #eee; font-weight: bold; }
+.symbol { color: #0bb; }
+.string { color: #6b4; }
+.ident { color: #ff8; }
+.constant { color: #66f; }
+.regex { color: #ec6; }
+.number { color: #F99; }
+.expr { color: #227; }
+
+#version {
+  float: right;
+  text-align: right;
+  font-family: sans-serif;
+  font-weight: normal;
+  background-color: #B3ABFF;
+  color: #141331;
+  padding: 15px 20px 10px 20px;
+  margin: 0 auto;
+	margin-top: 15px;
+  border: 3px solid #141331;
+}
+
+#version .numbers {
+  display: block;
+  font-size: 4em;
+  line-height: 0.8em;
+  letter-spacing: -0.1ex;
+	margin-bottom: 15px;
+}
+
+#version p {
+  text-decoration: none;
+	color: #141331;
+	background-color: #B3ABFF;
+	margin: 0;
+	padding: 0;
+}
+
+#version a {
+  text-decoration: none;
+	color: #141331;
+	background-color: #B3ABFF;
+}
+
+.clickable {
+	cursor:	pointer; 
+	cursor:	hand;
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlecharts
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -08:00
+date: 2010-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: []