hoth 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    hoth (0.3.0)
+      activesupport
+      bertrpc
+      json
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    bert (1.1.2)
+    bertrpc (1.3.0)
+      bert (>= 1.1.0, < 2.0.0)
+    diff-lcs (1.1.2)
+    eventmachine (0.12.10)
+    json (1.4.6)
+    memcache-client (1.8.5)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    simple_publisher (0.1.1)
+      starling
+      system_timer
+    starling (0.10.1)
+      eventmachine (>= 0.12.0)
+      memcache-client (>= 1.7.0)
+    system_timer (1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  bertrpc
+  hoth!
+  json
+  rspec
+  simple_publisher

data/lib/hoth.rb

@@ -18,6 +18,8 @@ require 'hoth/util/logger'
 require 'hoth/extension/core/exception'
 require 'hoth/exceptions'
 
+require 'digest/sha1'
+
 module Hoth
   
   class <<self
@@ -25,6 +27,11 @@ module Hoth
       load_service_definition
       load_module_definition
       Logger.init_logging!
+      @client_uuid = Digest::SHA1.hexdigest("Time.now--#{rand()}")
+    end
+
+    def client_uuid
+      @client_uuid
     end
   
     def config_path

data/lib/hoth/exceptions.rb

@@ -11,4 +11,11 @@ module Hoth
 
   class TransportError < HothException; end
   class TransportException < HothException; end
+
+  class EncodingError < HothException; end
+
+  class EmptyServiceNameError < HothException; end
+  class ServiceNotFoundException < HothException; end
+
+  class RecursiveServiceCallException < HothException; end
 end

data/lib/hoth/providers/rack_provider.rb

@@ -4,8 +4,8 @@ module Hoth
   module Providers
     class RackProvider
 
-      def initialize(app)
-        @app = app
+      def initialize(app=nil)
+        @app = app || lambda {|env| [404, {'Content-Type' => "text/plain"}, ["Nothing here!"]]}
       end
 
       def call(env)
@@ -13,33 +13,42 @@ module Hoth
         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"]
-            
+
+            raise EmptyServiceNameError.new("You must provide a service name!") if service_name.nil?
+
             responsible_service = ServiceRegistry.locate_service(service_name)
-            
+
+            raise ServiceNotFoundException.new("The requested service '#{service_name}' was not found!") if responsible_service.nil?
+
+            # check if we have called ourself
+            raise RecursiveServiceCallException.new("Service caller and callee have the same Client-UUID!") if req.params["caller_uuid"] == Hoth.client_uuid
+
             decoded_params = responsible_service.transport.encoder.decode(service_params)
             result = Hoth::Services.send(service_name, *decoded_params)
-            
+
             encoded_result = responsible_service.transport.encoder.encode({"result" => result})
-          
+
             [200, {'Content-Type' => responsible_service.transport.encoder.content_type, 'Content-Length' => "#{encoded_result.length}"}, [encoded_result]]
           rescue Exception => e
-            Hoth::Logger.debug "e: #{e.message}"
+            Hoth::Logger.error "e: #{e.message}"
+
             if responsible_service
               encoded_error = responsible_service.transport.encoder.encode({"error" => e})
-              [500, {'Content-Type' => service.transport.encoder.content_type, 'Content-Length' => "#{encoded_error.length}"}, [encoded_error]]
+              [500, {'Content-Type' => responsible_service.transport.encoder.content_type, 'Content-Length' => "#{encoded_error.length}"}, [encoded_error]]
             else
-              plain_error = "An error occuered! (#{e.message})"
-              [500, {'Content-Type' => "text/plain", 'Content-Length' => "#{plain_error.length}"}, [plain_error]]
+              plain_error = "An error occurred! (#{e.message})"
+              [e.class == ServiceNotFoundException ? 404 : 500, {'Content-Type' => "text/plain", 'Content-Length' => "#{plain_error.length}"}, [plain_error]]
             end
           end
         else
           @app.call(env)
         end
       end
-      
+
     end
   end
 end

data/lib/hoth/transport.rb

@@ -1,5 +1,6 @@
 require 'hoth/transport/base'
 require 'hoth/transport/http'
+require 'hoth/transport/https'
 require 'hoth/transport/bert'
 require 'hoth/transport/workling'
 
@@ -15,6 +16,13 @@ module Hoth
         :encoder => Encoding::Json
       },
       :http => :json_via_http,
