noah 0.6.pre-jruby → 0.8.1-jruby

data/lib/noah/app.rb

@@ -45,7 +45,7 @@ module Noah
     get '/' do
       content_type "text/html"
 
-      haml :index, :format => :html5, :locals => {:redis_url => settings.redis_url, :noah_version => Noah::VERSION}
+      haml :index, :format => :html5, :locals => {:redis_version => Ohm.redis.info["redis_version"].to_s, :noah_version => Noah::VERSION}
     end
 
     not_found do

data/lib/noah/helpers.rb

@@ -59,7 +59,54 @@ module Noah
       else  
         Noah::Services.all(:host_id => id)
       end  
-    end 
+    end
+
+    def find_hosts_by_service(servicename)
+      affected_hosts = []
+      s = Noah::Service.find(:name => servicename)
+      if s.nil?
+        affected_hosts
+      else
+        Noah::Host.all.each {|x| affected_hosts << x if (x.services.to_a & s.to_a).length > 0}
+        affected_hosts
+      end
+    end
+
+    def delete_service_from_host(servicename, hostname)
+      host = Noah::Host.find(:name => hostname).first
+      (halt 404) if host.nil?
+      service = Noah::Service.find(:name => servicename, :host_id => host.id).first
+      (halt 404) if service.nil?
+      service.delete
+      r = {"action" => "delete", "result" => "success", "id" => service.id, "host" => host.name, "service" => servicename}
+      r.to_json
+    end
+
+    def add_config_to_app(appname, config_hash)
+      begin
+        config = Noah::Configuration.find_or_create(config_hash)
+        if config.valid?
+          dep_action = config.is_new? ? "create" : "update"
+        else
+          raise "#{format_errors(config)}"
+        end
+        app = Noah::Application.find_or_create(:name => appname)
+        if app.valid?
+          action = app.is_new? ? "create" : "update"
+          app.configurations << config
+          r = {"result" => "success", "id" => "#{app.id}", "name" => "#{app.name}", "action" => action, "configuration" => {"action" => dep_action, "id" => "#{config.id}", "item" => "#{config.name}"}}
+          r.to_json
+        else
+          raise "#{format_errors(app)}"
+        end
+      rescue Exception => e
+        e.message
+      ensure
+        # Clean up partial objects
+        app.delete if app.valid? == false
+        config.delete if config.valid? == false
+      end
+    end
 
     def application(opts = {})
       Noah::Application.find(opts).first

data/lib/noah/models.rb

@@ -1,5 +1,7 @@
 require 'ohm'
 require 'ohm/contrib'
+require 'guid'
+
 module Noah
   class Model < Ohm::Model
 
@@ -96,6 +98,11 @@ module Noah
       end
     end
 
+    private
+    def initialize_id
+      @id ||= Guid.new.to_s
+    end
+
   end
 
   class RegisteredModels

data/lib/noah/models/applications.rb

@@ -20,7 +20,8 @@ module Noah
       configurations.sort.each do |cfg|
         cfg_hash["#{cfg.name}"] = {:format => cfg.to_hash[:format], :body => cfg.to_hash[:body]}
       end
-      {name => {:id => id, :created_at => created_at, :updated_at => updated_at, :configurations => cfg_hash}}
+      res_hash = {:name => name, :created_at => created_at, :updated_at => updated_at, :configurations => cfg_hash}
+      super.merge(res_hash)
     end
 
     class << self
@@ -43,8 +44,7 @@ module Noah
     def self.all(options = {})
       app_hash = Hash.new
       options.empty? ? apps=Application.all.sort : apps=Application.find(options).sort
-      #apps.each {|x| app_hash["#{x.name}"] = x.to_hash.reject {|k,v| k == :name} }
-      apps.each {|x| app_hash.merge!(x.to_hash) }
+      apps.each {|x| app_hash["#{x.name}"] = x.to_hash.reject {|k,v| k == :name} }
       app_hash
     end
   end

data/lib/noah/models/configurations.rb

@@ -44,9 +44,13 @@ module Noah
     class << self
     def find_or_create(opts={})
       begin
