graphite-metric 0.2.1 → 0.2.2

data/lib/graphite-metric/plaintext.rb

@@ -1,9 +1,5 @@
-require 'graphite-metric/util'
-
 module GraphiteMetric
   Plaintext = Struct.new(:key, :value, :timestamp) do
-    extend Util
-
     def initialize(*args)
       super
       self[:timestamp] ||= Time.now.utc.to_i
@@ -12,5 +8,17 @@ module GraphiteMetric
     def to_s
       [key, value, timestamp].join(" ")
     end
+
+    def self.from_hash(hash)
+      metric = new
+      members.each { |member| metric[member] = hash[member] if hash.has_key?(member) }
+      metric
+    end
+
+    def self.from_array(array)
+      array.inject([]) do |result, hash|
+        result << from_hash(hash)
+      end
+    end
   end
 end

data/lib/graphite-metric/raw.rb

@@ -1,5 +1,8 @@
+require 'graphite-metric/util'
+
 module GraphiteMetric
   class Raw
+    include Util
     attr_reader :raw, :metrics
 
     def initialize(raw)
@@ -35,7 +38,7 @@ module GraphiteMetric
       @raw.split("\n").each do |raw|
         raw_headers, raw_metrics = raw.split("|")
 
-        metric_name, from, to, step  = raw_headers.split(",")
+        metric_name, from, to, step  = extract_headers(raw_headers)
 
         current_step = 0
         raw_metrics.split(",").each do |raw_metric|
@@ -49,11 +52,5 @@ module GraphiteMetric
       end
       self
     end
-
-    def float(raw_metric)
-      Float(raw_metric)
-    rescue
-      0
-    end
   end
 end

data/lib/graphite-metric/util.rb

@@ -2,16 +2,20 @@ module GraphiteMetric
   module Util
     extend self
 
-    def from_hash(hash)
-      metric = new
-      members.each { |member| metric[member] = hash[member] if hash.has_key?(member) }
-      metric
+    def float(raw_metric)
+      Float(raw_metric)
+    rescue
+      0
     end
 
-    def from_array(array)
-      array.inject([]) do |result, hash|
-        result << from_hash(hash)
-      end
+    def extract_headers(raw_headers)
+      all_splits = raw_headers.split(",")
+      step = all_splits.pop
+      to = all_splits.pop
+      from = all_splits.pop
+      metric_name = all_splits.join(",")
+
+      [metric_name, from, to, step]
     end
   end
 end

data/lib/graphite-metric/version.rb

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

data/test/fixtures/metric_with_functions.txt

@@ -0,0 +1 @@
+scale(summarize(my.metric, "5min"),0.2),1337772900,1337773500,300|19.6,23.6

data/test/graphite-metric/plaintext_test.rb

@@ -12,5 +12,56 @@ module GraphiteMetric
     it "uses the graphite plaintext format when converted to string" do
       "#{Plaintext.new("visitors", 2)}".must_equal "visitors 2 #{utc_now}"
     end
+
+    before do
+      @timestamp = Time.now.to_i - 3600
+    end
+
+    describe "from hash" do
+      before do
+        @hash = {
+          :key       => "visitors",
+          :value     => 2,
+          :timestamp => @timestamp
+        }
+      end
+
+      it "can be built from a hash" do
+        "#{Plaintext.from_hash(@hash)}".must_equal "visitors 2 #{@timestamp}"
+      end
+    end
+
+    describe "from array (of hashes)" do
+      before do
+        @array = [
+          {
+            :key       => "visitors",
+            :value     => 1,
+            :timestamp => @timestamp
+          },
+          {
+            :key   => "visitors",
+            :value => 5
+          }
+        ]
+        @graphite_metrics = Plaintext.from_array(@array)
+      end
+
+      it "returns an array" do
+        @graphite_metrics.must_be_instance_of Array
+        @graphite_metrics.size.must_equal 2
+      end
+
+      it "each element is a GraphiteMetric::Plaintext" do
+        @graphite_metrics.each { |graphite_metric| graphite_metric.must_be_instance_of GraphiteMetric::Plaintext }
+      end
+
+      it "converts into graphite plaintext format" do
+        @graphite_metrics.map(&:to_s).must_equal([
+          "visitors 1 #{@timestamp}",
+          "visitors 5 #{utc_now}"
+        ])
+      end
+    end
   end
 end