+
+      :json_via_https => {
+        :transport_class => Transport::Https,
+        :encoder => Encoding::Json
+      },
+      :https => :json_via_https,
+
       :workling => {
         :transport_class => Transport::Workling
       }

data/lib/hoth/transport/http.rb

@@ -4,14 +4,10 @@ module Hoth
   module Transport
     class Http < Base     
       def call_remote_with(*params)
-        unless return_nothing?
-          begin
-            handle_response post_payload(params)
-          rescue Exception => e
-            raise TransportError.wrap(e)
-          end
-        else
-          return nil
+        begin
+          handle_response post_payload(params)
+        rescue Exception => e
+          raise TransportError.wrap(e)
         end
       end
       
@@ -35,8 +31,9 @@ module Hoth
       def post_payload(payload)
         uri = URI.parse(self.endpoint.to_url)
         return Net::HTTP.post_form(uri,
-          'name'   => self.name.to_s,
-          'params' => encoder.encode(payload)
+          'name'        => self.name.to_s,
+          'caller_uuid' => Hoth.client_uuid,
+          'params'      => encoder.encode(payload)
         )
       end
       

data/lib/hoth/transport/https.rb

@@ -0,0 +1,31 @@
+require 'net/http'
+require 'net/https'
+
+module Hoth
+  module Transport
+    class Https < Http
+      def post_payload(payload)
+        uri = URI.parse(self.endpoint.to_url)
+        
+        post = Net::HTTP::Post.new(uri.path)
+        
+        post.set_form_data({
+            'name'        => self.name.to_s,
+            'caller_uuid' => Hoth.client_uuid,
+            'params'      => encoder.encode(payload)
+        }, ';')
+        
+        request = Net::HTTP.new(uri.host, uri.port)
+        request.use_ssl = true
+        response = request.start {|http| http.request(post) }
+        
+        case response
+        when Net::HTTPSuccess, Net::HTTPRedirection
+          response
+        else
+          response.error!
+        end
+      end
+    end
+  end
+end

data/lib/hoth/util/logger.rb

@@ -1,46 +1,43 @@
 module Hoth
   class Logger
     class <<self
-      
+
       def log_provider=(log_provider)
         @log_provider = log_provider
       end
-      
-      def init_logging!
+
+      def init_logging!(logfile="log/hoth.log")
         Hoth::Logger.log_provider = if Object.const_defined?("Rails")
           Rails.logger
         else
           require 'logger'
-          ::Logger.new("/tmp/hoth.log")
+          ::Logger.new(logfile)
         end
       end
-      
+
       def debug(msg)
         log_provider.debug msg
       end
-      
+
       def info(msg)
         log_provider.info msg
       end
-      
+
       def warn(msg)
         log_provider.warn msg
       end
-      
+
       def error(msg)
         log_provider.error msg
       end
-      
+
       def fatal(msg)
         log_provider.fatal msg
       end
-      
-      private
-      
-        def log_provider
-          @log_provider || init_logging!
-        end
+
+      def log_provider
+        @log_provider || init_logging!
+      end
     end
-        
   end
 end

data/spec/unit/providers/rack_provider_spec.rb

@@ -10,6 +10,7 @@ module Hoth
     describe RackProvider do
       
       it "should get transport and encoder based on called service" do
+        Hoth.should_receive(:client_uuid).and_return("CALLER_UUID")
         app = stub("ApplicationStub").as_null_object
         middleware = Hoth::Providers::RackProvider.new(app)
         
@@ -40,10 +41,10 @@ module Hoth
         rack_response = middleware.call env
         rack_response.first.should == 500 #status code
         rack_response.last.should be_a_kind_of(Array)
-        rack_response.last.first.should == "An error occuered! (RuntimeError)"
+        rack_response.last.first.should == "An error occurred! (RuntimeError)"
       end
       
     end
     
   end
-end
+end

data/spec/unit/service_spec.rb

@@ -42,7 +42,16 @@ module Hoth
       service.should_receive(:is_local?).and_return(true)
       service.impl_class.should_receive(:execute).with(:arg1, :arg2)
       
-      service.execute(:arg1, :arg2)
+      service.execute(:arg1, :arg2).should be(nil)
+    end
+  
+    it "should execute the service stub locally if its impl-class was found and return a value" do
+      service = Service.new("test_service") { |p1, p2| returns :value }
+      
+      service.should_receive(:is_local?).and_return(true)
+      service.impl_class.should_receive(:execute).with(:arg1, :arg2).and_return(result = mock("ResultMock"))
+      
+      service.execute(:arg1, :arg2).should be(result)
     end
   
     it "should call the remote service if impl-class does not exist" do

data/spec/unit/transport/http_spec.rb

@@ -3,47 +3,44 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../../',  'spec_help
 module Hoth
   module Transport
     describe Http do
-      
+
       before(:each) do
         @service_mock = mock("ServiceMock")
       end
-      
+
       it "should call a remote via http" do
-        @service_mock.should_receive(:return_nothing?).and_return(false)
-        
         params = {:first_name => "Seras", :last_name => "Victoria"}
 
         transport = Http.new(@service_mock)
         transport.should_receive(:post_payload).with([params])
         transport.call_remote_with(params)
       end
-      
+
       it "should post payload encoded with JSON" do
+        Hoth.should_receive(:client_uuid).and_return("CLIENT_UUID")
         @service_mock.should_receive(:endpoint).and_return(endpoint = mock("EndpointMock"))
         @service_mock.should_receive(:name).and_return("service_name")
         endpoint.should_receive(:to_url).and_return("http://localhost:3000/execute")
 
         encoder = mock("JsonEncoderMock")
         encoder.should_receive(:encode).with("params").and_return("encoded_params")
-        
+
         URI.should_receive(:parse).with("http://localhost:3000/execute").and_return(uri = mock("URIMock"))
-        Net::HTTP.should_receive(:post_form).with(uri, {"name" => "service_name", "params" => "encoded_params"})
-        
+        Net::HTTP.should_receive(:post_form).with(uri, {"name" => "service_name", "params" => "encoded_params", "caller_uuid" => "CLIENT_UUID"})
+
         transport = Http.new(@service_mock, {:encoder => encoder})
         transport.post_payload("params")
       end
-      
+
       describe "Error Handling" do
-        
+
         before(:each) do
           service_mock = mock("ServiceMock")
-          service_mock.should_receive(:return_nothing?).any_number_of_times.and_return(false)
-
           @params    = {:first_name => "Seras", :last_name => "Victoria"}
           encoder    = mock("JsonEncoderMock")
           @transport = Http.new(service_mock, {:encoder => encoder})
         end
-        
+
         it "should handle http connection error" do
           @transport.should_receive(:post_payload).and_raise(Exception)
           lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
@@ -70,8 +67,53 @@ module Hoth
             lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
           end
         end
-      end
 
+        it "should handle Timeout::Error and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Timeout::Error)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle Errno::EINVAL and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Errno::EINVAL)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle Errno::ECONNRESET and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Errno::ECONNRESET)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle EOFError and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(EOFError)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle Net::HTTPBadResponse and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Net::HTTPBadResponse)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle Net::HTTPHeaderSyntaxError and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Net::HTTPHeaderSyntaxError)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle Net::ProtocolError and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Net::ProtocolError)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle Errno::ECONNREFUSED and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(Errno::ECONNREFUSED)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+
+        it "should handle SocketError and wrap them in a TransportError" do
+          @transport.should_receive(:post_payload).and_raise(SocketError)
+          lambda { @transport.call_remote_with(@params) }.should raise_error(TransportError)
+        end
+      end
     end
+
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoth
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Dirk Breuer
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2011-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: bertrpc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,9 +78,11 @@ dependencies:
   name: simple_publisher
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -91,6 +102,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- Gemfile.lock
 - README.rdoc
 - THANKS.md
 - lib/hoth.rb
@@ -111,6 +123,7 @@ files:
 - lib/hoth/transport/base.rb
 - lib/hoth/transport/bert.rb
 - lib/hoth/transport/http.rb
+- lib/hoth/transport/https.rb
 - lib/hoth/transport/workling.rb
 - lib/hoth/util/logger.rb
 - spec/spec_helper.rb
@@ -129,7 +142,7 @@ files:
 - LICENSE
 - TODO
 has_rdoc: true
-homepage: http://github.com/railsbros/hoth
+homepage: http://github.com/galaxycats/hoth
 licenses: []
 
 post_install_message: 
@@ -138,23 +151,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Registry and deployment description abstraction for SOA-Services