sanford 0.10.1 → 0.11.0

data/test/unit/test_runner_tests.rb

@@ -0,0 +1,206 @@
+require 'assert'
+require 'sanford/test_runner'
+
+class Sanford::TestRunner
+
+  class UnitTests < Assert::Context
+    desc "Sanford::TestRunner"
+    setup do
+      @handler_class = TestServiceHandler
+      @request = Sanford::Protocol::Request.new(Factory.string, {})
+      @params = { :something => Factory.string }
+      @logger = Factory.string
+      @template_source = Factory.string
+      @handler_flag = Factory.boolean
+
+      @runner_class = Sanford::TestRunner
+    end
+    subject{ @runner_class }
+
+    should "be a runner" do
+      assert_true subject < Sanford::Runner
+    end
+
+  end
+
+  class InitTests < UnitTests
+    desc "when init"
+    setup do
+      @args = {
+        :request => @request,
+        :params => @params,
+        :logger => @logger,
+        :template_source => @template_source,
+        :flag => @handler_flag
+      }
+      @runner = @runner_class.new(@handler_class, @args)
+    end
+    subject{ @runner }
+
+    should have_readers :response
+    should have_imeths :run
+
+    should "know its attributes" do
+      assert_equal @request, subject.request
+      assert_equal @params, subject.params
+      assert_equal @logger, subject.logger
+      assert_equal @template_source, subject.template_source
+    end
+
+    should "write extra args to its service handler" do
+      assert_equal @handler_flag, subject.handler.flag
+    end
+
+    should "not alter the args passed to it" do
+      assert_equal @request, @args[:request]
+      assert_equal @params, @args[:params]
+      assert_equal @logger, @args[:logger]
+      assert_equal @template_source, @args[:template_source]
+      assert_equal @handler_flag, @args[:flag]
+    end
+
+    should "default its request, logger, params and template source" do
+      test_runner = @runner_class.new(@handler_class)
+      assert_nil test_runner.request
+      assert_equal({}, test_runner.params)
+      assert_instance_of Sanford::NullLogger, test_runner.logger
+      assert_instance_of Sanford::NullTemplateSource, test_runner.template_source
+    end
+
+    should "not have called its service handlers before callbacks" do
+      assert_nil subject.handler.before_called
+    end
+
+    should "have called init on its service handler" do
+      assert_true subject.handler.init_called
+    end
+
+    should "not have a response by default" do
+      assert_nil subject.response
+    end
+
+    should "raise an invalid error when not passed a service handler" do
+      assert_raises(Sanford::InvalidServiceHandlerError) do
+        @runner_class.new(Class.new)
+      end
+    end
+
+  end
+
+  class RunTests < InitTests
+    desc "and run"
+    setup do
+      @response = @runner.run
+    end
+    subject{ @response }
+
+    should "know its response" do
+      assert_equal subject, @runner.response
+      assert_instance_of Sanford::Protocol::Response, subject
+    end
+
+    should "have called run on its service handler" do
+      assert_true @runner.handler.run_called
+    end
+
+    should "not have called its service handlers after callbacks" do
+      assert_nil @runner.handler.after_called
+    end
+
+  end
+
+  class RunWithInvalidResponseTests < InitTests
+    desc "and run with an invalid response"
+    setup do
+      @runner.handler.response = Class.new
+    end
+
+    should "raise a serialization error" do
+      assert_raises(BSON::InvalidDocument){ subject.run }
+    end
+
+  end
+
+  class InitThatHaltsTests < UnitTests
+    desc "when init with a handler that halts in its init"
+    setup do
+      @runner = @runner_class.new(HaltServiceHandler)
+    end
+    subject{ @runner }
+
+    should "know the response from the init halting" do
+      assert_instance_of Sanford::Protocol::Response, subject.response
+      assert_equal subject.handler.response_code, subject.response.code
+    end
+
+  end
+
+  class RunWithInitThatHaltsTests < InitThatHaltsTests
+    desc "is run"
+    setup do
+      @response = @runner.run
+    end
+    subject{ @response }
+
+    should "not call run on the service handler" do
+      assert_false @runner.handler.run_called
+    end
+
+    should "return the response from the init halting" do
+      assert_instance_of Sanford::Protocol::Response, subject
+      assert_equal @runner.handler.response_code, subject.code
+    end
+
+  end
+
+  class RunWithInvalidResponseFromInitHaltTests < UnitTests
+    desc "when init with a handler that halts in its init an invalid response"
+
+    should "raise a serialization error" do
+      assert_raises(BSON::InvalidDocument) do
+        @runner_class.new(HaltServiceHandler, :response_data => Class.new)
+      end
+    end
+
+  end
+
+  class TestServiceHandler
+    include Sanford::ServiceHandler
+
+    attr_reader :before_called, :after_called
+    attr_reader :init_called, :run_called
+    attr_accessor :flag, :response
+
+    before{ @before_called = true }
+    after{ @after_called = true }
+
+    def init!
+      @init_called = true
+      @run_called = false
+    end
+
+    def run!
+      @run_called = true
+      @response || Factory.boolean
+    end
+  end
+
+  class HaltServiceHandler
+    include Sanford::ServiceHandler
+
+    attr_reader :run_called
+    attr_accessor :response_code, :response_data
+
+    def init!
+      @run_called = false
+      @response_code ||= Factory.integer
+      @response_data ||= Factory.string
+      halt(@response_code, :data => @response_data)
+    end
+
+    def run!
+      @run_called = true
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 1
-  version: 0.10.1
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-11 00:00:00 Z
+date: 2014-06-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -24,14 +24,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
-        - 4
-        version: "0.4"
+        - 5
+        version: "0.5"
+  version_requirements: *id001
   type: :runtime
   name: dat-tcp
