simple_metrics 0.2.3 → 0.3.2

data/spec/data_point_spec.rb

@@ -54,78 +54,9 @@ module SimpleMetrics
       end
 
       it "parses increment timing with sample rate" do
+        # TODO
       end
     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 = DataPoint.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 = DataPoint.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 = DataPoint.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
-
-     describe "#aggregate_array" 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) )
-
-        results = DataPoint.aggregate_array([stats1, stats2, stats3], "com.test.*")
-        results.should have(2).data_points
-        results.first.name.should == "com.test.*"
-        results.last.name.should  == "com.test.*"
-        results.first.value.should == 12
-        results.last.value.should == 9
-      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) )
-
-        results = DataPoint.aggregate_array([stats1, stats2, stats3], "com.test.*")
-        results.should have(2).data_points
-        results.first.name.should == "com.test.*"
-        results.last.name.should  == "com.test.*"
-        results.first.value.should == 6
-        results.last.value.should == 9
-      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)
-        expect { DataPoint.aggregate_array([stats1, stats2], "com.test.*") }.to raise_error(SimpleMetrics::DataPoint::NonMatchingTypesError)
-      end
-    end
   end
-
 end

data/spec/graph_spec.rb

@@ -14,8 +14,8 @@ module SimpleMetrics
     end
 
   	before do
-  	  Mongo.truncate_collections
-  	  Mongo.ensure_collections_exist
+  	  DataPointRepository.truncate_collections
+  	  DataPointRepository.ensure_collections_exist
   	end
 
     describe "#query" do
@@ -66,24 +66,6 @@ module SimpleMetrics
       	result.should be_counter
       end
 
-      it "returns regexp request data points with aggregate gauge" do
-      	dp1 = DataPoint.create_gauge(:name => "com.test.key1", :value => 5)
-      	dp2 = DataPoint.create_gauge(:name => "com.test.key2", :value => 7)
-
-      	bucket.save(dp1, ts)
-      	bucket.save(dp2, ts)
-
-        current_ts = bucket.ts_bucket(ts)
-        from = current_ts
-        to   = current_ts
-
-      	results = Graph.query(bucket, from, to, /com\.test(.*)/)
-      	results.should have(1).data_point
-      	result = results.first
-      	result.name.should == "/com\\.test(.*)/"
-      	result.value.should == 6
-      	result.should be_gauge
-      end
     end
   end
 end

data/spec/metric_repository_spec.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+require "spec_helper"
+
+module SimpleMetrics
+
+  describe MetricRepository do
+
+    before do
+      MetricRepository.truncate_collections
+    end
+
+    let(:ts) do
+      Time.now.utc.to_i
+    end
+
+    describe "#save" do
+      it "saves metric correctly" do
+        metric = Metric.new(:name => "test", :total => 1)
+        MetricRepository.save(metric)
+
+        results = MetricRepository.find_all
+        results.should have(1).metric
+        results.first.name.should == "test"
+        results.first.total.should == 1
+      end
+    end    
+
+    describe "#find_all" do
+      it "returns all metrics" do
+        metric1 = Metric.new(:name => "test", :total => 1)
+        metric2 = Metric.new(:name => "test2", :total => 1)
+        MetricRepository.save(metric1)
+        MetricRepository.save(metric2)
+
+        results = MetricRepository.find_all
+        results.should have(2).metrics
+      end
+    end   
+
+    describe "#find_one_by_name" do
+      it "returns all metrics" do
+        metric1 = Metric.new(:name => "test", :total => 1)
+        metric2 = Metric.new(:name => "test2", :total => 1)
+        MetricRepository.save(metric1)
+        MetricRepository.save(metric2)
+
+        result = MetricRepository.find_one_by_name("test")
+        result.name.should == "test"
+      end
+    end   
+  end # describe MetricRepository
+
+end

data/spec/spec_helper.rb

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

data/spec/value_aggregation_spec.rb

