sanford 0.15.0 → 0.15.1

data/lib/sanford/server.rb

@@ -79,7 +79,7 @@ module Sanford
       end
 
       def listen(*args)
-        args = [ @server_data.ip, @server_data.port ] if args.empty?
+        args = [@server_data.ip, @server_data.port] if args.empty?
         @dat_tcp_server.listen(*args) do |server_socket|
           configure_tcp_server(server_socket)
         end
@@ -274,7 +274,7 @@ module Sanford
       include NsOptions::Proxy
 
       option :name,     String,  :required => true
-      option :ip,       String,  :required => true
+      option :ip,       String,  :required => true, :default => '0.0.0.0'
       option :port,     Integer, :required => true
       option :pid_file, Pathname
 
@@ -291,8 +291,6 @@ module Sanford
 
       def initialize(values = nil)
         super(values)
-        self.ip   = !(v = ENV['SANFORD_IP'].to_s).empty?   ? v : '0.0.0.0'
-        self.port = !(v = ENV['SANFORD_PORT'].to_s).empty? ? v : nil
         @init_procs, @error_procs = [], []
         @worker_start_procs, @worker_shutdown_procs = [], []
         @worker_sleep_procs, @worker_wakeup_procs   = [], []

data/lib/sanford/server_data.rb

@@ -20,8 +20,8 @@ module Sanford
     def initialize(args = nil)
       args ||= {}
       @name     = args[:name]
-      @ip       = args[:ip]
-      @port     = args[:port]
+      @ip       = !(v = ENV['SANFORD_IP'].to_s).empty?   ? v      : args[:ip]
+      @port     = !(v = ENV['SANFORD_PORT'].to_s).empty? ? v.to_i : args[:port]
       @pid_file = args[:pid_file]
 
       @receives_keep_alive = !!args[:receives_keep_alive]

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.15.0"
+  VERSION = "0.15.1"
 end

data/test/support/factory.rb

@@ -7,7 +7,8 @@ module Factory
     klass ||= StandardError
     message ||= Factory.text
     exception = nil
-    begin; raise(klass, message); rescue StandardError => exception; end
+    begin; raise(klass, message); rescue klass => exception; end
+    exception.set_backtrace(nil) if Factory.boolean
     exception
   end
 

data/test/system/server_tests.rb

@@ -23,21 +23,28 @@ module Sanford::Server
       # results
       @current_sanford_debug = ENV['SANFORD_DEBUG']
       ENV.delete('SANFORD_DEBUG')
+    end
+    teardown do
+      ENV['SANFORD_DEBUG'] = @current_sanford_debug
+      ENV['SANFORD_PROTOCOL_DEBUG'] = @current_sanford_protocol_debug
+    end
+
+  end
 
+  class RunningAppServerTests < SystemTests
+    setup do
       @server = AppServer.new
       @client = TestClient.new(AppServer.ip, AppServer.port)
       @server_runner = ServerRunner.new(@server).tap(&:start)
     end
     teardown do
       @server_runner.stop
-      ENV['SANFORD_DEBUG'] = @current_sanford_debug
-      ENV['SANFORD_PROTOCOL_DEBUG'] = @current_sanford_protocol_debug
     end
     subject{ @response }
 
   end
 
-  class SuccessTests < SystemTests
+  class SuccessTests < RunningAppServerTests
     desc "calling a service"
     setup do
       @message = Factory.string
@@ -53,7 +60,7 @@ module Sanford::Server
 
   end
 
-  class BadProtocolVersionTests < SystemTests
+  class BadProtocolVersionTests < RunningAppServerTests
     desc "calling a server with an invalid protocol version"
     setup do
       @client.bytes = "\000"
@@ -68,7 +75,7 @@ module Sanford::Server
 
   end
 
-  class BadMessageTests < SystemTests
+  class BadMessageTests < RunningAppServerTests
     desc "calling a server with an invalid message size"
     setup do
       @client.bytes = [ Sanford::Protocol.msg_version, "\000" ].join
@@ -83,7 +90,7 @@ module Sanford::Server
 
   end
 
-  class BadBodyTests < SystemTests
+  class BadBodyTests < RunningAppServerTests
     desc "calling a server with an invalid message body"
     setup do
       # these are a special set of bytes that cause BSON to throw an exception
@@ -99,7 +106,7 @@ module Sanford::Server
 
   end
 
-  class NotFoundTests < SystemTests
+  class NotFoundTests < RunningAppServerTests
     desc "with a request for a service the server doesn't provide"
     setup do
       @client.set_request('doesnt_exist')
@@ -114,7 +121,7 @@ module Sanford::Server
 
   end
 
-  class ServerErrorTests < SystemTests
+  class ServerErrorTests < RunningAppServerTests
     desc "with a request that causes a server error"
     setup do
       @client.set_request('raise')
@@ -129,7 +136,7 @@ module Sanford::Server
 
   end
 
-  class BadRequestTests < SystemTests
+  class BadRequestTests < RunningAppServerTests
     desc "calling a server with an invalid request"
     setup do
       @client.set_msg_body({})
@@ -144,7 +151,7 @@ module Sanford::Server
 
   end
 
-  class BadResponseTests < SystemTests
+  class BadResponseTests < RunningAppServerTests
     desc "calling a service that builds an invalid response"
     setup do
       @client.set_request('bad_response')
@@ -159,7 +166,7 @@ module Sanford::Server
 
   end
 
-  class TemplateTests < SystemTests
+  class TemplateTests < RunningAppServerTests
     desc "calling a service that renders a template"
     setup do
       @message = Factory.text
@@ -175,7 +182,7 @@ module Sanford::Server
 
   end
 
-  class KeepAliveTests < SystemTests
+  class KeepAliveTests < RunningAppServerTests
     desc "receiving a keep-alive connection"
     setup do
       # no bytes means our client won't write any, this mimics a keep-alive
@@ -190,7 +197,7 @@ module Sanford::Server
 
   end
 
-  class TimeoutErrorTests < SystemTests
+  class TimeoutErrorTests < RunningAppServerTests
     desc "with a client that connects but doesn't send anything"
     setup do
       @current_sanford_timeout = ENV['SANFORD_TIMEOUT']
@@ -215,7 +222,7 @@ module Sanford::Server
 
   end
 
-  class HaltTests < SystemTests
+  class HaltTests < RunningAppServerTests
 
     should "allow halting in a before callback" do
       @client.set_request('halt', :when => 'before')
@@ -291,7 +298,7 @@ module Sanford::Server
 
   end
 
-  class ErrorHandlerResponseTests < SystemTests
+  class ErrorHandlerResponseTests < RunningAppServerTests
     desc "calling a service that triggers an error handler"
     setup do
       @client.set_request('custom_error')
@@ -308,6 +315,33 @@ module Sanford::Server
 
   end
 
+  class WithEnvIpAndPortTests < SystemTests
+    desc "with an env var ip and port"
+    setup do
+      # get our current ip address, need something different than 0.0.0.0 and
+      # 127.0.0.1 to bind to
+      ENV['SANFORD_IP']   = IPSocket.getaddress(Socket.gethostname)
+      ENV['SANFORD_PORT'] = (AppServer.port + 1).to_s
+
+      @server = AppServer.new
+      @client = TestClient.new(ENV['SANFORD_IP'], ENV['SANFORD_PORT'])
+      @server_runner = ServerRunner.new(@server).tap(&:start)
+    end
+    teardown do
+      @server_runner.stop
+      ENV.delete('SANFORD_IP')
+      ENV.delete('SANFORD_PORT')
+    end
+
+    should "run the server on the env var ip and port" do
+      @client.set_request('echo', :message => Factory.string)
+      response = nil
+      assert_nothing_raised{ response = @client.call }
+      assert_equal 200, response.code
+    end
+
+  end
+
   class TestClient
     attr_accessor :delay, :bytes
 

data/test/unit/process_tests.rb

@@ -223,23 +223,6 @@ class Sanford::Process
 
   end
 
-  class RunWithIPAndPortTests < RunSetupTests
-    desc "with a custom IP and port is run"
-    setup do
-      ENV['SANFORD_IP'] = Factory.string
-      ENV['SANFORD_PORT'] = Factory.integer.to_s
-      @process = @process_class.new(@server_spy)
-      @process.run
-    end
-
-    should "have used the custom IP and port when listening" do
-      assert_true @server_spy.listen_called
-      expected = [ @process.server_ip, @process.server_port ]
-      assert_equal expected, @server_spy.listen_args
-    end
-
-  end
-
   class RunWithServerFDTests < RunSetupTests
     desc "with a server file descriptor is run"
     setup do

data/test/unit/server_data_tests.rb

@@ -8,46 +8,35 @@ class Sanford::ServerData
   class UnitTests < Assert::Context
     desc "Sanford::ServerData"
     setup do
-      @name     = Factory.string
-      @ip       = Factory.string
-      @port     = Factory.integer
-      @pid_file = Factory.file_path
-
-      @receives_keep_alive = Factory.boolean
-
-      @verbose_logging = Factory.boolean
-      @logger          = Factory.string
-      @template_source = Factory.string
-
-      @init_procs  = Factory.integer(3).times.map{ proc{} }
-      @error_procs = Factory.integer(3).times.map{ proc{} }
-
-      @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{} }
-
-      @router = Factory.string
-      @route  = Sanford::Route.new(Factory.string, TestHandler.to_s).tap(&:validate!)
-
-      @server_data = Sanford::ServerData.new({
-        :name                  => @name,
-        :ip                    => @ip,
-        :port                  => @port,
-        :pid_file              => @pid_file,
-        :receives_keep_alive   => @receives_keep_alive,
-        :verbose_logging       => @verbose_logging,
-        :logger                => @logger,
-        :template_source       => @template_source,
-        :init_procs            => @init_procs,
-        :error_procs           => @error_procs,
-        :worker_start_procs    => @start_procs,
-        :worker_shutdown_procs => @shutdown_procs,
-        :worker_sleep_procs    => @sleep_procs,
-        :worker_wakeup_procs   => @wakeup_procs,
-        :router                => @router,
+      @orig_ip_env_var   = ENV['SANFORD_IP']
+      @orig_port_env_var = ENV['SANFORD_PORT']
+      ENV.delete('SANFORD_IP')
+      ENV.delete('SANFORD_PORT')
+
+      @route = Sanford::Route.new(Factory.string, TestHandler.to_s).tap(&:validate!)
+      @config_hash = {
+        :name                  => Factory.string,
+        :ip                    => Factory.string,
+        :port                  => Factory.integer,
+        :pid_file              => Factory.file_path,
+        :receives_keep_alive   => Factory.boolean,
+        :verbose_logging       => Factory.boolean,
+        :logger                => Factory.string,
+        :template_source       => Factory.string,
+        :init_procs            => Factory.integer(3).times.map{ proc{} },
+        :error_procs           => Factory.integer(3).times.map{ proc{} },
+        :worker_start_procs    => Factory.integer(3).times.map{ proc{} },
+        :worker_shutdown_procs => Factory.integer(3).times.map{ proc{} },
+        :worker_sleep_procs    => Factory.integer(3).times.map{ proc{} },
+        :worker_wakeup_procs   => Factory.integer(3).times.map{ proc{} },
+        :router                => Factory.string,
         :routes                => [@route]
-      })
+      }
+      @server_data = Sanford::ServerData.new(@config_hash)
+    end
+    teardown do
+      ENV['SANFORD_IP']   = @orig_ip_env_var
+      ENV['SANFORD_PORT'] = @orig_port_env_var
     end
     subject{ @server_data }
 
@@ -62,26 +51,41 @@ class Sanford::ServerData
     should have_accessors :ip, :port
 
     should "know its attributes" do
-      assert_equal @name,     subject.name
-      assert_equal @ip,       subject.ip
-      assert_equal @port,     subject.port
-      assert_equal @pid_file, subject.pid_file
+      h = @config_hash
+      assert_equal h[:name],     subject.name
+      assert_equal h[:ip],       subject.ip
+      assert_equal h[:port],     subject.port
+      assert_equal h[:pid_file], subject.pid_file
+
+      assert_equal h[:receives_keep_alive], subject.receives_keep_alive
 
-      assert_equal @receives_keep_alive, subject.receives_keep_alive
+      assert_equal h[:verbose_logging], subject.verbose_logging
+      assert_equal h[:logger],          subject.logger
+      assert_equal h[:template_source], subject.template_source
 
-      assert_equal @verbose_logging, subject.verbose_logging
-      assert_equal @logger,          subject.logger
-      assert_equal @template_source, subject.template_source
+      assert_equal h[:init_procs],  subject.init_procs
+      assert_equal h[:error_procs], subject.error_procs
 
-      assert_equal @init_procs,  subject.init_procs
-      assert_equal @error_procs, subject.error_procs
+      assert_equal h[:worker_start_procs],    subject.worker_start_procs
+      assert_equal h[:worker_shutdown_procs], subject.worker_shutdown_procs
+      assert_equal h[:worker_sleep_procs],    subject.worker_sleep_procs
+      assert_equal h[:worker_wakeup_procs],   subject.worker_wakeup_procs
 
-      assert_equal @start_procs,    subject.worker_start_procs
-      assert_equal @shutdown_procs, subject.worker_shutdown_procs
-      assert_equal @sleep_procs,    subject.worker_sleep_procs
-      assert_equal @wakeup_procs,   subject.worker_wakeup_procs
+      assert_equal h[:router], subject.router
+    end
 
-      assert_equal @router, subject.router
+    should "use ip and port env vars if they are set" do
+      ENV['SANFORD_IP']   = Factory.string
+      ENV['SANFORD_PORT'] = Factory.integer.to_s
+      server_data = Sanford::ServerData.new(@config_hash)
+      assert_equal ENV['SANFORD_IP'],        server_data.ip
+      assert_equal ENV['SANFORD_PORT'].to_i, server_data.port
+
+      ENV['SANFORD_IP']   = ""
+      ENV['SANFORD_PORT'] = ""
+      server_data = Sanford::ServerData.new(@config_hash)
+      assert_equal @config_hash[:ip],   server_data.ip
+      assert_equal @config_hash[:port], server_data.port
     end
 
     should "build a routes lookup hash" do

data/test/unit/server_tests.rb

@@ -439,21 +439,12 @@ 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.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
@@ -497,15 +488,6 @@ module Sanford::Server
       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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 15
-  - 0
-  version: 0.15.0
+  - 1
+  version: 0.15.1
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-09-10 00:00:00 Z
+date: 2015-11-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement