rawjsonrpc 0.1.5 → 0.1.6

data/README.rdoc

@@ -1,8 +1,7 @@
 = rawjsonrpc
 
 rawjsonrpc is a libary to create a jsonrpc client for every type of stream. It
-also profides one client for tcpsocket, an server for one client and on server
-based on gserver from the ruby stdlib. 
+also profides an server and client over tcpip. 
 This is libary is a my first try in ruby to create a gem. Its more a test how 
 gems work but i hope i can help somebody with this lib. 
 
@@ -28,27 +27,18 @@ Create a client to send rpc calls.
   client.notification("noti", 1, "t")                #send notifaction no return value
   client.close()
 
-== Use server TCP simple
+== Use the TCP server
 
-Use the libary to serve functions over tcp ip. 
+Use the gserver to serve data over tcp ip 
 
-  server = RawJsonRpc::ServerSocket.new(8080)
-  server.add_method("func1", method("do_stuff1")) # adds do_stuff1 as 
-"func1"
+  server = RawJsonRpc::JSONTCPServer.new(8080)
+  server.add_method("func1", method("do_stuff1")) # adds do_stuff1 as "func1"
   server.add_method("foo", method(:bar))          # adds bar as foo
-  server.add_block("func2"){|a,b, *c|              # adds a block with 2 
-args
+  server.add_block("func2"){|a,b, *c|              # adds a block with 2 args
     #do stuff 			 		  # and args as func2
   }
-  server.serve()
-
-== use gserver TCP
-
-Lock in the stdlib for usage. The server delivers automaticly the functions.
-Beware of adding methods or blocks after starting.
-
-
-  server = RawJsonRpc::TCPServer.new(#args)
+  server.start
+  server.join
 
 == implement your own jsonclient
  

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/schroeder-/rawjsonrpc"
   gem.license = "MIT"
   gem.summary = %Q{A basic libary for json rpc that allow to create for your stream type. It includes a TCPIp Server and Client.}
-  gem.description = %Q{A basic libary for json rpc that allow you to easly create one for your streamtype. It includes tcp json rpc on socket connections. Version for single clients server, one for multiple clients server based on gserver are served and a TCP client.}
+  gem.description = %Q{A basic libary for json rpc that allow you to easly create one for your streamtype. It includes tcp json rpc on socket connections.}
   gem.email = "midix01@googlemail.com"
   gem.authors = ["Alexander Schrode"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/examples/server_examples.rb

@@ -0,0 +1,38 @@
+require 'rawjsonrpc'
+
+
+def test1(a)
+  a
+end
+
+def test2(b,c)
+  b
+end
+
+def test3
+  nil
+end
+
+class Tester
+  def b
+    5
+  end
+end
+
+
+#create exampel class
+test_class = Tester.new
+
+#launch a Server based on Gserver see infos at stdlib doc
+
+serve1 = RawJsonRpc::JSONTCPServer.new(port=8080, maxConnections=2)
+serve1.add_method("test1", method(:test1))
+serve1.add_method("func2", method(:test2))
+serve1.add_method("tes", method(:test3))
+serve1.add_method("clas-t2", test_class.method(:b))
+serve1.add_block("func4"){
+  return 100
+}
+serve1.start
+serve1.join
+puts "Ended"

data/lib/rawjsonrpc/server.rb

@@ -7,7 +7,6 @@
 # This is free software. Please see the LICENSE and COPYING files for details.
 
 require 'socket'
-#require 'logger'
 require 'json'
 require 'gserver'
 require_relative 'error'
@@ -70,49 +69,15 @@ module RawJsonRpc
       end
     end
   end
-  # Implements RawServerJsonRpcBase for a TCPServer, that can only handle
-  # one client at once.
-  class ServerSocket
-    include RawServerJsonRpc
-    # sets the port for serving. Optimal you can add a logger object to log
-    # server activities.
-    def initialize(port)
-      @port = port
-    end
-
-    public
-    # Starts the servering the methods for clients
-    def serve
-      ser = TCPServer.new(@port)
-      client = ser.accept
-      loop do
-        begin
-          data = client.gets
-          if data == nil or data == "END\n"
-            client.close
-            client = server.accept
-            next
-          end
-          data = execute(data)
-          if data != nil
-            client.puts(data)
-          end
-        rescue SocketError
-          client.close
-          client = server.accept
-        #  Exception from get killed
-        rescue Errno::EPIPE
-          exit
-        rescue => ex
-          client.close
-          raise ex
-        end
-      end
-    end
-  end
   # Implements the RawServerJsonRpcBase as GServer the stdlib SocketServer. For
   # more information go one to the stdlib.
   class JSONTCPServer < GServer
     include RawServerJsonRpc
+    def serve(io)
+      loop do
+        data = io.gets
+        io.puts execute(data)
+      end
+    end
   end
 end

data/rawjsonrpc.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "rawjsonrpc"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Schrode"]
-  s.date = "2012-01-13"
-  s.description = "A basic libary for json rpc that allow you to easly create one for your streamtype. It includes tcp json rpc on socket connections. Version for single clients server, one for multiple clients server based on gserver are served and a TCP client."
+  s.date = "2012-01-14"
+  s.description = "A basic libary for json rpc that allow you to easly create one for your streamtype. It includes tcp json rpc on socket connections."
   s.email = "midix01@googlemail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
     "doc/rdoc/lib/rawjsonrpc/server_rb.html",
     "doc/rdoc/lib/rawjsonrpc_rb.html",
     "doc/rdoc/rdoc.css",
+    "examples/server_examples.rb",
     "lib/rawjsonrpc.rb",
     "lib/rawjsonrpc/client.rb",
     "lib/rawjsonrpc/error.rb",
@@ -71,6 +72,7 @@ Gem::Specification.new do |s|
     "rawjsonrpc-0.1.2.gem",
     "rawjsonrpc-0.1.3.gem",
     "rawjsonrpc-0.1.4.gem",
+    "rawjsonrpc-0.1.5.gem",
     "rawjsonrpc.gemspec",
     "test/helper.rb",
     "test/test_rawjsonrpc.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rawjsonrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70563080 !ruby/object:Gem::Requirement
+  requirement: &81688840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70563080
+  version_requirements: *81688840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70562780 !ruby/object:Gem::Requirement
+  requirement: &81688560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,9 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70562780
+  version_requirements: *81688560
 description: A basic libary for json rpc that allow you to easly create one for your
-  streamtype. It includes tcp json rpc on socket connections. Version for single clients
-  server, one for multiple clients server based on gserver are served and a TCP client.
+  streamtype. It includes tcp json rpc on socket connections.
 email: midix01@googlemail.com
 executables: []
 extensions: []
@@ -89,6 +88,7 @@ files:
 - doc/rdoc/lib/rawjsonrpc/server_rb.html
 - doc/rdoc/lib/rawjsonrpc_rb.html
 - doc/rdoc/rdoc.css
+- examples/server_examples.rb
 - lib/rawjsonrpc.rb
 - lib/rawjsonrpc/client.rb
 - lib/rawjsonrpc/error.rb
@@ -97,6 +97,7 @@ files:
 - rawjsonrpc-0.1.2.gem
 - rawjsonrpc-0.1.3.gem
 - rawjsonrpc-0.1.4.gem
+- rawjsonrpc-0.1.5.gem
 - rawjsonrpc.gemspec
 - test/helper.rb
 - test/test_rawjsonrpc.rb
@@ -115,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -94339075
+      hash: -753691871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: