noah 0.4-jruby → 0.6.pre-jruby

data/lib/noah/models/hosts.rb

@@ -3,7 +3,8 @@ module Noah
   class Host < Model
     # Host model
     # @return {Host} a {Host} object
-
+    include Taggable
+    include Linkable
     attribute :name
     attribute :status
     collection :services, Service
@@ -21,9 +22,11 @@ module Noah
 
     # @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}
+      services_hash = Hash.new
+      services.sort.each do |svc|
+        services_hash["#{svc.name}"] = svc.status
+      end
+      h = {:name => name, :status => status, :created_at => created_at, :updated_at => updated_at, :services => services_hash}
       super.merge(h)
     end
 
@@ -50,7 +53,10 @@ module Noah
     # @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
+      host_hash = Hash.new
+      options.empty? ? hosts=Noah::Host.all.sort : hosts=Noah::Host.find(options).sort
+      hosts.each {|x| host_hash["#{x.name}"] = x.to_hash.reject {|k,v| k == :name } }
+      host_hash
     end
   end
 end

data/lib/noah/models/link.rb

@@ -1,45 +1,86 @@
-require File.join(File.dirname(__FILE__), 'link_member')
 module Noah
   class Link < Model
     attribute :path
-    list :nodes, LinkMember
-    
+    attribute :nodes
+
     index :path
+    index :nodes
+
+    def nodes
+      arr = []
+      self.key[:nodes].smembers.each do |node|
+        arr << node
+      end
+      arr
+    end
+
+    def nodes=(node)
+      case node.class.to_s
+      when "Array"
+        node.each do |n|
+          self.key[:nodes].sadd(n.key)
+          n.links << self
+        end
+      else
+        self.key[:nodes].sadd(node.key)
+        node.links << self
+      end
+    end
 
     def validate
       super
       assert_present :path
     end
-    # Nothing to see yet.
-    # This will be for creating "overlays" or "link" relationships
-    # between arbitrary objects or modeling your data the way you want.
-    #
-    # Example:
-    # path = "/myservers"
-    # path.nodes = ["/applications/myapp","/some/ephemeral/path", "sometag"]
-    #
-    # would result in a structure like:
-    # path/
-    #     applications/
-    #                  myapp
-    #     some/ephemeral/path/
-    #                        child1
-    #                        child2
-    #                        child3
-    #     sometag/
-    #            tagged_item1
-    #            tagged_item2
-    #            tagged_item4
-    #            tagged_item5
-    #
-    # The idea is to create a blended view across opinionated, tagged and
-    # ephemeral nodes.
-    #
-    # Almost a "choose your own model" thing.
+
+    def to_hash
+      # TODO Holy shit, is this messy or what?
+      # Prepopulate instance variables of each object type instead?
+      %w[applications configurations hosts services ephemerals].each {|x| instance_variable_set("@#{x}", Hash.new)}
+      if nodes.size > 0
+        nodes.each do |node|
+          rejected_vals = [:created_at, :updated_at, :links, :name]
+          n = node_to_class(node)
+          cls = class_to_lower(n.class.to_s)
+          hsh = instance_variable_get("@#{cls}s")
+          # all of this bs is because services are unique per [servicename, hostname]
+          # so if I add multiple services just by name to the hash, I'll wipe the previous one
+          # a better option would be for services to be named slug style 
+          hsh["#{n.name}"] = Hash.new unless hsh.has_key?(n.name)
+          case cls
+          when "service"
+            sh = Noah::Host[n.host_id].name
+            hsh["#{n.name}"]["#{sh}"] = Hash.new unless hsh["#{n.name}"].has_key?("#{sh}")
+            hsh["#{n.name}"]["#{sh}"].merge!({:id => n.id, :status => n.status, :tags => n.to_hash[:tags]})
+          when "host"
+            hsh["#{n.name}"].merge!({:id => n.id, :status => n.status, :tags => n.to_hash[:tags], :services => n.to_hash[:services]})
+          else
+            hsh["#{n.name}"].merge!(n.to_hash.reject{|key, value| rejected_vals.member?(key)})
+          end
+        end
+      end
+      h = {:name => name, :hosts => @hosts, :services => @services, :applications => @applications, :configurations => @configurations, :ephemerals => @ephemerals, :created_at => created_at, :updated_at => updated_at}
+      super.merge(h)
+    end
 
     def name
       @name = path
     end
 
+    class <<self
+    def find_or_create(opts={})
+      begin
+        find(opts).first.nil? ? obj=create(opts) : obj=find(opts).first
+        obj
+      rescue Exception => e
+        e.message
+      end
+    end
+    end
+
+    private
+    def node_to_class(node)
+      node.match(/^Noah::(.*):(\d+)$/)
+      Noah.const_get($1).send(:[], $2)
+    end
   end
 end

data/lib/noah/models/services.rb

@@ -1,7 +1,8 @@
 module Noah
 
   class Service < Model
-
+    include Taggable
+    include Linkable
     attribute :name
     attribute :status
     reference :host, Host
@@ -48,7 +49,15 @@ module Noah
 
   class Services
     def self.all(options = {})
-      options.empty? ? Service.all.sort : Service.find(options).sort
+      service_hash = Hash.new
+      options.empty? ? services=Service.all.sort : services=Service.find(options).sort
+      services.each do |svc|
+        service_hash["#{svc.name}"] = Hash.new unless service_hash.has_key?(svc.name)
+        host_name = Noah::Host[svc.host_id].name
+        service_hash["#{svc.name}"]["#{host_name}"] = Hash.new
+        service_hash["#{svc.name}"]["#{host_name}"].merge!({:id => svc.id, :status => svc.status, :tags => svc.to_hash[:tags], :links => svc.to_hash[:links], :created_at => svc.created_at, :updated_at => svc.updated_at})
+      end
+      service_hash
     end
   end
 end

data/lib/noah/models/tags.rb

@@ -1,13 +1,94 @@
 module Noah
+
   class Tag < Model
-    counter :total
+    attribute :name
+    attribute :members
+    index :members
+    index :name
+
+    def validate
+      super
+      assert_present :name
+      assert_unique :name
+    end
+
+    def members=(member)
+      self.key[:members].sadd(member.key)
+      member.tag! self.name unless member.tags.member?(self)
+    end
+
+    def members
+      hsh = Hash.new
+      self.key[:members].smembers.each do |member|
+        n = node_to_class(member)
+        cls = class_to_lower(n.class.to_s)
+        hash_key = "#{cls}s".to_sym
+        hsh[hash_key] = Array.new unless hsh.has_key?(hash_key)
+        hsh[hash_key] << n
+      end
+      hsh
+    end
+
+    def to_hash
+      h = {:name => name, :created_at => created_at, :updated_at => updated_at}
+      h.merge!(members_to_hash)
+      super.merge(h)
+    end
+
+    class <<self
+      def find_or_create(opts={})
+        begin
+          find(opts).first.nil? ? obj=create(opts) : obj=find(opts).first
+          obj
+        rescue Exception => e
+          e.message
+        end
+      end
+    end
+
+    private
+    def node_to_class(node)
+      node.match(/^Noah::(.*):(\d+)$/)
+      Noah.const_get($1).send(:[], $2)
+    end
+
+    def members_to_hash
+      new_hash = Hash.new
+      members.keys.each {|k| new_hash[k] = Hash.new}
+      members.each do |category, member_array|
+        rejected_vals = [:created_at, :updated_at, :tags, :name, :host]
+        h = new_hash[category]
+        member_array.each {|mem| h["#{mem.name}"] = Hash.new unless h.has_key?(mem.name)}
+        case category
+        when :services
+          member_array.each do |s|
+            sh = Noah::Host[s.host_id].name
+            h["#{s.name}"]["#{sh}"] = Hash.new unless h["#{s.name}"].has_key?(sh)
+            h["#{s.name}"]["#{sh}"].merge!(s.to_hash.reject{|k,v| rejected_vals.member?(k)})
+          end
+        else
+          member_array.each do |m|
+            h["#{m.name}"].merge!(m.to_hash.reject{|k,v| rejected_vals.member?(k)})
+          end
+        end
+      end
+      new_hash
+    end
+  end
 
-    def name
-      @name = id
+  class Tags
+    def self.all(options = {})
+      tag_hash = Hash.new
+      options.empty? ? tags=Tag.all.sort : tags=Tag.find(options).sort
+      tags.each {|t| tag_hash["#{t.name}"] = t.to_hash.reject {|k,v| k == :name } }
+      tag_hash
     end
 
-    def self.[](id)
-      super(encode(id)) || create(:id => encode(id))
+    class <<self
+      def tagged(tag)
+        t = Tag.find(:name => tag).first
+        t.members
+      end
     end
   end
 

data/lib/noah/models/watchers.rb

@@ -1,4 +1,3 @@
-require 'digest/sha1'
 module Noah
   class Watcher < Model
     include WatcherValidations

data/lib/noah/{application_routes.rb → routes/applications.rb}

@@ -2,21 +2,23 @@ class Noah::App
   # Application URIs
   get '/applications/: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  
+    (halt 404) if app.nil?
+    c = app.configurations.find(:name => config).first
+    c.to_json
   end
 
   get '/applications/:appname/?' do |appname|
     app = Noah::Application.find(:name => appname).first
-    if app.nil?
-      halt 404
-    else
-      app.to_json
-    end
+    (halt 404) if app.nil?
+    app.to_json
+  end
+
+  put '/applications/:appname/tag' do |appname|
+    required_params = ["tags"]
+    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) : (a.tag!(data['tags']))
+    a.to_json
   end
 
   put '/applications/:appname/watch' do |appname|
@@ -27,6 +29,14 @@ class Noah::App
     w.to_json
   end
 
+  put '/applications/:appname/link' do |appname|
+    required_params = ["link_name"]
+    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) : (a.link! data["link_name"])
+    a.to_json
+  end
+
   put '/applications/:appname/?' do |appname|
     required_params = ["name"]
     data = JSON.parse(request.body.read)
@@ -47,24 +57,18 @@ class Noah::App
 
   delete '/applications/: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
+    (halt 404) if app.nil?
+    app.delete
+    r = {"result" => "success", "action" => "delete", "id" => "#{app.id}", "name" => "#{appname}"}
+    r.to_json
+  end
+
+  delete '/applications/:appname/configurations/:configname/?' do |appname, configname|
   end
 
   get '/applications/?' do
-    apps = []
-    Noah::Application.all.sort.each {|a| apps << a.to_hash}
-    if apps.empty?
-      halt 404
-    else  
-      apps.to_json
-    end  
+    apps = Noah::Applications.all
+    (halt 404) if apps.size == 0
+    apps.to_json
   end
 end

data/lib/noah/routes/configurations.rb

@@ -0,0 +1,77 @@
+class Noah::App
+  content_type_mapping = {
+            :yaml => "text/x-yaml",
+            :json => "application/json",
+            :xml => "text/xml",
+            :string => "text/plain"
+  }
+  # GET the raw data of a configuration object
+  get '/configurations/:configname/data/?' 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
+  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
+  end
+  # GET all configurations
+  get '/configurations/?' do
+    configs = Noah::Configurations.all.to_hash
+    (halt 404) if configs.size == 0
+    configs.to_json
+  end
+  # Add configuration object to a custom link hierarchy
+  put '/configurations/:configname/link' do |configname|
+    required_params = ["link_name"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (a = Noah::Configuration.find(:name => configname).first) : (raise "Missing Parameters")
+    a.nil? ? (halt 404) : (a.link! data["link_name"])
+    a.to_json
+  end
+  # Add a tag to a configuration object
+  put '/configurations/:configname/tag' do |configname|
+    required_params = ["tags"]
+    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) : (c.tag!(data['tags']))
+    c.to_json
+
+  end
+  # Add a watch to a configuration object
+  put '/configurations/: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
+  # Attach a configuration object to an application object
+  put '/configurations/:configname/?' do |configname|
+    required_params = ["format", "body"]
+    data = JSON.parse(request.body.read)
+    data.keys.sort == required_params.sort ? config=Noah::Configuration.find_or_create(:name => configname) : (raise "Missing Parameters")
+    config.body = data["body"]
+    config.format = data["format"]
+    if config.valid?
+      config.save
+      action = config.is_new? ? "create" : "update"
+      r = {"result" => "success","id" => "#{config.id}", "action" => action, "item" => config.name}
+      r.to_json
+    else
+      raise "#{format_errors(config)}"
+    end
+  end
+
+  delete '/configurations/:configname/?' do |configname|
+    cfg = Noah::Configuration.find(:name => configname).first
+    (halt 404) if cfg.nil?
+    cfg.delete
+    r = {"result" => "success", "id" => cfg.id, "action" => "delete", "affected_applications" => cfg.affected_applications, "item" => cfg.name}
+    r.to_json
+  end
+end