fastbeans 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 34f9f59a758172ffcc5fd127dfcc13f042dbcf8d
-  data.tar.gz: 208209f3eba7a5a7234d609b3404ce32be5bbd3e
+  metadata.gz: 04cdb54378919592072c8368e3c26d62366dfde5
+  data.tar.gz: e80257667320c6b26b58134008f6c24417fb6770
 !binary "U0hBNTEy":
-  metadata.gz: 520fe196b83219df71b4e07251bac4be33c024634f9eb06d815134b87d232335f8caffc456c2f0cef3071de3dcef11c1baa38789daddd6d7e2d6fd50bac9dbdd
-  data.tar.gz: 08abc020dd251e1123527cd0f1bccfa4364c13ae329534e4f213dfe0194b1fd432ecd4c2ebe84da992cf3f34d1a09676294352af8efbadb3868ac89288fdae7c
+  metadata.gz: 278316a00225048129fb1094eb3716368000d0ca6ee98ca9fe1bfc63341d214fc5fd630359fec2cb085161bb951acc272d11d1eb0e1097e349c6d7c182e8f45e
+  data.tar.gz: 1da6d91ff9374c9b11b1f4ddfb41bf58bb4368b3f33b40e29dfe26b397515527d8127c53db3ed4100a8b6f9715ae4e9e66f1cf5ca6b768c05b1a885a41b0694e

data/lib/fastbeans/client.rb

@@ -1,6 +1,7 @@
 require 'msgpack'
 require 'thread'
 require 'rufus-lru'
+require 'fastbeans/response'
 
 module Fastbeans
 
@@ -62,17 +63,14 @@ module Fastbeans
     end
 
     def call_without_retries(*data)
-      resp = @mutex.synchronize do
+      raw_resp = @mutex.synchronize do
         payload = MessagePack.pack(data).force_encoding("BINARY")
         @sock.write([payload.bytesize].pack("N"))
         @sock.write(payload)
         MessagePack.load(@sock)
       end
-      if resp == 0xDEAD
-        raise RemoteException.new("Remote exception on #{data.inspect} through #{@sock.inspect}")
-      else
-        resp
-      end
+      resp = Response.new(data, raw_resp)
+      resp.payload
     rescue IOError, Errno::EPIPE, MessagePack::MalformedFormatError => e
       ne = RemoteConnectionFailed.new(e.message)
       ne.orig_exc = e

data/lib/fastbeans/errors.rb

@@ -8,5 +8,6 @@ module Fastbeans
   class RemoteException < Fastbeans::Exception; end
   class RemoteConnectionFailed  < Fastbeans::Exception; end
   class RemoteConnectionDead  < Fastbeans::Exception; end
-
+  class AutogeneratedException < Fastbeans::Exception; end
+  
 end

data/lib/fastbeans/response.rb

@@ -0,0 +1,29 @@
+module Fastbeans
+
+
+  class Response
+
+    def initialize(call_data, raw_response)
+      @call_data = call_data
+      @raw_response = raw_response
+    end
+
+    def error?
+      @raw_response.is_a?(Hash) and @raw_response.has_key?("fastbeans-error")
+    end
+
+    def payload
+      unless error?
+        @raw_response
+      else
+        raise to_exception
+      end
+    end
+
+    def to_exception
+      name = @raw_response["fastbeans-error"].underscore.classify
+      Fastbeans.exception(name).new(@raw_response["error-information"])
+    end
+  end
+
+end

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/fastbeans.rb

@@ -1,6 +1,6 @@
-require "fastbeans/version"
-require "fastbeans/errors"
-require "fastbeans/client"
+require 'fastbeans/version'
+require 'fastbeans/errors'
+require 'fastbeans/client'
 
 module Fastbeans
   class << self
@@ -10,7 +10,7 @@ module Fastbeans
     def debug(str_or_exc)
       case str_or_exc
         when String 
-          STDERR.puts("[#{Time.now}] #{str}") if self.debug_mode
+          STDERR.puts("[#{Time.now}] #{str_or_exc}") if self.debug_mode
         when Exception
           debug("Exception: #{str_or_exc.message}\n#{str_or_exc.backtrace.join("\n")}")
       end
@@ -24,5 +24,13 @@ module Fastbeans
       t2 = Time.now
       debug("Time spent: #{t2-t1}s")
     end
+
+    def exception(classname)
+      begin 
+        Fastbeans.const_get(classname)
+      rescue NameError
+        Fastbeans.const_set(classname, Class.new(Fastbeans::AutogeneratedException))
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -82,6 +82,7 @@ files:
 - lib/fastbeans.rb
 - lib/fastbeans/client.rb
 - lib/fastbeans/errors.rb
+- lib/fastbeans/response.rb
 - lib/fastbeans/version.rb
 homepage: https://github.com/dsabanin/fastbeans-rb
 licenses: