noah 0.2.1 → 0.3

data/spec/noahapp_host_spec.rb

@@ -5,13 +5,13 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
 
     describe "GET" do
       it "all hosts should work" do
-        get '/h'
+        get '/hosts'
         last_response.should be_ok
         last_response.should return_json
       end
 
       it "existing host should work" do
-        get '/h/localhost'
+        get '/hosts/localhost'
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -29,7 +29,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
       end  
 
       it "named service for host should work" do
-        get '/h/localhost/noah'
+        get '/hosts/localhost/noah'
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -42,7 +42,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
     describe "PUT" do
       it "new host should work" do
         host_data = {:name => "host99.domain.com", :status => "down"}.to_json
-        put '/h/host99.domain.com', host_data, "CONTENT_TYPE" => "application/json"
+        put '/hosts/host99.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -56,7 +56,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
       it "existing host should work" do
         sleep 3
         host_data = {:name => "host99.domain.com", :status => "pending"}.to_json
-        put '/h/host99.domain.com', host_data, "CONTENT_TYPE" => "application/json"
+        put '/hosts/host99.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -65,19 +65,19 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
 
       it "host missing name parameter should not work" do
         host_data = {:status => "pending"}.to_json
-        put '/h/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
+        put '/hosts/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end
 
       it "host missing status parameter should not work" do
         host_data = {:name => "host100.domain.com"}.to_json
-        put '/h/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
+        put '/hosts/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end 
 
       it "host with invalid status parameter should not work" do
         host_data = {:name => "host100.domain.com", :status => "fscked"}.to_json
-        put '/h/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
+        put '/hosts/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should_not be_ok
         response = last_response.should return_json
 
@@ -96,7 +96,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
       end  
       it "existing host should work" do
         svc_size = @h.services.size
-        delete "/h/#{@h.name}"
+        delete "/hosts/#{@h.name}"
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -107,7 +107,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
       end
 
       it "invalid host should not work" do
-        delete "/h/#{@h.name}"
+        delete "/hosts/#{@h.name}"
         last_response.should be_missing
       end
     end

data/spec/noahapp_service_spec.rb

@@ -13,13 +13,13 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
     
     describe "GET" do
       it "all services should work" do
-        get '/s'
+        get '/services'
         last_response.should be_ok
         response = last_response.should return_json
         response.is_a?(Array).should == true
       end
       it "all named services should work" do
-        get "/s/#{@sample_service[:name]}"
+        get "/services/#{@sample_service[:name]}"
         last_response.should be_ok
         response = last_response.should return_json
         response.is_a?(Array).should == true
@@ -30,7 +30,7 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         s["host"].should == @h.name
       end
       it "named service for host should work" do
-        get "/s/#{@sample_service[:name]}/#{@sample_host[:name]}"
+        get "/services/#{@sample_service[:name]}/#{@sample_host[:name]}"
         last_response.should be_ok
         response = last_response.should return_json
         response["id"].should == @s.id
@@ -39,7 +39,7 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         response["host"].should == @h.name
       end
       it "missing service for host should not work" do
-        get '/s/foobar/baz'
+        get '/services/foobar/baz'
         last_response.should be_missing
       end
     end
@@ -49,7 +49,7 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         @payload = {:name => 'another_rspec_service', :status => 'up', :host => @h.name}
       end  
       it "new service should work" do
-        put "/s/#{@payload[:name]}/", @payload.to_json, "CONTENT_TYPE" => "application/json"
+        put "/services/#{@payload[:name]}/", @payload.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -61,26 +61,26 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         Noah::Service.find(:name => @payload[:name]).first.is_new?.should == true
       end
       it "new service without host should not work" do
-        put "/s/foobar", {:name => "foobar", :status => "up"}.to_json, "CONTENT_TYPE" => "application/json"
+        put "/services/foobar", {:name => "foobar", :status => "up"}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end  
       it "new service with invalid status should not work" do