-        find(opts).first.nil? ? (obj = new(opts)) : (obj = find(opts).first)
-        if obj.valid?
+        find(:name => opts[:name]).first.nil? ? (obj = new(opts)) : (obj = find(:name => opts[:name]).first)
+        if obj.valid? && obj.new?
           obj.save
+        else
+          obj.format = opts[:format]
+          obj.body = opts[:body]
+          obj.save if obj.valid?
         end
         obj
       rescue Exception => e

data/lib/noah/models/hosts.rb

@@ -11,6 +11,7 @@ module Noah
 
     index :name
     index :status
+    index :services
 
     def validate
       super
@@ -33,9 +34,9 @@ module Noah
     class << self
     def find_or_create(opts = {})
       begin
-        # exclude requested status from lookup
-        h = find(opts.reject{|key,value| key == :status}).first
-        host = h.nil? ? create(opts) : h
+        h = find(:name => opts[:name]).first
+        #h = find(opts.reject{|key,value| key == :status}).first
+        h.nil? ? host=new(opts) : host=h
         host.status = opts[:status]
         if host.valid?
           host.save

data/lib/noah/models/services.rb

@@ -33,8 +33,8 @@ module Noah
             opts.reject!{|key, value| key == :host}
           end  
           # exclude requested status from lookup
-          s = find(opts.reject{|key,value| key == :status}).first
-          service = s.nil? ? create(opts) : s
+          s = find(:name => opts[:name], :host_id => opts[:host_id]).first
+          s.nil? ? service=new(opts) : service=s
           service.status = opts[:status]
           if service.valid?
             service.save

data/lib/noah/models/tags.rb

@@ -48,7 +48,7 @@ module Noah
 
     private
     def node_to_class(node)
-      node.match(/^Noah::(.*):(\d+)$/)
+      node.match(/^Noah::(.*):(.*)$/)
       Noah.const_get($1).send(:[], $2)
     end
 

data/lib/noah/routes/applications.rb

@@ -1,10 +1,10 @@
 class Noah::App
   # Application URIs
-  get '/applications/:appname/:config/?' do |appname, config|
+  get '/applications/:appname/configurations/:config/?' do |appname, config|
     app = Noah::Application.find(:name => appname).first
     (halt 404) if app.nil?
-    c = app.configurations.find(:name => config).first
-    c.to_json
+    request.path_info = "/configurations/#{config}"
+    pass
   end
 
   get '/applications/:appname/?' do |appname|
@@ -37,6 +37,14 @@ class Noah::App
     a.to_json
   end
 
+  put '/applications/:appname/configurations/:configname/?' do |appname, configname|
+    required_params = ["format", "body"]
+    raise "Missing Parameters" if request.body.nil?
+    data = JSON.parse(request.body.read)
+    raise "Missing Parameters" if data.keys.sort != required_params.sort
+    add_config_to_app(appname, {:name => configname, :format => data['format'], :body => data['body']})
+  end
+
   put '/applications/:appname/?' do |appname|
     required_params = ["name"]
     data = JSON.parse(request.body.read)
@@ -64,6 +72,17 @@ class Noah::App
   end
 
   delete '/applications/:appname/configurations/:configname/?' do |appname, configname|
+    app = Noah::Application.find(:name => appname).first
+    (halt 404) if app.nil?
+    config = Noah::Configuration.find(:name => configname).first
+    (halt 404) if config.nil?
+    if app.configurations.member?(config)
+      app.configurations.delete(config)
+      r = {"result" => "success", "action" => "delete", "id" => "#{app.id}", "name" => "#{app.name}", "configuration" => "#{config.name}"}
+      r.to_json
+    else
+      halt 404
+    end
   end
 
   get '/applications/?' do

data/lib/noah/routes/configurations.rb

@@ -5,19 +5,17 @@ class Noah::App
             :xml => "text/xml",
             :string => "text/plain"
   }
-  # GET the raw data of a configuration object
-  get '/configurations/:configname/data/?' do |configname|
+  get '/configurations/:configname/?', :provides => :json do |configname|
     c = Noah::Configuration.find(:name => configname).first
     (halt 404) if c.nil?
-    content_type content_type_mapping[c.format.to_sym] if content_type_mapping[c.format.to_sym]
-    response.headers['Content-Disposition'] = "attachment; filename=#{configname}"
-    c.body
+    c.to_json
   end
