noah 0.4-jruby → 0.6.pre-jruby

data/lib/noah/{ephemeral_routes.rb → routes/ephemerals.rb}

@@ -1,16 +1,16 @@
 class Noah::App
-  get '/e/?' do
+  get '/ephemerals/?' do
     halt 404
   end
 
-  get '/e/*' do
+  get '/ephemerals/*' do
     params["splat"].size == 0 ? (halt 404) : (e=Noah::Ephemeral.find(:path => "/#{params["splat"][0]}").first)
     (halt 404) if e.nil?
     content_type "application/octet-stream"
     e.data.nil? ? "" : "#{e.data}"
   end
 
-  put '/e/*/watch' do
+  put '/ephemerals/*/watch' do
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)
     (data.keys.sort == required_params.sort) ? (e = Noah::Watcher.find(:path => params[:splat][0]).first) : (raise "Missing Parameters")
@@ -18,7 +18,7 @@ class Noah::App
     w.to_json
   end
 
-  put '/e/*' do
+  put '/ephemerals/*' do
     raise("Data too large") if request.body.size > 512
     d = request.body.read  || nil
     opts = {:path => "/#{params[:splat][0]}", :data => d}
@@ -32,7 +32,7 @@ class Noah::App
     end
   end
 
-  delete '/e/*' do
+  delete '/ephemerals/*' do
     p = params[:splat][0]
     e = Noah::Ephemeral.find(:path => "/"+p).first
     if e

data/lib/noah/{host_routes.rb → routes/hosts.rb}

@@ -25,7 +25,6 @@ class Noah::App
 
   # GET all {Hosts}
   get '/hosts/?' do
-    hosts.map {|h| h.to_hash}
     if hosts.size == 0
       halt 404
     else
@@ -33,6 +32,14 @@ class Noah::App
     end
   end
 
+  put '/hosts/:hostname/tag' do |hostname|
+    required_params = ["tags"]
+    data = JSON.parse(request.body.read)
+    (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
+  end
+
   put '/hosts/:hostname/watch' do |hostname|
     required_params = ["endpoint"]
     data = JSON.parse(request.body.read)
@@ -41,6 +48,14 @@ class Noah::App
     w.to_json
   end
 
+  put '/hosts/:hostname/link' do |hostname|
+    required_params = ["link_name"]
+    data = JSON.parse(request.body.read)
+    (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"]
     data = JSON.parse(request.body.read)

data/lib/noah/routes/links.rb

@@ -0,0 +1,16 @@
+class Noah::App
+
+  get '/:link_name/:model_name/?' do |path, model|
+    link_name = Noah::Link.find(:path => "/"+path).first
+    (halt 404) if link_name.nil?
+    (halt 404) if link_name.to_hash.has_key?(model.to_sym) == false
+    link_name.to_hash[model.to_sym].to_json
+  end
+
+  get '/:link_name/?' do |path|
+    link_name = Noah::Link.find(:path => "/"+path).first
+    (halt 404) if link_name.nil?
+    link_name.to_json
+  end
+
+end

data/lib/noah/{service_routes.rb → routes/services.rb}

@@ -13,21 +13,37 @@ class Noah::App
 
   get '/services/:servicename/?' do |servicename|
     s = services(:name => servicename)
-    s.map {|x| x.to_hash}
-    if s.empty?
-      halt 404
-    else  
-      s.to_json
-    end  
+    (halt 404) if s.size == 0
+    s.to_json
   end
 
   get '/services/?' do
-    if services.empty?
-      halt 404
-    else
-      services.map {|s| s.to_hash}
-      services.to_json
-    end  
+    (halt 404) if services.size == 0
+    services.to_json
+  end
+
+  put '/services/:servicename/link' do |appname|
+    required_params = ["link_name"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (a = Noah::Service.find(:name => servicename).first) : (raise "Missing Parameters")
+    a.nil? ? (halt 404) : (a.link! data["link_name"])
+    a.to_json
+  end
+
+  put '/services/:servicename/:hostname/link' do |servicename, hostname|
+    required_params = ["link_name"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (a=host_service(hostname, servicename)) : (raise "Missing Parameters")
+    a.nil? ? (halt 404) : (a.link! data["link_name"])
+    a.to_json
+  end
+
+  put '/services/:servicename/:hostname/tag' do |servicename, hostname|
+    required_params = ["tags"]
+    data = JSON.parse(request.body.read)
+    (data.keys.sort == required_params.sort) ? (a=host_service(hostname, servicename)) : (raise "Missing Parameters")
+    a.nil? ? (halt 404) : (a.tag!(data['tags']))
+    a.to_json
   end
 
   put '/services/:servicename/watch' do |servicename|

data/lib/noah/routes/tags.rb

@@ -0,0 +1,15 @@
+class Noah::App
+
+  get '/tags/:tagname/?' do |tagname|
+    tags = Noah::Tags.all(:name => tagname).to_hash
+    (halt 404) if tags.size == 0
+    tags.to_json
+  end
+
+  get '/tags/?' do
+    tags = Noah::Tags.all.to_hash
+    (halt 404) if tags.size == 0
+    tags.to_json
+  end
+
+end

data/lib/noah/taggable.rb

@@ -0,0 +1,30 @@
+module Noah::Taggable
+  def self.included(model)
+    model.send :set, :tags, ::Noah::Tag
+    model.send :index, :tags
+  end
+
+  def tag!(tag_name)
+    case tag_name.class.to_s
+    when "Array"
+      tag_name.each do |t|
+        my_tag = ::Noah::Tag.find_or_create(:name => t)
+        tags << my_tag
+        my_tag.members = self
+      end
+    else
+      my_tag = ::Noah::Tag.find_or_create(:name => tag_name)
+      tags << my_tag
+      my_tag.members = self
+    end
+  end
+
+  def untag!(tag_name)
+  end
+
+  def to_hash
+    tag_arr = Array.new
+    self.tags.sort.each {|t| tag_arr << t.name} if self.tags.size != 0
+    super.merge(:tags => tag_arr)
+  end
+end

data/lib/noah/version.rb

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

data/noah.gemspec

@@ -4,7 +4,8 @@ require "noah/version"
 
 Gem::Specification.new do |s|
   s.name        = "noah"
-  s.version     = Noah::VERSION
+  s.version     = "#{Noah::VERSION}.pre"
+  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"
   s.authors     = ["John E. Vincent"]
@@ -22,11 +23,11 @@ Gem::Specification.new do |s|
 
   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("redis", ["= 2.2.0"])
   s.add_dependency("nest", ["= 1.1.0"])
-  s.add_dependency("rack", ["= 1.2.1"])
+  s.add_dependency("rack", ["= 1.2.2"])
   s.add_dependency("tilt", ["= 1.2.2"])
-  s.add_dependency("sinatra", ["= 1.2.0"])
+  s.add_dependency("sinatra", ["= 1.2.3"])
   s.add_dependency("ohm", ["= 0.1.3"])
   s.add_dependency("ohm-contrib", ["= 0.1.1"])
   s.add_dependency("haml", ["= 3.0.25"])

data/spec/application_spec.rb

@@ -23,7 +23,7 @@ describe "Using the Application Model", :reset_redis => true do
     end
     it "create a new Noah::Application with Configurations" do
       a = Noah::Application.create(@appdata1)
-      a.configurations << Noah::Configuration.create(@appconf_string.merge({:application => a}))
+      a.configurations << Noah::Configuration.create(@appconf_string)
       a.valid?.should == true
       a.is_new?.should == true
       a.save
@@ -61,8 +61,8 @@ describe "Using the Application Model", :reset_redis => true do
       b = Noah::Application.create(@appdata2)
       c = Noah::Applications.all
       c.size.should == 2
-      c.member?(a).should == true
-      c.member?(b).should == true
+      c.keys.member?(a.name).should == true
+      c.keys.member?(b.name).should == true
     end  
   end
 

data/spec/configuration_spec.rb

@@ -3,13 +3,11 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Using the Configuration Model", :reset_redis => true do
   before(:each) do
     Ohm.redis.flushdb
-    app = Noah::Application.create :name => "my_application"
-    @appconf_string = {:name => "mystringconf", :format => "string", :body => "some_var", :application_id => app.id}
-    @appconf_json = {:name => "myjsonconf", :format => "json", :body => @appconf_string.to_json, :application_id => app.id}
+    @appconf_string = {:name => "mystringconf", :format => "string", :body => "some_var"}
+    @appconf_json = {:name => "myjsonconf", :format => "json", :body => @appconf_string.to_json}
     @appconf_missing_name = @appconf_string.reject {|k, v| k == :name}
     @appconf_missing_format = @appconf_string.reject {|k, v| k == :format}
     @appconf_missing_body = @appconf_string.reject {|k, v| k == :body}
-    @appconf_missing_application = @appconf_string.reject {|k, v| k == :application_id}
   end
   after(:each) do
     Ohm.redis.flushdb
@@ -48,13 +46,27 @@ describe "Using the Configuration Model", :reset_redis => true do
       c = Noah::Configuration.find(@appconf_string).first
       c.nil?.should == true
     end
+    it "delete from Application when deleting Configuration" do
+      # We have to test this because we override delete in Configuration
+      a = Noah::Configuration.find_or_create(@appconf_string)
+      b = Noah::Configuration.find(@appconf_string).first
+      c = Noah::Application.create(:name => "somerandomapp1234")
+      c.configurations << a
+      b.should == a
+      a.delete
+      d = Noah::Configuration.find(@appconf_string).first
+      d.nil?.should == true
+      a.affected_applications.member?(c.name).should == true
+      c.configurations.size.should == 0
+    end
     it "return all Configurations" do
       a = Noah::Configuration.find_or_create(@appconf_string)
       b = Noah::Configuration.find_or_create(@appconf_json)
       c = Noah::Configurations.all
+      c.class.to_s.should == 'Hash'
       c.size.should == 2
-      c.member?(a).should == true
-      c.member?(b).should == true
+      c.has_key?(a.name).should == true
+      c.has_key?(b.name).should == true
     end
   end
 
@@ -74,15 +86,10 @@ describe "Using the Configuration Model", :reset_redis => true do
       a.valid?.should == false
       a.errors.should == [[:body, :not_present]]
     end
-    it "create a new Confguration without an application" do
-      a = Noah::Configuration.create(@appconf_missing_application)
-      a.valid?.should == false
-      a.errors.should == [[:application_id, :not_present]]
-    end      
     it "create a duplicate Configuration" do
       a = Noah::Configuration.create(@appconf_string)
       b = Noah::Configuration.create(@appconf_string)
-      b.errors.should == [[[:name, :application_id], :not_unique]]
+      b.errors.should == [[:name, :not_unique]]
     end
   end
 

data/spec/host_spec.rb

@@ -73,12 +73,12 @@ describe "Using the Host Model", :reset_redis => true do
       host2 = Noah::Host.create(:name => hostname2, :status => status2)
       host1.save
       host2.save
-      Noah::Hosts.all.class.should == Array
+      Noah::Hosts.all.class.should == Hash
       Noah::Hosts.all.size.should == 2
-      Noah::Hosts.all.first.name.should == hostname1
-      Noah::Hosts.all.first.status.should == status1
-      Noah::Hosts.all.last.name.should == hostname2
-      Noah::Hosts.all.last.status.should == status2
+      Noah::Hosts.all.has_key?(hostname1).should == true
+      Noah::Hosts.all[hostname1][:status].should == status1
+      Noah::Hosts.all.has_key?(hostname2).should == true
+      Noah::Hosts.all[hostname2][:status].should == status2
     end
   end
 

data/spec/noahapp_application_spec.rb

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Using the Application API", :reset_redis => false do
   before(:all) do
     @a = Noah::Application.create(:name => 'rspec_sample_app')
-    @a.configurations << Noah::Configuration.create(:name => 'rspec_config', :format => 'string', :body => 'rspec is great', :application => @a)
+    @c = Noah::Configuration.create(:name => 'rspec_config', :format => 'string', :body => 'rspec is great')
+    @a.configurations << @c
     @a.save
-    @c = @a.configurations.first
   end  
   describe "calling" do
 
@@ -14,20 +14,20 @@ describe "Using the Application API", :reset_redis => false do
         get '/applications'
         last_response.should be_ok
         response = last_response.should return_json
-        response.is_a?(Array).should == true
+        response.is_a?(Hash).should == true
       end
       it "named application should work" do
         get '/applications/rspec_sample_app'
         last_response.should be_ok
         response = last_response.should return_json
-
-        response["id"].should == @a.id
-        response["name"].should == @a.name
-        c = response["configurations"].first
-        c["id"].should == @c.id
-        c["name"].should == @c.name
-        c["body"].should == @c.body
-        c["format"].should == @c.format
+        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"]
+        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}"
@@ -38,7 +38,6 @@ describe "Using the Application API", :reset_redis => false do
         response["name"].should == @c.name
         response["format"].should == @c.format
         response["body"].should == @c.body
-        response["application"].should == @a.name
       end
       it "invalid application should not work" do
         get "/applications/should_not_exist"
@@ -96,7 +95,6 @@ describe "Using the Application API", :reset_redis => false do
         response["action"].should == "delete"
         response["id"].nil?.should == false
         response["name"].should == @appdata[:name]
-        response["configurations"].should == "0"
       end
       it "invalid application should not work" do
         delete "/applications/should_not_work"

data/spec/noahapp_configuration_spec.rb

@@ -1,34 +1,61 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Using the Configuration API", :reset_redis => false, :populate_sample_data => true do
+SAMPLE_YAML = <<EOY
+development:
+  database: development_database
+  adapter: mysql
+  username: dev_user
+  password: dev_password
+EOY
+
+SAMPLE_JSON = <<EOJ
+{
+  "id":"hostname",
+  "data":"localhost"
+}
+EOJ
+
+describe "Using the Configuration API", :reset_redis => true, :populate_sample_data => false do
   describe "calling" do
+    before(:each) do
+      Ohm.redis.flushdb
+      @redis_config = Noah::Configuration.create(:name => 'redis_url', :format => 'string', :body => 'redis://127.0.0.1:6379/0')
+      @json_config = Noah::Configuration.create(:name => 'json_config', :format => 'json', :body => SAMPLE_JSON)
+      @yaml_config = Noah::Configuration.create(:name => 'yaml_config', :format => 'yaml', :body => SAMPLE_YAML)
+      @sample_application = Noah::Application.create(:name => 'rspec_application')
+    end
+    after(:each) do
+      Ohm.redis.flushdb
+    end
 
     describe "GET" do
       it "all configurations should work" do
         get '/configurations'
         last_response.should be_ok
-        last_response.should return_json
-      end
-      it "named application should work" do
-        get '/configurations/noah'
-        last_response.should be_ok
         response = last_response.should return_json
-
-        response.is_a?(Array).should == true
-        response.first["name"].should == "redis"
-        response.first["format"].should == "string"
-        response.first["body"].should == "redis://127.0.0.1:6379/0"
-        response.first["application"].should == "noah"
+        response.keys.size.should == 3
+        %w[redis_url json_config yaml_config].each do |c|
+          response.keys.member?(c).should == true
+          %w[id tags links format body created_at updated_at].each do |ck|
+            response[c].keys.member?(ck).should == true
+          end
+        end
       end
-      it "named configuration for application should work" do
-        get '/configurations/noah/redis'
+      it "named configuration should work" do
+        get '/configurations/redis_url'
         last_response.should be_ok
-        response = last_response.body
-        response.should == "redis://127.0.0.1:6379/0"
+        response = last_response.should return_json
+        response.is_a?(Hash).should == true
+        response['name'].should == @redis_config.name
+        response['id'].should == @redis_config.id
+        response["format"].should == @redis_config.format
+        response["body"].should == @redis_config.body
+        response["tags"].size.should == 0
+        response["links"].size.should == 0
       end
       it "named configuration should work with mime-type" do
         require 'yaml'
-        get '/configurations/myrailsapp1/database.yml'
+        get '/configurations/yaml_config/data'
         last_response.should be_ok
         last_response.headers["Content-Type"].should == "text/x-yaml;charset=utf-8"
         response = YAML.load(last_response.body)
@@ -37,12 +64,12 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
         response["development"].keys.sort.should == ["adapter", "database", "password", "username"]
         response["development"].values.sort.should == ["dev_password", "dev_user", "development_database", "mysql"]
       end
-      it "invalid application should not work" do
-        get '/configurations/badapp'
+      it "invalid configuration should not work" do
+        get '/configurations/badconfig'
         last_response.should be_missing
       end  
-      it "invalid configuration for application should not work" do
-        get '/configurations/badapp/badconfig'
+      it "invalid configuration data should not work" do
+        get '/configurations/badconfig/data'
         last_response.should be_missing
       end  
     end
@@ -50,60 +77,56 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
     describe "PUT" do
       it "new configuration should work" do
         config_data = {:format => "string", :body => "sample_config_entry"}.to_json
-        put '/configurations/newapp/newconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/newconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
         response["action"].should == "create"
-        response["dependencies"].should == "created"
-        response["application"].should == "newapp"
         response["item"].should == "newconfig"
       end
       it "existing configuration should work" do
         config_data = {:format => "string", :body => "sample_config_entry"}.to_json
+        put '/configurations/newconfig', config_data, "CONTENT_TYPE" => "application/json"
         sleep 3
-        put '/configurations/newapp/newconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/newconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
         response["action"].should == "update"
-        response["dependencies"].should == "updated"
-        response["application"].should == "newapp"
         response["item"].should == "newconfig"
       end
       it "new configuration with missing format should not work" do
         config_data = {:body => "a string"}.to_json
-        put '/configurations/newnewapp/someconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/someconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end
       it "new configuration with missing body should not work" do
         config_data = {:body => "a string"}.to_json
-        put '/configurations/newnewapp/someconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/someconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end  
     end
 
     describe "DELETE" do
-      before(:all) do
-        @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
-
       it "existing configuration should work" do
-        delete "/configurations/#{@a.name}/#{@c.name}"
+        @a = Noah::Application.create(:name => 'delete_test_app')
+        cparms = {:name => 'asdf', :format => 'string', :body => 'asdf'}
+        @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"
         response["id"].should == @c.id
         response["action"].should == "delete"
-        response["application"].should == @a.name
+        response["affected_applications"].member?(@a.name).should == true
         response["item"].should == @c.name
       end
       it "invalid configuration should not work" do
-        delete "/configurations/#{@a.name}/#{@c.name}"
+        delete "/configurations/somethingthatshouldnotexist"
         last_response.should be_missing
       end
     end