-  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -44,9 +44,9 @@ dependencies:
         - 1
         - 1
         version: "1.1"
+  version_requirements: *id002
   type: :runtime
   name: ns-options
-  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -54,14 +54,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
-        - 8
-        version: "0.8"
+        - 9
+        version: "0.9"
+  version_requirements: *id003
   type: :runtime
   name: sanford-protocol
-  version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -69,29 +69,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 2
-        - 10
-        version: "2.10"
-  type: :development
-  name: assert
+        - 11
+        version: "2.11"
   version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
   type: :development
-  name: assert-mocha
-  version_requirements: *id005
+  name: assert
   prerelease: false
 description: Sanford TCP protocol server for hosting services
 email: 
@@ -110,57 +95,65 @@ files:
 - README.md
 - Rakefile
 - bench/client.rb
+- bench/config.sanford
+- bench/report.rb
 - bench/report.txt
-- bench/runner.rb
-- bench/services.rb
-- bench/tasks.rb
 - bin/sanford
 - lib/sanford.rb
 - lib/sanford/cli.rb
-- lib/sanford/config.rb
+- lib/sanford/config_file.rb
+- lib/sanford/connection_handler.rb
 - lib/sanford/error_handler.rb
-- lib/sanford/host.rb
-- lib/sanford/host_data.rb
-- lib/sanford/hosts.rb
 - lib/sanford/logger.rb
-- lib/sanford/manager.rb
+- lib/sanford/pid_file.rb
+- lib/sanford/process.rb
+- lib/sanford/process_signal.rb
+- lib/sanford/route.rb
+- lib/sanford/router.rb
 - lib/sanford/runner.rb
 - lib/sanford/sanford_runner.rb
 - lib/sanford/server.rb
+- lib/sanford/server_data.rb
 - lib/sanford/service_handler.rb
 - lib/sanford/template_engine.rb
 - lib/sanford/template_source.rb
 - lib/sanford/test_helpers.rb
 - lib/sanford/test_runner.rb
 - lib/sanford/version.rb
-- lib/sanford/worker.rb
 - log/.gitkeep
 - sanford.gemspec
 - test/helper.rb
+- test/support/app_server.rb
+- test/support/config.sanford
+- test/support/config_invalid_run.sanford
+- test/support/config_no_run.sanford
 - test/support/factory.rb
-- test/support/fake_connection.rb
-- test/support/helpers.rb
-- test/support/service_handlers.rb
-- test/support/services.rb
-- test/support/simple_client.rb
+- test/support/fake_server_connection.rb
+- test/support/pid_file_spy.rb
+- test/support/template.erb
 - test/support/template.json
 - test/support/test_disallowed_template.rb
 - test/support/test_template.test
-- test/system/request_handling_tests.rb
-- test/unit/config_tests.rb
+- test/system/server_tests.rb
+- test/system/service_handler_tests.rb
+- test/unit/cli_tests.rb
+- test/unit/config_file_tests.rb
+- test/unit/connection_handler_tests.rb
 - test/unit/error_handler_tests.rb
-- test/unit/host_data_tests.rb
-- test/unit/host_tests.rb
-- test/unit/hosts_tests.rb
-- test/unit/manager_tests.rb
+- test/unit/pid_file_tests.rb
+- test/unit/process_signal_tests.rb
+- test/unit/process_tests.rb
+- test/unit/route_tests.rb
+- test/unit/router_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/sanford_runner_tests.rb
 - test/unit/sanford_tests.rb
+- test/unit/server_data_tests.rb
 - test/unit/server_tests.rb
 - test/unit/service_handler_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
-- test/unit/worker_tests.rb
+- test/unit/test_runner_tests.rb
 - tmp/.gitkeep
 homepage: https://github.com/redding/sanford
 licenses: 
@@ -191,33 +184,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Sanford TCP protocol server for hosting services
 test_files: 
 - test/helper.rb
+- test/support/app_server.rb
+- test/support/config.sanford
+- test/support/config_invalid_run.sanford
+- test/support/config_no_run.sanford
 - test/support/factory.rb
-- test/support/fake_connection.rb
-- test/support/helpers.rb
-- test/support/service_handlers.rb
-- test/support/services.rb
-- test/support/simple_client.rb
+- test/support/fake_server_connection.rb
+- test/support/pid_file_spy.rb
+- test/support/template.erb
 - test/support/template.json
 - test/support/test_disallowed_template.rb
 - test/support/test_template.test
-- test/system/request_handling_tests.rb
-- test/unit/config_tests.rb
+- test/system/server_tests.rb
+- test/system/service_handler_tests.rb
+- test/unit/cli_tests.rb
+- test/unit/config_file_tests.rb
+- test/unit/connection_handler_tests.rb
 - test/unit/error_handler_tests.rb
-- test/unit/host_data_tests.rb
-- test/unit/host_tests.rb
-- test/unit/hosts_tests.rb
-- test/unit/manager_tests.rb
+- test/unit/pid_file_tests.rb
+- test/unit/process_signal_tests.rb
+- test/unit/process_tests.rb
+- test/unit/route_tests.rb
+- test/unit/router_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/sanford_runner_tests.rb
 - test/unit/sanford_tests.rb
+- test/unit/server_data_tests.rb
 - test/unit/server_tests.rb
 - test/unit/service_handler_tests.rb
 - test/unit/template_engine_tests.rb
 - test/unit/template_source_tests.rb
-- test/unit/worker_tests.rb
+- test/unit/test_runner_tests.rb

data/bench/tasks.rb

@@ -1,41 +0,0 @@
-namespace :bench do
-
-  task :load do
-    require 'bench/runner'
-  end
-
-  namespace :server do
-
-    task :load do
-      ENV['SANFORD_SERVICES_FILE'] = 'bench/services'
-    end
-
-    desc "Run the bench server"
-    task :run => :load do
-      Kernel.exec("bundle exec sanford run")
-    end
-
-    desc "Start a daemonized bench server"
-    task :start => :load do
-      Kernel.system("bundle exec sanford start")
-    end
-
-    desc "Stop the bench server"
-    task :stop => :load do
-      Kernel.system("bundle exec sanford stop")
-    end
-
-  end
-
-  desc "Run a Benchmark report against the Benchmark server"
-  task :report => :load do
-    Bench::Runner.new.build_report
-  end
-
-  desc "Run Benchmark requests against the 'simple' service"
-  task :simple, [ :times ] => :load do |t, args|
-    runner = Bench::Runner.new(:output => '/dev/null')
-    runner.benchmark_service('v1', 'simple', {}, args[:times] || 1, true)
-  end
-
-end

data/lib/sanford/config.rb

@@ -1,28 +0,0 @@
-require 'ns-options'
-require 'pathname'
-require 'sanford/logger'
-require 'sanford/runner'
-require 'sanford/template_source'
-
-module Sanford
-
-  class Config
-    include NsOptions::Proxy
-
-    option :services_file,  Pathname, :default => proc{ ENV['SANFORD_SERVICES_FILE'] }
-    option :logger,                   :default => proc{ Sanford::NullLogger.new }
-
-    attr_reader :template_source
-
-    def initialize
-      super
-      @template_source = NullTemplateSource.new
-    end
-
-    def set_template_source(path, &block)
-      @template_source = TemplateSource.new(path).tap{ |s| block.call(s) if block }
-    end
-
-  end
-
-end

data/lib/sanford/host.rb

@@ -1,129 +0,0 @@
-require 'ns-options'
-require 'pathname'
-require 'singleton'
-
-require 'sanford/logger'
-
-module Sanford
-
-  module Host
-
-    class Configuration
-      include NsOptions::Proxy
-
-      # A Host's configuration is a seperate ns-options proxy class because
-      # `Host` is a module, so it itself cannot be a ns-options proxy (and
-      # still function as a mixin). Also, since it is making the `Host`
-      # a `Singleton`, mixing that with `NsOptions::Proxy` could have strange
-      # effects (messing up someone's `initialize`). Thus, the `Configuration`
-      # is a separate class and not on the `Host` directly.
-
-      option :name,                String
-      option :ip,                  String,  :default => '0.0.0.0'
-      option :port,                Integer
-      option :pid_file,            Pathname
-      option :logger,                       :default => proc{ Sanford.config.logger }
-      option :verbose_logging,              :default => true
-      option :receives_keep_alive,          :default => false
-      option :error_procs,         Array,   :default => []
-      option :init_procs,          Array,   :default => []
-
-      def initialize(host)
-        self.name = host.class.to_s
-      end
-
-    end
-
-    def self.included(host_class)
-      host_class.class_eval do
-        include Singleton
-        extend Sanford::Host::ClassMethods
-      end
-      Sanford.register(host_class)
-    end
-
-    attr_reader :configuration, :services
-
-    def initialize
-      @configuration = Configuration.new(self)
-      @service_handler_ns = nil
-      @services = {}
-    end
-
-    def name(*args)
-      self.configuration.name *args
-    end
-
-    def ip(*args)
-      self.configuration.ip *args
-    end
-
-    def port(*args)
-      self.configuration.port *args
-    end
-
-    def pid_file(*args)
-      self.configuration.pid_file *args
-    end
-
-    def logger(*args)
-      self.configuration.logger *args
-    end
-
-    def verbose_logging(*args)
-      self.configuration.verbose_logging *args
-    end
-
-    def receives_keep_alive(*args)
-      self.configuration.receives_keep_alive *args
-    end
-
-    def error(&block)
-      self.configuration.error_procs << block
-    end
-
-    def init(&block)
-      self.configuration.init_procs << block
-    end
-
-    def service_handler_ns(value = nil)
-      @service_handler_ns = value if value
-      @service_handler_ns
-    end
-
-    def service(service_name, handler_class_name)
-      if @service_handler_ns && !(handler_class_name =~ /^::/)
-        handler_class_name = "#{@service_handler_ns}::#{handler_class_name}"
-      end
-      @services[service_name.to_s] = handler_class_name
-    end
-
-    def inspect
-      reference = '0x0%x' % (self.object_id << 1)
-      "#<#{self.class}:#{reference} ip=#{self.configuration.ip.inspect} " \
-      "port=#{self.configuration.port.inspect}>"
-    end
-
-    module ClassMethods
-
-      # the class level of a `Host` should just proxy its methods down to its
-      # instance (it's a `Singleton`)
-
-      # `name` is defined by all objects, so we can't rely on `method_missing`
-      def name(*args)
-        self.instance.name(*args)
-      end
-
-      def method_missing(method, *args, &block)
-        self.instance.send(method, *args, &block)
-      end
-
-      def respond_to?(method)
-        super || self.instance.respond_to?(method)
-      end
-
-    end
-
-  end
-
-end