noah 0.0.5 → 0.0.9

data/spec/noahapp_application_spec.rb

@@ -2,8 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Using the Application API", :reset_redis => false do
   before(:all) do
-    @a = Application.create(:name => 'rspec_sample_app')
-    @a.configurations << Configuration.create(:name => 'rspec_config', :format => 'string', :body => 'rspec is great', :application => @a)
+    @a = Noah::Application.create(:name => 'rspec_sample_app')
+    @a.configurations << Noah::Configuration.create(:name => 'rspec_config', :format => 'string', :body => 'rspec is great', :application => @a)
     @a.save
     @c = @a.configurations.first
   end  
@@ -62,8 +62,8 @@ describe "Using the Application API", :reset_redis => false do
         response["id"].nil?.should == false
         response["name"].should == @appdata[:name]
         response["action"].should == "create"
-        Application.find(:name => @appdata[:name]).size.should == 1
-        Application.find(:name => @appdata[:name]).first.is_new?.should == true
+        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 missing name should not work" do
         put "/a/should_not_work", '{"foo":"bar"}', "CONTENT_TYPE" => "application/json"
@@ -79,8 +79,8 @@ describe "Using the Application API", :reset_redis => false do
         response["id"].nil?.should == false
         response["name"].should == @appdata[:name]
         response["action"].should == "update"
-        Application.find(:name => @appdata[:name]).size.should == 1
-        Application.find(:name => @appdata[:name]).first.is_new?.should == false
+        Noah::Application.find(:name => @appdata[:name]).size.should == 1
+        Noah::Application.find(:name => @appdata[:name]).first.is_new?.should == false
       end  
     end
 

data/spec/noahapp_configuration_spec.rb

@@ -85,9 +85,9 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
 
     describe "DELETE" do
       before(:all) do
-        cparms = {:name => 'a', :format => 'string', :body => 'asdf'}
-        @a = Application.create(:name => 'delete_test_app')
-        @a.configurations << Configuration.create(cparms)
+        @a = Noah::Application.create(:name => 'delete_test_app')
+        cparms = {:name => 'a', :format => 'string', :body => 'asdf', :application_id => @a.id}
+        @a.configurations << Noah::Configuration.create(cparms)
         @a.save
         @c = @a.configurations.first
       end

data/spec/noahapp_host_spec.rb

@@ -88,9 +88,9 @@ describe "Using the Host API", :reset_redis => false, :populate_sample_data => t
 
     describe "DELETE" do
       before(:all) do
-        @h = Host.create(:name => 'h', :status => 'up')
+        @h = Noah::Host.create(:name => 'h', :status => 'up')
         sparms = {:name => 's', :status => "up"}
-        @h.services << Service.create(sparms.merge({:host => @h}))
+        @h.services << Noah::Service.create(sparms.merge({:host => @h}))
         @h.save
         @s = @h.services.first
       end  

data/spec/noahapp_service_spec.rb

@@ -4,10 +4,10 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
   before(:all) do
     @sample_host = {:name => 'rspec_sample_host', :status => 'up'}
     @sample_service = {:name => 'rspec_sample_service', :status => 'up'}
-    @h = Host.create(:name => 'rspec_sample_host', :status => 'up')
-    @h.services << Service.create({:host => @h}.merge(@sample_service))
+    @h = Noah::Host.create(:name => 'rspec_sample_host', :status => 'up')
+    @h.services << Noah::Service.create({:host => @h}.merge(@sample_service))
     @h.save
-    @s = Service.find(@sample_service).first
+    @s = Noah::Service.find(@sample_service).first
   end  
   describe "calling" do
     
@@ -57,8 +57,8 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         response["id"].nil?.should == false
         response["name"].should == @payload[:name]
         response["host"].should == @payload[:host]
-        Service.find(:name => @payload[:name]).size.should == 1
-        Service.find(:name => @payload[:name]).first.is_new?.should == true
+        Noah::Service.find(:name => @payload[:name]).size.should == 1
+        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"
@@ -88,15 +88,15 @@ describe "Using the Service API", :reset_redis => false, :populate_sample_data =
         response["id"].nil?.should == false
         response["name"].should == @payload[:name]
         response["host"].should == @payload[:host]
-        Service.find(:name => @payload[:name]).size.should == 1
-        Service.find(:name => @payload[:name]).first.is_new?.should == false
+        Noah::Service.find(:name => @payload[:name]).size.should == 1
+        Noah::Service.find(:name => @payload[:name]).first.is_new?.should == false
       end
     end
 
     describe "DELETE" do
       before(:all) do
-        @h = Host.create(:name => "h1", :status => "up")
-        @h.services << Service.create(:name => "s1", :status => "up", :host => @h)
+        @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  

data/spec/noahapp_watcher_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Using the Watcher API", :reset_redis => true do
+  before(:each) do
+    endpoint = 'http://localhost:4567/webhook'
+    Ohm.redis.flushdb
+    a = Noah::Application.create :name => 'fooapp'
+    a.watch! :endpoint => endpoint
+    c = Noah::Configuration.create :name => 'fooconfig'
+    c.watch! :endpoint => endpoint
+    h = Noah::Host.create :name => 'localhost', :status => 'up'
+    h.watch! :endpoint => endpoint
+    s = Noah::Service.create :name => 'localhostservice', :status => 'up', :host => h
+    s.watch! :endpoint => endpoint
+  end
+
+  after(:all) do
+    Ohm.redis.flushdb
+  end
+
+  describe "calling" do
+
+    describe "GET" do
+      it "all watches should work" do
+        get '/w'
+        last_response.should be_ok
+        response = last_response.should return_json
+        response.is_a?(Array).should == true
+        response.size.should == 4
+      end
+    end
+
+  end
+end  

data/spec/service_spec.rb

@@ -8,9 +8,9 @@ describe "Noah Service Model", :reset_redis => true do
       servicestatus = "up"
       hostname = "mytesthost1"
       hoststatus = "up"
-      host = Host.create(:name => hostname, :status => hoststatus)
+      host = Noah::Host.create(:name => hostname, :status => hoststatus)
       host.save
-      service = Service.create(:name => servicename, :status => servicestatus, :host => host)
+      service = Noah::Service.create(:name => servicename, :status => servicestatus, :host => host)
       service.valid?.should == true
       service.save
       service.name.should == servicename
@@ -20,45 +20,45 @@ describe "Noah Service Model", :reset_redis => true do
     end
 
     it "create a new Service with find_or_create" do
-      host = Host.create(:name => "h1", :status => "up")
+      host = Noah::Host.create(:name => "h1", :status => "up")
       host.save
-      service = Service.find_or_create(:name => "s1", :status => "up", :host => host)
+      service = Noah::Service.find_or_create(:name => "s1", :status => "up", :host => host)
       service.save
       service.is_new?.should == true
     end
 
     it "update an existing Service with find_or_create" do
-      host = Host.create(:name => "h2", :status => "up")
+      host = Noah::Host.create(:name => "h2", :status => "up")
       host.save
-      service = Service.find_or_create(:name => "s2", :status => "up", :host => host)
+      service = Noah::Service.find_or_create(:name => "s2", :status => "up", :host => host)
       service.save
       sleep 1
-      service2 = Service.find_or_create(:name => "s2", :status => "up", :host => host)
+      service2 = Noah::Service.find_or_create(:name => "s2", :status => "up", :host => host)
       service2.save
       service2.is_new?.should == false
     end
 
     it "delete a Service" do
-      h = Host.create(:name => "h1", :status => "up")
+      h = Noah::Host.create(:name => "h1", :status => "up")
       h.save
-      s = Service.create(:name => "s1", :status => "up", :host => h)
+      s = Noah::Service.create(:name => "s1", :status => "up", :host => h)
       s.save
-      s = Service.find(:name => "s1").first
+      s = Noah::Service.find(:name => "s1").first
       s.delete
-      s = Service.find(:name => "s1").first
+      s = Noah::Service.find(:name => "s1").first
       s.should == nil
     end
 
     it "find multiple Services" do
-      h = Host.create(:name => "h1", :status => "up")
+      h = Noah::Host.create(:name => "h1", :status => "up")
       if h.valid?
-        h.services << Service.create(:name => "s1", :status => "up", :host => h)
-        h.services << Service.create(:name => "s2", :status => "up", :host => h)
+        h.services << Noah::Service.create(:name => "s1", :status => "up", :host => h)
+        h.services << Noah::Service.create(:name => "s2", :status => "up", :host => h)
         h.save
       end
-      Services.all.size.should == 2
-      Services.all.first.name.should == "s1"
-      Services.all.last.name.should == "s2"
+      Noah::Services.all.size.should == 2
+      Noah::Services.all.first.name.should == "s1"
+      Noah::Services.all.last.name.should == "s2"
     end
 
   end
@@ -68,41 +68,41 @@ describe "Noah Service Model", :reset_redis => true do
     it "create a new Service when missing a Host" do
       servicename = "myservice1"
       servicestatus = "up"
-      service = Service.create(:name => servicename, :status => servicestatus)
+      service = Noah::Service.create(:name => servicename, :status => servicestatus)
       service.valid?.should == false
       service.errors.should == [[:host_id, :not_present]]
     end
 
     it "create a new Service when missing a name" do
-      host = Host.create(:name => "host1.domain.com", :status => "up")
+      host = Noah::Host.create(:name => "host1.domain.com", :status => "up")
       host.save
-      service = Service.create(:status => "up", :host => host)
+      service = Noah::Service.create(:status => "up", :host => host)
       service.valid?.should == false
       service.errors.should == [[:name, :not_present]]
     end
 
     it "create a new Service when missing a status" do
-      host = Host.create(:name => "host1.domain.com", :status => "up")
+      host = Noah::Host.create(:name => "host1.domain.com", :status => "up")
       host.save
-      service = Service.create(:name => 'foo', :host => host)
+      service = Noah::Service.create(:name => 'foo', :host => host)
       service.valid?.should == false
       service.errors.should == [[:status, :not_present], [:status, :not_member]]
     end
 
     it "create a new Service with an invalid status" do
-      host = Host.create(:name => "host1.domain.com", :status => "up")
+      host = Noah::Host.create(:name => "host1.domain.com", :status => "up")
       host.save
-      service = Service.create(:name => "myservice", :status => "invalid_status", :host => host)
+      service = Noah::Service.create(:name => "myservice", :status => "invalid_status", :host => host)
       service.valid?.should == false
       service.errors.should == [[:status, :not_member]]
     end
 
     it "create a duplicate Service" do
-      host = Host.create(:name => "host1.domain.com", :status => "up")
+      host = Noah::Host.create(:name => "host1.domain.com", :status => "up")
       host.save
-      s = Service.create(:name => "myservice", :status => "up", :host => host)
+      s = Noah::Service.create(:name => "myservice", :status => "up", :host => host)
       s.save
-      s1 = Service.create(:name => "myservice", :status => "up", :host => host)
+      s1 = Noah::Service.create(:name => "myservice", :status => "up", :host => host)
       s1.valid?.should == false
       s1.errors.should == [[[:name, :host_id], :not_unique]]
     end

data/spec/spec_helper.rb

@@ -1,19 +1,10 @@
-require 'bundler/setup'
-require 'ohm'
-begin
-  require 'yajl'
-rescue LoadError
-  require 'json'
-end
-
-ENV['RACK_ENV'] = 'test'
-ENV['REDIS_URL'] = 'redis://localhost:6379/3'
-Ohm::connect
-  
 require File.join(File.dirname(__FILE__), '..', 'lib', 'noah')
 require File.join(File.dirname(__FILE__), '..', 'lib', 'noah', 'app')
 require 'rspec'
 require 'rack/test'
+ENV['RACK_ENV'] = 'test'
+ENV['REDIS_URL'] = 'redis://localhost:6379/3'
+Ohm::connect
 
 RSpec.configure do |config|
   config.color_enabled = true
@@ -23,19 +14,19 @@ 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
-    h = Host.create(:name => 'localhost', :status => "up")
+    h = Noah::Host.create(:name => 'localhost', :status => "up")
     if h.save
       %w[redis noah].each do |service|
-        s = Service.create(:name => service, :status => "up", :host => h)
+        s = Noah::Service.create(:name => service, :status => "up", :host => h)
         h.services << s
       end
     end
 
-    a = Application.create(:name => 'noah')
+    a = Noah::Application.create(:name => 'noah')
     if a.save
-      cr = Configuration.create(:name => 'redis', :format => 'string', :body => 'redis://127.0.0.1:6379/0', :application => a)
-      ch = Configuration.create(:name => 'host', :format => 'string', :body => 'localhost', :application  => a)
-      cp = Configuration.create(:name => 'port', :format => 'string', :body => '9292', :application => a)
+      cr = Noah::Configuration.create(:name => 'redis', :format => 'string', :body => 'redis://127.0.0.1:6379/0', :application => a)
+      ch = Noah::Configuration.create(:name => 'host', :format => 'string', :body => 'localhost', :application  => a)
+      cp = Noah::Configuration.create(:name => 'port', :format => 'string', :body => '9292', :application => a)
       %w[cr ch cp].each do |c|
         a.configurations << eval(c)
       end
@@ -55,15 +46,15 @@ EOY
     }
 EOJ
 
-    a1 = Application.create(:name => 'myrailsapp1')
+    a1 = Noah::Application.create(:name => 'myrailsapp1')
     if a1.save
-      c1 = Configuration.create(:name => 'database.yml', :format => 'yaml', :body => my_yaml, :application => a1)
+      c1 = Noah::Configuration.create(:name => 'database.yml', :format => 'yaml', :body => my_yaml, :application => a1)
       a1.configurations << c1
     end
 
