hoth 0.3.2.beta4 → 0.3.3

data/Gemfile.lock

@@ -1,21 +1,25 @@
 PATH
   remote: .
   specs:
-    hoth (0.3.0)
+    hoth (0.3.2.beta6)
       activesupport
       bertrpc
+      hoth
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
+    activesupport (3.0.6)
+    beanstalk-client (1.1.0)
     bert (1.1.2)
     bertrpc (1.3.0)
-      bert (>= 1.1.0, < 2.0.0)
+      bert (< 2.0.0, >= 1.1.0)
     diff-lcs (1.1.2)
+    em-jack (0.1.3)
+      eventmachine
     eventmachine (0.12.10)
-    json (1.4.6)
+    json (1.5.1)
     memcache-client (1.8.5)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
@@ -37,9 +41,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  bertrpc
+  beanstalk-client
+  em-jack
   hoth!
-  json
   rspec
   simple_publisher

data/lib/hoth/providers/beanstalkd_provider.rb

@@ -9,18 +9,17 @@ module Hoth
 
     class BeanstalkdProvider
       
-      def initialize
-        @services_to_listen_for = Hoth::Modules.service_modules.values.inject([]) do |services, service_module|
-          services << service_module.registered_services.select do |service|
-            service.endpoint.transport == :beanstalkd
-          end
-          services.flatten
-        end
+      attr_reader :module_name, :services_to_listen_for
+      
+      def initialize(module_name = nil)
+        raise ArgumentError.new("You have to specify the module name for the beanstalkd provider") unless module_name
+        @module_name = module_name
+        identify_services_to_listen_for
       end
 
       def listen
         EM.run {
-          @services_to_listen_for.each do |service|
+          self.services_to_listen_for.each do |service|
             conn_for_service = EMJack::Connection.new(:host => service.endpoint.host, :port => service.endpoint.port)
             conn_for_service.watch(service.transport.tube_name)
             conn_for_service.each_job do |job|
@@ -30,10 +29,10 @@ module Hoth
 
               begin
                 decoded_params = responsible_service.transport.encoder.decode(job.body)
-                Rails.logger.debug "decoded_params: #{decoded_params}"
+                Hoth::Logger.debug "decoded_params: #{decoded_params}"
                 Hoth::Services.send(service.name, *decoded_params)
               rescue => e
-                Rails.logger.warn "An error occured while invoking the service: #{e.message}"
+                Hoth::Logger.warn "An error occured while invoking the service: #{e.message}"
               ensure
                 conn_for_service.delete(job)
               end
@@ -41,6 +40,14 @@ module Hoth
           end
         } 
       end
+      
+      private
+        
+        def identify_services_to_listen_for
+          @services_to_listen_for = Hoth::Modules.service_modules[self.module_name.to_sym].registered_services.select do |service|
+              service.endpoint.transport == :beanstalkd
+          end
+        end
 
     end
     

data/lib/hoth/providers/rack_provider.rb

@@ -9,11 +9,9 @@ module Hoth
       end
 
       def call(env)
-        Hoth::Logger.debug "env: #{env.inspect}"
         if env["PATH_INFO"] =~ /^\/execute/
           begin
             req = Rack::Request.new(env)
-            Hoth::Logger.debug "req: #{req.inspect}"
 
             service_name   = req.params["name"]
             service_params = req.params["params"]
@@ -51,4 +49,4 @@ module Hoth
 
     end
   end
-end
+end

data/lib/hoth/transport/beanstalkd.rb

@@ -10,12 +10,18 @@ module Hoth
     class Beanstalkd < Base
 
       def call_remote_with(*args)
-        connection = Beanstalk::Pool.new(["#{endpoint.host}:#{endpoint.port}"])
+        connection = Beanstalk::Connection.new("#{endpoint.host}:#{endpoint.port}")
         connection.use(tube_name)
 
-        encoded_args = encoder.encode(args)
-        Rails.logger.debug "encoded_args: #{encoded_args}"
-        connection.put encoded_args
+        begin
+          encoded_args = encoder.encode(args)
+          Hoth::Logger.debug "encoded_args: #{encoded_args}"
+          connection.put encoded_args
+        rescue => e
+          Hoth::Logger.warn "An error occured while sending a payload to beanstalkd: #{e.message}"
+        ensure
+          connection.close
+        end
       end
 
       def tube_name

data/spec/unit/providers/beanstalkd_provider_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../../',  'spec_helper'))
+
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../',  'lib', 'hoth', 'providers', 'beanstalkd_provider'))
+
+require 'rack/mock'
+
+module Hoth
+  module Providers
+    describe BeanstalkdProvider do
+      
+      it "should know its module name" do
+        # cannot be tested since i do not know how to mock constructor call
+        # http://stackoverflow.com/questions/5270819/how-to-test-a-method-call-in-a-constructor-with-rspec
+        # Hoth::Providers::BeanstalkdProvider.any_instance.stub!(:identify_services_to_listen_for)
+        # beanstalkd_provider = Hoth::Providers::BeanstalkdProvider.new("foo_module")
+        # beanstalkd_provider.module_name.should == "foo_module"
+      end
+      
+      it "should throw an error if no module name is passed" do
+        lambda { Hoth::Providers::BeanstalkdProvider.new }.should raise_error(ArgumentError)
+      end
+      
+      it "should only listen for services defined for the passed module name" do
+        mail_module = Hoth::ServiceModule.new(:name => "mail_module")
+        mail_module.should_not_receive(:registered_services)
+        foo_module = Hoth::ServiceModule.new(:name => "foo_module")
+        service = mock("RegisteredService")
+        service.stub_chain(:endpoint, :transport).and_return :beanstalkd
+        foo_module.should_receive(:registered_services).and_return([service])
+        Hoth::Modules.should_receive(:service_modules).and_return({
+          :mail_module => mail_module,
+          :foo_module => foo_module
+        })
+        beanstalkd_provider = Hoth::Providers::BeanstalkdProvider.new("foo_module")
+      end
+
+    end
+  end
+end

data/spec/unit/transport/beanstalkd_spec.rb

@@ -0,0 +1,61 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '../../',  'spec_helper'))
+
+module Hoth
+  module Transport
+    
+    describe "Beanstalkd" do
+      before(:each) do
+          endpoint = mock("EndpointMock")
+          endpoint.stub(:host).and_return("localhost")
+          endpoint.stub(:port).and_return("11300")
+
+          service_module = mock("ServiceModule")
+          service_module.should_receive(:name).and_return(:test_service_module)
+
+          @service = mock("ServiceMock")
+          @service.should_receive(:name).and_return(:test_service)
+          @service.should_receive(:endpoint).any_number_of_times.and_return(endpoint)
+          @service.should_receive(:module).any_number_of_times.and_return(service_module)
+
+          @beanstalk_connection = mock("Beanstalk::Connection")
+      end
+
+      it "should send the payload over a simple Beanstalk::Connection and close the connection afterwards" do
+        Beanstalk::Connection.should_receive(:new).with("localhost:11300").and_return(@beanstalk_connection)
+        @beanstalk_connection.should_receive(:use).with(anything)
+        @beanstalk_connection.should_receive(:put).with(["some_data_to_send"])
+        @beanstalk_connection.should_receive(:close)
+
+        transport = Beanstalkd.new(@service)
+        transport.call_remote_with("some_data_to_send")
+      end
+
+      it "should ensure to close the connection after sending the payload to beanstalkd" do
+        Beanstalk::Connection.should_receive(:new).with("localhost:11300").and_return(@beanstalk_connection)
+        @beanstalk_connection.should_receive(:use).with(anything)
+        @beanstalk_connection.should_receive(:put).never
+        @beanstalk_connection.should_receive(:close)
+
+        transport = Beanstalkd.new(@service)
+        transport.encoder.should_receive(:encode).with(anything).and_raise("some error")
+        transport.call_remote_with("some_data_to_send")
+      end
+
+      it "should use the beanstalk tube specified by the transport" do
+        Beanstalk::Connection.should_receive(:new).with("localhost:11300").and_return(@beanstalk_connection)
+        transport = Beanstalkd.new(@service)
+        @beanstalk_connection.should_receive(:use).with(transport.tube_name)
+        @beanstalk_connection.should_receive(:put).with(["some_data_to_send"])
+        @beanstalk_connection.should_receive(:close)
+
+        transport.call_remote_with("some_data_to_send")
+      end
+
+      it "should define the tube_name according to the module and service name" do
+        transport = Beanstalkd.new(@service)
+        transport.tube_name.should == "test-service-module/test-service"
+      end
+    end
+
+  end
+end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoth
 version: !ruby/object:Gem::Version 