@@ -0,0 +1,52 @@
+# 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70351255266000 !ruby/object:Gem::Requirement
+  requirement: &70208853226100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351255266000
+  version_requirements: *70208853226100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70351255265220 !ruby/object:Gem::Requirement
+  requirement: &70208853225360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351255265220
+  version_requirements: *70208853225360
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70351255264460 !ruby/object:Gem::Requirement
+  requirement: &70208853224800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351255264460
+  version_requirements: *70208853224800
+- !ruby/object:Gem::Dependency
+  name: shotgun
+  requirement: &70208853224200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70208853224200
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70351255263760 !ruby/object:Gem::Requirement
+  requirement: &70208853223700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351255263760
+  version_requirements: *70208853223700
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70351255263280 !ruby/object:Gem::Requirement
+  requirement: &70208853223080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70351255263280
+  version_requirements: *70208853223080
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70351255262760 !ruby/object:Gem::Requirement
+  requirement: &70208853238880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,21 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70351255262760
+  version_requirements: *70208853238880
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70351255262240 !ruby/object:Gem::Requirement
+  requirement: &70208853238180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70208853238180
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70208853237480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,40 +109,121 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70351255262240
+  version_requirements: *70208853237480
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70208853236920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70208853236920
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: &70208853236320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70208853236320
+- !ruby/object:Gem::Dependency
+  name: vegas
+  requirement: &70208853235540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70208853235540
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70208853234900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70208853234900
 description: SimpleMetrics
 email:
 - fdietz@gmail.com
 executables:
 - populate
-- simple_metrics_client
 - simple_metrics_server
+- simple_metrics_web
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
 - bin/populate
-- bin/simple_metrics_client
 - bin/simple_metrics_server
+- bin/simple_metrics_web
+- config.ru
+- default_config.yml
 - example/increment.rb
 - lib/simple_metrics.rb
+- lib/simple_metrics/app.rb
+- lib/simple_metrics/array_aggregation.rb
 - lib/simple_metrics/bucket.rb
-- lib/simple_metrics/client.rb
+- lib/simple_metrics/configuration.rb
 - lib/simple_metrics/data_point.rb
+- lib/simple_metrics/data_point/base.rb
+- lib/simple_metrics/data_point/counter.rb
+- lib/simple_metrics/data_point/event.rb
+- lib/simple_metrics/data_point/gauge.rb
+- lib/simple_metrics/data_point/timing.rb
+- lib/simple_metrics/data_point_repository.rb
 - lib/simple_metrics/functions.rb
 - lib/simple_metrics/graph.rb
-- lib/simple_metrics/mongo.rb
-- lib/simple_metrics/server.rb
+- lib/simple_metrics/metric.rb
+- lib/simple_metrics/metric_repository.rb
+- lib/simple_metrics/public/css/bootstrap-responsive.min.css
+- lib/simple_metrics/public/css/bootstrap.min.css
+- lib/simple_metrics/public/css/graph.css
+- lib/simple_metrics/public/css/rickshaw.min.css
+- lib/simple_metrics/public/img/glyphicons-halflings-white.png
+- lib/simple_metrics/public/img/glyphicons-halflings.png
+- lib/simple_metrics/public/js/application.js
+- lib/simple_metrics/public/js/backbone-0.9.2.min.js
+- lib/simple_metrics/public/js/bootstrap.min.js
+- lib/simple_metrics/public/js/d3.v2.min.js
+- lib/simple_metrics/public/js/handlebars-1.0.0.beta.6.js
+- lib/simple_metrics/public/js/jquery-1.7.1.min.js
+- lib/simple_metrics/public/js/rickshaw.min.js
+- 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
+- lib/simple_metrics/views/layout.erb
+- lib/simple_metrics/views/show.erb
 - simple_metrics.gemspec
+- spec/array_aggregation_spec.rb
 - spec/bucket_spec.rb
+- spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
+- spec/metric_repository_spec.rb
 - spec/spec_helper.rb
+- spec/value_aggregation_spec.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -135,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1198545675235569375
+      hash: -3589789120249469613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,15 +247,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1198545675235569375
+      hash: -3589789120249469613
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: SimpleMetrics
 test_files:
+- spec/array_aggregation_spec.rb
 - spec/bucket_spec.rb
+- spec/data_point_repository_spec.rb
 - spec/data_point_spec.rb
 - spec/graph_spec.rb
+- spec/metric_repository_spec.rb
 - spec/spec_helper.rb
+- spec/value_aggregation_spec.rb