simple_metrics 0.3.2 → 0.3.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_metrics
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70208853226100 !ruby/object:Gem::Requirement
+  requirement: &70191513973620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208853226100
+  version_requirements: *70191513973620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70208853225360 !ruby/object:Gem::Requirement
+  requirement: &70191513972880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208853225360
+  version_requirements: *70191513972880
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70208853224800 !ruby/object:Gem::Requirement
+  requirement: &70191513972300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208853224800
+  version_requirements: *70191513972300
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70208853224200 !ruby/object:Gem::Requirement
+  requirement: &70191513971780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208853224200
+  version_requirements: *70191513971780
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70208853223700 !ruby/object:Gem::Requirement
+  requirement: &70191513971140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853223700
+  version_requirements: *70191513971140
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70208853223080 !ruby/object:Gem::Requirement
+  requirement: &70191513970580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853223080
+  version_requirements: *70191513970580
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70208853238880 !ruby/object:Gem::Requirement
+  requirement: &70191513969960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853238880
+  version_requirements: *70191513969960
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70208853238180 !ruby/object:Gem::Requirement
+  requirement: &70191513985680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853238180
+  version_requirements: *70191513985680
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70208853237480 !ruby/object:Gem::Requirement
+  requirement: &70191513985040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853237480
+  version_requirements: *70191513985040
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70208853236920 !ruby/object:Gem::Requirement
+  requirement: &70191513984480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853236920
+  version_requirements: *70191513984480
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70208853236320 !ruby/object:Gem::Requirement
+  requirement: &70191513983800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853236320
+  version_requirements: *70191513983800
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70208853235540 !ruby/object:Gem::Requirement
+  requirement: &70191513983000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70208853235540
+  version_requirements: *70191513983000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70208853234900 !ruby/object:Gem::Requirement
+  requirement: &70191513982480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70208853234900
+  version_requirements: *70191513982480
 description: SimpleMetrics
 email:
 - fdietz@gmail.com
@@ -190,6 +190,7 @@ files:
 - lib/simple_metrics/data_point_repository.rb
 - lib/simple_metrics/functions.rb
 - lib/simple_metrics/graph.rb
+- lib/simple_metrics/importer.rb
 - lib/simple_metrics/metric.rb
 - lib/simple_metrics/metric_repository.rb
 - lib/simple_metrics/public/css/bootstrap-responsive.min.css
@@ -208,8 +209,6 @@ files:
 - lib/simple_metrics/public/js/underscore-1.3.1.min.js
 - lib/simple_metrics/repository.rb
 - lib/simple_metrics/udp_server.rb
-- lib/simple_metrics/update_aggregation.rb
-- lib/simple_metrics/value_aggregation.rb
 - lib/simple_metrics/version.rb
 - lib/simple_metrics/views/graph.erb
 - lib/simple_metrics/views/index.erb
@@ -221,9 +220,9 @@ files:
 - spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
+- spec/importer_spec.rb
 - spec/metric_repository_spec.rb
 - spec/spec_helper.rb
-- spec/value_aggregation_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -238,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3589789120249469613
+      hash: 878091864515966970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3589789120249469613
+      hash: 878091864515966970
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -260,6 +259,6 @@ test_files:
 - spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
+- spec/importer_spec.rb
 - spec/metric_repository_spec.rb
 - spec/spec_helper.rb
-- spec/value_aggregation_spec.rb

data/lib/simple_metrics/update_aggregation.rb

