simple_metrics 0.3.2 → 0.3.3

data/lib/simple_metrics/importer.rb

@@ -0,0 +1,90 @@
+module SimpleMetrics
+  module Importer
+    extend self
+    
+    def flush_raw(data)      
+      data_points = []
+      data.each do |str|
+        begin
+          data_points << DataPoint.parse(str)
+        rescue DataPoint::ParserError => e
+          SimpleMetrics.logger.debug "Invalid Data skipped: #{str}, #{e}"
+        end
+      end
+      flush_data_points(data_points, Time.now.utc.to_i)
+    end
+
+    def flush_data_points(data_points, ts = nil)
+      return if data_points.empty?
+      SimpleMetrics.logger.info "#{Time.now} Flushing #{data_points.count} to MongoDB"
+
+      ts   ||= Time.now.utc.to_i
+      bucket = Bucket.first
+
+      group_by_name(data_points) do |name, dps|
+        dp = aggregate_values(dps)
+        bucket.save(dp, ts)
+        update_metric(dp, dps.size)
+        aggregate_coarse_buckets(dp)  
+      end
+    end
+
+    def aggregate_coarse_buckets(dp)
+      coarse_buckets.each do |bucket|
+        if existing_dp = bucket.find_data_point_at_ts(dp.ts, dp.name)
+          bucket.update(existing_dp.combine(dp), existing_dp.ts)
+        else
+          bucket.save(dp, dp.ts)
+        end
+      end
+    end
+
+    private
+
+    def group_by_name(dps, &block)
+      dps.group_by { |dp| dp.name }.each_pair do |name,dps|
+        block.call(name, dps)
+      end
+    end
+
+    def aggregate_values(dps)
+      raise SimpleMetrics::DataPoint::NonMatchingTypesError if has_non_matching_types?(dps)
+
+      dp       = dps.first.dup
+      dp.value = if dp.counter?
+        sum(dps) / dps.size
+      elsif dp.gauge?
+        sum(dps)
+      elsif dp.event?
+        raise "Implement me!"
+      elsif dp.timing?
+        raise "Implement me!"
+      else
+        raise ArgumentError("Unknown data point type: #{dp}")
+      end
+      dp
+    end
+
+    def sum(dps)
+      dps.map { |dp| dp.value }.inject(0) { |result, value| result += value }
+    end
+
+    def has_non_matching_types?(dps)
+      dps.group_by { |dp| dp.type }.size != 1
+    end
+
+    def update_metric(dp, total)
+      if metric = MetricRepository.find_one_by_name(dp.name)
+        metric.total += total
+        MetricRepository.update(metric)
+      else
+        MetricRepository.save(Metric.new(:name => dp.name, :total => total))
+      end
+    end
+
+    def coarse_buckets
+      Bucket.all.sort_by! { |r| r.seconds }[1..-1]
+    end
+    
+  end
+end

data/lib/simple_metrics/metric.rb

@@ -1,7 +1,8 @@
 module SimpleMetrics
   class Metric
 
-    attr_reader :id, :name, :total, :created_at, :updated_at
+    attr_reader :id, :name, :created_at, :updated_at
+    attr_accessor :total
 
     def initialize(attributes)
       @id          = attributes[:id]

data/lib/simple_metrics/public/js/application.js

