graphite_graph 0.0.7 → 0.0.8

data/lib/graphite_graph.rb

@@ -33,7 +33,9 @@ class GraphiteGraph
                    :hide_legend => nil,
                    :hide_grid => nil,
                    :ymin => nil,
+                   :yminright => nil,
                    :ymax => nil,
+                   :ymaxright => nil,
                    :yunit_system => nil,
                    :linewidth => nil,
                    :linemode => nil,
@@ -49,7 +51,8 @@ class GraphiteGraph
                    :minor_grid_line_color => nil,
                    :area => :none,
                    :logbase => nil,
-                   :placeholders => nil}.merge(@overrides)
+                   :placeholders => nil,
+                   :area_alpha => nil}.merge(@overrides)
   end
 
   def [](key)
@@ -261,7 +264,6 @@ class GraphiteGraph
     return nil if properties[:surpress]
 
     url_parts = []
-    colors = []
 
     [:title, :vtitle, :from, :width, :height, :until].each do |item|
       url_parts << "#{item}=#{properties[item]}" if properties[item]
@@ -271,7 +273,9 @@ class GraphiteGraph
     url_parts << "hideLegend=#{properties[:hide_legend]}" unless properties[:hide_legend].nil?
     url_parts << "hideGrid=#{properties[:hide_grid]}" if properties[:hide_grid]
     url_parts << "yMin=#{properties[:ymin]}" if properties[:ymin]
+    url_parts << "yMinRight=#{properties[:yminright]}" if properties[:yminright]
     url_parts << "yMax=#{properties[:ymax]}" if properties[:ymax]
+    url_parts << "yMaxRight=#{properties[:ymaxright]}" if properties[:ymaxright]
     url_parts << "yUnitSystem=#{properties[:yunit_system]}" if properties[:yunit_system]
     url_parts << "lineWidth=#{properties[:linewidth]}" if properties[:linewidth]
     url_parts << "lineMode=#{properties[:linemode]}" if properties[:linemode]
@@ -287,6 +291,7 @@ class GraphiteGraph
     url_parts << "fgcolor=#{properties[:foreground_color]}" if properties[:foreground_color]
     url_parts << "vtitleRight=#{properties[:vtitle_right]}" if properties[:vtitle_right]
     url_parts << "logBase=#{properties[:logbase]}" if properties[:logbase]
+    url_parts << "areaAlpha=#{properties[:area_alpha]}" if properties[:area_alpha]
 
     target_order.each do |name|
       target = targets[name]
@@ -298,6 +303,7 @@ class GraphiteGraph
 
         graphite_target = target[:data]
 
+        graphite_target = "lineWidth(#{graphite_target},#{target[:field_linewidth]})" if target[:field_linewidth]
         graphite_target = "keepLastValue(#{graphite_target})" if target[:keep_last_value]
         graphite_target = "sum(#{graphite_target})" if target[:sum]
         if target[:derivative]
@@ -350,8 +356,8 @@ class GraphiteGraph
     url_parts << "format=#{format}" if format
 
     if url
+      properties[:placeholders].each { |k,v| url_parts.each {|part| part.gsub!("%{#{k}}", v.to_s) } } if properties[:placeholders].is_a?(Hash)
       url_str = url_parts.map { |pair| k,v = pair.split('='); "#{k}=#{CGI.escape(v)}" }.join("&")
-      properties[:placeholders].each { |k,v| url_str.gsub!("%{#{k}}", v.to_s) } if properties[:placeholders].is_a?(Hash)
 
       url_str
     else

data/lib/graphite_graph/version.rb

@@ -1,3 +1,3 @@
 class GraphiteGraph
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphite_graph
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-21 00:00:00 +01:00
+date: 2013-01-18 00:00:00 +00:00
 default_executable: 
 dependencies: []