sanford 0.7.0 → 0.8.0

data/bench/runner.rb

@@ -10,7 +10,7 @@ module Bench
     HOST_AND_PORT = [ '127.0.0.1', 59284 ]
 
     REQUESTS = [
-      [ 'v1', 'simple', {}, 10000 ]
+      [ 'simple', {}, 10000 ]
     ]
 
     TIME_MODIFIER = 10 ** 4 # 4 decimal places
@@ -24,19 +24,19 @@ module Bench
     def build_report
       output "Running benchmark report..."
 
-      REQUESTS.each do |version, name, params, times|
-        self.benchmark_service(version, name, params, times, false)
+      REQUESTS.each do |name, params, times|
+        self.benchmark_service(name, params, times, false)
       end
 
       output "Done running benchmark report"
     end
 
-    def benchmark_service(version, name, params, times, show_result = false)
+    def benchmark_service(name, params, times, show_result = false)
       benchmarks = []
 
       output "\nHitting #{name.inspect} service with #{params.inspect}, #{times} times"
       [*(1..times.to_i)].each do |index|
-        benchmark = self.hit_service(version, name, params.merge({ :request_number => index }), show_result)
+        benchmark = self.hit_service(name, params.merge({ :request_number => index }), show_result)
         benchmarks << self.round_time(benchmark.real * 1000.to_f)
         output('.', false) if ((index - 1) % 100 == 0) && !show_result
       end
@@ -73,11 +73,11 @@ module Bench
     end
 
 
-    def hit_service(version, name, params, show_result)
+    def hit_service(name, params, show_result)
       Benchmark.measure do
         begin
           client = Bench::Client.new(*HOST_AND_PORT)
-          response = client.call(version, name, params)
+          response = client.call(name, params)
           if show_result
             output "Got a response:"
             output "  #{response.status}"

data/bench/services.rb

@@ -7,9 +7,7 @@ class BenchHost
   logger           Logger.new(STDOUT)
   verbose_logging  false
 
-  version 'v1' do
-    service 'simple', 'BenchHost::Simple'
-  end
+  service 'simple', 'BenchHost::Simple'
 
   class Simple
     include Sanford::ServiceHandler

data/lib/sanford/host.rb

@@ -43,11 +43,12 @@ module Sanford
       Sanford.register(host_class)
     end
 
-    attr_reader :configuration, :versioned_services
+    attr_reader :configuration, :services
 
     def initialize
       @configuration = Configuration.new(self)
-      @versioned_services = {}
+      @service_handler_ns = nil
+      @services = {}
     end
 
     def name(*args)
@@ -90,9 +91,16 @@ module Sanford
       self.configuration.init_proc = block
     end
 
-    def version(name, &block)
-      version_group = Sanford::Host::VersionGroup.new(name, &block)
-      @versioned_services.merge!(version_group.to_hash)
+    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] = handler_class_name
     end
 
     def inspect
@@ -103,33 +111,6 @@ module Sanford
 
     protected
 
-    class VersionGroup
-      attr_reader :name, :services
-
-      def initialize(name, &definition_block)
-        @name = name
-        @services = {}
-        self.instance_eval(&definition_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 self.service_handler_ns && !(handler_class_name =~ /^::/)
-          handler_class_name = "#{self.service_handler_ns}::#{handler_class_name}"
-        end
-        @services[service_name] = handler_class_name
-      end
-
-      def to_hash
-        { self.name => self.services }
-      end
-
-    end
-
     module ClassMethods
 
       # the class level of a `Host` should just proxy it's methods down to it's

data/lib/sanford/host_data.rb

@@ -27,8 +27,8 @@ module Sanford
       @runner      = configuration[:runner]
       @error_procs = configuration[:error_procs]
 
-      @handlers = service_host.versioned_services.inject({}) do |hash, (version, services)|
-        hash.merge({ version => self.constantize_services(services) })
+      @handlers = service_host.services.inject({}) do |h, (name, handler_class_name)|
+        h.merge({ name => self.constantize(handler_class_name) })
       end
     end
 
@@ -36,19 +36,12 @@ module Sanford
       self.runner.new(handler_class, request, self.logger).run
     end
 
-    def handler_class_for(version, service)
-      version_group = @handlers[version] || {}
-      version_group[service] || raise(Sanford::NotFoundError)
+    def handler_class_for(service)
+      @handlers[service] || raise(Sanford::NotFoundError)
     end
 
     protected
 
-    def constantize_services(services)
-      services.inject({}) do |hash, (name, handler_class_name)|
-        hash.merge({ name => self.constantize(handler_class_name) })
-      end
-    end
-
     def constantize(handler_class_name)
       Sanford::ServiceHandler.constantize(handler_class_name) ||
         raise(Sanford::NoHandlerClassError.new(handler_class_name))

data/lib/sanford/runner.rb

@@ -54,7 +54,7 @@ module Sanford
     module ClassMethods
 
       def run(handler_class, params = nil, logger = nil)
-        request = Sanford::Protocol::Request.new('version', 'name', params || {})
+        request = Sanford::Protocol::Request.new('name', params || {})
         self.new(handler_class, request, logger).run
       end
 

data/lib/sanford/test_runner.rb

@@ -27,7 +27,7 @@ module Sanford
     protected
 
     def test_request(params)
-      Sanford::Protocol::Request.new('version', 'name', params)
+      Sanford::Protocol::Request.new('name', params)
     end
 
     def build_response(response_args)

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/sanford/worker.rb

@@ -42,7 +42,7 @@ module Sanford
         self.log_request(request)
         service.request = request
 
-        handler_class = @host_data.handler_class_for(request.version, request.name)
+        handler_class = @host_data.handler_class_for(request.name)
         self.log_handler_class(handler_class)
         service.handler_class = handler_class
 
@@ -84,7 +84,6 @@ module Sanford
     end
 
     def log_request(request)
-      log_verbose "  Version: #{request.version.inspect}"
       log_verbose "  Service: #{request.name.inspect}"
       log_verbose "  Params:  #{request.params.inspect}"
     end
@@ -104,7 +103,6 @@ module Sanford
         summary_line_args['status'] = processed_service.response.code
       end
       if (request = processed_service.request)
-        summary_line_args['version'] = request.version
         summary_line_args['service'] = request.name
         summary_line_args['params']  = request.params
       end

data/sanford.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = "Sanford TCP protocol server for hosting services"
   gem.summary       = "Sanford TCP protocol server for hosting services"
   gem.homepage      = "https://github.com/redding/sanford"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -19,8 +20,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("dat-tcp",           ["~>0.4"])
   gem.add_dependency("ns-options",        ["~>1.0"])
-  gem.add_dependency("sanford-protocol",  ["~>0.5"])
+  gem.add_dependency("sanford-protocol",  ["~>0.6"])
 
-  gem.add_development_dependency("assert",        ["~>2.0"])
+  gem.add_development_dependency("assert",        ["~>2.3"])
   gem.add_development_dependency("assert-mocha",  ["~>1.0"])
 end

data/test/support/fake_connection.rb

@@ -2,8 +2,8 @@ class FakeConnection
 
   attr_reader :read_data, :response, :write_stream_closed
 
-  def self.with_request(version, name, params = {}, raise_on_write = false)
-    request = Sanford::Protocol::Request.new(version, name, params)
+  def self.with_request(name, params = {}, raise_on_write = false)
+    request = Sanford::Protocol::Request.new(name, params)
     self.new(request.to_hash, raise_on_write)
   end
 

data/test/support/services.rb

@@ -24,16 +24,14 @@ class TestHost
     end
   end
 
-  version 'v1' do
-    service_handler_ns 'TestHost'
-
-    service 'echo',         'Echo'
-    service 'bad',          'Bad'
-    service 'multiply',     'Multiply'
-    service 'halt_it',      '::TestHost::HaltIt'
-    service 'authorized',   'Authorized'
-    service 'custom_error', 'CustomError'
-  end
+  service_handler_ns 'TestHost'
+
+  service 'echo',         'Echo'
+  service 'bad',          'Bad'
+  service 'multiply',     'Multiply'
+  service 'halt_it',      '::TestHost::HaltIt'
+  service 'authorized',   'Authorized'
+  service 'custom_error', 'CustomError'
 
   class Echo
     include Sanford::ServiceHandler
@@ -116,9 +114,8 @@ class UndefinedHandlersHost
 
   port 12345
 
-  version 'v1' do
-    service 'undefined', 'ThisIsNotDefined'
-  end
+  service 'undefined', 'ThisIsNotDefined'
+
 end
 
 class EmptyHost

data/test/support/simple_client.rb

@@ -2,8 +2,8 @@ require 'sanford-protocol/test/fake_socket'
 
 class SimpleClient
 
-  def self.call_with_request(service_host, version, name, params)
-    self.new(service_host).call_with_request(version, name, params)
+  def self.call_with_request(service_host, name, params)
+    self.new(service_host).call_with_request(name, params)
   end
 
   def self.call_with_msg_body(service_host, *args)

data/test/system/request_handling_tests.rb

@@ -26,7 +26,7 @@ class RequestHandlingTests < Assert::Context
   class EchoTests < FakeConnectionTests
     desc "running a request for the echo server"
     setup do
-      @connection = FakeConnection.with_request('v1', 'echo', { :message => 'test' })
+      @connection = FakeConnection.with_request('echo', { :message => 'test' })
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -47,33 +47,10 @@ class RequestHandlingTests < Assert::Context
 
   end
 
-  class MissingServiceVersionTests < FakeConnectionTests
-    desc "running a request with no service version"
-    setup do
-      request_hash = Sanford::Protocol::Request.new('v1', 'what', {}).to_hash
-      request_hash.delete('version')
-      @connection = FakeConnection.new(request_hash)
-      @worker = Sanford::Worker.new(@host_data, @connection)
-    end
-
-    should "return a bad request response" do
-      assert_raises(Sanford::Protocol::BadRequestError) do
-        @worker.run
-      end
-      response = @connection.response
-
-      assert_equal 400,       response.code
-      assert_match "request", response.status.message
-      assert_match "version", response.status.message
-      assert_equal nil,       response.data
-    end
-
-  end
-
   class MissingServiceNameTests < FakeConnectionTests
     desc "running a request with no service name"
     setup do
-      request_hash = Sanford::Protocol::Request.new('v1', 'what', {}).to_hash
+      request_hash = Sanford::Protocol::Request.new('what', {}).to_hash
       request_hash.delete('name')
       @connection = FakeConnection.new(request_hash)
       @worker = Sanford::Worker.new(@host_data, @connection)
@@ -96,7 +73,7 @@ class RequestHandlingTests < Assert::Context
   class NotFoundServiceTests < FakeConnectionTests
     desc "running a request with no matching service name"
     setup do
-      @connection = FakeConnection.with_request('v1', 'what', {})
+      @connection = FakeConnection.with_request('what', {})
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -116,7 +93,7 @@ class RequestHandlingTests < Assert::Context
   class ErrorServiceTests < FakeConnectionTests
     desc "running a request that errors on the server"
     setup do
-      @connection = FakeConnection.with_request('v1', 'bad', {})
+      @connection = FakeConnection.with_request('bad', {})
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -136,7 +113,7 @@ class RequestHandlingTests < Assert::Context
   class HaltTests < FakeConnectionTests
     desc "running a request that halts"
     setup do
-      @connection = FakeConnection.with_request('v1', 'halt_it', {})
+      @connection = FakeConnection.with_request('halt_it', {})
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -154,7 +131,7 @@ class RequestHandlingTests < Assert::Context
   class AuthorizeRequestTests < FakeConnectionTests
     desc "running a request that halts in a callback"
     setup do
-      @connection = FakeConnection.with_request('v1', 'authorized', {})
+      @connection = FakeConnection.with_request('authorized', {})
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -172,7 +149,7 @@ class RequestHandlingTests < Assert::Context
   class WithCustomErrorHandlerTests < FakeConnectionTests
     desc "running a request that triggers our custom error handler"
     setup do
-      @connection = FakeConnection.with_request('v1', 'custom_error', {})
+      @connection = FakeConnection.with_request('custom_error', {})
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -190,7 +167,7 @@ class RequestHandlingTests < Assert::Context
   class WithBadResponseHashTests < FakeConnectionTests
     desc "running a request that builds an object that can't be encoded"
     setup do
-      @connection = FakeConnection.with_request('v1', 'echo', { :message => 'cant encode' }, true)
+      @connection = FakeConnection.with_request('echo', { :message => 'cant encode' }, true)
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
 
@@ -247,7 +224,7 @@ class RequestHandlingTests < Assert::Context
 
     should "return a successful response and echo the params sent to it" do
       self.start_server(TestHost) do
-        response = SimpleClient.call_with_request(TestHost, 'v1', 'echo', {
+        response = SimpleClient.call_with_request(TestHost, 'echo', {
           :message => 'test'
         })
 
@@ -317,7 +294,7 @@ class RequestHandlingTests < Assert::Context
     should "timeout" do
       self.start_server(TestHost) do
         client = SimpleClient.new(TestHost, :with_delay => 1)
-        response = client.call_with_request('v1', 'echo', { :message => 'test' })
+        response = client.call_with_request('echo', { :message => 'test' })
 
         assert_equal 408,   response.code
         assert_equal nil,   response.status.message

data/test/unit/host_data_tests.rb

@@ -34,20 +34,20 @@ class Sanford::HostData
 
     should "constantize a host's handlers" do
       handlers = subject.instance_variable_get("@handlers")
-      assert_equal TestHost::Authorized,  handlers['v1']['authorized']
-      assert_equal TestHost::Bad,         handlers['v1']['bad']
-      assert_equal TestHost::Echo,        handlers['v1']['echo']
-      assert_equal TestHost::HaltIt,      handlers['v1']['halt_it']
-      assert_equal TestHost::Multiply,    handlers['v1']['multiply']
+      assert_equal TestHost::Authorized,  handlers['authorized']
+      assert_equal TestHost::Bad,         handlers['bad']
+      assert_equal TestHost::Echo,        handlers['echo']
+      assert_equal TestHost::HaltIt,      handlers['halt_it']
+      assert_equal TestHost::Multiply,    handlers['multiply']
     end
 
     should "look up handler classes with #handler_class_for" do
-      assert_equal TestHost::Echo, subject.handler_class_for('v1', 'echo')
+      assert_equal TestHost::Echo, subject.handler_class_for('echo')
     end
 
     should "raise a custom error when handler_class_for is called with an unknown service" do
       assert_raises(Sanford::NotFoundError) do
-        subject.handler_class_for('not', 'defined')
+        subject.handler_class_for('not_defined')
       end
     end
 

data/test/unit/host_tests.rb

@@ -13,8 +13,8 @@ module Sanford::Host
     subject{ MyHost.instance }
 
     should have_instance_methods :configuration, :name, :ip, :port, :pid_file,
-      :logger, :verbose_logging, :runner, :error, :init, :version,
-      :versioned_services
+      :logger, :verbose_logging, :runner, :error, :init, :service_handler_ns,
+      :service, :services
 
     should "get and set it's configuration options with their matching methods" do
       subject.name 'my_awesome_host'
@@ -23,10 +23,18 @@ module Sanford::Host
       assert_equal subject.configuration.port,  subject.port
     end
 
-    should "add a version group with #version" do
-      subject.version('v1'){ }
+    should "allow adding a service with #service" do
+      subject.service_handler_ns 'MyNamespace'
+      subject.service('test', 'MyServiceHandler')
 
-      assert_equal({}, subject.versioned_services["v1"])
+      assert_equal 'MyNamespace::MyServiceHandler', subject.services['test']
+    end
+
+    should "ignore a namespace when a service class has leading colons" do
+      subject.service_handler_ns 'MyNamespace'
+      subject.service('test', '::MyServiceHandler')
+
+      assert_equal '::MyServiceHandler', subject.services['test']
     end
 
   end

data/test/unit/runner_tests.rb

@@ -5,7 +5,7 @@ module Sanford::Runner
   class BaseTests < Assert::Context
     desc "Sanford::Runner"
     setup do
-      request = Sanford::Protocol::Request.new('v1', 'test', {})
+      request = Sanford::Protocol::Request.new('test', {})
       @runner = Sanford::DefaultRunner.new(BasicServiceHandler, request)
     end
     subject{ @runner }

data/test/unit/worker_tests.rb

@@ -9,7 +9,7 @@ class Sanford::Worker
     desc "Sanford::Worker"
     setup do
       @host_data = Sanford::HostData.new(TestHost)
-      @connection = FakeConnection.with_request('version', 'service', {})
+      @connection = FakeConnection.with_request('service', {})
       @worker = Sanford::Worker.new(@host_data, @connection)
     end
     subject{ @worker }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,10 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-15 00:00:00 Z
+date: 2013-10-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +29,11 @@ dependencies:
         - 0
         - 4
         version: "0.4"
+  type: :runtime
   requirement: *id001
+  prerelease: false
   name: dat-tcp
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,41 +44,41 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  type: :runtime
   requirement: *id002
+  prerelease: false
   name: ns-options
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 0
-        - 5
-        version: "0.5"
+        - 6
+        version: "0.6"
+  type: :runtime
   requirement: *id003
+  prerelease: false
   name: sanford-protocol
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 3
+        version: "2.3"
+  type: :development
   requirement: *id004
+  prerelease: false
   name: assert
-  type: :development
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,9 +89,10 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  type: :development
   requirement: *id005
+  prerelease: false
   name: assert-mocha
-  type: :development
 description: Sanford TCP protocol server for hosting services
 email: 
 - collin.redding@me.com
@@ -141,7 +141,6 @@ files:
 - test/unit/host_configuration_tests.rb
 - test/unit/host_data_tests.rb
 - test/unit/host_tests.rb
-- test/unit/host_version_group_tests.rb
 - test/unit/hosts_tests.rb
 - test/unit/manager_pid_file_tests.rb
 - test/unit/manager_tests.rb
@@ -151,8 +150,8 @@ files:
 - test/unit/worker_tests.rb
 - tmp/.gitkeep
 homepage: https://github.com/redding/sanford
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -196,7 +195,6 @@ test_files:
 - test/unit/host_configuration_tests.rb
 - test/unit/host_data_tests.rb
 - test/unit/host_tests.rb
-- test/unit/host_version_group_tests.rb
 - test/unit/hosts_tests.rb
 - test/unit/manager_pid_file_tests.rb
 - test/unit/manager_tests.rb

data/test/unit/host_version_group_tests.rb

@@ -1,39 +0,0 @@
-require 'assert'
-
-class Sanford::Host::VersionGroup
-
-  class BaseTests < Assert::Context
-    desc "Sanford::Host::VersionGroup"
-    setup do
-      @version_group = Sanford::Host::VersionGroup.new('v1'){ }
-    end
-    subject{ @version_group }
-
-    should have_instance_methods :name, :services, :service, :to_hash
-
-    should "add a key-value to it's services hash with #service" do
-      subject.service('test', 'MyServiceHandler')
-
-      assert_equal 'MyServiceHandler', subject.services['test']
-    end
-    should "allow setting a namespace and use it when a service is added" do
-      subject.service_handler_ns 'MyNamespace'
-      subject.service('test', 'MyServiceHandler')
-
-      assert_equal 'MyNamespace::MyServiceHandler', subject.services['test']
-    end
-    should "ignore a namespace and when a service class has leading colons" do
-      subject.service_handler_ns 'MyNamespace'
-      subject.service('test', '::MyServiceHandler')
-
-      assert_equal '::MyServiceHandler', subject.services['test']
-    end
-    should "return a hash with it's name as a key and its services as the value with #to_hash" do
-      subject.service('test', 'MyServiceHandler')
-      expected = { subject.name => subject.services }
-
-      assert_equal expected, subject.to_hash
-    end
-  end
-
-end