-  # GET the JSON representation of a configuration object
   get '/configurations/:configname/?' do |configname|
     c = Noah::Configuration.find(:name => configname).first
     (halt 404) if c.nil?
-    c.to_json
+    content_type content_type_mapping[c.format.to_sym] if content_type_mapping[c.format.to_sym]
+    #response.headers['Content-Disposition'] = "attachment; filename=#{configname}"
+    c.body
   end
   # GET all configurations
   get '/configurations/?' do

data/lib/noah/routes/hosts.rb

@@ -2,7 +2,7 @@ class Noah::App
 # Host URIs
 
   # GET named {Service} for named {Host}
-  get '/hosts/:hostname/:servicename/?' do |hostname, servicename|
+  get '/hosts/:hostname/services/:servicename/?' do |hostname, servicename|
     h = host_service(hostname, servicename)
     if h.nil?
       halt 404
@@ -35,6 +35,7 @@ class Noah::App
   put '/hosts/:hostname/tag' do |hostname|
     required_params = ["tags"]
     data = JSON.parse(request.body.read)
+    raise "Missing parameters" if data.nil?
     (data.keys.sort == required_params.sort) ? (a=Noah::Host.find(:name=>hostname).first) : (raise "Missing Parameters")
     a.nil? ? (halt 404) : (a.tag!(data['tags']))
     a.to_json
@@ -43,6 +44,7 @@ class Noah::App
   put '/hosts/:hostname/watch' do |hostname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)
+    raise "Missing parameters" if data.nil?
     (data.keys.sort == required_params.sort) ? (h = Noah::Host.find(:name => hostname).first) : (raise "Missing Parameters")
     h.nil? ? (halt 404) : (w = h.watch!(:endpoint => data['endpoint']))
     w.to_json
@@ -51,15 +53,17 @@ class Noah::App
   put '/hosts/:hostname/link' do |hostname|
     required_params = ["link_name"]
     data = JSON.parse(request.body.read)
+    raise "Missing parameters" if data.nil?
     (data.keys.sort == required_params.sort) ? (a = Noah::Host.find(:name => hostname).first) : (raise "Missing Parameters")
     a.nil? ? (halt 404) : (a.link! data["link_name"])
     a.to_json
   end
 
   put '/hosts/:hostname/?' do |hostname|
-    required_params = ["name", "status"]
+    required_params = ["status"]
     data = JSON.parse(request.body.read)
-    (data.keys.sort == required_params.sort && data['name'] == hostname) ? (host = Noah::Host.find_or_create(:name => data['name'], :status => data['status'])) : (raise "Missing Parameters")
+    raise "Missing parameters" if data.nil?
+    (data.keys.sort == required_params.sort) ? (host = Noah::Host.find_or_create(:name => hostname, :status => data['status'])) : (raise "Missing Parameters")
     if host.valid?
       r = {"result" => "success","id" => "#{host.id}","status" => "#{host.status}", "name" => "#{host.name}", "new_record" => host.is_new?}
       r.to_json
@@ -70,15 +74,16 @@ class Noah::App
 
   delete '/hosts/:hostname/?' do |hostname|
     host = Noah::Host.find(:name => hostname).first
-    if host
-      services = []
-      Noah::Service.find(:host_id => host.id).sort.each {|x| services << x; x.delete} if host.services.size > 0
-      host.delete
-      r = {"result" => "success", "id" => "#{host.id}", "name" => "#{hostname}", "service_count" => "#{services.size}"}
-      r.to_json
-    else
-      halt 404
-    end
+    (halt 404) if host.nil?
+    services = []
+    Noah::Service.find(:host_id => host.id).sort.each {|x| services << x; x.delete} if host.services.size > 0
+    host.delete
+    r = {"result" => "success", "id" => "#{host.id}", "name" => "#{hostname}", "service_count" => "#{services.size}"}
+    r.to_json
+  end
+
+  delete '/hosts/:hostname/services/:servicename/?' do |hostname, servicename|
+    delete_service_from_host(servicename, hostname)
   end
 
 end

data/lib/noah/routes/services.rb

@@ -54,19 +54,26 @@ class Noah::App
     w.to_json
   end
 
