noah 0.2.1-jruby → 0.3-jruby

data/lib/noah/models/ephemerals.rb

@@ -1,5 +1,6 @@
 module Noah
   class Ephemeral < Model
+    include EphemeralValidations
 
     attribute :path
     attribute :data
@@ -11,6 +12,7 @@ module Noah
       super
       assert_present :path
       assert_unique :path
+      assert_not_reserved
     end
 
     def name

data/lib/noah/models/link.rb

@@ -0,0 +1,45 @@
+require File.join(File.dirname(__FILE__), 'link_member')
+module Noah
+  class Link < Model
+    attribute :path
+    list :nodes, LinkMember
+    
+    index :path
+
+    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 name
+      @name = path
+    end
+
+  end
+end

data/lib/noah/models/link_member.rb

@@ -0,0 +1,18 @@
+module Noah
+  class LinkMember
+
+    class <<self
+      def create(path)
+        path_to_instance(path)
+      end
+
+      protected
+      def path_to_instance(path)
+        p = path.split('/')
+        model, name = p[1], p[2]
+        x = instance_eval(Noah::PATH_MAPPING[model])
+        x.find(:name => name).first
+      end
+    end
+  end
+end

data/lib/noah/models/tags.rb

@@ -0,0 +1,14 @@
+module Noah
+  class Tag < Model
+    counter :total
+
+    def name
+      @name = id
+    end
+
+    def self.[](id)
+      super(encode(id)) || create(:id => encode(id))
+    end
+  end
+
+end

data/lib/noah/models/watchers.rb

@@ -1,8 +1,6 @@
 require 'digest/sha1'
 module Noah
-  class Watcher < Model #NYI
-    # Don't trust anything in here yet
-    # I'm still trying a few things
+  class Watcher < Model
     include WatcherValidations
 
     attribute :pattern

data/lib/noah/service_routes.rb

@@ -2,7 +2,7 @@ class Noah::App
   # Service URIs
 
   # get named {Service} for named {Host}
-  get '/s/:servicename/:hostname/?' do |servicename, hostname|
+  get '/services/:servicename/:hostname/?' do |servicename, hostname|
     hs = host_service(hostname, servicename)
     if hs.nil?
       halt 404
@@ -11,7 +11,7 @@ class Noah::App
     end  
   end
 
-  get '/s/:servicename/?' do |servicename|
+  get '/services/:servicename/?' do |servicename|
     s = services(:name => servicename)
     s.map {|x| x.to_hash}
     if s.empty?
@@ -21,7 +21,7 @@ class Noah::App
     end  
   end
 
-  get '/s/?' do
+  get '/services/?' do
     if services.empty?
       halt 404
     else
@@ -30,7 +30,7 @@ class Noah::App
     end  
   end
 
-  put '/s/:servicename/watch' do |servicename|
+  put '/services/: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")
@@ -38,7 +38,7 @@ class Noah::App
     w.to_json
   end
 
-  put '/s/:servicename/?' do |servicename|
+  put '/services/:servicename/?' do |servicename|
     required_params = ["status", "host", "name"]
     data = JSON.parse(request.body.read)
     if data.keys.sort == required_params.sort
@@ -57,7 +57,7 @@ class Noah::App
     end  
   end
 
-  delete '/s/:servicename/:hostname/?' do |servicename, hostname|
+  delete '/services/: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

data/lib/noah/validations.rb

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

data/lib/noah/validations/ephemeral_validations.rb

@@ -0,0 +1,20 @@
+module Noah
+  module EphemeralValidations
+
+      def assert_not_reserved(error = [:path, :reserved_path])
+        # This is to work around how Ohm evaluates validations
+        # Allows assert_present :path to override
+        return if self.path.nil?
+        # This is the real test
+        self.instance_of?(Noah::Ephemeral) ? (assert valid_path?, error) : (assert false, "Validation not applicable")
+      end
+
+      private
+      def valid_path?
+        PROTECTED_PATHS.member?(self.path.split("/")[1]) ? (return false) : (return true)
+      rescue ArgumentError
+        return false
+      end
+
+  end
+end

data/lib/noah/version.rb

@@ -1,3 +1,3 @@
 module Noah
-  VERSION = "0.2.1"
+  VERSION = "0.3"
 end

data/lib/noah/watcher_routes.rb

@@ -1,11 +1,11 @@
 class Noah::App
 
-  get '/w/:name' do |name|
+  get '/watches/:name' do |name|
     w = Noah::Watcher.find_by_name(name)
     w.nil? ? (halt 404) : w.to_json
   end
 
-  get '/w/?' do
+  get '/watches/?' do
     w = Noah::Watcher.all.sort_by(:pattern)
     if w.size == 0
       halt 404
@@ -14,7 +14,7 @@ class Noah::App
     end 
   end
 
-  put '/w/?' do
+  put '/watches/?' 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")
@@ -28,7 +28,7 @@ class Noah::App
     end
   end
 
-  delete '/w/?' do
+  delete '/watches/?' 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")

data/noah.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   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", ["= 1.2.0"])
   s.add_dependency("ohm", ["= 0.1.3"])
   s.add_dependency("ohm-contrib", ["= 0.1.1"])
   s.add_dependency("haml", ["= 3.0.25"])

data/spec/ephemeral_spec.rb

@@ -42,6 +42,12 @@ describe "Using the Ephemeral Model", :reset_redis => true do
       @good_ephemeral.delete
       Noah::Ephemeral[@good_ephemeral.id].should == nil
     end
+    it "should allow reserved keywords as subpaths" do
+      Noah::PROTECTED_PATHS.each do |path|
+        e = Noah::Ephemeral.new :path => "/this/should/be/#{path}"
+        e.valid?.should == true
+      end
+    end
   end
   describe "should not" do
     it "create a new Noah::Ephemeral with missing path" do
@@ -55,5 +61,12 @@ describe "Using the Ephemeral Model", :reset_redis => true do
       f.valid?.should == false
       f.errors.should == [[:path, :not_unique]]
     end
+    it "allow a reserved keyword as a path" do
+      Noah::PROTECTED_PATHS.each do |path|
+        e = Noah::Ephemeral.new :path => "/#{path}"
+        e.valid?.should == false
+        e.errors.should == [[:path, :reserved_path]]
+      end
+    end
   end
 end

data/spec/noahapp_application_spec.rb

@@ -11,13 +11,13 @@ describe "Using the Application API", :reset_redis => false do
 
     describe "GET" do
       it "all applications should work" do
-        get '/a'
+        get '/applications'
         last_response.should be_ok
         response = last_response.should return_json
         response.is_a?(Array).should == true
       end
       it "named application should work" do
-        get '/a/rspec_sample_app'
+        get '/applications/rspec_sample_app'
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -30,7 +30,7 @@ describe "Using the Application API", :reset_redis => false do
         c["format"].should == @c.format
       end
       it "named configuration for application should work" do
-        get "/a/#{@a.name}/#{@c.name}"
+        get "/applications/#{@a.name}/#{@c.name}"
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -41,11 +41,11 @@ describe "Using the Application API", :reset_redis => false do
         response["application"].should == @a.name
       end
       it "invalid application should not work" do
-        get "/a/should_not_exist"
+        get "/applications/should_not_exist"
         last_response.should be_missing
       end  
       it "invalid configuration for application should not work" do
-        get "/a/should_not_exist/should_not_exist"
+        get "/applications/should_not_exist/should_not_exist"
         last_response.should be_missing
       end
     end
@@ -55,7 +55,7 @@ describe "Using the Application API", :reset_redis => false do
         @appdata = {:name => "should_now_exist"}
       end  
       it "new application should work" do
-        put "/a/#{@appdata[:name]}", @appdata.to_json, "CONTENT_TYPE" => "application/json"
+        put "/applications/#{@appdata[:name]}", @appdata.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -66,13 +66,13 @@ describe "Using the Application API", :reset_redis => false do
         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"
+        put "/applications/should_not_work", '{"foo":"bar"}', "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end
       it "existing application should work" do
         sleep 3
 
-        put "/a/#{@appdata[:name]}", @appdata.to_json, "CONTENT_TYPE" => "application/json"
+        put "/applications/#{@appdata[:name]}", @appdata.to_json, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -89,7 +89,7 @@ describe "Using the Application API", :reset_redis => false do
         @appdata = {:name => "should_now_exist"}
       end  
       it "existing application should work" do
-        delete "/a/#{@appdata[:name]}"
+        delete "/applications/#{@appdata[:name]}"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -99,7 +99,7 @@ describe "Using the Application API", :reset_redis => false do
         response["configurations"].should == "0"
       end
       it "invalid application should not work" do
-        delete "/a/should_not_work"
+        delete "/applications/should_not_work"
         last_response.should be_missing
       end
     end

data/spec/noahapp_configuration_spec.rb

@@ -5,12 +5,12 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
 
     describe "GET" do
       it "all configurations should work" do
-        get '/c'
+        get '/configurations'
         last_response.should be_ok
         last_response.should return_json
       end
       it "named application should work" do
-        get '/c/noah'
+        get '/configurations/noah'
         last_response.should be_ok
         response = last_response.should return_json
 
@@ -21,14 +21,14 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
         response.first["application"].should == "noah"
       end
       it "named configuration for application should work" do
-        get '/c/noah/redis'
+        get '/configurations/noah/redis'
         last_response.should be_ok
         response = last_response.body
         response.should == "redis://127.0.0.1:6379/0"
       end
       it "named configuration should work with mime-type" do
         require 'yaml'
-        get '/c/myrailsapp1/database.yml'
+        get '/configurations/myrailsapp1/database.yml'
         last_response.should be_ok
         last_response.headers["Content-Type"].should == "text/x-yaml;charset=utf-8"
         response = YAML.load(last_response.body)
@@ -38,11 +38,11 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
         response["development"].values.sort.should == ["dev_password", "dev_user", "development_database", "mysql"]
       end
       it "invalid application should not work" do
-        get '/c/badapp'
+        get '/configurations/badapp'
         last_response.should be_missing
       end  
       it "invalid configuration for application should not work" do
-        get '/c/badapp/badconfig'
+        get '/configurations/badapp/badconfig'
         last_response.should be_missing
       end  
     end
@@ -50,7 +50,7 @@ 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 '/c/newapp/newconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/newapp/newconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -62,7 +62,7 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
       it "existing configuration should work" do
         config_data = {:format => "string", :body => "sample_config_entry"}.to_json
         sleep 3
-        put '/c/newapp/newconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/newapp/newconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -73,12 +73,12 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
       end
       it "new configuration with missing format should not work" do
         config_data = {:body => "a string"}.to_json
-        put '/c/newnewapp/someconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/newnewapp/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 '/c/newnewapp/someconfig', config_data, "CONTENT_TYPE" => "application/json"
+        put '/configurations/newnewapp/someconfig', config_data, "CONTENT_TYPE" => "application/json"
         last_response.should be_invalid
       end  
     end
@@ -93,7 +93,7 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
       end
 
       it "existing configuration should work" do
-        delete "/c/#{@a.name}/#{@c.name}"
+        delete "/configurations/#{@a.name}/#{@c.name}"
         last_response.should be_ok
         response = last_response.should return_json
         response["result"].should == "success"
@@ -103,7 +103,7 @@ describe "Using the Configuration API", :reset_redis => false, :populate_sample_
         response["item"].should == @c.name
       end
       it "invalid configuration should not work" do
-        delete "/c/#{@a.name}/#{@c.name}"
+        delete "/configurations/#{@a.name}/#{@c.name}"
         last_response.should be_missing
       end
     end

data/spec/noahapp_ephemeral_spec.rb

@@ -87,6 +87,21 @@ describe "Using the Ephemeral API", :reset_redis => true do
         last_response.should be_ok
         last_response.body.should == 'a new value'
       end
+      it "ephemeral with reserved word in subpath should work" do
+        Noah::PROTECTED_PATHS.each do |path|
+        put "/e/a/valid/path/with/#{path}"
+          last_response.should be_ok
+        end
+      end
+      it "ephemeral with reserved word as path should not work" do
+        Noah::PROTECTED_PATHS.each do |path|
+          put "/e/#{path}/other/stuff"
+          last_response.should_not be_ok
+          response = last_response.should return_json
+          response['error_message'].should == 'Path is reserved'
+          response['result'].should == 'failure'
+        end
+      end
     end
 
     describe "DELETE" do