slate 0.1.0 → 0.2.0

data/lib/slate/calculation.rb

@@ -8,13 +8,33 @@ module Slate
       end
 
       def result
-        nil # Override this
+        targets.map do |target|
+          name = target.first
+          points = target.last
+          target name, map(points)
+        end
       end
 
       protected
 
+      # This is the method to do calculations in children classes
+      def map(points)
+        points
+      end
+
+      def targets
+        data.map { |t| [t["target"], t["datapoints"].map(&:first).compact] }
+      end
+
+      def target(name, value)
+        {
+          "name"  => name,
+          "value" => value
+        }
+      end
+
       def data
-        @data ||= JSON.parse(@graph.download(:json)).first["datapoints"].map(&:first).compact
+        @data ||= JSON.parse(@graph.download(:json))
       end
     end
   end

data/lib/slate/calculation/last.rb

@@ -1,8 +1,10 @@
 module Slate
   module Calculation
     class Last < Base
-      def result
-        data.last
+      protected
+
+      def map(points)
+        points.last
       end
     end
   end

data/lib/slate/calculation/mean.rb

@@ -1,8 +1,10 @@
 module Slate
   module Calculation
     class Mean < Base
-      def result
-        data.inject(0.0, :+) / data.size.to_f
+      protected
+
+      def map(points)
+        points.inject(0.0, :+) / points.size.to_f
       end
     end
   end

data/lib/slate/version.rb

@@ -1,3 +1,3 @@
 module Slate
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/slate/calculation/last_spec.rb

@@ -19,6 +19,6 @@ describe Slate::Calculation::Last do
 
   it "should calculate the mean of the series" do
     calculation = Slate::Calculation::Last.new(@graph)
-    calculation.result.should == 3.0
+    calculation.result.should == [{ "name" => "some.stat", "value" => 3.0 }]
   end
 end

data/spec/slate/calculation/mean_spec.rb

@@ -19,6 +19,6 @@ describe Slate::Calculation::Mean do
 
   it "should calculate the mean of the series" do
     calculation = Slate::Calculation::Mean.new(@graph)
-    calculation.result.should == 1.5
+    calculation.result.should == [{ "name" => "some.stat", "value" => 1.5 }]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3951322141183346689
+      hash: -1731051461027255620
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3951322141183346689
+      hash: -1731051461027255620
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24