@@ -237,7 +237,7 @@ $(function(){
     routes: {
       "":               "home",
       "metrics":        "metrics",
-      "metrics/:id":    "metric_details",
+      "metrics/:name":    "metric_details",
       "dashboard":      "dashboard",
       "about":          "about"
     },
@@ -250,10 +250,10 @@ $(function(){
       console.log("ROUTER: metrics");
       new AppView({ el: "#main", collection: metricList }).render();
     },
-    metric_details: function(id) {
-      console.log("ROUTER: metric details:", id);
+    metric_details: function(name) {
+      console.log("ROUTER: metric details:", name);
 
-      metric = new Metric({ id: id});
+      metric = new Metric({ name: name});
       metric.fetch({
         success: function(model, resp) {
           new MetricDetailView({ el: "#main", model:  model}).render();

data/lib/simple_metrics/repository.rb

@@ -7,7 +7,7 @@ module SimpleMetrics
     end
 
     def db
-      @@db ||= connection.db(db_name, config['options'])
+      @@db ||= connection.db(db_name, config.fetch(:options))
     end
 
     def db_name
@@ -15,15 +15,15 @@ module SimpleMetrics
     end
 
     def prefix
-      config['prefix'] || 'development'
+      config[:prefix] || 'development'
     end
     
     def host
-      config['host'] || 'localhost'
+      config[:host] || 'localhost'
     end
 
     def port
-      config['port'] || 27017
+      config[:port] || 27017
     end
 
     def config

data/lib/simple_metrics/udp_server.rb

@@ -44,7 +44,7 @@ module SimpleMetrics
           EventMachine::add_periodic_timer(flush_interval) do
             SimpleMetrics.logger.debug "SERVER: period timer triggered after #{flush_interval} seconds"
 
-            EM.defer { Bucket.flush_raw_data(ClientHandler.get_and_clear_data) } 
+            EM.defer { Bucket.flush_raw(ClientHandler.get_and_clear_data) } 
           end
         end
       end

data/lib/simple_metrics/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SimpleMetrics
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/simple_metrics/views/layout.erb

@@ -56,7 +56,7 @@
       <tbody>
         {{#each metrics}}
           <tr>
-            <td><a href="#metrics/{{id}}">{{name}}</a></td>
+            <td><a href="#metrics/{{name}}">{{name}}</a></td>
             <td>{{total}}</td>
             <td>{{updated_at}}</td>
           </tr>

data/lib/simple_metrics.rb

@@ -12,9 +12,8 @@ require "simple_metrics/data_point/counter"
 require "simple_metrics/data_point/event"
 require "simple_metrics/data_point/gauge"
 require "simple_metrics/data_point/timing"
-require "simple_metrics/value_aggregation"
 require "simple_metrics/array_aggregation"
-require "simple_metrics/update_aggregation"
+require "simple_metrics/importer"
 require "simple_metrics/bucket"
 require "simple_metrics/graph"
 require "simple_metrics/functions"

data/spec/array_aggregation_spec.rb

@@ -16,9 +16,9 @@ module SimpleMetrics
     
     describe "#aggregate" do
       it "aggregates counter data points" do
-        stats1  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5, :ts => ts)
-        stats2  =  DataPoint.create_counter(:name => "com.test.key1", :value => 7, :ts => ts)
-        stats3  =  DataPoint.create_counter(:name => "com.test.key1", :value => 9, :ts => (ts + 60) )
+        stats1  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats2  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 7, :ts => ts)
+        stats3  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 9, :ts => (ts + 60) )
 
         results = ArrayAggregation.aggregate([stats1, stats2, stats3], "com.test.*")
         results.should have(2).data_points
@@ -29,9 +29,9 @@ module SimpleMetrics
       end
 
       it "aggregates gauge data points" do
-        stats1  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 5, :ts => ts)
-        stats2  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 7, :ts => ts)
-        stats3  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 9, :ts => (ts + 60) )
+        stats1  =  DataPoint::Gauge.new(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats2  =  DataPoint::Gauge.new(:name => "com.test.key1", :value => 7, :ts => ts)
+        stats3  =  DataPoint::Gauge.new(:name => "com.test.key1", :value => 9, :ts => (ts + 60) )
 
         results = ArrayAggregation.aggregate([stats1, stats2, stats3], "com.test.*")
         results.should have(2).data_points
@@ -42,8 +42,8 @@ module SimpleMetrics
       end
       
       it "raises NonMatchingTypesError if types are different" do
-        stats1  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5, :ts => ts)
-        stats2  =  DataPoint.create_gauge(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats1  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 5, :ts => ts)
+        stats2  =  DataPoint::Gauge.new(:name => "com.test.key1", :value => 5, :ts => ts)
         expect { ArrayAggregation.aggregate([stats1, stats2], "com.test.*") }.to raise_error(SimpleMetrics::DataPoint::NonMatchingTypesError)
       end
     end

data/spec/bucket_spec.rb

@@ -43,7 +43,7 @@ module SimpleMetrics
       end
 
       let(:stats) do
-        DataPoint.create_counter(:name => "key1", :value => 5)
+        DataPoint::Counter.new(:name => "key1", :value => 5)
       end
 
       it "saves given data in bucket" do
@@ -71,8 +71,8 @@ module SimpleMetrics
 
       describe "#find_all_at_ts" do
         it "returns all stats in given timestamp" do
-          stats1  =  DataPoint.create_counter(:name => "key1", :value => 5)
-          stats2  =  DataPoint.create_counter(:name => "key2", :value => 3)
+          stats1  =  DataPoint::Counter.new(:name => "key1", :value => 5)
+          stats2  =  DataPoint::Counter.new(:name => "key2", :value => 3)
 
           bucket.save(stats1, ts)
           bucket.save(stats2, bucket.next_ts_bucket(ts))
@@ -89,9 +89,9 @@ module SimpleMetrics
 
       describe "#find_all_in_ts_range_by_wildcard" do
         it "returns all stats for given name and timestamp" do
-          stats1  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5)
-          stats2  =  DataPoint.create_counter(:name => "com.test.key2", :value => 7)
-          stats_different =  DataPoint.create_counter(:name => "com.test2.key1", :value => 3)
+          stats1  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 5)
+          stats2  =  DataPoint::Counter.new(:name => "com.test.key2", :value => 7)
+          stats_different =  DataPoint::Counter.new(:name => "com.test2.key1", :value => 3)
 
           from = bucket.ts_bucket(ts)
           to   = from
@@ -109,7 +109,7 @@ module SimpleMetrics
 
       describe "#fill_gaps" do
         it "returns stats and fills missing gaps with null entries" do
-          stats  =  DataPoint.create_counter(:name => "com.test.key1", :value => 5)
+          stats  =  DataPoint::Counter.new(:name => "com.test.key1", :value => 5)
 
           from = ts - 10
           to   = ts + 10
@@ -134,102 +134,5 @@ module SimpleMetrics
       end
     end # describe "finder methods"
 
-    describe "#aggregate_all" do
-      before do
-        DataPointRepository.truncate_collections
-        DataPointRepository.ensure_collections_exist
-      end
-
-      it "aggregates all counter data points" do
-        stats1a  =  DataPoint.create_counter(:name => "key1", :value => 5)
-        stats1b  =  DataPoint.create_counter(:name => "key1", :value => 7)
-        stats2   =  DataPoint.create_counter(:name => "key2", :value => 3)
-
-        bucket2 = Bucket[1]
-        ts_at_insert = bucket2.previous_ts_bucket(ts)
-        bucket.save(stats1a, ts_at_insert)
-        Bucket.aggregate(stats1a)
-        bucket.save(stats1b, ts_at_insert)
-        Bucket.aggregate(stats1b)
-        bucket.save(stats2, ts_at_insert)
-        Bucket.aggregate(stats2)
-
-        results = bucket2.find_all_at_ts(ts_at_insert)
-        results.should have(2).items
-
-        key1_result = results.find {|stat| stat.name == "key1"}
-        key1_result.value.should == 12
-        key1_result.should be_counter
-
-        key2_result = results.find {|stat| stat.name == "key2"}
-        key2_result.value.should == 3
-        key2_result.should be_counter
-      end
-
-      it "aggregates all gauge data points" do
-        stats1a  =  DataPoint.create_gauge(:name => "key1", :value => 5)
-        stats1b  =  DataPoint.create_gauge(:name => "key1", :value => 7)
-        stats2   =  DataPoint.create_gauge(:name => "key2", :value => 3)
-
-        bucket2 = Bucket[1]
-        ts_at_insert = bucket2.previous_ts_bucket(ts)
-        bucket.save(stats1a, ts_at_insert)
-        Bucket.aggregate(stats1a)
-        bucket.save(stats1b, ts_at_insert)
-        Bucket.aggregate(stats1b)
-        bucket.save(stats2, ts_at_insert)
-        Bucket.aggregate(stats2)
-
-        results = bucket2.find_all_at_ts(ts_at_insert)
-        results.should have(2).items
-
-        key1_result = results.find {|stat| stat.name == "key1"}
-        key1_result.value.should == 6
-        key1_result.should be_gauge
-
-        key2_result = results.find {|stat| stat.name == "key2"}
-        key2_result.value.should == 3
-        key2_result.should be_gauge
-      end
-
-    end # describe "#aggregate_all"
-
-    describe "#flush_data_points" do
-      before do
-        DataPointRepository.truncate_collections
-        DataPointRepository.ensure_collections_exist
-        
-        stats1 = DataPoint.create_counter(:name => "key1", :value => 5)
-        stats2 = DataPoint.create_counter(:name => "key1", :value => 7)
-        stats3 = DataPoint.create_counter(:name => "key2", :value => 3)
-        @stats = [stats1, stats2, stats3]
-      end
-
-      it "saves all stats in finest/first bucket" do
-        Bucket.flush_data_points(@stats)
-
-        results = bucket.find_all_at_ts(ts)
-        results.should have(2).items
-      end
-
-      it "saves all stats and aggregate if duplicates found" do
-        Bucket.flush_data_points(@stats)
-
-        results = bucket.find_all_at_ts(ts)
-        results.should have(2).items
-        results.first.name.should == "key1"
-        results.last.name.should == "key2"
-        results.first.value == 12
-        results.last.value == 3
-      end
-
-      it "raises error if name matches but type does not" do
-        stats4 = DataPoint.create_gauge(:name => "key1", :value => 3)
-        input = @stats + [stats4]
-        expect { Bucket.flush_data_points(input) }.to raise_error(SimpleMetrics::DataPoint::NonMatchingTypesError)
-      end
-
-    end # describe "#flush_data_points"
-
   end
 end

data/spec/data_point_repository_spec.rb

@@ -20,7 +20,7 @@ module SimpleMetrics
 
     describe "#save" do
       it "saves data point correctly" do
-        dp = DataPoint.create_counter(:name => "key", :ts => ts)
+        dp = DataPoint::Counter.new(:name => "key", :ts => ts)
         repository.save(dp)
 
         results = repository.find_all_at_ts(ts)
@@ -30,8 +30,8 @@ module SimpleMetrics
 
     describe "#find_all_at_ts" do
       it "returns all data points at given time stamp" do
-        dp1 = DataPoint.create_counter(:name => "key1", :ts => ts)
-        dp2 = DataPoint.create_counter(:name => "key1", :ts => ts + 10)
+        dp1 = DataPoint::Counter.new(:name => "key1", :ts => ts)
+        dp2 = DataPoint::Counter.new(:name => "key1", :ts => ts + 10)
         repository.save(dp1)
         repository.save(dp2)
 
@@ -41,27 +41,11 @@ module SimpleMetrics
       end
     end    
 
-    describe "#find_all_in_ts_range" do
-      it "returns all data points in given time stamp range" do
-        dp1 = DataPoint.create_counter(:name => "key1", :ts => ts)
-        dp2 = DataPoint.create_counter(:name => "key2", :ts => ts + 10)
-        dp3 = DataPoint.create_counter(:name => "key3", :ts => ts + 20)
-        repository.save(dp1)
-        repository.save(dp2)
-        repository.save(dp3)
-
-        results = repository.find_all_in_ts_range(ts, ts+10)
-        results.should have(2).data_points
-        results.first.name.should == "key1"
-        results.last.name.should == "key2"
-      end
-    end
-
     describe "#find_all_in_ts_range_by_name" do
       it "returns all data points in given time stamp range by name" do
-        dp1 = DataPoint.create_counter(:name => "key1", :ts => ts)
-        dp2 = DataPoint.create_counter(:name => "key2", :ts => ts + 10)
-        dp3 = DataPoint.create_counter(:name => "key3", :ts => ts + 20)
+        dp1 = DataPoint::Counter.new(:name => "key1", :ts => ts)
+        dp2 = DataPoint::Counter.new(:name => "key2", :ts => ts + 10)
+        dp3 = DataPoint::Counter.new(:name => "key3", :ts => ts + 20)
         repository.save(dp1)
         repository.save(dp2)
         repository.save(dp3)
@@ -74,9 +58,9 @@ module SimpleMetrics
 
     describe "#find_all_in_ts_range_by_wildcard" do
       it "returns all data points in given time stamp range by wildcard" do
-        dp1 = DataPoint.create_counter(:name => "test.key1", :ts => ts)
-        dp2 = DataPoint.create_counter(:name => "test.key2", :ts => ts + 10)
-        dp3 = DataPoint.create_counter(:name => "test.key3", :ts => ts + 20)
+        dp1 = DataPoint::Counter.new(:name => "test.key1", :ts => ts)
+        dp2 = DataPoint::Counter.new(:name => "test.key2", :ts => ts + 10)
+        dp3 = DataPoint::Counter.new(:name => "test.key3", :ts => ts + 20)
         repository.save(dp1)
         repository.save(dp2)
         repository.save(dp3)
@@ -88,27 +72,6 @@ module SimpleMetrics
       end
     end
 
-    describe "#count_at" do
-      it "returns the total count of entries for given time stamp" do
-        dp1 = DataPoint.create_counter(:name => "test.key1", :ts => ts)
-        dp2 = DataPoint.create_counter(:name => "test.key2", :ts => ts + 10)
-        repository.save(dp1)
-        repository.save(dp2)
-        repository.count_at(ts).should == 1
-      end
-    end
-
-    describe "#find_all_distinct_names" do
-      it "returns all distinct names of data points" do
-        dp1 = DataPoint.create_counter(:name => "test.key1", :ts => ts)
-        dp2 = DataPoint.create_counter(:name => "test.key2", :ts => ts + 10)
-        repository.save(dp1)
-        repository.save(dp2)
-        results = repository.find_all_distinct_names
-        results.should include("test.key1")
-        results.should include("test.key2")
-      end
-    end    
   end
 
 end

data/spec/graph_spec.rb

@@ -21,7 +21,7 @@ module SimpleMetrics
     describe "#query" do
 
       it "returns string request data points as is" do
-      	dp1 = DataPoint.create_counter(:name => "key1", :value => 5)
+      	dp1 = DataPoint::Counter.new(:name => "key1", :value => 5)
 
       	bucket.save(dp1, ts)
 
@@ -34,7 +34,7 @@ module SimpleMetrics
       end
 
       it "returns string request data points and fill graps" do
-        dp1 = DataPoint.create_counter(:name => "key1", :value => 5)
+        dp1 = DataPoint::Counter.new(:name => "key1", :value => 5)
 
         bucket.save(dp1, ts)
 
@@ -49,8 +49,8 @@ module SimpleMetrics
       end
 
       it "returns wildcard request data points with aggregate counter" do
-      	dp1 = DataPoint.create_counter(:name => "com.test.key1", :value => 5)
-      	dp2 = DataPoint.create_counter(:name => "com.test.key2", :value => 7)
+      	dp1 = DataPoint::Counter.new(:name => "com.test.key1", :value => 5)
+      	dp2 = DataPoint::Counter.new(:name => "com.test.key2", :value => 7)
 
       	bucket.save(dp1, ts)
       	bucket.save(dp2, ts)
@@ -66,6 +66,35 @@ module SimpleMetrics
       	result.should be_counter
       end
 
+    end # descibe
+
+    describe "#query_all" do
+
+      it "returns request data points as is" do
+        dp1 = DataPoint::Counter.new(:name => "com.test.key1", :value => 5)
+        dp2 = DataPoint::Counter.new(:name => "com.test.key2", :value => 7)
+        dp3 = DataPoint::Counter.new(:name => "com.test.key2", :value => 3)
+        bucket.save(dp1, ts)
+        bucket.save(dp2, ts - 10)
+        bucket.save(dp3, ts)
+
+        current_ts = bucket.ts_bucket(ts)
+        from = current_ts - 10
+        to   = current_ts
+        results = Graph.query_all(bucket, from, to, "com.test.key1", "com.test.key2")
+        key1 = results.first
+        key1[:name].should == "com.test.key1"
+        key1[:data].should have(2).entry
+        key1[:data].first[:y].should == 0
+        key1[:data].last[:y].should == 5
+
+        key2 = results.last
+        key2[:name].should == "com.test.key2"
+        key2[:data].should have(2).entry
+        key2[:data].first[:y].should == 7
+        key2[:data].last[:y].should == 3
+      end
+
     end
   end
 end

data/spec/importer_spec.rb

@@ -0,0 +1,126 @@
+# encoding: utf-8
+require "spec_helper"
+
+module SimpleMetrics
+
+  describe Importer do
+
+    let(:bucket) do
+      Bucket.first
+    end
+
+    let(:ts) do
+      Time.now.utc.to_i
+    end
+
+    describe "#aggregate_coarse_buckets" do
+      before do
+        DataPointRepository.truncate_collections
+        DataPointRepository.ensure_collections_exist
+      end
+
+      it "aggregates all counter data points" do
+        stats1a  =  DataPoint::Counter.new(:name => "key1", :value => 5)
+        stats1b  =  DataPoint::Counter.new(:name => "key1", :value => 7)
+        stats2   =  DataPoint::Counter.new(:name => "key2", :value => 3)
+
+        bucket2 = Bucket[1]
+        ts_at_insert = bucket2.previous_ts_bucket(ts)
+        bucket.save(stats1a, ts_at_insert)
+        Importer.aggregate_coarse_buckets(stats1a)
+        bucket.save(stats1b, ts_at_insert)
+        Importer.aggregate_coarse_buckets(stats1b)
+        bucket.save(stats2, ts_at_insert)
+        Importer.aggregate_coarse_buckets(stats2)
+
+        results = bucket2.find_all_at_ts(ts_at_insert)
+        results.should have(2).items
+
+        key1_result = results.find {|stat| stat.name == "key1"}
+        key1_result.value.should == 12
+        key1_result.should be_counter
+
+        key2_result = results.find {|stat| stat.name == "key2"}
+        key2_result.value.should == 3
+        key2_result.should be_counter
+      end
+
+      it "aggregates all gauge data points" do
+        stats1a  =  DataPoint::Gauge.new(:name => "key1", :value => 5)
+        stats1b  =  DataPoint::Gauge.new(:name => "key1", :value => 7)
+        stats2   =  DataPoint::Gauge.new(:name => "key2", :value => 3)
+
+        bucket2 = Bucket[1]
+        ts_at_insert = bucket2.previous_ts_bucket(ts)
+        bucket.save(stats1a, ts_at_insert)
+        Importer.aggregate_coarse_buckets(stats1a)
+        bucket.save(stats1b, ts_at_insert)
+        Importer.aggregate_coarse_buckets(stats1b)
+        bucket.save(stats2, ts_at_insert)
+        Importer.aggregate_coarse_buckets(stats2)
+
+        results = bucket2.find_all_at_ts(ts_at_insert)
+        results.should have(2).items
+
+        key1_result = results.find {|stat| stat.name == "key1"}
+        key1_result.value.should == 6
+        key1_result.should be_gauge
+
+        key2_result = results.find {|stat| stat.name == "key2"}
+        key2_result.value.should == 3
+        key2_result.should be_gauge
+      end
+
+    end # describe "#aggregate_all"
+
+    describe "#flush_data_points" do
+      before do
+        DataPointRepository.truncate_collections
+        DataPointRepository.ensure_collections_exist
+        MetricRepository.truncate_collections
+
+        stats1 = DataPoint::Counter.new(:name => "key1", :value => 5)
+        stats2 = DataPoint::Counter.new(:name => "key1", :value => 7)
+        stats3 = DataPoint::Counter.new(:name => "key2", :value => 3)
+        @stats = [stats1, stats2, stats3]
+      end
+
+      it "saves all stats in finest/first bucket" do
+        Importer.flush_data_points(@stats)
+
+        results = bucket.find_all_at_ts(ts)
+        results.should have(2).items
+      end
+
+      it "saves all stats and aggregate if duplicates found" do
+        Importer.flush_data_points(@stats)
+
+        results = bucket.find_all_at_ts(ts)
+        results.should have(2).items
+        results.first.name.should == "key1"
+        results.last.name.should == "key2"
+        results.first.value == 12
+        results.last.value == 3
+      end
+
+      it "raises error if name matches but type does not" do
+        stats4 = DataPoint::Gauge.new(:name => "key1", :value => 3)
+        input = @stats + [stats4]
+        expect { Importer.flush_data_points(input) }.to raise_error(SimpleMetrics::DataPoint::NonMatchingTypesError)
+      end
+
+      it "increments metrics counter" do
+        Importer.flush_data_points(@stats)
+        key1 = MetricRepository.find_one_by_name("key1")
+        key1.name.should == "key1"
+        key1.total.should == 2
+        key2 = MetricRepository.find_one_by_name("key2")
+        key2.name.should == "key2"
+        key2.total.should == 1
+      end
+
+    end # describe "#flush_data_points"
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -6,5 +6,5 @@ end
 
 SimpleMetrics.logger = Logger.new('/dev/null')
 SimpleMetrics.configure do |config|
-  config.db = { 'host' => 'localhost', 'prefix' => 'test', 'options' => {} }
+  config.db = { :host => 'localhost', :prefix => 'test', :options => {} }
 end