@@ -1,62 +0,0 @@
-module SimpleMetrics
-  module UpdateAggregation
-    extend self
-
-    class Base
-      def aggregate(existing_dp, dp)
-        raise "subclass must implement me!"
-      end
-    end
-
-    class Counter < Base
-      def aggregate(existing_dp, dp)
-        existing_dp.total += 1
-        existing_dp.value += dp.value
-        existing_dp.sum   += dp.value
-      end
-    end
-
-    class Gauge < Base
-      def aggregate(existing_dp, dp)
-        existing_dp.total += 1
-        existing_dp.sum   += dp.value
-        existing_dp.value  = existing_dp.sum / existing_dp.total 
-      end
-    end
-
-    class Timing < Base
-      def aggregate(existing_dp, dp)
-        # TODO implement timing
-      end
-    end
-
-    class Event < Base
-      def aggregate(existing_dp, dp)
-        # TODO implement event
-      end
-    end
-
-    def aggregate(existing_dp, dp)
-      raise SimpleMetrics::DataPoint::NonMatchingTypesError if existing_dp.type != dp.type
-      strategy(existing_dp).aggregate(existing_dp, dp)
-    end
-
-    private
-
-    def strategy(dp)
-      if dp.counter?
-        Counter.new
-      elsif dp.gauge?
-        Gauge.new
-      elsif dp.timing?
-        Timing.new
-      elsif dp.event?
-        Event.new
-      end
-    end
-
-    def has_non_matching_types?(dps)
-      dps.group_by { |dp| dp.type }.size != 1
-    end
-  end
-end

data/lib/simple_metrics/value_aggregation.rb

@@ -1,63 +0,0 @@
-module SimpleMetrics
-  module ValueAggregation
-    extend self
-
-    class Base
-      def aggregate(dps)
-        raise "subclass must implement me!"
-      end
-    end
-
-    class Counter < Base
-      def aggregate(dps)
-        dps.map { |dp| dp.value }.inject(0) { |result, value| result += value }
-      end
-    end
-
-    class Gauge < Base
-      def aggregate(dps)
-        total_value = dps.map { |dp| dp.value }.inject(0) { |result, value| result += value }
-        total_value / dps.size
-      end
-    end
-
-    class Timing < Base
-      def aggregate(dps)
-        # TODO implement timing
-      end
-    end
-
-    class Event < Base
-      def aggregate(dps)
-        # TODO implement event
-      end
-    end
-
-    def aggregate(dps, name = nil)
-      raise SimpleMetrics::DataPoint::NonMatchingTypesError if has_non_matching_types?(dps)
-
-      dp       = dps.first.dup
-      dp.name  = name if name
-      dp.value = strategy(dp).aggregate(dps)
-      dp
-    end
-
-    private
-
-    def strategy(dp)
-      if dp.counter?
-        Counter.new
-      elsif dp.gauge?
-        Gauge.new
-      elsif dp.timing?
-        Timing.new
-      elsif dp.event?
-        Event.new
-      end
-    end
-
-    def has_non_matching_types?(dps)
-      dps.group_by { |dp| dp.type }.size != 1
-    end
-  end
-end

data/spec/value_aggregation_spec.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-require "spec_helper"
-
-module SimpleMetrics
-
-  describe ArrayAggregation do
-
-    before do
-      DataPointRepository.truncate_collections
-      DataPointRepository.ensure_collections_exist
-    end
-
-    let(:ts) do
-      Time.now.utc.to_i
-    end
-
-    describe "#aggregate" do
-      it "aggregates counter data points" do
-        stats1  =  DataPoint.create_counter(:name => "key1", :value => 5)
-        stats2  =  DataPoint.create_counter(:name => "key1", :value => 7)
-        result = ValueAggregation.aggregate([stats1, stats2])
-        result.value.should == 12
-        result.name.should == "key1"
-        result.should be_counter
-      end
-
-      it "aggregates counter data points with custom name" do
-        stats1  =  DataPoint.create_counter(:name => "key1", :value => 5)
-        stats2  =  DataPoint.create_counter(:name => "key1", :value => 7)
-        result = ValueAggregation.aggregate([stats1, stats2], "new_name")
-        result.value.should == 12
-        result.name.should == "new_name"
-        result.should be_counter
-      end
-
-      it "aggregates gauge data points" do
-        stats1  =  DataPoint.create_gauge(:name => "key1", :value => 5)
-        stats2  =  DataPoint.create_gauge(:name => "key1", :value => 7)
-        result = ValueAggregation.aggregate([stats1, stats2])
-        result.value.should == 6
-        result.name.should == "key1"
-        result.should be_gauge
-      end
-
-      it "aggregates timing data points" do
-      end
-      
-      it "aggregates event data points" do
-      end
-    end
-  end
-end