-        put "/s/foobar", {:name => "foobar", :status => "fsck", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
+        put "/services/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 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"
+        put "/services/foobar", {:status => "fsck", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end
       it "new service with missing status should not work" do
-        put "/s/foobar", {:name => "foobar", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
+        put "/services/foobar", {:name => "foobar", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end  
       it "existing service should work" do
         sleep 3
-        put "/s/#{@payload[:name]}", {:name => @payload[:name], :status => "down", :host => @payload[:host]}.to_json, "CONTENT_TYPE" => "application/json"
+        put "/services/#{@payload[:name]}", {:name => @payload[:name], :status => "down", :host => @payload[:host]}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -101,7 +101,7 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         @s = @h.services.first
       end  
       it "existing host should work" do
-        delete "/s/#{@s.name}/#{@h.name}"
+        delete "/services/#{@s.name}/#{@h.name}"
         last_response.should be_ok
         response = last_response.should return_json
         
@@ -112,7 +112,7 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         response["service"].should == @s.name
       end  
       it "invalid host should not work" do
-        delete "/s/#{@s.name}/#{@h.name}"
+        delete "/services/#{@s.name}/#{@h.name}"
         last_response.should be_missing
       end
     end

data/spec/noahapp_watcher_spec.rb

@@ -22,7 +22,7 @@ describe "Using the Watcher API", :reset_redis => true do
 
     describe "GET" do
       it "all watches should work" do
-        get '/w'
+        get '/watches'
         last_response.should be_ok
         response = last_response.should return_json
         response.is_a?(Array).should == true
@@ -30,8 +30,8 @@ describe "Using the Watcher API", :reset_redis => true do
       end
 
       it "named watch should work" do
-        w = Noah::Watcher.create(:pattern => '//noah/application/myapp', :endpoint => 'http://localhost/webhook')
-        get "/w/#{w.name}"
+        w = Noah::Watcher.create(:pattern => '//noah/application/myapp', :endpoint => 'http://localhost/watchersebhook')
+        get "/watches/#{w.name}"
         last_response.should be_ok
         response = last_response.should return_json
         response['pattern'].should == w.pattern
@@ -39,15 +39,15 @@ describe "Using the Watcher API", :reset_redis => true do
       end
 
       it "invalid watch should not work" do
-        get '/w/asdfasdfasdfasdfasdfsdf'
+        get '/watches/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"
+        data = {:pattern => "//noah/application", :endpoint => "http://myendpoint/watchersebhook"}
+        put '/watches', data.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response['pattern'].should == data[:pattern]
@@ -58,30 +58,30 @@ describe "Using the Watcher API", :reset_redis => true do
       end
 
       it "new watch without pattern should not work" do
-        data = {:endpoint => "http://myendpoint/webhook"}
-        put '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        data = {:endpoint => "http://myendpoint/watchersebhook"}
+        put '/watches', 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"
+        put '/watches', 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"
+        Noah::Watcher.create(:endpoint => 'http://myendpoint/watchersebhook', :pattern => '//noah/application/foo')
+        data = {:endpoint => "http://myendpoint/watchersebhook", :pattern => '//noah/application'}
+        put '/watches', 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"
+        Noah::Watcher.create(:endpoint => 'http://myendpoint/watchersebhook', :pattern => '//noah/application')
+        data = {:endpoint => "http://myendpoint/watchersebhook", :pattern => '//noah/application/foo'}
+        put '/watches', 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'
@@ -90,9 +90,9 @@ describe "Using the Watcher API", :reset_redis => true do
 
     describe "DELETE" do
       it "delete an existing watch should work" do
-        data = {:endpoint => "http://myendpoint/webhookd", :pattern => '//noah/application/d'}
+        data = {:endpoint => "http://myendpoint/watchersebhookd", :pattern => '//noah/application/d'}
         w = Noah::Watcher.create(data)
-        delete '/w', data.to_json, "CONTENT_TYPE" => "application/json"
+        delete '/watches', data.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response['pattern'].should == data[:pattern]
@@ -103,19 +103,19 @@ describe "Using the Watcher API", :reset_redis => true do
 
       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"
+        delete '/watches', 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"
+        delete '/watches', 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"
+        delete '/watches', data.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end
     end

data/spec/spec_helper.rb

@@ -14,6 +14,11 @@ RSpec.configure do |config|
   config.after(:all, :populate_sample_data => true) {Ohm::redis.flushdb }
   config.before(:all, :populate_sample_data => true) do
     Ohm::redis.flushdb
+    Noah::Watcher.create :endpoint => "dummy://applications", :pattern => "//noah/applications"
+    Noah::Watcher.create :endpoint => "dummy://configurations", :pattern => "//noah/configurations"
+    Noah::Watcher.create :endpoint => "dummy://hosts", :pattern => "//noah/hosts"
+    Noah::Watcher.create :endpoint => "dummy://services", :pattern => "//noah/services"
+    Noah::Watcher.create :endpoint => "dummy://ephemerals", :pattern => "//noah/ephemerals"
     h = Noah::Host.create(:name => 'localhost', :status => "up")
     if h.save
       %w[redis noah].each do |service|

data/views/index.haml

@@ -14,42 +14,42 @@
             %h2 Hosts
             %ul
                 %li 
-                    %a{:href => "h/"} All registered Hosts
+                    %a{:href => "hosts/"} All registered Hosts
                 %li 
-                    %a{:href => "h/localhost"} localhost (this server)
+                    %a{:href => "hosts/localhost"} localhost (this server)
                 %li
-                    %a{:href => "h/localhost/noah"} localhost noah service
+                    %a{:href => "hosts/localhost/noah"} localhost noah service
         #header
             %h2 Services
             %ul
                 %li 
-                    %a{:href => "s/"} All registered Services
+                    %a{:href => "services/"} All registered Services
                 %li
-                    %a{:href => "s/http"} All hosts providing 'http'
+                    %a{:href => "services/http"} All hosts providing 'http'
                 %li 
-                    %a{:href => "s/noah/localhost"} localhost noah service
+                    %a{:href => "services/noah/localhost"} localhost noah service
         #header
             %h2 Applications
             %ul
                 %li
-                    %a{:href => "a/"} All registered Applications
+                    %a{:href => "applications/"} All registered Applications
                 %li
-                    %a{:href => "a/noah"} Noah Application entry
+                    %a{:href => "applications/noah"} Noah Application entry
                 %li
-                    %a{:href => "a/noah/redis"} Noah Redis configuration entry
+                    %a{:href => "applications/noah/redis"} Noah Redis configuration entry
         #header
             %h2 Configurations
             %ul
                 %li
-                    %a{:href => "c/"} All registered Configurations
+                    %a{:href => "configurations/"} All registered Configurations
                 %li
-                    %a{:href => "c/noah"} Noah Configuration entry
+                    %a{:href => "configurations/noah"} Noah Configuration entry
                 %li
-                    %a{:href => "c/myrailsapp1"} myrailsapp1 Configuration entry
+                    %a{:href => "configurations/myrailsapp1"} myrailsapp1 Configuration entry
                 %li
-                    %a{:href => "c/myrestapp1"} myrestapp1 Configuration entry
+                    %a{:href => "configurations/myrestapp1"} myrestapp1 Configuration entry
                 %li
-                    %a{:href => "c/myrailsapp1/database.yml"} database.yml file for myrailsapp1 (should return the proper content-type)
+                    %a{:href => "configurations/myrailsapp1/database.yml"} database.yml file for myrailsapp1 (should return the proper content-type)
                 %li
-                    %a{:href => "c/myrestapp1/config.json"} config.json file for myrestapp1
+                    %a{:href => "configurations/myrestapp1/config.json"} config.json file for myrestapp1
 

metadata

@@ -2,7 +2,7 @@
 name: noah
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: "0.3"
 platform: ruby
 authors: 
 - John E. Vincent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -04:00
+date: 2011-03-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -275,16 +275,21 @@ files:
 - lib/noah/ephemeral_routes.rb
 - lib/noah/helpers.rb
 - lib/noah/host_routes.rb
+- lib/noah/log.rb
 - lib/noah/models.rb
 - lib/noah/models/applications.rb
 - lib/noah/models/configurations.rb
 - lib/noah/models/ephemerals.rb
 - lib/noah/models/hosts.rb
+- lib/noah/models/link.rb
+- lib/noah/models/link_member.rb
 - lib/noah/models/services.rb
+- lib/noah/models/tags.rb
 - lib/noah/models/watchers.rb
 - lib/noah/passthrough.rb
 - lib/noah/service_routes.rb
 - lib/noah/validations.rb
+- lib/noah/validations/ephemeral_validations.rb
 - lib/noah/validations/watcher_validations.rb
 - lib/noah/version.rb
 - lib/noah/watcher_routes.rb