data/test/graphite-metric/raw_test.rb

@@ -34,5 +34,10 @@ module GraphiteMetric
       gmr = GraphiteMetric::Raw.new(multiple_metrics_raw)
       gmr.grouped_metrics.must_equal multiple_metrics_grouped
     end
+
+    it "understands metrics with functions" do
+      gmr = GraphiteMetric::Raw.new(metric_with_functions_raw)
+      gmr.metrics.must_equal metric_with_functions_converted
+    end
   end
 end

data/test/graphite-metric/util_test.rb

@@ -1,60 +1,22 @@
 require_relative '../test_helper'
-require 'graphite-metric/plaintext'
+require 'graphite-metric/util'
 
 include TestHelpers
 
 module GraphiteMetric
-  describe Plaintext do
-    before do
-      @timestamp = Time.now.to_i - 3600
-    end
-
-    describe "from hash" do
-      before do
-        @hash = {
-          :key       => "visitors",
-          :value     => 2,
-          :timestamp => @timestamp
-        }
-      end
-
-      it "can be built from a hash" do
-        "#{Plaintext.from_hash(@hash)}".must_equal "visitors 2 #{@timestamp}"
-      end
-    end
-
-    describe "from array (of hashes)" do
-      before do
-        @array = [
-          {
-            :key       => "visitors",
-            :value     => 1,
-            :timestamp => @timestamp
-          },
-          {
-            :key   => "visitors",
-            :value => 5
-          }
-        ]
-        @graphite_metrics = Plaintext.from_array(@array)
-      end
-
-      it "returns an array" do
-        @graphite_metrics.must_be_instance_of Array
-        @graphite_metrics.size.must_equal 2
+  describe Util do
+    describe "extract_raw_headers" do
+      it "simple metrics" do
+        Util.extract_headers("my.metric,1336559725,1336559845,60").must_equal(
+          ["my.metric", "1336559725", "1336559845", "60"]
+        )
       end
 
-      it "each element is a GraphiteMetric::Plaintext" do
-        @graphite_metrics.each { |graphite_metric| graphite_metric.must_be_instance_of GraphiteMetric::Plaintext }
+      it "metrics with functions" do
+        Util.extract_headers("scale(summarize(my.metric,\"5min\"),0.2),1337772900,1337773500,300").must_equal(
+          ["scale(summarize(my.metric,\"5min\"),0.2)", "1337772900", "1337773500", "300"]
+        )
       end
-
-      it "converts into graphite plaintext format" do
-        @graphite_metrics.map(&:to_s).must_equal([
-          "visitors 1 #{@timestamp}",
-          "visitors 5 #{utc_now}"
-        ])
-      end
-
     end
   end
 end

data/test/test_helper.rb

@@ -103,4 +103,23 @@ module TestHelpers
       ]
     }
   end
+
+  def metric_with_functions_raw
+    @metric_with_functions_raw ||= File.read("#{BASE_PATH}/test/fixtures/metric_with_functions.txt")
+  end
+
+  def metric_with_functions_converted
+    [
+      {
+        :key       => "scale(summarize(my.metric, \"5min\"),0.2)",
+        :timestamp => 1337772900,
+        :value     => 19.6
+      },
+      {
+        :key       => "scale(summarize(my.metric, \"5min\"),0.2)",
+        :timestamp => 1337773200,
+        :value     => 23.6
+      }
+    ]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite-metric
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
@@ -95,6 +95,7 @@ files:
 - lib/graphite-metric/raw.rb
 - lib/graphite-metric/util.rb
 - lib/graphite-metric/version.rb
+- test/fixtures/metric_with_functions.txt
 - test/fixtures/multiple_metrics.txt
 - test/fixtures/single_metric.txt
 - test/graphite-metric/plaintext_test.rb
@@ -126,6 +127,7 @@ signing_key:
 specification_version: 3
 summary: Generates strings that graphite understands. Loads raw graphite data.
 test_files:
+- test/fixtures/metric_with_functions.txt
 - test/fixtures/multiple_metrics.txt
 - test/fixtures/single_metric.txt
 - test/graphite-metric/plaintext_test.rb