-  put '/services/:servicename/?' do |servicename|
-    required_params = ["status", "host", "name"]
+  put '/services/:servicename/:hostname?' do |servicename, hostname|
+    required_params = ["status", "host_status"]
     data = JSON.parse(request.body.read)
+    raise ("Missing Parameters") if data.nil?
     if data.keys.sort == required_params.sort
-      h = Noah::Host.find(:name => data['host']).first || (raise "Invalid Host")
-      service = Noah::Service.find_or_create(:name => servicename, :status => data['status'], :host => h)
-      if service.valid?
-        action = service.is_new? ? "create" : "update"
-        service.save
-        r = {"action" => action, "result" => "success", "id" => service.id, "host" => h.name, "name" => service.name}
-        r.to_json
-      else
-        raise "#{format_errors(service)}"
+      begin
+        host = Noah::Host.find_or_create(:name => hostname, :status => data['host_status'])
+        if host.valid?
+          service = Noah::Service.find_or_create(:name => servicename, :status => data['status'], :host => host)
+          if service.valid?
+            service_action = service.is_new? ? "create" : "update"
+            host_action = host.is_new? ? "create" : "update"
+            r = {"action" => service_action, "result" => "success", "id" => service.id, "name" => service.name, "host" => {"name" => host.name, "action" => host_action, "status" => host.status}}
+            r.to_json
+          else
+            raise "#{format_errors(service)}"
+          end
+        else
+          raise "#{format_errors(host)}"
+        end
       end
     else
       raise "Missing Parameters"
@@ -74,14 +81,15 @@ class Noah::App
   end
 
   delete '/services/:servicename/:hostname/?' do |servicename, hostname|
-    host = Noah::Host.find(:name => hostname).first || (halt 404)
-    service = Noah::Service.find(:name => servicename, :host_id => host.id).first || (halt 404)
-    if host && service
-      service.delete
-      r = {"action" => "delete", "result" => "success", "id" => service.id, "host" => host.name, "service" => servicename}
-      r.to_json
-    else
-      halt 404
-    end  
-  end  
+    delete_service_from_host(servicename, hostname)
+  end
+
+  delete '/services/:servicename/?' do |servicename|
+    affected_hosts = find_hosts_by_service(servicename)
+    (halt 404) if affected_hosts.size == 0
+    service = Noah::Service.find(:name => servicename)
+    service.each {|x| x.delete}
+    r = {"action" => "delete", "result" => "success", "affected_hosts" => affected_hosts.size, "service" => servicename}
+    r.to_json
+  end
 end

data/lib/noah/version.rb

@@ -1,3 +1,3 @@
 module Noah
-  VERSION = "0.6"
+  VERSION = "0.8.1"
 end

data/noah.gemspec

@@ -4,7 +4,7 @@ require "noah/version"
 
 Gem::Specification.new do |s|
   s.name        = "noah"
