@@ -1,3 +1,6 @@
+== 1.3.X
+* added code to properly escape image tag URLs (mokolabs)
+
== 1.3.4
* updated documentation and cleaned it up (mokolabs)
* added support for custom class, id and alt tags when using the image_tag format (i.e Gchart.line(:data => [0, 26], :format => 'image_tag')) (mokolabs)
History.txt
@@ -130,7 +130,7 @@ class Gchart
image = "<img"
image += " id=\"#{@id}\"" if @id
image += " class=\"#{@class}\"" if @class
- image += " src=\"#{query_builder}\""
+ image += " src=\"#{query_builder(:html)}\""
image += " width=\"#{@width}\""
image += " height=\"#{@height}\""
image += " alt=\"#{@alt}\""
@@ -368,7 +368,7 @@ class Gchart
end
- def query_builder
+ def query_builder(options="")
query_params = instance_variables.map do |var|
case var
# Set the graph size
@@ -399,7 +399,15 @@ class Gchart
end
end.compact
- jstize(@@url + query_params.join('&'))
+ # Use ampersand as default delimiter
+ unless options == :html
+ delimiter = '&'
+ # Escape ampersand for html image tags
+ else
+ delimiter = '&'
+ end
+
+ jstize(@@url + query_params.join(delimiter))
end
end
\ No newline at end of file
lib/gchart.rb
@@ -404,6 +404,15 @@ describe 'exporting a chart' do
it "should be available as an image tag using custom css class selector" do
Gchart.line(:data => [0, 26], :format => 'image_tag', :class => 'chart').should match(/<img class="chart" src=(.*) width="300" height="200" alt="Google Chart" \/>/)
end
+
+ it "should use ampersands to separate key/value pairs in URLs by default" do
+ Gchart.line(:data => [0, 26]).should satisfy {|chart| chart.include? "&" }
+ Gchart.line(:data => [0, 26]).should_not satisfy {|chart| chart.include? "&" }
+ end
+
+ it "should escape ampersands in URLs when used as an image tag" do
+ Gchart.line(:data => [0, 26], :format => 'image_tag', :class => 'chart').should satisfy {|chart| chart.include? "&" }
+ end
it "should be available as a file" do
File.delete('chart.png') if File.exist?('chart.png')
spec/gchart_spec.rb
@@ -562,7 +562,7 @@ Data set:
<p><strong>Insert as an image tag</strong></p>
- <p>Because, I’m lazy, you can generate a full image tag, with support for the standard html options.</p>
+ <p>Because, I’m lazy, you can generate a full image tag, with support for standard html options.</p>
<p><pre class='syntax'>
@@ -571,7 +571,7 @@ Data set:
<p><pre class='syntax'>
-<span class="punct"><</span><span class="ident">img</span> <span class="ident">src</span><span class="punct">="</span><span class="string">http://chart.apis.google.com/chart?chs=300x200&chd=s:A9&cht=lc</span><span class="punct">"</span> <span class="ident">width</span><span class="punct">="</span><span class="string">300</span><span class="punct">"</span> <span class="ident">height</span><span class="punct">="</span><span class="string">200</span><span class="punct">"</span> <span class="ident">alt</span><span class="punct">="</span><span class="string">Google Chart</span><span class="punct">"</span> <span class="punct">/></span>
+<span class="punct"><</span><span class="ident">img</span> <span class="ident">src</span><span class="punct">="</span><span class="string">http://chart.apis.google.com/chart?chs=300x200&amp;chd=s:A9&amp;cht=lc</span><span class="punct">"</span> <span class="ident">width</span><span class="punct">="</span><span class="string">300</span><span class="punct">"</span> <span class="ident">height</span><span class="punct">="</span><span class="string">200</span><span class="punct">"</span> <span class="ident">alt</span><span class="punct">="</span><span class="string">Google Chart</span><span class="punct">"</span> <span class="punct">/></span>
</pre></p>
@@ -716,7 +716,7 @@ Data set:
<a href="http://github.com/takeo">Toby Sterrett</a>
<a href="http://github.com/mokolabs">Patrick Crowley</a></p>
<p class="coda">
- <a href="mattaimonetti@gmail.com">Matt Aimonetti</a>, 26th June 2008<br>
+ <a href="mattaimonetti@gmail.com">Matt Aimonetti</a>, 2nd July 2008<br>
Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
</p>
</div>
website/index.html
@@ -397,14 +397,14 @@ Gchart.line(:data => [0, 26], :format => 'file', :filename => 'custom_filename.p
*Insert as an image tag*
-Because, I'm lazy, you can generate a full image tag, with support for the standard html options.
+Because, I'm lazy, you can generate a full image tag, with support for standard html options.
<pre syntax="ruby">
Gchart.line(:data => [0, 26], :format => 'image_tag')
</pre>
<pre syntax="ruby">
-<img src="http://chart.apis.google.com/chart?chs=300x200&chd=s:A9&cht=lc" width="300" height="200" alt="Google Chart" />
+<img src="http://chart.apis.google.com/chart?chs=300x200&chd=s:A9&cht=lc" width="300" height="200" alt="Google Chart" />
</pre>
Here are a few more examples:
website/index.txt
a02bbf85e38751c4715c1f1ab7e161243ac8fb1a
Patrick
patrick@mokolabs.com
http://github.com/mattetti/googlecharts/commit/c05957222941cbbfebe17076d730de84c61e17b6
c05957222941cbbfebe17076d730de84c61e17b6
2008-07-02T01:44:39-07:00
2008-07-02T01:44:39-07:00
added code to properly escape image tag URLs
632345e8bb58878f72ffb671be4fc707c4c2b22b
Patrick
patrick@mokolabs.com