check 0.2.0 → 0.2.1

data/check.gemspec

@@ -5,7 +5,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'check'
-  gem.version       = '0.2.0'
+  gem.version       = '0.2.1'
   gem.authors       = ['Gerhard Lazu']
   gem.email         = ['gerhard@lazu.co.uk']
   gem.description   = 'Redis backed service for monitoring metric data streams against pre-defined thresholds'

data/lib/check/api/metrics.rb

@@ -27,16 +27,38 @@ module Check
       end
     end
 
+    resource :metric do
+      desc 'List all matching metric checks'
+      params do
+        optional :name, :type => String, :desc => "Name of metric check"
+      end
+      get do
+        metric_check = Metric.find(metric_params)
+
+        if metric_check.persisted?
+          metric_check.similar.to_json
+        else
+          []
+        end
+      end
+
+      desc 'Delete all matching metric checks'
+      params do
+        requires :name, :type => String, :desc => "Name of metric check"
+      end
+      delete do
+        Metric.delete_all(params[:name])
+      end
+    end
+
     resources :metrics do
       desc 'Create metric check'
+      params do
+        requires :name, :type => String, :desc => "Name of metric check"
+      end
       post '/' do
         metric_check = Metric.new(metric_params).save
-
-        if metric_check.valid?
-          [metric_check.name]
-        else
-          error!({:errors => metric_check.errors}, 409)
-        end
+        [metric_check.name]
       end
 
       desc 'Delete specific metric check'
@@ -45,11 +67,17 @@ module Check
       end
 
       desc 'Delete all matching metric checks'
+      params do
+        requires :name, :type => String, :desc => "Name of metric check"
+      end
       delete '/:name' do
         Metric.delete_all(params[:name])
       end
 
       desc 'List all matching metric checks'
+      params do
+        optional :name, :type => String, :desc => "Name of metric check"
+      end
       get '/:name' do
         metric_check = Metric.find(metric_params)
 

data/test/check/api/metrics_test.rb

@@ -30,8 +30,8 @@ module Check
 
       describe "when there are metrics" do
         before do
-          matching_metric = Metric.new(name: "foo").save
-          other_metric = Metric.new(name: "bar").save
+          Metric.new(name: "foo").save
+          Metric.new(name: "bar").save
         end
 
         it "returns only matching ones" do
@@ -42,16 +42,28 @@ module Check
           body.first.fetch('name').must_equal "foo"
         end
       end
+
+      describe "when there are metrics with url-safe characters in their name" do
+        before do
+          Metric.new(name: "foo-bar_baz.qux").save
+          Metric.new(name: "foo.qux").save
+        end
+
+        it "returns only matching ones" do
+          get("/metric", :name => "foo-bar_baz.qux")
+          last_response.content_type.must_equal "application/json"
+          last_response.status.must_equal 200
+          body.size.must_equal 1
+          body.first.fetch('name').must_equal "foo-bar_baz.qux"
+        end
+      end
     end
 
     describe "POST /metrics" do
-      it "returns a 409 if params are invalid" do
+      it "returns a 400 if params are invalid" do
         post("/metrics")
         last_response.content_type.must_equal "application/json"
-        last_response.status.must_equal 409
-        body["errors"].must_equal({
-          'name' => "can't be blank"
-        })
+        last_response.status.must_equal 400
       end
 
       it "creates a new metric if params are valid" do
@@ -87,6 +99,16 @@ module Check
           Redis.current.keys.must_equal ["bar"]
         end
       end
+
+      describe "when metric has url-safe name" do
+        it "deletes all similar" do
+          Metric.new(name: "foo-bar_baz.qux").save
+          Metric.new(name: "foo.bar").save
+          delete("/metric", :name => "foo.bar")
+          last_response.status.must_equal 200
+          Redis.current.keys.must_equal ["foo-bar_baz.qux"]
+        end
+      end
     end
 
     describe "DELETE /metrics" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: check
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3975405867045093680
+      hash: 2887667756830827794
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3975405867045093680
+      hash: 2887667756830827794
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23