sanford 0.14.0 → 0.15.0

data/test/unit/server_tests.rb

@@ -23,6 +23,8 @@ module Sanford::Server
     should have_imeths :receives_keep_alive
     should have_imeths :verbose_logging, :logger
     should have_imeths :init, :error
+    should have_imeths :on_worker_start, :on_worker_shutdown
+    should have_imeths :on_worker_sleep, :on_worker_wakeup
     should have_imeths :router, :template_source
 
     should "know its configuration" do
@@ -93,6 +95,22 @@ module Sanford::Server
       assert_includes new_error_proc, subject.configuration.error_procs
     end
 
+    should "allow reading/writing its configuration worker procs" do
+      p = proc{}
+
+      subject.on_worker_start(&p)
+      assert_equal [p], subject.configuration.worker_start_procs
+
+      subject.on_worker_shutdown(&p)
+      assert_equal [p], subject.configuration.worker_shutdown_procs
+
+      subject.on_worker_sleep(&p)
+      assert_equal [p], subject.configuration.worker_sleep_procs
+
+      subject.on_worker_wakeup(&p)
+      assert_equal [p], subject.configuration.worker_wakeup_procs
+    end
+
     should "allow reading/writing its configuration router" do
       new_router = Factory.string
       subject.router(new_router)
@@ -124,13 +142,26 @@ module Sanford::Server
       @server_class.name Factory.string
       @server_class.ip Factory.string
       @server_class.port Factory.integer
-      @server_class.error{ Factory.string }
+
+      @error_procs = Factory.integer(3).times.map{ proc{} }
+      @error_procs.each{ |p| @server_class.error(&p) }
+
+      @start_procs    = Factory.integer(3).times.map{ proc{} }
+      @shutdown_procs = Factory.integer(3).times.map{ proc{} }
+      @sleep_procs    = Factory.integer(3).times.map{ proc{} }
+      @wakeup_procs   = Factory.integer(3).times.map{ proc{} }
+      @start_procs.each    { |p| @server_class.on_worker_start(&p) }
+      @shutdown_procs.each { |p| @server_class.on_worker_shutdown(&p) }
+      @sleep_procs.each    { |p| @server_class.on_worker_sleep(&p) }
+      @wakeup_procs.each   { |p| @server_class.on_worker_wakeup(&p) }
+
       @server_class.router do
         service Factory.string, TestHandler.to_s
       end
 
-      @dat_tcp_server_spy = DatTCP::ServerSpy.new
+      @dat_tcp_server_spy = nil
       Assert.stub(DatTCP::Server, :new) do |&block|
+        @dat_tcp_server_spy = DatTCP::ServerSpy.new
         @dat_tcp_server_spy.serve_proc = block
         @dat_tcp_server_spy
       end
@@ -156,22 +187,34 @@ module Sanford::Server
       sd = subject.server_data
 
       assert_instance_of Sanford::ServerData, sd
-      assert_equal configuration.name, sd.name
-      assert_equal configuration.ip, sd.ip
-      assert_equal configuration.port, sd.port
-      assert_equal configuration.verbose_logging, sd.verbose_logging
-      assert_equal configuration.receives_keep_alive, sd.receives_keep_alive
-      assert_equal configuration.error_procs, sd.error_procs
-      assert_equal configuration.routes, sd.routes.values
+      assert_equal configuration.name,                  sd.name
+      assert_equal configuration.ip,                    sd.ip
+      assert_equal configuration.port,                  sd.port
+      assert_equal configuration.verbose_logging,       sd.verbose_logging
+      assert_equal configuration.receives_keep_alive,   sd.receives_keep_alive
+      assert_equal configuration.error_procs,           sd.error_procs
+      assert_equal configuration.worker_start_procs,    sd.worker_start_procs
+      assert_equal configuration.worker_shutdown_procs, sd.worker_shutdown_procs
+      assert_equal configuration.worker_sleep_procs,    sd.worker_sleep_procs
+      assert_equal configuration.worker_wakeup_procs,   sd.worker_wakeup_procs
+      assert_equal configuration.routes,                sd.routes.values
+
       assert_instance_of configuration.logger.class, sd.logger
     end
 
     should "know its dat tcp server" do
-      assert_equal @dat_tcp_server_spy, subject.dat_tcp_server
+      assert_not_nil @dat_tcp_server_spy
       assert_not_nil @dat_tcp_server_spy.serve_proc
+
+      assert_equal @start_procs,    @dat_tcp_server_spy.worker_start_procs
+      assert_equal @shutdown_procs, @dat_tcp_server_spy.worker_shutdown_procs
+      assert_equal @sleep_procs,    @dat_tcp_server_spy.worker_sleep_procs
+      assert_equal @wakeup_procs,   @dat_tcp_server_spy.worker_wakeup_procs
+
+      assert_equal @dat_tcp_server_spy, subject.dat_tcp_server
     end
 
-    should "know its name, pid file" do
+    should "demeter its server data" do
       assert_equal subject.server_data.name, subject.name
       assert_equal subject.server_data.ip, subject.configured_ip
       assert_equal subject.server_data.port, subject.configured_port
@@ -195,6 +238,16 @@ module Sanford::Server
       assert_equal subject.server_data.port, @dat_tcp_server_spy.port
     end
 
+    should "write its ip and port back to its server data" do
+      ip   = Factory.string
+      port = Factory.integer
+      assert_not_equal ip,   subject.server_data.ip
+      assert_not_equal port, subject.server_data.port
+      subject.listen(ip, port)
+      assert_equal ip,   subject.server_data.ip
+      assert_equal port, subject.server_data.port
+    end
+
     should "pass any args to its dat tcp server using `listen`" do
       ip, port = Factory.string, Factory.integer
       subject.listen(ip, port)
@@ -386,12 +439,21 @@ module Sanford::Server
 
     desc "Configuration"
     setup do
+      @orig_ip_env_var   = ENV['SANFORD_IP']
+      @orig_port_env_var = ENV['SANFORD_PORT']
+      ENV.delete('SANFORD_IP')
+      ENV.delete('SANFORD_PORT')
+
       @configuration = Configuration.new.tap do |c|
         c.name Factory.string
-        c.ip Factory.string
+        c.ip   Factory.string
         c.port Factory.integer
       end
     end
+    teardown do
+      ENV['SANFORD_IP']   = @orig_ip_env_var
+      ENV['SANFORD_PORT'] = @orig_port_env_var
+    end
     subject{ @configuration }
 
     should have_options :name, :ip, :port, :pid_file
@@ -400,6 +462,8 @@ module Sanford::Server
     should have_options :template_source
     should have_accessors :init_procs, :error_procs
     should have_accessors :router
+    should have_readers :worker_start_procs, :worker_shutdown_procs
+    should have_readers :worker_sleep_procs, :worker_wakeup_procs
     should have_imeths :routes
     should have_imeths :to_hash
     should have_imeths :valid?, :validate!
@@ -424,10 +488,24 @@ module Sanford::Server
       assert_equal [], config.init_procs
       assert_equal [], config.error_procs
 
+      assert_equal [], subject.worker_start_procs
+      assert_equal [], subject.worker_shutdown_procs
+      assert_equal [], subject.worker_sleep_procs
+      assert_equal [], subject.worker_wakeup_procs
+
       assert_instance_of Sanford::Router, config.router
       assert_empty config.router.routes
     end
 
+    should "use env vars for its options if they are set" do
+      ENV['SANFORD_IP']   = Factory.string
+      ENV['SANFORD_PORT'] = Factory.integer.to_s
+
+      config = Configuration.new
+      assert_equal ENV['SANFORD_IP'],        config.ip
+      assert_equal ENV['SANFORD_PORT'].to_i, config.port
+    end
+
     should "not be valid by default" do
       assert_false subject.valid?
     end
@@ -438,12 +516,16 @@ module Sanford::Server
       assert_equal subject.router.routes, subject.routes
     end
 
-    should "include its init/error procs and router/routes in its `to_hash`" do
+    should "include its procs and router/routes in its `to_hash`" do
       config_hash = subject.to_hash
-      assert_equal subject.init_procs, config_hash[:init_procs]
-      assert_equal subject.error_procs, config_hash[:error_procs]
-      assert_equal subject.router, config_hash[:router]
-      assert_equal subject.routes, config_hash[:routes]
+      assert_equal subject.init_procs,            config_hash[:init_procs]
+      assert_equal subject.error_procs,           config_hash[:error_procs]
+      assert_equal subject.worker_start_procs,    config_hash[:worker_start_procs]
+      assert_equal subject.worker_shutdown_procs, config_hash[:worker_shutdown_procs]
+      assert_equal subject.worker_sleep_procs,    config_hash[:worker_sleep_procs]
+      assert_equal subject.worker_wakeup_procs,   config_hash[:worker_wakeup_procs]
+      assert_equal subject.router,                config_hash[:router]
+      assert_equal subject.routes,                config_hash[:routes]
     end
 
     should "call its init procs when validated" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 35
   prerelease: 
   segments: 
   - 0
-  - 14
+  - 15
   - 0
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-06-22 00:00:00 Z
+date: 2015-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -24,11 +24,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 7
+        version: "0.7"
   type: :runtime
   name: dat-tcp
   version_requirements: *id001
@@ -69,11 +69,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 2
-        - 14
-        version: "2.14"
+        - 15
+        version: "2.15"
   type: :development
   name: assert
   version_requirements: *id004