graphite-metric 0.2.2 → 0.3.0

data/README.md

@@ -70,7 +70,7 @@ gmps.map(&:to_s)
 ### GraphiteMetric::Raw
 
 It supports single as well as multiple raw metrics (multiple targets).
-For simplicity's, all examples will use single metrics:
+For simplicity, all examples will use single metrics:
 
 ```ruby
 gmr = GraphiteMetric::Raw.new("my.metric,1336559725,1336559845,60|34.999,35.10,33.0")

data/lib/graphite-metric/raw.rb

@@ -33,6 +33,31 @@ module GraphiteMetric
       end
     end
 
+    # It's most efficient to use the raw metrics directly.
+    # As of graphite 0.9.10, these values are available in the headers
+    # when using cactiStyle function:
+    # http://graphite.readthedocs.org/en/0.9.10/functions.html#graphite.render.functions.cactiStyle
+    def summary_metrics
+      return @summary if @summary
+
+      @summary = {}
+
+      @raw.split("\n").each do |raw|
+        raw_headers, raw_metrics = raw.split("|")
+
+        metric_name, from, to, step  = extract_headers(raw_headers)
+        metrics = raw_metrics.split(",").map { |v| float(v) }
+
+        @summary[metric_name] = {
+          :min => metrics.min,
+          :max => metrics.max,
+          :avg => float(metrics.reduce(:+) / metrics.size).round(3)
+        }
+      end
+
+      @summary
+    end
+
     def populate_from_raw
       @metrics = []
       @raw.split("\n").each do |raw|

data/lib/graphite-metric/util.rb

@@ -5,7 +5,7 @@ module GraphiteMetric
     def float(raw_metric)
       Float(raw_metric)
     rescue
-      0
+      0.0
     end
 
     def extract_headers(raw_headers)

data/lib/graphite-metric/version.rb

@@ -1,3 +1,3 @@
 module GraphiteMetric
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/test/graphite-metric/raw_test.rb

@@ -39,5 +39,17 @@ module GraphiteMetric
       gmr = GraphiteMetric::Raw.new(metric_with_functions_raw)
       gmr.metrics.must_equal metric_with_functions_converted
     end
+
+    describe "summarises" do
+      it "single metrics" do
+        gmr = GraphiteMetric::Raw.new(single_metric_raw)
+        gmr.summary_metrics.must_equal single_metric_summarised
+      end
+
+      it "multiple metrics" do
+        gmr = GraphiteMetric::Raw.new(multiple_metrics_raw)
+        gmr.summary_metrics.must_equal multiple_metrics_summarised
+      end
+    end
   end
 end

data/test/graphite-metric/util_test.rb

@@ -5,6 +5,24 @@ include TestHelpers
 
 module GraphiteMetric
   describe Util do
+    describe "float" do
+      it "converts string" do
+        Util.float("1.8008138").must_equal 1.8008138
+      end
+
+      it "converts integer" do
+        converted = Util.float(1)
+        converted.must_be_instance_of Float
+        converted.to_s.must_equal "1.0"
+      end
+
+      it "invalid value becomes 0.0" do
+        converted = Util.float("None")
+        converted.must_be_instance_of Float
+        converted.to_s.must_equal "0.0"
+      end
+    end
+
     describe "extract_raw_headers" do
       it "simple metrics" do
         Util.extract_headers("my.metric,1336559725,1336559845,60").must_equal(

data/test/test_helper.rb

@@ -32,6 +32,16 @@ module TestHelpers
     ]
   end
 
+  def single_metric_summarised
+    {
+      "my.metric" => {
+        :min => 0.000,
+        :max => 35.100,
+        :avg => 23.366
+      }
+    }
+  end
+
   def multiple_metrics_raw
     @multiple_metrics_raw ||= File.read("#{BASE_PATH}/test/fixtures/multiple_metrics.txt")
   end
@@ -71,6 +81,21 @@ module TestHelpers
     ]
   end
 
+  def multiple_metrics_summarised
+    {
+      "my.first.metric" => {
+        :min => 0.000,
+        :max => 9.210,
+        :avg => 5.848
+      },
+      "my.second.metric" => {
+        :min => 1.100,
+        :max => 3.500,
+        :avg => 2.533
+      }
+    }
+  end
+
   def multiple_metrics_grouped
     {
       "my.first.metric" => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite-metric
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest