fastbeans 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 67eab3ca06d0a653513eb084cb45a0655f408427
-  data.tar.gz: 23abe57b8fe553ad1138ebf0788152ebc80a5998
+  metadata.gz: fab0fdaf53dfe7c4f0f821c7ccf713f937034f50
+  data.tar.gz: d14e754ccef7d5ee62ca7e78079dd155401f509f
 !binary "U0hBNTEy":
-  metadata.gz: 9ccbef09ae0418cef27d3036c2b883bc8cab52d4d32d261339b52132c3b1c91f695beb5e0668f4b7a900451f86b1491f9c0fdd8c1c5d40a790c8524a9f9172e9
-  data.tar.gz: 5dd5b54ed3ceb38b3ef08a0df61710078da3e6eb74d5a99f399556247c26536e1690e9b0dde21b7082fce10c8fb9d4a51e7b3f74512dfb469de3033b1e78ff1f
+  metadata.gz: 6ec9d3d4080268b7604dbd51c223b370f1eeeb823fb5e7bc6bc930ca4b0b8e582dd31e2eb576fcb27375ded8b28dc66ed3633c9c65b04f0f37b56700af8e14a2
+  data.tar.gz: 571af395f94112bc12bf2ef2d42666fe68aed6234b932e3a934fd0686865343efa51f164ffb7d7642d4bfad14637777ac0bd7408ad3db158069b12318ab10534

data/lib/fastbeans/client.rb

@@ -1,14 +1,12 @@
 require 'msgpack'
-require 'thread'
 require 'rufus-lru'
 require 'fastbeans/connection'
 require 'fastbeans/response'
 require 'connection_pool'
-module Fastbeans
 
+module Fastbeans
   class Client
     CALL_CACHE_SIZE=100
-    MAX_RETRIES=3
     
     attr_reader :call_cache
 
@@ -31,23 +29,8 @@ module Fastbeans
 
     def call(*data)
       Fastbeans.benchmark("Calling: #{data.inspect}") do
-        retries = 0
-        begin
-          call_without_retries(*data)
-        rescue Fastbeans::RemoteConnectionFailed => e
-          Fastbeans.debug(e)
-          if retries < MAX_RETRIES
-            Fastbeans.debug("Retrying (#{retries} out of #{MAX_RETRIES} retries)")
-            retries += 1
-            begin
-              reconnect!
-            rescue => e
-              raise RemoteConnectionDead, e.message
-            end
-            retry
-          else
-            raise RemoteConnectionDead, "#{e.message} (#{retries} retries)"
-          end
+        pool.with do |conn|
+          conn.call(*data)
         end
       end
     end
@@ -55,21 +38,5 @@ module Fastbeans
     def cached_call(*data)
       @call_cache[data] ||= call(*data)
     end
-
-    def call_without_retries(*data)
-      raw_resp = pool.with do |conn|
-        payload = MessagePack.pack(data).force_encoding("BINARY")
-        conn.write([payload.bytesize].pack("N"))
-        conn.write(payload)
-        MessagePack.load(conn.socket)
-      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
-      raise ne
-    end
   end
-
 end

data/lib/fastbeans/connection.rb

@@ -0,0 +1,66 @@
+require 'socket'
+
+module Fastbeans
+  class Connection
+    MAX_RETRIES=3
+
+    attr_reader :socket
+
+    def initialize(host, port)
+      Fastbeans.debug("Connecting to #{host}:#{port}")
+      @host, @port = host, port
+      connect!(@host, @port)
+    end
+
+    def connect!(host, port)
+      @socket = TCPSocket.new(host, port)
+      @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+    end
+
+    def disconnect!
+      if @socket
+        @socket.close rescue nil
+      end
+    end
+
+    def reconnect!
+      disconnect!
+      connect!(@host, @port)
+    end
+
+    def call(*data)
+      retries = 0
+      begin
+        call_without_retries(*data)
+      rescue Fastbeans::RemoteConnectionFailed => e
+        Fastbeans.debug(e)
+        if retries < MAX_RETRIES
+          Fastbeans.debug("Retrying (#{retries} out of #{MAX_RETRIES} retries)")
+          retries += 1
+          begin
+            reconnect!
+          rescue => e
+            raise RemoteConnectionDead, e.message
+          end
+          retry
+        else
+          raise RemoteConnectionDead, "#{e.message} (#{retries} retries)"
+        end
+      end
+    end
+
+    def call_without_retries(*data)
+      payload = MessagePack.pack(data).force_encoding("BINARY")
+      @socket.write([payload.bytesize].pack("N"))
+      @socket.write(payload)
+      raw_resp = MessagePack.load(@socket)
+      resp = Response.new(data, raw_resp)
+      resp.payload
+    rescue IOError, Errno::EPIPE, MessagePack::MalformedFormatError => e
+      ne = RemoteConnectionFailed.new(e.message)
+      ne.orig_exc = e
+      raise ne
+    end
+
+  end
+end

data/lib/fastbeans/response.rb

@@ -21,9 +21,32 @@ module Fastbeans
     end
 
     def to_exception
-      name = @raw_response["fastbeans-error"].underscore.classify
+      name = camelize(underscore(@raw_response["fastbeans-error"]))
       Fastbeans.exception(name).new(@raw_response["error-information"])
     end
+
+    def camelize(term, uppercase_first_letter = true)
+      string = term.to_s
+      acronym_regex = /(?=a)b/
+      if uppercase_first_letter
+        string = string.sub(/^[a-z\d]*/) { $&.capitalize }
+      else
+        string = string.sub(/^(?:#{acronym_regex}(?=\b|[A-Z_])|\w)/) { $&.downcase }
+      end
+      string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+    end
+
+    def underscore(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      acronym_regex = /(?=a)b/
+      word.gsub!(/::/, '/')
+      word.gsub!(/(?:([A-Za-z\d])|^)(#{acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
   end
 
 end

data/lib/fastbeans/version.rb

@@ -1,3 +1,3 @@
 module Fastbeans
-  VERSION = "0.2.1"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbeans
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Dima Sabanin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -95,6 +95,7 @@ files:
 - fastbeans.gemspec
 - lib/fastbeans.rb
 - lib/fastbeans/client.rb
+- lib/fastbeans/connection.rb
 - lib/fastbeans/errors.rb
 - lib/fastbeans/response.rb
 - lib/fastbeans/version.rb