-    a2 = Application.create(:name => 'myrestapp1')
+    a2 = Noah::Application.create(:name => 'myrestapp1')
     if a2.save
-      c2 = Configuration.create(:name => 'config.json', :format => 'json', :body => my_json, :application => a2)
+      c2 = Noah::Configuration.create(:name => 'config.json', :format => 'json', :body => my_json, :application => a2)
       a2.configurations << c2
     end
   end

data/spec/support/test-redis.conf

@@ -0,0 +1,8 @@
+dir spec/support/db
+pidfile spec/support/db/redis.pid
+port 6379
+timeout 300
+loglevel debug
+logfile stdout
+databases 16
+daemonize yes

data/spec/watcher_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Using the Watcher Model", :reset_redis => true do
+  before(:each) do
+    Ohm.redis.flushdb
+    @test_endpoint = "http://localhost/webhook"
+    @test_pattern = "/foo/bar"
+    Noah::Watcher.create :pattern => @test_pattern, :endpoint => @test_webhook
+    @test_watch = Noah::Watcher.new :endpoint => "http://localhost/webhook"
+  end
+  after(:each) do
+    #Ohm.redis.flushdb
+  end
+
+  describe "should" do
+    it "create a new Noah::Watcher" do
+      @test_watch.pattern = "/snarf"
+      @test_watch.valid?.should == true
+      @test_watch.save
+      a = Noah::Watcher.find(:endpoint => @test_watch.endpoint, :pattern => @test_watch.pattern).first
+      a.should == @test_watch
+    end
+    it "delete an existing Noah::Watcher" do
+      @test_watch.pattern = "/snarf"
+      @test_watch.save
+      @test_watch.delete
+      Noah::Watcher.find(:endpoint => @test_endpoint, :pattern => @test_pattern).first.should == nil
+    end
+  end
+
+  describe "should not" 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]]"
+    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]]"
+    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]]"
+    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]]"
+    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]]"
+    end
+  end
+
+end

data/views/index.haml

@@ -4,46 +4,52 @@
 
         #header
             %h1 Sample links
+            %h2 System Information
+            %ul
+                %li
+                    Noah Version: #{locals[:noah_version]}
+                %li
+                    Redis URL: #{locals[:redis_url]}
         #header
             %h2 Hosts
             %ul
                 %li 
-                    %a{:href => "/h/"} All registered Hosts
+                    %a{:href => "h/"} All registered Hosts
                 %li 
-                    %a{:href => "/h/localhost"} localhost (this server)
+                    %a{:href => "h/localhost"} localhost (this server)
                 %li
-                    %a{:href => "/h/localhost/noah"} localhost noah service
+                    %a{:href => "h/localhost/noah"} localhost noah service
         #header
             %h2 Services
             %ul
                 %li 
-                    %a{:href => "/s/"} All registered Services
+                    %a{:href => "s/"} All registered Services
                 %li
-                    %a{:href => "/s/http"} All hosts providing 'http'
+                    %a{:href => "s/http"} All hosts providing 'http'
                 %li 
-                    %a{:href => "/s/noah/localhost"} localhost noah service
+                    %a{:href => "s/noah/localhost"} localhost noah service
         #header
             %h2 Applications
             %ul
                 %li
-                    %a{:href => "/a/"} All registered Applications
+                    %a{:href => "a/"} All registered Applications
                 %li
-                    %a{:href => "/a/noah"} Noah Application entry
+                    %a{:href => "a/noah"} Noah Application entry
                 %li
-                    %a{:href => "/a/noah/redis"} Noah Redis configuration entry
+                    %a{:href => "a/noah/redis"} Noah Redis configuration entry
         #header
             %h2 Configurations
             %ul
                 %li
-                    %a{:href => "/c/"} All registered Configurations
+                    %a{:href => "c/"} All registered Configurations
                 %li
-                    %a{:href => "/c/noah"} Noah Configuration entry
+                    %a{:href => "c/noah"} Noah Configuration entry
                 %li
-                    %a{:href => "/c/myrailsapp1"} myrailsapp1 Configuration entry
+                    %a{:href => "c/myrailsapp1"} myrailsapp1 Configuration entry
                 %li
-                    %a{:href => "/c/myrestapp1"} myrestapp1 Configuration entry
+                    %a{:href => "c/myrestapp1"} myrestapp1 Configuration entry
                 %li
-                    %a{:href => "/c/myrailsapp1/database.yml"} database.yml file for myrailsapp1 (should return the proper content-type)
+                    %a{:href => "c/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 => "c/myrestapp1/config.json"} config.json file for myrestapp1