noah 0.0.5-jruby → 0.1-jruby

data/lib/noah/models/ephemerals.rb

@@ -0,0 +1,54 @@
+module Noah
+  class Ephemeral < Model
+
+    attribute :path
+    attribute :data
+    attribute :lifetime
+
+    index :path
+
+    def validate
+      super
+      assert_present :path
+      assert_unique :path
+    end
+
+    def name
+      @name = path
+    end
+
+    def to_hash
+      h = {:path => path, :data => data, :created_at => created_at, :updated_at => updated_at}
+      super.merge(h)
+    end
+
+    class << self
+    def find_or_create(opts = {})
+      begin
+        path, data = opts[:path], opts[:data]
+        find(:path => path).first.nil? ? (eph = new(:path => path)) : (eph = find(:path => path).first)
+        eph.data = data
+        if eph.valid?
+          eph.save
+        end
+        eph
+      rescue Exception => e
+        e.message
+      end
+    end
+    end
+
+    protected
+    def save_hook
+      # called after any create,update,delete
+      # logic needed to expire any orphaned ephemerals
+    end
+
+    private
+    def path_protected?(path_part)
+      # Check for protected paths in ephemeral nodes
+    end
+
+  end
+
+end

data/lib/noah/models/hosts.rb

@@ -0,0 +1,56 @@
+require File.join(File.dirname(__FILE__), 'services')
+module Noah
+  class Host < Model
+    # Host model
+    # @return {Host} a {Host} object
+
+    attribute :name
+    attribute :status
+    collection :services, Service
+
+    index :name
+    index :status
+
+    def validate
+      super
+      assert_present :name
+      assert_present :status
+      assert_unique :name
+      assert_member :status, ["up","down","pending"]
+    end
+
+    # @return [Hash] A hash representation of a {Host}
+    def to_hash
+      arr = []
+      services.sort.each {|s| arr << s.to_hash}
+      h = {:name => name, :status => status, :created_at => created_at, :updated_at => updated_at, :services => arr}
+      super.merge(h)
+    end
+
+    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
+        host.status = opts[:status]
+        if host.valid?
+          host.save
+        end
+        host
+      rescue Exception => e
+        e.message
+      end
+    end
+    end
+
+  end
+
+  class Hosts
+    # @param [Hash] optional filters for results
+    # @return [Array] Array of {Host} objects
+    def self.all(options = {})
+      options.empty? ? Noah::Host.all.sort : Noah::Host.find(options).sort
+    end
+  end
+end

data/lib/noah/models/services.rb

@@ -0,0 +1,54 @@
+module Noah
+
+  class Service < Model
+
+    attribute :name
+    attribute :status
+    reference :host, Host
+
+    index :name
+    index :status
+
+    def validate
+      super
+      assert_present :name
+      assert_present :status
+      assert_present :host_id
+      assert_unique [:name, :host_id]
+      assert_member :status, ["up", "down", "pending"]
+    end
+
+    def to_hash
+      Host[host_id].nil? ? host_name=nil : host_name=Host[host_id].name
+      super.merge(:name => name, :status => status, :updated_at => updated_at, :host => host_name)
+    end
+
+    class << self
+      def find_or_create(opts = {})
+        begin
+          # convert passed host object to host_id if passed
+          if opts.has_key?(:host)
+            opts.merge!({:host_id => opts[:host].id})
+            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
+          service.status = opts[:status]
+          if service.valid?
+            service.save
+          end
+          service
+        rescue Exception => e
+          e.message
+        end
+      end
+    end
+  end
+
+  class Services
+    def self.all(options = {})
+      options.empty? ? Service.all.sort : Service.find(options).sort
+    end
+  end
+end

data/lib/noah/models/watchers.rb

@@ -0,0 +1,62 @@
+require 'digest/sha1'
+module Noah
+  class Watcher < Model #NYI
+    # Don't trust anything in here yet
+    # I'm still trying a few things
+    include WatcherValidations
+
+    attribute :pattern
+    attribute :endpoint
+    attribute :name
+
+    index :pattern
+    index :endpoint
+
+    def validate
+      super
+      assert_present :endpoint
+      assert_present :pattern
+      assert_unique [:endpoint, :pattern]
+      assert_not_superset
+      assert_not_subset
+    end
+
+    def name
+      @name = Base64.encode64("#{pattern}|#{endpoint}").gsub("\n","")
+    end
+
+    def to_hash
+      h = {:pattern => pattern, :name => name, :endpoint => endpoint, :created_at => created_at, :updated_at => updated_at}
+      super.merge(h)
+    end
+
+    class << self
+    def find_by_name(name)
+      pattern, endpoint = Base64.decode64(name).split('|')
+      find(:pattern => pattern, :endpoint => endpoint).first
+    end
+
+    def watch_list
+      arr = []
+      watches = self.all.sort_by(:pattern)
+      watches.each {|w| arr << w.name}
+      arr
+    end
+    end
+
+    private
+    # Not sure about these next two.
+    # Could get around patterns changing due to namespace changes
+    def path_to_pattern
+    end
+
+    def pattern_to_path
+    end
+  end
+
+  class Watchers
+    def self.all(options = {})
+      options.empty? ? Watcher.all.sort : Watcher.find(options).sort
+    end
+  end
+end

data/lib/noah/passthrough.rb

@@ -0,0 +1,11 @@
+module Noah
+  module Passthrough
+    def passthrough(*methods)
+      methods.each do |method|
+        raise ArgumentError if ! method.is_a?(Symbol)
+        meth = method.to_s
+        self.class_eval("def #{meth}(*args); self.class.#{meth}(*args); end")
+      end
+    end
+  end
+end

data/lib/noah/service_routes.rb

@@ -0,0 +1,71 @@
+class Noah::App
+  # Service URIs
+
+  # get named {Service} for named {Host}
+  get '/s/:servicename/:hostname/?' do |servicename, hostname|
+    hs = host_service(hostname, servicename)
+    if hs.nil?
+      halt 404
+    else  
+      hs.to_json
+    end  
+  end
+
+  get '/s/: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 '/s/?' do
+    if services.empty?
+      halt 404
+    else
+      services.map {|s| s.to_hash}
+      services.to_json
+    end  
+  end
+
+  put '/s/:servicename/watch' do |servicename|
+    required_params = ["endpoint"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (s = Noah::Service.find(:name => servicename).first) : (raise "Missing Parameters")
+    s.nil? ? (halt 404) : (w = s.watch!(:endpoint => data['endpoint']))
+    w.to_json
+  end
+
+  put '/s/:servicename/?' do |servicename|
+    required_params = ["status", "host", "name"]
+    data = JSON.parse(request.body.read)
+    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)}"
+      end
+    else
+      raise "Missing Parameters"
+    end  
+  end
+
+  delete '/s/: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  
+end

data/lib/noah/validations.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__), 'validations','watcher_validations')

data/lib/noah/validations/watcher_validations.rb

@@ -0,0 +1,48 @@
+module Noah
+  module WatcherValidations
+
+      def assert_not_subset(error = [:pattern, :already_provided])
+        self.instance_of?(Noah::Watcher) ? (assert endpoint_covered?, error) : (assert false, "Validation not applicable")
+      end
+
+      def assert_not_superset(error = [:pattern, :replaces_existing])
+        self.instance_of?(Noah::Watcher) ? (assert endpoint_overrides?, error) : (assert false, "Validation not applicable")
+      end
+
+      def assert_valid_watch(error = [:pattern, :invalid_format])
+        self.instance_of?(Noah::Watcher) ? (assert pattern_valid?, error) : (assert false, "Validation not applicable")
+      end
+
+      private
+      def endpoint_covered?
+        watches = Watcher.all.find(:endpoint => self.endpoint).sort
+        watches.each do |w|
+          if (w.pattern.size < self.pattern.size) && self.pattern.match(/^#{w.pattern}/)
+            return false
+          end
+        end
+      rescue ArgumentError
+        return false
+      end
+
+      def endpoint_overrides?
+        watches = Watcher.all.find(:endpoint => self.endpoint).sort
+        watches.each do |w|
+          if (w.pattern.size > self.pattern.size) && w.pattern.match(/^#{self.pattern}/)
+            return false
+          end
+        end
+      rescue ArgumentError
+        return false
+      end
+
+      def pattern_valid?
+        unless self.pattern.match(/^\/\/noah\/.*\/$/)
+          return false
+        end
+      rescue ArgumentError
+        return false
+      end
+
+  end
+end

data/lib/noah/version.rb

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

data/lib/noah/watcher_routes.rb

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

data/noah.gemspec

@@ -5,8 +5,9 @@ require "noah/version"
 Gem::Specification.new do |s|
   s.name        = "noah"
   s.version     = Noah::VERSION
-  s.platform    = RUBY_ENGINE
-  s.authors     = ["lusis"]
+  #s.platform    = Gem::Platform::RUBY
+  s.platform    = "jruby"
+  s.authors     = ["John E. Vincent"]
   s.email       = ["lusis.org+rubygems.org@gmail.com"]
   s.homepage    = "https://github.com/lusis/noah"
   s.summary     = %q{Application registry based on Apache Zookeeper}
@@ -19,26 +20,33 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rake", ["= 0.8.7"])
+  s.add_dependency("eventmachine", ["1.0.0.beta.3"])
+  s.add_dependency("em-http-request", ["1.0.0.beta.3"])
+  s.add_dependency("redis", ["= 2.1.1"])
+  s.add_dependency("nest", ["= 1.1.0"])
+  s.add_dependency("rack", ["= 1.2.1"])
+  s.add_dependency("tilt", ["= 1.2.2"])
   s.add_dependency("sinatra", ["= 1.1.2"])
-  s.add_dependency("sinatra-namespace", ["0.6.1"])
   s.add_dependency("ohm", ["= 0.1.3"])
-  s.add_dependency("ohm-contrib", ["= 0.1.0"])
+  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("yajl-ruby", ["= 0.7.9"]) if s.platform.to_s == 'ruby'
-  s.add_dependency("jruby-json", ["= 1.5.0"]) if s.platform.to_s == 'jruby'
-  s.add_dependency("thin", ["= 1.2.7"]) if s.platform.to_s == 'ruby'
-  s.add_dependency("json-jruby", ["= 1.4.6"]) if s.platform.to_s == 'jruby'
-  s.add_dependency("jruby-openssl", ["= 0.7.3"]) if s.platform.to_s == 'jruby'
 
+
+  if RUBY_PLATFORM =~ /java/
+    s.add_dependency("jruby-openssl")
+    s.add_dependency("json")
+    s.add_development_dependency("warbler", ["= 1.2.1"])
+  else
+    s.add_dependency("hiredis", ["= 0.3.1"])
+    s.add_dependency("yajl-ruby") 
+    s.add_dependency("SystemTimer") if RUBY_VERSION =~ /1.8/
+    s.add_dependency("thin")
+  end
+
+  s.add_development_dependency("diff-lcs", ["= 1.1.2"])
   s.add_development_dependency("sinatra-reloader", ["= 0.5.0"])
-  s.add_development_dependency("rspec", ["= 2.4.0"])
-  s.add_development_dependency("rcov", ["= 0.9.9"]) if s.platform.to_s == 'ruby'
+  s.add_development_dependency("rspec", ["~> 2.5"])
+  s.add_development_dependency("rcov", ["= 0.9.9"])
   s.add_development_dependency("rack-test", ["= 0.5.7"])
-  s.add_development_dependency("ZenTest", ["= 4.4.2"])
-  s.add_development_dependency("autotest", ["= 4.4.6"])
-  s.add_development_dependency("autotest-growl", ["= 0.2.9"])
-  s.add_development_dependency("warbler", ["= 1.2.1"]) if s.platform.to_s == 'java'
-
 end