-  hash: 62196363
-  prerelease: 6
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  - beta
-  - 4
-  version: 0.3.2.beta4
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Dirk Breuer
@@ -17,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +01:00
-default_executable: 
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,25 +28,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id001
+  name: hoth
 - !ruby/object:Gem::Dependency 
-  name: bertrpc
-  prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 2
+        - 6
         - 0
-        version: "0"
-  type: :runtime
+        version: 2.6.0
+  prerelease: false
   version_requirements: *id002
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,11 +58,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  prerelease: false
   version_requirements: *id003
+  name: simple_publisher
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,11 +72,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
   version_requirements: *id004
+  name: beanstalk-client
 - !ruby/object:Gem::Dependency 
-  name: simple_publisher
-  prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,11 +86,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
   version_requirements: *id005
+  name: em-jack
 - !ruby/object:Gem::Dependency 
-  name: beanstalk-client
-  prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,11 +100,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
   version_requirements: *id006
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: em-jack
-  prerelease: false
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -116,8 +114,81 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  prerelease: false
   version_requirements: *id007
+  name: bertrpc
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  version_requirements: *id008
+  name: json
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  prerelease: false
+  version_requirements: *id009
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  version_requirements: *id010
+  name: simple_publisher
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  version_requirements: *id011
+  name: beanstalk-client
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  version_requirements: *id012
+  name: em-jack
 description: |
   Creating a SOA requires a centralized location to define all services within the
   SOA. Furthermore you want to know where to deploy those services.
@@ -163,23 +234,24 @@ files:
 - spec/unit/endpoint_spec.rb
 - spec/unit/extension/core/exception_spec.rb
 - spec/unit/hoth_spec.rb
+- spec/unit/providers/beanstalkd_provider_spec.rb
 - spec/unit/providers/rack_provider_spec.rb
 - spec/unit/service_definition_spec.rb
 - spec/unit/service_module_spec.rb
 - spec/unit/service_spec.rb
 - spec/unit/transport/base_spec.rb
+- spec/unit/transport/beanstalkd_spec.rb
 - spec/unit/transport/http_spec.rb
 - spec/unit/transport/workling_spec.rb
 - spec/unit/transport_spec.rb
 - LICENSE
 - TODO
-has_rdoc: true
 homepage: http://github.com/galaxycats/hoth
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -194,32 +266,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Registry and deployment description abstraction for SOA-Services
-test_files: 
-- spec/spec_helper.rb
-- spec/unit/encoding/json_spec.rb
-- spec/unit/endpoint_spec.rb
-- spec/unit/extension/core/exception_spec.rb
-- spec/unit/hoth_spec.rb
-- spec/unit/providers/rack_provider_spec.rb
-- spec/unit/service_definition_spec.rb
-- spec/unit/service_module_spec.rb
-- spec/unit/service_spec.rb
-- spec/unit/transport/base_spec.rb
-- spec/unit/transport/http_spec.rb
-- spec/unit/transport/workling_spec.rb
-- spec/unit/transport_spec.rb
+test_files: []
+