noah 0.0.9 → 0.1

data/Rakefile

@@ -13,28 +13,24 @@ end
 
 
 task :default => :run
-task :test => [:start, :spec, :stop]
+task :test => :run
 
 desc "Run tests and manage server start/stop"
 task :run => [:start, :spec, :stop]
 
-desc "Start the Redis server"
 task :start do
   puts "Starting redis-server"
   system "redis-server #{REDIS_CNF}"
 end
 
-desc "Stop the Redis server"
 task :stop do
   puts "Killing redis"
   system "killall -TERM redis-server"
 end
 
 namespace :coverage do
-  desc "Delete aggregate coverage data."
   task(:clean) { rm_f "coverage.data" }
 end
-desc "Run Rcov code coverage analysis"
 RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov = true
   t.verbose = true
@@ -128,7 +124,6 @@ rescue LoadError
   "You need YARD installed to generate docs"
 end
 
-desc "Demo environment"
 task :start_demo do
   puts "Soon, young padawan"
 end

data/TODO.md

@@ -1,4 +1,12 @@
 # Brain dump of stuff
+* Fix JRuby
+
+    This is an ongoing issue for me. I can't rely on stuff that's MRI only.
+
+* Break agent into separate gem
+
+    Again so that the server gem can be as lean as possible
+
 * Documentation
 
     Need to finish documenting everything for YARD to pick up.
@@ -13,15 +21,18 @@
 
 * Watchers
 
-    This is going to be a fun task. I'm serious.
+    **IN PROGRESS**
+    Need to resolve some issues around pathing for Configuration and Service nodes however watch registration and listing are up.    
+    Need to address alternative watcher URIs. Webhook is the only one supported right now.
 
 * Ephemeral nodes
 
-    Not sure how I want to implement that. Not too keen on storing them as in-memory hashes. Maybe a LRU in Redis?
+    **IN PROGRESS**
+    implement lifetime support
 
 * Examples
 
-    I need to make some example apps to really demonstrate what I'm trying to accomplish. 
+    Pretty happy with the examples I have but I need more. Want some in other languages - Python, Java, whatever!
 
 * Clean up deps
 
@@ -35,9 +46,6 @@
 * Github pages
   - see [[http://lusis.github.com/Noah/]]
 
-* Bundle a war
-  - see [[https://github.com/downloads/lusis/Noah/noah.war]]
-
 * Examples
   - Sort of done. Demo app is up! [[http://noah-demo.heroku.com/]]. Also see `examples` directory.
 
@@ -48,12 +56,10 @@
   - Done.
 
 * Watchers
-  - Partially done. Framework is in place to create a custom Watcher by hooking directly into Redis. Need to expand that to "official" watchers
+  - Done. GET PUT DELETE are all available at the '/w/' endpoint now!
 
 
 ## Watcher specific stuff
-* Implement a watcher endpoint
-* Implement webhooks
 * Implement AMQP
 * Implement REST
 * Implement JMX on JRuby

data/bin/noah-watcher.rb

@@ -1,15 +1,22 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-require 'rubygems'
-require 'rbtrace'
-require 'logger'
-require 'optparse'
-require 'em-hiredis'
-require 'eventmachine'
-require 'em-http-request'
-require 'thin'
-require 'noah'
-require 'json'
+  HELP = <<-EOH
+  Unfortunately, the agent script has some difficult requirements right now.
+  Please see https://github.com/lusis/Noah/Watcher-Agent for details.
+  EOH
+begin
+  require 'rubygems'
+  require 'logger'
+  require 'optparse'
+  require 'em-hiredis'
+  require 'eventmachine'
+  require 'em-http-request'
+  require 'noah'
+  require 'json'
+rescue LoadError
+  puts HELP
+  exit
+end
 
 LOGGER = Logger.new(STDOUT)
 
@@ -73,6 +80,7 @@ end
 
 EventMachine.run do
   logger = LOGGER
+  trap("INT") { logger.debug("Shutting down. Watches will not be fired");EM.stop }
   noah = EventMachine::NoahAgent.new
   # Passing messages...like a boss
   master_channel = EventMachine::Channel.new

data/lib/noah/app.rb

@@ -63,7 +63,7 @@ module Noah
     load File.join(File.dirname(__FILE__), 'application_routes.rb')
     load File.join(File.dirname(__FILE__), 'configuration_routes.rb')
     load File.join(File.dirname(__FILE__), 'watcher_routes.rb')
-    #load File.joint(File.dirname(__FILE__), 'ephemeral_routes.rb')
+    load File.join(File.dirname(__FILE__), 'ephemeral_routes.rb')
 
   end
 end

data/lib/noah/application_routes.rb

@@ -41,7 +41,7 @@ class Noah::App
       r = {"result" => "success","id" => app.id, "action" => action, "name" => app.name }
       r.to_json
     else
-      raise "#{app.errors}"
+      raise "#{format_errors(app)}"
     end
   end
 

data/lib/noah/configuration_routes.rb

@@ -59,7 +59,7 @@ class Noah::App
       r = {"result" => "success","id" => "#{config.id}", "action" => action, "dependencies" => dependency_action, "application" => app.name, "item" => config.name}
       r.to_json
     else
-      raise "#{config.errors}"
+      raise "#{format_errors(config)}"
     end
   end
 

data/lib/noah/ephemeral_routes.rb

@@ -1,19 +1,48 @@
 class Noah::App
-  # Stubbing Ephemeral endpoints
+  get '/e/?' do
+    halt 404
+  end
+
   get '/e/*' do
-    # Some logic to handle splats for ephemerals
-    # Eventually I'll move to root path
+    params["splat"].size == 0 ? (halt 404) : (e=Noah::Ephemeral.find(:path => "/#{params["splat"][0]}").first)
+    (halt 404) if e.nil?
+    content_type "application/octet-stream"
+    e.data.nil? ? "" : "#{e.data}"
   end
 
   put '/e/*/watch' do
-    # Logic for adding watches to ephemerals
+    required_params = ["endpoint"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (e = Noah::Watcher.find(:path => params[:splat][0]).first) : (raise "Missing Parameters")
+    e.nil? ? (halt 404) : (w = e.watch!(:endpoint => data["endpoint"]))
+    w.to_json
   end
 
   put '/e/*' do
-    # Some logic for creating ephemerals
+    raise("Data too large") if request.body.size > 512
+    d = request.body.read  || nil
+    e = Noah::Ephemeral.find_or_create(:path => "/#{params[:splat][0]}")
+    e.data = d
+    if e.valid?
+      e.save
+      action = e.is_new? ? "create" : "update"
+      r = {"action" => action, "result" => "success", "id" => e.id, "path" => e.path, "data" => e.data}
+      r.to_json
+    else
+      raise "#{format_errors(e)}"
+    end
   end
 
   delete '/e/*' do
-    # See previous two entries
+    p = params[:splat][0]
+    e = Noah::Ephemeral.find(:path => "/"+p).first
+    if e
+      e.delete
+      r = {"result" => "success", "id" => "#{e.id}", "action" => "delete", "path" => e.name}
+      r.to_json
+    else
+      halt 404
+    end
   end
+
 end

data/lib/noah/helpers.rb

@@ -1,5 +1,30 @@
 module Noah
   module SinatraHelpers
+    
+    def format_errors(model)
+      error_messages = model.errors.present do |e|
+        # Missing attributes
+        e.on [:name, :not_present], "Name attribute missing"
+        e.on [:status, :not_present], "Status attribute missing"
+        e.on [:format, :not_present], "Format attribute missing"
+        e.on [:body, :not_present], "Body attribute missing"
+        e.on [:application_id, :not_present], "Application attribute missing"
+        e.on [:path, :not_present], "Path attribute missing"
+        e.on [:pattern, :not_present], "Pattern attribute missing"
+        e.on [:endpoint, :not_present], "Endpoint attribute missing"
+        # Invalid option
+        e.on [:status, :not_member], "Status must be up, down or pending"
+        # Duplicate keys
+        e.on [[:name, :application_id], :not_unique], "Record already exists"
+        e.on [[:name, :host_id], :not_unique], "Record already exists"
+        e.on [[:endpoint, :pattern], :not_unique], "Record already exists"
+        e.on [:path, :not_unique], "Record already exists"
+        # Custom exceptions
+        e.on [:pattern, :already_provided], "Pattern is already provided"
+        e.on [:pattern, :replaces_existing], "Pattern would overwrite existing"
+      end
+      error_messages.first
+    end
 
     def host(opts = {})
       Noah::Host.find(opts).first

data/lib/noah/host_routes.rb

@@ -49,7 +49,7 @@ class Noah::App
       r = {"result" => "success","id" => "#{host.id}","status" => "#{host.status}", "name" => "#{host.name}", "new_record" => host.is_new?}
       r.to_json
     else
-      raise "#{host.errors}"
+      raise "#{format_errors(host)}"
     end
   end
 

data/lib/noah/models/ephemerals.rb

@@ -1,9 +1,9 @@
-require 'digest/sha1'
 module Noah
   class Ephemeral < Model #NYI
 
     attribute :path
     attribute :data
+    attribute :lifetime
 
     index :path
 
@@ -17,6 +17,25 @@ module Noah
       @name = path
     end
 
+    def to_hash
+      h = {:path => path, :data => data, :created_at => created_at, :updated_at => :updated_at}
+      super.merge(h)
+    end
+
+    class << self
+    def find_or_create(opts = {})
+      begin
+        find(opts).first.nil? ? (eph = create(opts)) : (eph = find(opts).first)
+        if eph.valid?
+          eph.save
+        end
+        eph
+      rescue Exception => e
+        e.message
+      end
+    end
+    end
+
     protected
     def save_hook
       # called after any create,update,delete
@@ -27,7 +46,7 @@ module Noah
     def path_protected?(path_part)
       # Check for protected paths in ephemeral nodes
     end
-      
+
   end
 
 end

data/lib/noah/models/watchers.rb

@@ -7,6 +7,7 @@ module Noah
 
     attribute :pattern
     attribute :endpoint
+    attribute :name
 
     index :pattern
     index :endpoint
@@ -29,12 +30,19 @@ module Noah
       super.merge(h)
     end
 
-    def self.watch_list
+    class << self
+    def find_by_name(name)
+      pattern, endpoint = Base64.decode64(name).split('|')
+      find(:pattern => pattern, :endpoint => endpoint).first
+    end
+
+    def watch_list
       arr = []
       watches = self.all.sort_by(:pattern)
       watches.each {|w| arr << w.name}
       arr
     end
+    end
 
     private
     # Not sure about these next two.

data/lib/noah/service_routes.rb

@@ -50,7 +50,7 @@ class Noah::App
         r = {"action" => action, "result" => "success", "id" => service.id, "host" => h.name, "name" => service.name}
         r.to_json
       else
-        raise "#{service.errors}"
+        raise "#{format_errors(service)}"
       end
     else
       raise "Missing Parameters"

data/lib/noah/version.rb

@@ -1,3 +1,3 @@
 module Noah
-  VERSION = "0.0.9"
+  VERSION = "0.1"
 end

data/lib/noah/watcher_routes.rb

@@ -1,12 +1,45 @@
 class Noah::App
 
+  get '/w/:name' do |name|
+    w = Noah::Watcher.find_by_name(name)
+    w.nil? ? (halt 404) : w.to_json
+  end
+
   get '/w/?' do
     w = Noah::Watcher.all.sort_by(:pattern)
     if w.size == 0
       halt 404
     else  
       w.to_json
-    end  
+    end 
+  end
+
+  put '/w/?' do
+    required_params = %w[endpoint pattern]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (pattern, endpoint = data['pattern'],data['endpoint']) : (raise "Missing Parameters")
+    w = Noah::Watcher.create(:pattern => pattern, :endpoint => endpoint)
+    if w.valid?
+        w.save
+        r = {"action" => "create", "result" => "success"}.merge(w.to_hash)
+        r.to_json
+    else
+        raise "#{format_errors(w)}"
+    end
+  end
+
+  delete '/w/?' do
+    required_params = %w[endpoint pattern]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (pattern, endpoint = data['pattern'],data['endpoint']) : (raise "Missing Parameters")
+    w = Noah::Watcher.find(:pattern => pattern, :endpoint => endpoint).first
+    if w.nil?
+      halt 404
+    else
+      w.delete
+      r = {"result" => "success", "action" => "delete"}.merge(w.to_hash)
+      r.to_json
+    end
   end
 
 end

data/noah.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency("warbler", ["= 1.2.1"])
   else
     s.add_dependency("yajl-ruby") 
+    s.add_dependency("SystemTimer") if RUBY_VERSION =~ /1.8/
     s.add_dependency("thin")
   end
 

data/spec/configuration_spec.rb

@@ -1,18 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Using the Configuration Model", :reset_redis => true do
-  before(:all) do
-    app = Noah::Application.create(:name => "my_application")
-    app.save
-    @appconf_string = {:name => "mystringconf", :format => "string", :body => "some_var", :application_id => app.id}
-    @appconf_json = {:name => "myjsonconf", :format => "json", :body => @appconf_string.to_json, :application_id => app.id}
-    @appconf_missing_name = @appconf_string.reject {|x| x == :name}
-    @appconf_missing_format = @appconf_string.reject {|x| x == :format}
-    @appconf_missing_body = @appconf_string.reject {|x| x == :body}
-    @appconf_missing_application = @appconf_string.reject {|x| x == :application_id}
-  end
   before(:each) do
     Ohm.redis.flushdb
+    app = Noah::Application.create :name => "my_application"
+    @appconf_string = {:name => "mystringconf", :format => "string", :body => "some_var", :application_id => app.id}
+    @appconf_json = {:name => "myjsonconf", :format => "json", :body => @appconf_string.to_json, :application_id => app.id}
+    @appconf_missing_name = @appconf_string.reject {|k, v| k == :name}
+    @appconf_missing_format = @appconf_string.reject {|k, v| k == :format}
+    @appconf_missing_body = @appconf_string.reject {|k, v| k == :body}
+    @appconf_missing_application = @appconf_string.reject {|k, v| k == :application_id}
   end
   after(:each) do
     Ohm.redis.flushdb

data/spec/ephemeral_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Using the Ephemeral Model", :reset_redis => true do
   before(:all) do
     @edata = {:path => "/foo/bar/baz", :data => "some_value"}
-    @emissing_path = @edata.reject {|x| x == :path}
-    @emissing_data = @edata.reject {|x| x == :data}
+    @emissing_path = @edata.reject {|k, v| k == :path}
+    @emissing_data = @edata.reject {|k, v| k == :data}
     @good_ephemeral = Noah::Ephemeral.new(@edata)
     @missing_path = Noah::Ephemeral.new(@emissing_path)
     @missing_data = Noah::Ephemeral.new(@emissing_data)
@@ -28,15 +28,15 @@ describe "Using the Ephemeral Model", :reset_redis => true do
       b = Noah::Ephemeral[@missing_data.id]
       b.should == @missing_data
     end
-#    it "update an existing Noah::Ephemeral" do
-#      @good_ephemeral.save
-#      Noah::Ephemeral.all.size.should == 1
-#      c = Noah::Ephemeral[@good_ephemeral.id]
-#      c.data = "updated_data"
-#      c.save
-#      sleep(2)
-#      c.is_new?.should == false
-#    end
+    it "update an existing Noah::Ephemeral" do
+      e = Noah::Ephemeral.create :path => "/is/new/test"
+      Noah::Ephemeral.all.size.should == 1
+      sleep(2)
+      c = Noah::Ephemeral[e.id]
+      c.data = "updated_data"
+      c.save
+      c.is_new?.should == false
+    end
     it "delete an existing Noah::Ephemeral" do
       @good_ephemeral.save
       @good_ephemeral.delete
@@ -45,8 +45,15 @@ describe "Using the Ephemeral Model", :reset_redis => true do
   end
   describe "should not" do
     it "create a new Noah::Ephemeral with missing path" do
-      @missing_path.valid?.should == false
-      @missing_path.errors.should == [[:path, :not_present]]
+      e = Noah::Ephemeral.create
+      e.valid?.should == false
+      e.errors.should == [[:path, :not_present]]
+    end
+    it "create a duplicate Noah::Ephemeral" do
+      e = Noah::Ephemeral.create :path => "/random/path"
+      f = Noah::Ephemeral.create :path => "/random/path"
+      f.valid?.should == false
+      f.errors.should == [[:path, :not_unique]]
     end
   end
 end

data/spec/noahapp_configuration_spec.rb

@@ -34,8 +34,8 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
         response = YAML.load(last_response.body)
         response.is_a?(Hash).should == true
         response.keys.should == ["development"]
-        response["development"].keys.should == ["database", "adapter", "username", "password"]
-        response["development"].values.should == ["development_database", "mysql", "dev_user", "dev_password"]
+        response["development"].keys.sort.should == ["adapter", "database", "password", "username"]
+        response["development"].values.sort.should == ["dev_password", "dev_user", "development_database", "mysql"]
       end
       it "invalid application should not work" do
         get '/c/badapp'

data/spec/noahapp_ephemeral_spec.rb

@@ -0,0 +1,115 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Using the Ephemeral API", :reset_redis => true do
+  before(:each) do
+    Ohm.redis.flushdb
+    Noah::Ephemeral.create(:path => "/foo/bar/baz", :data => "value1")
+    Noah::Ephemeral.create(:path => "/baz/bar")
+  end
+  after(:each) do
+    Ohm.redis.flushdb
+  end
+  describe "calling" do
+
+    describe "GET" do
+      it "all ephemerals should return 404" do
+        get '/e'
+        last_response.should_not be_ok
+        last_response.status.should == 404
+        response = last_response.should return_json
+        response['error_message'].should == 'Resource not found'
+        response['result'].should == 'failure'
+      end
+
+      it "named path with data should work" do
+        get '/e/foo/bar/baz'
+        last_response.should be_ok
+        last_response.body.should == 'value1'
+      end
+
+      it "named path without data should work" do
+        get '/e/baz/bar'
+        last_response.status.should == 200
+        last_response.body.should == ""
+      end
+
+      it "invalid path should not work" do
+        get '/e/ssss/dddd'
+        last_response.should_not be_ok
+        last_response.status.should == 404
+        response = last_response.should return_json
+        response['error_message'].should == 'Resource not found'
+        response['result'].should == 'failure'
+      end
+    end
+
+    describe "PUT" do
+      it "new ephemeral with data should work" do
+        put '/e/whiz/bang/', 'value3'
+        last_response.should be_ok
+        response = last_response.should return_json
+        response['result'].should == 'success'
+        response['id'].nil?.should == false
+        response['path'].should == '/whiz/bang/'
+        response['data'].should == 'value3'
+      end
+
+      it "new ephemeral without data should work" do
+        put '/e/bang/whiz'
+        last_response.should be_ok
+        response = last_response.should return_json
+        response['result'].should == 'success'
+        response['action'].should == 'create'
+        response['id'].nil?.should == false
+        response['path'].should == '/bang/whiz'
+        response['data'].should == nil
+      end
+
+      it "existing ephemeral with data should work" do
+        Noah::Ephemeral.create(:path => '/new/ephemeral', :data => 'old_value')
+        get '/e/new/ephemeral'
+        last_response.should be_ok
+        last_response.body.should == 'old_value'
+        put '/e/new/ephemeral', 'new_value'
+        last_response.should be_ok
+        get '/e/new/ephemeral'
+        last_response.should be_ok
+        last_response.body.should == 'new_value'
+      end
+      it "existing ephemeral without data should work" do
+        Noah::Ephemeral.create(:path => '/a/random/key')
+        get '/e/a/random/key'
+        last_response.should be_ok
+        last_response.body.should == ""
+        put '/e/a/random/key', 'a new value'
+        last_response.should be_ok
+        get '/e/a/random/key'
+        last_response.should be_ok
+        last_response.body.should == 'a new value'
+      end
+    end
+
+    describe "DELETE" do
+      it "existing path should work" do
+        e = Noah::Ephemeral.new(:path => '/slart/i/bart/fast', :data => 'someddata')
+        e.save
+        delete "/e/slart/i/bart/fast"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response['result'].should == 'success'
+        response['action'].should == 'delete'
+        response['id'].should == e.id
+        response['path'].should == e.name
+      end
+
+      it "invalid path should not work" do
+        delete '/e/fork/spoon/knife'
+        last_response.should_not be_ok
+        last_response.status.should == 404
+        response = last_response.should return_json
+        response['error_message'].should == 'Resource not found'
+        response['result'].should == 'failure'
+      end
+    end
+  end
+end

data/spec/noahapp_host_spec.rb

@@ -82,7 +82,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
         response = last_response.should return_json
 
         response["result"].should == "failure"
-        response["error_message"].should == "[[:status, :not_member]]"
+        response["error_message"].should == "Status must be up, down or pending"
       end
     end
 

data/spec/noahapp_service_spec.rb

@@ -68,7 +68,7 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         put "/s/foobar", {:name => "foobar", :status => "fsck", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should_not be_ok
         response = last_response.should return_json
-        response["error_message"].should == "[[:status, :not_member]]"
+        response["error_message"].should == "Status must be up, down or pending"
       end  
       it "new service with missing name should not work" do
         put "/s/foobar", {:status => "fsck", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"

data/spec/noahapp_watcher_spec.rb

@@ -28,7 +28,96 @@ describe "Using the Watcher API", :reset_redis => true do
         response.is_a?(Array).should == true
         response.size.should == 4
       end
+
+      it "named watch should work" do
+        w = Noah::Watcher.create(:pattern => '//noah/application/myapp', :endpoint => 'http://localhost/webhook')
+        get "/w/#{w.name}"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response['pattern'].should == w.pattern
+        response['endpoint'].should == w.endpoint
+      end
+
+      it "invalid watch should not work" do
+        get '/w/asdfasdfasdfasdfasdfsdf'
+        last_response.should be_missing
+      end
     end
 
+    describe "PUT" do
+      it "new watch should work" do
+        data = {:pattern => "//noah/application", :endpoint => "http://myendpoint/webhook"}
+        put '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response['pattern'].should == data[:pattern]
+        response['endpoint'].should == data[:endpoint]
+        w = Noah::Watcher.find(data).first
+        w.pattern.should == data[:pattern]
+        w.endpoint.should == data[:endpoint]
+      end
+
+      it "new watch without pattern should not work" do
+        data = {:endpoint => "http://myendpoint/webhook"}
+        put '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_invalid
+      end
+
+      it "new watch without endpoint should not work" do
+        data = {:pattern => "//noah/application"}
+        put '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_invalid
+      end
+
+      it "new watch that supercedes existing should not work" do
+        Noah::Watcher.create(:endpoint => 'http://myendpoint/webhook', :pattern => '//noah/application/foo')
+        data = {:endpoint => "http://myendpoint/webhook", :pattern => '//noah/application'}
+        put '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should_not be_ok
+        response = last_response.should return_json
+        response['error_message'].should == 'Pattern would overwrite existing'
+      end
+
+      it "new watch that subsets an existing should not work" do
+        Noah::Watcher.create(:endpoint => 'http://myendpoint/webhook', :pattern => '//noah/application')
+        data = {:endpoint => "http://myendpoint/webhook", :pattern => '//noah/application/foo'}
+        put '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should_not be_ok
+        response = last_response.should return_json
+        response['error_message'].should == 'Pattern is already provided'
+      end
+    end
+
+    describe "DELETE" do
+      it "delete an existing watch should work" do
+        data = {:endpoint => "http://myendpoint/webhookd", :pattern => '//noah/application/d'}
+        w = Noah::Watcher.create(data)
+        delete '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response['pattern'].should == data[:pattern]
+        response['endpoint'].should == data[:endpoint]
+        response['name'].should_not == "null"
+        Noah::Watcher.find(data).size.should == 0
+      end
+
+      it "delete an invalid watch should not work" do
+        data = {:endpoint => 'missing', :pattern => '//noah/application/dag'}
+        delete '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_missing
+      end
+
+      it "delete without pattern should not work" do
+        data = {:endpoint => "invalid"}
+        delete '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_invalid
+      end
+
+      it "delete without endpoint should not work" do
+        data = {:pattern => "//noah/invalid"}
+        delete '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        last_response.should be_invalid
+      end
+    end
   end
 end  

data/spec/watcher_spec.rb

@@ -32,30 +32,30 @@ describe "Using the Watcher Model", :reset_redis => true do
     it "create a new Noah::Watcher with missing endpoint" do
       a = Noah::Watcher.create(:pattern => "/foo/bar")
       a.valid?.should == false
-      a.errors.to_s.should == "[[:endpoint, :not_present]]"
+      a.errors.should == [[:endpoint, :not_present]]
     end
     it "create a new Noah::Watcher with missing pattern" do
       a = Noah::Watcher.create(:endpoint => "http://localhost/webhook")
       a.valid?.should == false
-      a.errors.to_s.should == "[[:pattern, :not_present]]"
+      a.errors.should == [[:pattern, :not_present]]
     end
     it "create a new Noah::Watcher with subset pattern" do
       a = Noah::Watcher.create(:endpoint => "http://localhost.domain.com/webhook", :pattern => "//noah/")
       b = Noah::Watcher.create(:endpoint => "http://localhost.domain.com/webhook", :pattern => "//noah/foobar")
       b.valid?.should == false
-      b.errors.to_s.should == "[[:pattern, :already_provided]]"
+      b.errors.should == [[:pattern, :already_provided]]
     end
     it "create a new Noah::Watcher with superset pattern" do
       a = Noah::Watcher.create(:endpoint => "http://localhost.domain.com/webhook", :pattern => "//noah/foobar")
       b = Noah::Watcher.create(:endpoint => "http://localhost.domain.com/webhook", :pattern => "//noah")
       b.valid?.should == false
-      b.errors.to_s.should == "[[:pattern, :replaces_existing]]"
+      b.errors.should == [[:pattern, :replaces_existing]]
     end
     it "create a duplicate Noah::Watcher" do
       a = Noah::Watcher.create(:endpoint => "http://localhost.domain.com/webhook", :pattern => "//noah/foobar")
       b = Noah::Watcher.create(:endpoint => "http://localhost.domain.com/webhook", :pattern => "//noah/foobar")
       b.valid?.should == false
-      b.errors.to_s.should == "[[[:endpoint, :pattern], :not_unique]]"
+      b.errors.should == [[[:endpoint, :pattern], :not_unique]]
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: noah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: "0.1"
 platform: ruby
 authors: 
 - John E. Vincent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -265,7 +265,6 @@ files:
 - lib/vendor/em-hiredis/Gemfile
 - lib/vendor/em-hiredis/README.md
 - lib/vendor/em-hiredis/Rakefile
-- lib/vendor/em-hiredis/em-hiredis-0.0.1.gem
 - lib/vendor/em-hiredis/em-hiredis.gemspec
 - lib/vendor/em-hiredis/lib/em-hiredis.rb
 - lib/vendor/em-hiredis/lib/em-hiredis/client.rb
@@ -279,6 +278,7 @@ files:
 - spec/host_spec.rb
 - spec/noahapp_application_spec.rb
 - spec/noahapp_configuration_spec.rb
+- spec/noahapp_ephemeral_spec.rb
 - spec/noahapp_host_spec.rb
 - spec/noahapp_service_spec.rb
 - spec/noahapp_spec.rb
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: noah
-rubygems_version: 1.5.3
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Application registry based on Apache Zookeeper