-  s.version     = "#{Noah::VERSION}.pre"
+  s.version     = "#{Noah::VERSION}"
   s.post_install_message = %q{This release has backwards incompatible changes to the API. Please watch http://goo.gl/jYqp2 for details}
   #s.platform    = Gem::Platform::RUBY
   s.platform    = "jruby"
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency("ohm-contrib", ["= 0.1.1"])
   s.add_dependency("haml", ["= 3.0.25"])
   s.add_dependency("vegas", ["= 0.1.8"])
+  s.add_dependency("guid", ["= 0.1.1"])
 
 
   if RUBY_PLATFORM =~ /java/

data/spec/host_spec.rb

@@ -26,10 +26,10 @@ describe "Using the Host Model", :reset_redis => true do
       host.name.should == hostname
       host.status.should == hoststatus
       host.services.size.should == 1
-      host.services[1].valid?.should == true
-      host.services[1].name.should == servicename
-      host.services[1].status.should == servicestatus
-      host.services[1].host_id.should == host.id
+      host.services.first.valid?.should == true
+      host.services.first.name.should == servicename
+      host.services.first.status.should == servicestatus
+      host.services.first.host_id.should == host.id
     end
 
     it "create a Host via find_or_create" do

data/spec/noahapp_application_spec.rb

@@ -2,7 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Using the Application API", :reset_redis => false do
   before(:all) do
+    Ohm.redis.flushdb
     @a = Noah::Application.create(:name => 'rspec_sample_app')
+    @b = Noah::Application.create(:name => 'rspec_sample_app_2')
     @c = Noah::Configuration.create(:name => 'rspec_config', :format => 'string', :body => 'rspec is great')
     @a.configurations << @c
     @a.save
@@ -15,30 +17,39 @@ describe "Using the Application API", :reset_redis => false do
         last_response.should be_ok
         response = last_response.should return_json
         response.is_a?(Hash).should == true
+        response.size.should == 2
       end
       it "named application should work" do
         get '/applications/rspec_sample_app'
         last_response.should be_ok
         response = last_response.should return_json
-        response.has_key?(@a.name).should == true
-        response[@a.name].class.to_s.should == 'Hash'
-        response[@a.name]["id"].should == @a.id.to_s
-        response[@a.name].has_key?("configurations").should == true
-        c = response[@a.name]["configurations"]
+        response["id"].should == @a.id.to_s
+        response["name"].should == @a.name
+        response.has_key?("configurations").should == true
+        c = response["configurations"]
         c.has_key?(@c.name).should == true
         c["#{@c.name}"]["format"].should == "#{@c.format}"
         c["#{@c.name}"]["body"].should == "#{@c.body}"
       end
-      it "named configuration for application should work" do
-        get "/applications/#{@a.name}/#{@c.name}"
+      it "named configuration for application should work as JSON" do
+        header "Accept", "application/json"
+        get "/applications/#{@a.name}/configurations/#{@c.name}"
         last_response.should be_ok
         response = last_response.should return_json
-
         response["id"].should == @c.id
         response["name"].should == @c.name
         response["format"].should == @c.format
         response["body"].should == @c.body
       end
+      it "named configuration for application should work as raw" do
+        header "Accept", "application/octet"
+        get "/applications/#{@a.name}/configurations/#{@c.name}"
+        last_response.should be_ok
+        headers = last_response.headers
+        body = last_response.body
+        headers["Content-Type"].should == 'text/plain;charset=utf-8'
+        body.should == @c.body
+      end
       it "invalid application should not work" do
         get "/applications/should_not_exist"
         last_response.should be_missing
@@ -64,6 +75,7 @@ describe "Using the Application API", :reset_redis => false do
         Noah::Application.find(:name => @appdata[:name]).size.should == 1
         Noah::Application.find(:name => @appdata[:name]).first.is_new?.should == true
       end
+      it "new application with new configuration should work"
       it "new application with missing name should not work" do
         put "/applications/should_not_work", '{"foo":"bar"}', "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
@@ -80,7 +92,9 @@ describe "Using the Application API", :reset_redis => false do
         response["action"].should == "update"
         Noah::Application.find(:name => @appdata[:name]).size.should == 1
         Noah::Application.find(:name => @appdata[:name]).first.is_new?.should == false
-      end  
+      end
+      it "existing application with new configuration"
+      it "existing application with existing configuration"
     end
 
     describe "DELETE" do

data/spec/noahapp_configuration_spec.rb

@@ -41,7 +41,8 @@ describe "Using the Configuration API", :reset_redis => true, :populate_sample_d
           end
         end
       end
-      it "named configuration should work" do
+      it "named configuration should work as JSON" do
+        header "Accept", "application/json"
         get '/configurations/redis_url'
         last_response.should be_ok
         response = last_response.should return_json
@@ -55,7 +56,7 @@ describe "Using the Configuration API", :reset_redis => true, :populate_sample_d
       end
       it "named configuration should work with mime-type" do
         require 'yaml'
-        get '/configurations/yaml_config/data'
+        get '/configurations/yaml_config'
         last_response.should be_ok
         last_response.headers["Content-Type"].should == "text/x-yaml;charset=utf-8"
         response = YAML.load(last_response.body)
@@ -114,9 +115,7 @@ describe "Using the Configuration API", :reset_redis => true, :populate_sample_d
         @c = Noah::Configuration.create(cparms)
         @a.configurations << @c
         get "/configurations/asdf"
-        p last_response
         delete "/configurations/#{@c.name}"
-        p last_response
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"

data/spec/noahapp_host_spec.rb

@@ -27,7 +27,7 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
       end  
 
       it "named service for host should work" do
-        get '/hosts/localhost/noah'
+        get '/hosts/localhost/services/noah'
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -39,7 +39,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
+        host_data = {:status => "down"}.to_json
         put '/hosts/host99.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
@@ -53,7 +53,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
+        host_data = {:status => "pending"}.to_json
         put '/hosts/host99.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
@@ -61,20 +61,13 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
         response["new_record"].should == false
       end
 
-      it "host missing name parameter should not work" do
-        host_data = {:status => "pending"}.to_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 '/hosts/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
+        put '/hosts/host100.domain.com', "{}", "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
+        host_data = {:status => "fscked"}.to_json
         put '/hosts/host100.domain.com', host_data, "CONTENT_TYPE" => "application/json"
         last_response.should_not be_ok
         response = last_response.should return_json
@@ -85,7 +78,8 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
     end
 
     describe "DELETE" do
-      before(:all) do
+      before(:each) do
+        Ohm.redis.flushdb
         @h = Noah::Host.create(:name => 'h', :status => 'up')
         sparms = {:name => 's', :status => "up"}
         @h.services << Noah::Service.create(sparms.merge({:host => @h}))
@@ -97,15 +91,25 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
         delete "/hosts/#{@h.name}"
         last_response.should be_ok
         response = last_response.should return_json
-
         response["result"].should == "success"
         response["id"].should == @h.id
         response["name"].should == @h.name
         response["service_count"].should == svc_size.to_s
       end
 
+      it "valid service from valid host should work" do
+        delete "/hosts/#{@h.name}/services/#{@s.name}"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response["result"].should == "success"
+        response["action"].should == "delete"
+        response["id"].should == @s.id
+        response["host"].should == @h.name
+        response["service"].should == @s.name
+      end
+
       it "invalid host should not work" do
-        delete "/hosts/#{@h.name}"
+        delete "/hosts/not_a_valid_hsot"
         last_response.should be_missing
       end
     end

data/spec/noahapp_service_spec.rb

@@ -46,76 +46,143 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
     end
 
     describe "PUT" do
-      before(:all) do
-        @payload = {:name => 'another_rspec_service', :status => 'up', :host => @h.name}
-      end  
-      it "new service should work" do
-        put "/services/#{@payload[:name]}/", @payload.to_json, "CONTENT_TYPE" => "application/json"
+      before(:each) do
+        Ohm.redis.flushdb
+        @host_name = 'rspec_sample_host'
+        @service_name = 'rspec_sample_service'
+        @payload = {:status => 'up', :host_status => 'up'}
+      end
+      after(:each) do
+        Ohm.redis.flushdb
+      end
+      it "new service on new host should work" do
+        put "/services/#{@service_name}/#{@host_name}", @payload.to_json, "CONTENT_TYPE" => "application/json"
         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["name"].should == @payload[:name]
-        response["host"].should == @payload[:host]
-        Noah::Service.find(:name => @payload[:name]).size.should == 1
-        Noah::Service.find(:name => @payload[:name]).first.is_new?.should == true
+        response["name"].should == @service_name
+        response["host"]["name"].should == @host_name
+        response["host"]["status"].should == 'up'
+        response["host"]["action"].should == 'create'
+        response["host"]["status"].should == 'up'
+        Noah::Service.find(:name => @service_name).size.should == 1
+        Noah::Service.find(:name => @service_name).first.is_new?.should == true
+        Noah::Host.find(:name => @host_name).size.should == 1
+        Noah::Host.find(:name => @host_name).first.is_new?.should == true
       end
-      it "new service without host should not work" do
-        put "/services/foobar", {:name => "foobar", :status => "up"}.to_json, "CONTENT_TYPE" => "application/json"
-        last_response.should be_invalid
+      it "new service on existing host should work" do
+        hostname = 'non-existant-rspec-host'
+        servicename = 'non-existant-rspec-service'
+        Noah::Host.create(:name => hostname, :status => 'up')
+        sleep(3)
+        put "/services/#{servicename}/#{hostname}", @payload.to_json, "CONTENT_TYPE" => "application/json"
+        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["name"].should == servicename
+        response["host"]["name"].should == hostname
+        response["host"]["status"].should == 'up'
+        response["host"]["action"].should == 'update'
+        Noah::Service.find(:name => servicename).size.should == 1
+        Noah::Service.find(:name => servicename).first.is_new?.should == true
+      end
+      it "new service with invalid host status should not work" do
+        put "/services/foobar/#{@host_name}", {:host_status => "fsck", :status => "up"}.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 invalid status should not work" do
-        put "/services/foobar", {:name => "foobar", :status => "fsck", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
+      it "new service with invalid service status should not work" do
+        put "/services/foobar/#{@host_name}", {:host_status => "up", :status => "fsck"}.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 "/services/foobar", {:status => "fsck", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
+      it "new service with missing host_status should not work" do
+        put "/services/foobar/#{@host_name}", {:status => "up"}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end
       it "new service with missing status should not work" do
-        put "/services/foobar", {:name => "foobar", :host => @h.name}.to_json, "CONTENT_TYPE" => "application/json"
+        put "/services/foobar/#{@host_name}", {:host_status => 'up'}.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end  
       it "existing service should work" do
-        sleep 3
-        put "/services/#{@payload[:name]}", {:name => @payload[:name], :status => "down", :host => @payload[:host]}.to_json, "CONTENT_TYPE" => "application/json"
+        a = Noah::Host.create(:name => @host_name, :status => 'up')
+        b = Noah::Service.create(:name => @service_name, :status => 'pending', :host => a)
+        sleep(3)
+        put "/services/#{@service_name}/#{@host_name}", @payload.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
         response["action"].should == "update"
         response["id"].nil?.should == false
-        response["name"].should == @payload[:name]
-        response["host"].should == @payload[:host]
-        Noah::Service.find(:name => @payload[:name]).size.should == 1
-        Noah::Service.find(:name => @payload[:name]).first.is_new?.should == false
+        response["name"].should == @service_name
+        response["host"]["name"].should == @host_name
+        response["host"]["status"].should == 'up'
+        response["host"]["action"].should == 'update'
       end
     end
 
     describe "DELETE" do
       before(:all) do
+        Ohm.redis.flushdb
         @h = Noah::Host.create(:name => "h1", :status => "up")
         @h.services << Noah::Service.create(:name => "s1", :status => "up", :host => @h)
         @h.save
         @s = @h.services.first
       end  
-      it "existing host should work" do
+      it "service from existing host should work" do
         delete "/services/#{@s.name}/#{@h.name}"
         last_response.should be_ok
         response = last_response.should return_json
-        
         response["result"].should == "success"
         response["action"].should == "delete"
         response["id"].should == @s.id
         response["host"].should == @h.name
         response["service"].should == @s.name
-      end  
-      it "invalid host should not work" do
+      end
+      it "all entries for a valid service" do
+        all_svc_name = 'my_sample_service'
+        foo_svc_name = 'my_sample_service_two'
+        bar_svc_name = 'my_sample_service_three'
+        %w[foo bar baz].each do |host|
+          h = Noah::Host.create(:name => host, :status => "up")
+          Noah::Service.create(:name => all_svc_name, :status => 'up', :host => h)
+        end
+        foo_host = Noah::Host.find(:name => 'foo').first
+        bar_host = Noah::Host.find(:name => 'bar').first
+        Noah::Service.create(:name => foo_svc_name, :status => 'down', :host => foo_host)
+        Noah::Service.create(:name => bar_svc_name, :status => 'pending', :host => bar_host)
+        
+        delete "/services/#{all_svc_name}"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response["result"].should == "success"
+        response["action"].should == "delete"
+        response["affected_hosts"].should == 3
+
+        delete "/services/#{foo_svc_name}"
+        last_response.should be_ok
+        response = last_response.should return_json
+        response["affected_hosts"].should == 1
+      end
+      it "service for invalid host should not work" do
         delete "/services/#{@s.name}/#{@h.name}"
         last_response.should be_missing
       end
+      it "invalid service for valid host should not work" do
+        Noah::Host.create(:name => 'valid_host', :status => 'up')
+        delete "/services/not_really_here/valid_host"
+        last_response.should be_missing
+      end
+      it "all entries for an invalid service should not_work" do
+        delete "/services/not_really_here"
+        last_response.should be_missing
+      end
     end
   
   end

data/spec/service_spec.rb

@@ -16,7 +16,7 @@ describe "Noah Service Model", :reset_redis => true do
       service.name.should == servicename
       service.status.should == servicestatus
       service.host_id.should == host.id
-      host.services[1].name.should == servicename
+      host.services[service.id].name.should == servicename
     end
 
     it "create a new Service with find_or_create" do

data/spec/support/sample_data.rb

@@ -78,9 +78,8 @@ l1.nodes = [a1, c2, Noah::Host.find(:name => 'localhost').first, Noah::Service.f
 a1.tag! ["production", "sample_data"]
 e2.tag! ["ephemeral", "development"]
 c1.tag! "development"
-Noah::Service[1].tag! "development"
-Noah::Service[2].tag! ["development", "out-of-service"]
-Noah::Service[2].link! "/my_sample_organization"
+Noah::Service.all.first.tag! ["development", "out-of-service"]
+Noah::Service.all.first.link! "/my_sample_organization"
 
 
 puts "Sample data populated!"

data/views/index.haml

@@ -9,7 +9,7 @@
                 %li
                     Noah Version: #{locals[:noah_version]}
                 %li
-                    Redis URL: #{locals[:redis_url]}
+                    Redis Version: #{locals[:redis_version]}
         #header
             %h2 Hosts
             %ul

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: noah
 version: !ruby/object:Gem::Version 
-  prerelease: 4
-  version: 0.6.pre
+  prerelease: 
+  version: 0.8.1
 platform: jruby
 authors: 
   - John E. Vincent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -135,18 +135,18 @@ dependencies:
     type: :runtime
     version_requirements: *id011
   - !ruby/object:Gem::Dependency 
-    name: jruby-openssl
+    name: guid
     prerelease: false
     requirement: &id012 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 0.1.1
     type: :runtime
     version_requirements: *id012
   - !ruby/object:Gem::Dependency 
-    name: json
+    name: jruby-openssl
     prerelease: false
     requirement: &id013 !ruby/object:Gem::Requirement 
       none: false
@@ -157,71 +157,82 @@ dependencies:
     type: :runtime
     version_requirements: *id013
   - !ruby/object:Gem::Dependency 
-    name: warbler
+    name: json
     prerelease: false
     requirement: &id014 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id014
+  - !ruby/object:Gem::Dependency 
+    name: warbler
+    prerelease: false
+    requirement: &id015 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 1.2.1
     type: :development
-    version_requirements: *id014
+    version_requirements: *id015
   - !ruby/object:Gem::Dependency 
     name: diff-lcs
     prerelease: false
-    requirement: &id015 !ruby/object:Gem::Requirement 
+    requirement: &id016 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 1.1.2
     type: :development
-    version_requirements: *id015
+    version_requirements: *id016
   - !ruby/object:Gem::Dependency 
     name: sinatra-reloader
     prerelease: false
-    requirement: &id016 !ruby/object:Gem::Requirement 
+    requirement: &id017 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 0.5.0
     type: :development
-    version_requirements: *id016
+    version_requirements: *id017
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
-    requirement: &id017 !ruby/object:Gem::Requirement 
+    requirement: &id018 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.5"
     type: :development
-    version_requirements: *id017
+    version_requirements: *id018
   - !ruby/object:Gem::Dependency 
     name: rcov
     prerelease: false
-    requirement: &id018 !ruby/object:Gem::Requirement 
+    requirement: &id019 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 0.9.9
     type: :development
-    version_requirements: *id018
+    version_requirements: *id019
   - !ruby/object:Gem::Dependency 
     name: rack-test
     prerelease: false
-    requirement: &id019 !ruby/object:Gem::Requirement 
+    requirement: &id020 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
             version: 0.5.7
     type: :development
-    version_requirements: *id019
+    version_requirements: *id020
 description: Application registry based on Apache Zookeeper
 email: 
   - lusis.org+rubygems.org@gmail.com
@@ -342,9 +353,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: noah