noah 0.0.5-jruby → 0.1-jruby

data/lib/noah.rb

@@ -1,5 +1,6 @@
-require 'ohm'
-require 'ohm/contrib'
+module Noah
+  PROTECTED_PATHS = %w[a c h s w]
+end
 begin
   require 'yajl'
 rescue LoadError
@@ -8,11 +9,8 @@ end
 require 'haml'
 require 'yaml'
 require 'sinatra/base'
-require 'sinatra/namespace'
 
-require File.join(File.dirname(__FILE__), 'noah','hosts')
-require File.join(File.dirname(__FILE__), 'noah','services')
-require File.join(File.dirname(__FILE__), 'noah','applications')
-require File.join(File.dirname(__FILE__), 'noah','configurations')
-require File.join(File.dirname(__FILE__), 'noah','watchers')
+require File.join(File.dirname(__FILE__), 'noah', 'custom_watcher')
+require File.join(File.dirname(__FILE__), 'noah','validations')
+require File.join(File.dirname(__FILE__), 'noah','models')
 require File.join(File.dirname(__FILE__), 'noah','app')

data/lib/noah/app.rb

@@ -1,15 +1,9 @@
-require 'sinatra/base'
-require 'sinatra/namespace'
-require 'ohm'
-require 'ohm/contrib'
-
+require File.join(File.dirname(__FILE__), 'version')
 require File.join(File.dirname(__FILE__), 'helpers')
 require File.join(File.dirname(__FILE__), 'models')
 
 module Noah
   class App < Sinatra::Base
-    register ::Sinatra::Namespace
-
     helpers Noah::SinatraHelpers
 
     configure do
@@ -19,6 +13,8 @@ module Noah
       set :logging, true
       set :raise_errors, false
       set :show_exceptions, false
+      set :run, false
+      set :redis_url, ENV['REDIS_URL'] || 'redis://localhost:6379/0'
     end
 
     configure(:development) do
@@ -32,14 +28,24 @@ module Noah
       end
     end
 
+    # Need to move this out to configuration.
+    # Maybe bootstrap them from itself?
+    @content_type_mapping = {
+              :yaml => "text/x-yaml",
+              :json => "application/json",
+              :xml => "text/xml",
+              :string => "text/plain"
+    }
+
     before do
       content_type "application/json"
     end
 
+    # Displays an overview page of all registered objects
     get '/' do
       content_type "text/html"
 
-      haml :index, :format => :html5
+      haml :index, :format => :html5, :locals => {:redis_url => settings.redis_url, :noah_version => Noah::VERSION}
     end
 
     not_found do
@@ -52,266 +58,12 @@ module Noah
       erb :'500'
     end
 
-    namespace "/h" do
-
-      get '/:hostname/:servicename/?' do |hostname, servicename|
-        h = host_service(hostname, servicename)
-        if h.nil?
-          halt 404
-        else
-          h.to_json
-        end
-      end
-
-      get '/:hostname/?' do |hostname|
-        h = host(:name => hostname)
-        if h.nil?
-          halt 404
-        else
-          h.to_json
-        end
-      end
-
-      get '/?' do
-        hosts.map {|h| h.to_hash}
-        if hosts.size == 0
-          halt 404
-        else
-          hosts.to_json
-        end
-      end
-
-      put '/:hostname/?' do |hostname|
-        required_params = ["name", "status"]
-        data = JSON.parse(request.body.read)
-        (data.keys.sort == required_params.sort && data['name'] == hostname) ? (host = ::Host.find_or_create(:name => data['name'], :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
-        else
-          raise "#{host.errors}"
-        end
-      end
-
-      delete '/:hostname/?' do |hostname|
-        host = ::Host.find(:name => hostname).first
-        if host
-          services = []
-          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
-      end
-
-    end
-
-    namespace "/s" do
-
-      get '/:servicename/:hostname/?' do |servicename, hostname|
-        hs = host_service(hostname, servicename)
-        if hs.nil?
-          halt 404
-        else  
-          hs.to_json
-        end  
-      end
-
-      get '/:servicename/?' do |servicename|
-        s = services(:name => servicename)
-        s.map {|x| x.to_hash}
-        if s.empty?
-          halt 404
-        else  
-          s.to_json
-        end  
-      end
-
-      get '/?' do
-        if services.empty?
-          halt 404
-        else
-          services.map {|s| s.to_hash}
-          services.to_json
-        end  
-      end
-
-      put '/:servicename/?' do |servicename|
-        required_params = ["status", "host", "name"]
-        data = JSON.parse(request.body.read)
-        if data.keys.sort == required_params.sort
-          h = ::Host.find(:name => data['host']).first || (raise "Invalid Host")
-          service = ::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 "#{service.errors}"
-          end
-        else
-          raise "Missing Parameters"
-        end  
-      end
-
-      delete '/:servicename/:hostname/?' do |servicename, hostname|
-        host = ::Host.find(:name => hostname).first || (halt 404)
-        service = ::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  
-
-    end
+    load File.join(File.dirname(__FILE__), 'host_routes.rb')
+    load File.join(File.dirname(__FILE__), 'service_routes.rb')
+    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.join(File.dirname(__FILE__), 'ephemeral_routes.rb')
 
-    namespace "/a" do
-
-      get '/:appname/:config/?' do |appname, config|
-        app = ::Application.find(:name => appname).first
-        if app.nil?
-          halt 404
-        else  
-          c = ::Configuration.find(:name => config, :application_id => app.id).first
-          c.to_json
-        end  
-      end
-
-      get '/:appname/?' do |appname|
-        app = ::Application.find(:name => appname).first
-        if app.nil?
-          halt 404
-        else
-          app.to_json
-        end
-      end
-
-      put '/:appname/?' do |appname|
-        required_params = ["name"]
-        data = JSON.parse(request.body.read)
-        if data.keys.sort == required_params.sort && data['name'] == appname
-          app = ::Application.find_or_create(:name => appname)
-        else
-          raise "Missing Parameters"
-        end  
-        if app.valid?
-          action = app.is_new? ? "create" : "update"
-          app.save
-          r = {"result" => "success","id" => app.id, "action" => action, "name" => app.name }
-          r.to_json
-        else
-          raise "#{app.errors}"
-        end
-      end
-
-      delete '/:appname/?' do |appname|
-        app = ::Application.find(:name => appname).first
-        if app.nil?
-          halt 404
-        else
-          configurations = []
-          ::Configuration.find(:application_id => app.id).sort.each {|x| configurations << x; x.delete} if app.configurations.size > 0
-          app.delete
-          r = {"result" => "success", "action" => "delete", "id" => "#{app.id}", "name" => "#{appname}", "configurations" => "#{configurations.size}"}
-          r.to_json
-        end
-      end
-
-      get '/?' do
-        apps = []
-        ::Application.all.sort.each {|a| apps << a.to_hash}
-        if apps.empty?
-          halt 404
-        else  
-          apps.to_json
-        end  
-      end
-
-    end
-
-    namespace '/c' do
-
-      # Need to move this out to configuration.
-      # Maybe bootstrap them from itself?
-      content_type_mapping = {
-                :yaml => "text/x-yaml",
-                :json => "application/json",
-                :xml => "text/xml",
-                :string => "text/plain"
-      }
-
-      get '/:appname/:element/?' do |appname, element|
-        a = ::Application.find(:name => appname).first
-        if a.nil?
-          halt 404
-        else  
-          c = ::Configuration.find(:name => element, :application_id => a.id).first
-          content_type content_type_mapping[c.format.to_sym] if content_type_mapping[c.format.to_sym]
-          c.body
-        end  
-      end
-
-      get '/:appname/?' do |appname|
-        config = []
-        a = ::Application.find(:name => appname).first
-        if a.nil?
-          halt 404
-        else  
-          ::Configuration.find(:application_id => a.id).sort.each {|c| config << c.to_hash}
-          config.to_json
-        end  
-      end
-
-      get '/?' do
-        configs = []
-        ::Configuration.all.sort.each {|c| configs << c.to_hash}
-        if configs.empty?
-          halt 404
-        else  
-          configs.to_json
-        end  
-      end
-
-      put '/:appname/:element?' do |appname, element|
-        app = ::Application.find_or_create(:name => appname)
-        config = ::Configuration.find_or_create(:name => element, :application_id => app.id)
-        required_params = ["format", "body"]
-        data = JSON.parse(request.body.read)
-        data.keys.sort == required_params.sort  ? (config.format = data["format"]; config.body = data["body"]) : (raise "Missing Parameters")
-        if config.valid?
-          config.save
-          action = config.is_new? ? "create" : "update"
-          dependency_action = app.is_new? ? "created" : "updated"
-          r = {"result" => "success","id" => "#{config.id}", "action" => action, "dependencies" => dependency_action, "application" => app.name, "item" => config.name}
-          r.to_json
-        else
-          raise "#{config.errors}"
-        end
-      end
-
-      delete '/:appname/:element?' do |appname, element|
-        app = ::Application.find(:name => appname).first
-        if app
-          config = ::Configuration.find(:name=> element, :application_id => app.id).first
-          if config
-            config.delete
-            r = {"result" => "success", "id" => "#{config.id}", "action" => "delete", "application" => "#{app.name}", "item" => "#{element}"}
-            r.to_json
-          else
-            halt 404
-          end
-        else
-          halt 404
-        end
-      end
-
-    end
-  #  run! if app_file == $0
   end
 end

data/lib/noah/application_routes.rb

@@ -0,0 +1,70 @@
+class Noah::App
+  # Application URIs
+  get '/a/:appname/:config/?' do |appname, config|
+    app = Noah::Application.find(:name => appname).first
+    if app.nil?
+      halt 404
+    else  
+      c = Noah::Configuration.find(:name => config, :application_id => app.id).first
+      c.to_json
+    end  
+  end
+
+  get '/a/:appname/?' do |appname|
+    app = Noah::Application.find(:name => appname).first
+    if app.nil?
+      halt 404
+    else
+      app.to_json
+    end
+  end
+
+  put '/a/:appname/watch' do |appname|
+    required_params = ["endpoint"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (a = Noah::Application.find(:name => appname).first) : (raise "Missing Parameters")
+    a.nil? ? (halt 404) : (w = a.watch!(:endpoint => data['endpoint']))
+    w.to_json
+  end
+
+  put '/a/:appname/?' do |appname|
+    required_params = ["name"]
+    data = JSON.parse(request.body.read)
+    if data.keys.sort == required_params.sort && data['name'] == appname
+      app = Noah::Application.find_or_create(:name => appname)
+    else
+      raise "Missing Parameters"
+    end  
+    if app.valid?
+      action = app.is_new? ? "create" : "update"
+      app.save
+      r = {"result" => "success","id" => app.id, "action" => action, "name" => app.name }
+      r.to_json
+    else
+      raise "#{format_errors(app)}"
+    end
+  end
+
+  delete '/a/:appname/?' do |appname|
+    app = Noah::Application.find(:name => appname).first
+    if app.nil?
+      halt 404
+    else
+      configurations = []
+      Noah::Configuration.find(:application_id => app.id).sort.each {|x| configurations << x; x.delete} if app.configurations.size > 0
+      app.delete
+      r = {"result" => "success", "action" => "delete", "id" => "#{app.id}", "name" => "#{appname}", "configurations" => "#{configurations.size}"}
+      r.to_json
+    end
+  end
+
+  get '/a/?' do
+    apps = []
+    Noah::Application.all.sort.each {|a| apps << a.to_hash}
+    if apps.empty?
+      halt 404
+    else  
+      apps.to_json
+    end  
+  end
+end

data/lib/noah/configuration_routes.rb

@@ -0,0 +1,81 @@
+class Noah::App
+  content_type_mapping = {
+            :yaml => "text/x-yaml",
+            :json => "application/json",
+            :xml => "text/xml",
+            :string => "text/plain"
+  }
+  # Configuration URIs
+  get '/c/:appname/:element/?' do |appname, element|
+    a = Noah::Application.find(:name => appname).first
+    if a.nil?
+      halt 404
+    else 
+      c = Noah::Configuration.find(:name => element, :application_id => a.id).first
+      content_type content_type_mapping[c.format.to_sym] if content_type_mapping[c.format.to_sym]
+      c.body
+    end  
+  end
+
+  get '/c/:appname/?' do |appname|
+    config = []
+    a = Noah::Application.find(:name => appname).first
+    if a.nil?
+      halt 404
+    else  
+      Noah::Configuration.find(:application_id => a.id).sort.each {|c| config << c.to_hash}
+      config.to_json
+    end  
+  end
+
+  get '/c/?' do
+    configs = []
+    Noah::Configuration.all.sort.each {|c| configs << c.to_hash}
+    if configs.empty?
+      halt 404
+    else  
+      configs.to_json
+    end  
+  end
+
+  put '/c/:configname/watch' do |configname|
+    required_params = ["endpoint"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (c = Noah::Configuration.find(:name => configname).first) : (raise "Missing Parameters")
+    c.nil? ? (halt 404) : (w = c.watch!(:endpoint => data['endpoint']))
+    w.to_json
+  end
+
+  put '/c/:appname/:element?' do |appname, element|
+    app = Noah::Application.find_or_create(:name => appname)
+    config = Noah::Configuration.find_or_create(:name => element, :application_id => app.id)
+    required_params = ["format", "body"]
+    data = JSON.parse(request.body.read)
+    data.keys.sort == required_params.sort  ? (config.format = data["format"]; config.body = data["body"]) : (raise "Missing Parameters")
+    if config.valid?
+      config.save
+      action = config.is_new? ? "create" : "update"
+      dependency_action = app.is_new? ? "created" : "updated"
+      r = {"result" => "success","id" => "#{config.id}", "action" => action, "dependencies" => dependency_action, "application" => app.name, "item" => config.name}
+      r.to_json
+    else
+      raise "#{format_errors(config)}"
+    end
+  end
+
+  delete '/c/:appname/:element?' do |appname, element|
+    app = Noah::Application.find(:name => appname).first
+    if app
+      config = Noah::Configuration.find(:name=> element, :application_id => app.id).first
+      if config
+        config.delete
+        r = {"result" => "success", "id" => "#{config.id}", "action" => "delete", "application" => "#{app.name}", "item" => "#{element}"}
+        r.to_json
+      else
+        halt 404
+      end
+    else
+      halt 404
+    end
+  end
+end