ruby_skynet 0.4.0.pre → 0.4.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 729668f7d983cdc9801d603ace66a025d0038cf2
-  data.tar.gz: 9f9ac2b233d3c607d01f316476bf193010cc8a86
+  metadata.gz: 0a4505056e7cd42bd2218494f4ef40c5c46b68b8
+  data.tar.gz: a2c44053bd1e42ac9bf3f67797e0363d5002b6fa
 SHA512:
-  metadata.gz: d68231094851f6c74ee3eb1f0eaf17442ca7fb9d7788c7247c09561b61344b68cd68fb495468f66e8ee517171566b8e099431e0ba0a844f6be35c2df0ba92072
-  data.tar.gz: c57624d3a943a3c8751b738f7c4a447b145d9127d4b08bd040ac700c1bbde88ca9c12aa379a0e84c2034cf785d2e8f30ff117242a6171e0730dd957eb9e07f6d
+  metadata.gz: df66afd5b487c3f1014064c39687404681f1c0cb5528e888af262daf7b2535474b10029a8d278d7e133b1ccb89f223b9621a5bd944ee19b7f413462cc4c8602f
+  data.tar.gz: 47ed383fa62a90510cb2788d520a9416e6f82610db9300fcb7a6370285fc298cfd96348c99ecbc1bcbd5bb03c708a3456283b52f524960843aeb0f0eb930d5d1

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source :rubygems
 
 group :test do
   gem "shoulda"

data/examples/e.rb

@@ -0,0 +1,14 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'rubygems'
+require 'ruby_skynet'
+require 'active_support/core_ext/hash/conversions'
+
+SemanticLogger::Logger.default_level = :trace
+SemanticLogger::Logger.appenders << SemanticLogger::Appender::File.new('skynet.log')
+
+client = RubySkynet::Client.new('InquiriesService')
+#h = {}; 1000.times{|i| h["hello#{i}"] = i}
+#p client.call('echo', h)
+data = Hash.from_xml(File.read("../../claritybase/test/load/inquiry.xml"))['inquiry']
+p data
+p client.call('create', data)

data/examples/echo_client.rb

@@ -1,9 +1,10 @@
+# Allow examples to be run directly outside of the Gem
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
 require 'ruby_skynet'
-require 'sync_attr'
 
 SemanticLogger::Logger.default_level = :trace
-SemanticLogger::Logger.appenders << SemanticLogger::Appender::File.new('skynet.log')
+SemanticLogger::Logger.appenders << SemanticLogger::Appender::File.new('echo_client.log')
 
 client = RubySkynet::Client.new('EchoService')
 p client.call('echo', :hello => 'world')

data/examples/echo_server.rb

@@ -1,12 +1,14 @@
+# Allow examples to be run directly outside of the Gem
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'rubygems'
 require 'ruby_skynet'
 
 # Log trace information to a log file
 SemanticLogger::Logger.default_level = :trace
-SemanticLogger::Logger.appenders << SemanticLogger::Appender::File.new('skynet.log')
+SemanticLogger::Logger.appenders << SemanticLogger::Appender::File.new('echo_server.log')
 
 # Specify Port and Hostname to listen for requests on
-RubySkynet::Server.port = 2000
+RubySkynet::Server.port = 2020
 RubySkynet::Server.hostname = '127.0.0.1'
 
 # Just echo back any parameters received when the echo method is called
@@ -26,3 +28,5 @@ RubySkynet::Server.start
 
 puts "Press enter to shutdown server"
 gets
+
+RubySkynet::Server.stop

data/lib/ruby_skynet/common.rb

@@ -9,12 +9,16 @@ module RubySkynet
       # Read 4 byte size of following BSON document
       bytes = socket.read(4)
 
+      # No more data
+      return unless bytes
+
       # Read BSON document
       sz = bytes.unpack("V")[0]
       raise "Invalid Data received from server:#{bytes.inspect}" unless sz
 
       bytebuf.append!(bytes)
       bytebuf.append!(socket.read(sz - 4))
+      raise "Celluloid is not returning #{sz} requested bytes. #{bytebuf.length} bytes returned" unless sz == bytebuf.length
       return BSON.deserialize(bytebuf)
     end
 

data/lib/ruby_skynet/connection.rb

@@ -95,7 +95,7 @@ module RubySkynet
         client_handshake = { 'clientid' => client_id }
         @logger.debug "Sending Client Handshake"
         @logger.trace 'Client Handshake', client_handshake
-        socket.write(BSON.serialize(client_handshake))
+        socket.write(BSON.serialize(client_handshake).to_s)
       end
 
       # To prevent strange issues if user incorrectly supplies server names
@@ -135,12 +135,12 @@ module RubySkynet
 
         @logger.debug "Sending Header"
         @logger.trace 'Header', header
-        socket.write(BSON.serialize(header))
+        socket.write(BSON.serialize(header).to_s)
 
         # The parameters are placed in the request object in BSON serialized form
         request = {
           'clientid'    => socket.user_data[:client_id],
-          'in'          => BSON.serialize(parameters).to_s,
+          'in'          => BSON::Binary.new(BSON.serialize(parameters).to_s),
           'method'      => method_name.to_s,
           'requestinfo' => {
             'requestid'     => request_id,
@@ -156,7 +156,7 @@ module RubySkynet
         @logger.debug "Sending Request"
         @logger.trace 'Request', request
         @logger.trace 'Parameters:', parameters
-        socket.write(BSON.serialize(request))
+        socket.write(BSON.serialize(request).to_s)
 
         # Since Send does not affect state on the server we can also retry reads
         if idempotent

data/lib/ruby_skynet/registry.rb

@@ -57,7 +57,7 @@ module RubySkynet
         :read_timeout           => 5,
         :connect_timeout        => 3,
         :connect_retry_interval => 1,
-        :connect_retry_count    => 300
+        :connect_retry_count    => 30
       }
     end
 

data/lib/ruby_skynet/server.rb

@@ -167,7 +167,7 @@ module RubySkynet
 
           logger.debug "Sending Reply"
           logger.trace 'Reply', reply
-          client.write(BSON.serialize({'out' => BSON.serialize(reply).to_s}).to_s)
+          client.write(BSON.serialize('out' => BSON::Binary.new(BSON.serialize(reply))).to_s)
         else
           logger.debug "Closing client since no reply is being sent back"
           break

data/lib/ruby_skynet/version.rb

@@ -1,3 +1,3 @@
 module RubySkynet #:nodoc
-  VERSION = "0.4.0.pre"
+  VERSION = "0.4.0.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_skynet
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre
+  version: 0.4.0.pre2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger
@@ -106,6 +106,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/e.rb
 - examples/echo_client.rb
 - examples/echo_server.rb
 - lib/ruby_skynet.rb