em-jsonrpc 0.0.3 → 0.1.0

data/lib/em-jsonrpc.rb

@@ -0,0 +1,7 @@
+require "yajl"
+require "securerandom"
+
+require "em-jsonrpc/version"
+require "em-jsonrpc/constants"
+require "em-jsonrpc/client"
+require "em-jsonrpc/server"

data/lib/em-jsonrpc/client.rb

@@ -1,11 +1,3 @@
-require "eventmachine"
-require "yajl"
-require "securerandom"
-
-require "em-jsonrpc/version"
-require "em-jsonrpc/constants"
-
-
 module EventMachine::JsonRPC
 
   class Client < EM::Connection
@@ -193,9 +185,6 @@ module EventMachine::JsonRPC
   end  # class Client
 
 
-  class ConnectionError < StandardError ; end
-
-
   def self.connect_tcp(host, port, handler, request_timeout=nil, parser_options={}, &block)
     raise Error, "EventMachine is not running" unless EM.reactor_running?
 

data/lib/em-jsonrpc/server.rb

@@ -1,18 +1,11 @@
-require "eventmachine"
-require "yajl"
-
-require "em-jsonrpc/version"
-require "em-jsonrpc/constants"
-
-
 module EventMachine::JsonRPC
 
   class Server < EM::Connection
     attr_reader :encoder
-    
+
     def initialize(*options)
       parser_options = options.first || {}
-      
+
       if parser_options[:symbolize_keys]
         @key_jsonrpc = :jsonrpc
         @key_id = :id
@@ -24,10 +17,10 @@ module EventMachine::JsonRPC
         @key_method = KEY_METHOD
         @key_params = KEY_PARAMS
       end
-      
+
       @parser = Yajl::Parser.new parser_options
       @parser.on_parse_complete = method(:obj_parsed)
-      
+
       @state = :data
     end
 
@@ -53,7 +46,7 @@ module EventMachine::JsonRPC
 
     def obj_parsed(obj)
       @encoder ||= Yajl::Encoder.new
-      
+
       case obj
       # Individual request/notification.
       when Hash
@@ -79,19 +72,19 @@ module EventMachine::JsonRPC
           return false
         end
       end
-        
+
       unless obj[@key_jsonrpc] == "2.0"
         invalid_request obj, CODE_INVALID_REQUEST, MSG_INVALID_REQ_JSONRPC
         reply_error id, CODE_INVALID_REQUEST, MSG_INVALID_REQ_JSONRPC
         return false
       end
-      
+
       unless (method = obj[@key_method]).is_a? String
         invalid_request obj, CODE_INVALID_REQUEST, MSG_INVALID_REQ_METHOD
         reply_error id, CODE_INVALID_REQUEST, MSG_INVALID_REQ_METHOD
         return false
       end
-      
+
       if (params = obj[@key_params])
         unless params.is_a? Array or params.is_a? Hash
           invalid_request obj, CODE_INVALID_REQUEST, MSG_INVALID_REQ_PARAMS
@@ -137,7 +130,7 @@ module EventMachine::JsonRPC
     def batch_not_supported_error(obj)
       $stderr.puts "batch request received but not implemented"
     end
-    
+
     # This method could be overriden in the user's inherited class.
     def invalid_request(obj, code, message=nil)
       $stderr.puts "error #{code}: #{message}"

data/lib/em-jsonrpc/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module JsonRPC
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

data/test/em-jsonrpc-client.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/ruby
+# coding: utf-8
+
+require "eventmachine-le"
+require "em-jsonrpc"
+
+
+class MyHandler < EM::JsonRPC::Client
+
+  def do_request
+    puts "--- my: do_request()"
+    request = send_request "subtract", [42, 23]
+    request.callback do |result|
+      puts "INFO: result = #{result.inspect}"
+      EM.add_timer(SecureRandom.random_number) { do_request }
+    end
+    request.errback do |error|
+      puts "ERROR: result = #{error.inspect}"
+      EM.add_timer(SecureRandom.random_number) { do_request }
+    end
+  end
+
+  def connection_failed
+    $stderr.puts "ERROR: connection failed"
+    exit 1
+  end
+
+  def connection_terminated
+    @connection_attemp ||= 0
+    @connection_attemp  += 1
+    $stderr.puts "WARN: connection terminated, reconnecting (#{@connection_attemp} attemp)..."
+    EM.add_timer(0.5) { connect_again }
+  end
+
+  def parsing_error
+    $stderr.puts "ERROR: parsing error"
+  end
+
+end
+
+
+EM.set_max_timers 500000
+
+EM.run do
+
+  yajl_options = { :symbolize_keys => true }
+  EM.connect "127.0.0.1", 8888, MyHandler, "127.0.0.1", 8888, nil, yajl_options do |conn|
+    conn.do_request
+    EM.add_periodic_timer(1) { puts "." }
+    EM.add_periodic_timer(4) { puts "DEBUG: #{conn.pending_requests.size} pending requests" ; sleep 0.5 }
+  end
+
+end

data/test/{test-em-jsonrpc-server.rb → em-jsonrpc-server.rb}

@@ -1,9 +1,8 @@
 #!/usr/bin/ruby
 # coding: utf-8
 
-### TMP
-$LOAD_PATH.insert 0, File.expand_path(File.join(File.dirname(__FILE__), "../", "lib"))
-require "em-jsonrpc/server"
+require "eventmachine-le"
+require "em-jsonrpc"
 
 
 class MyJsonRpcServer < EM::JsonRPC::Server

metadata

@@ -1,98 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-jsonrpc
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Inaki Baz Castillo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-02 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
-  type: :runtime
-  version_requirements: *id002
-description: em-jsonrpc provides a JSON RPC 2.0 TCP/UnixSocket client and server to be integrated within EventMachine reactor
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+description: em-jsonrpc provides a JSON RPC 2.0 TCP/UnixSocket client and server to
+  be integrated within EventMachine reactor
 email: ibc@aliax.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/em-jsonrpc.rb
 - lib/em-jsonrpc/version.rb
 - lib/em-jsonrpc/constants.rb
 - lib/em-jsonrpc/server.rb
 - lib/em-jsonrpc/client.rb
-- test/test-em-jsonrpc-client.rb
-- test/test-em-jsonrpc-server.rb
-has_rdoc: true
+- test/em-jsonrpc-client.rb
+- test/jsonrpc-client.rb
+- test/em-jsonrpc-server.rb
 homepage: https://github.com/ibc/em-jsonrpc
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: JSON RCP 2.0 client and server for EventMachine over TCP or UnixSocket
 test_files: []
-
+has_rdoc: false