graphite_graph 0.0.4 → 0.0.5

data/lib/graphite_graph.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'cgi'
 require "graphite_graph/version"
 # A small DSL to assist in the creation of Graphite graphs
 # see https://github.com/ripienaar/graphite-graph-dsl/wiki
@@ -39,6 +40,7 @@ class GraphiteGraph
                    :fontbold => false,
                    :fontname => nil,
                    :timezone => nil,
+                   :xformat => nil,
                    :background_color => nil,
                    :foreground_color => nil,
                    :draw_null_as_zero => false,
@@ -275,6 +277,7 @@ class GraphiteGraph
     url_parts << "fontName=#{properties[:fontname]}" if properties[:fontname]
     url_parts << "drawNullAsZero=#{properties[:draw_null_as_zero]}" if properties[:draw_null_as_zero]
     url_parts << "tz=#{properties[:timezone]}" if properties[:timezone]
+    url_parts << "xFormat=#{properties[:xformat]}" if properties[:xformat]
     url_parts << "majorGridLineColor=#{properties[:major_grid_line_color]}" if properties[:major_grid_line_color]
     url_parts << "minorGridLineColor=#{properties[:minor_grid_line_color]}" if properties[:minor_grid_line_color]
     url_parts << "bgcolor=#{properties[:background_color]}" if properties[:background_color]
@@ -339,7 +342,7 @@ class GraphiteGraph
       url_str = url_parts.join("&")
       properties[:placeholders].each { |k,v| url_str.gsub!("%{#{k}}", v.to_s) } if properties[:placeholders].is_a?(Hash)
 
-      URI.encode(url_str, Regexp.union(URI::REGEXP::UNSAFE, /[+]/))
+      CGI.escape(url_str)
     else
       url_parts
     end

data/lib/graphite_graph/version.rb

@@ -1,3 +1,3 @@
 class GraphiteGraph
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphite_graph
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 +01:00
+date: 2012-07-16 00:00:00 +01:00
 default_executable: 
 dependencies: []