rawjsonrpc 0.1.4 → 0.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/rawjsonrpc/server.rb +6 -20
- data/rawjsonrpc-0.1.4.gem +0 -0
- data/rawjsonrpc.gemspec +2 -1
- metadata +7 -6
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.5
|
data/lib/rawjsonrpc/server.rb
CHANGED
@@ -7,7 +7,7 @@
|
|
7
7
|
# This is free software. Please see the LICENSE and COPYING files for details.
|
8
8
|
|
9
9
|
require 'socket'
|
10
|
-
require 'logger'
|
10
|
+
#require 'logger'
|
11
11
|
require 'json'
|
12
12
|
require 'gserver'
|
13
13
|
require_relative 'error'
|
@@ -76,48 +76,34 @@ module RawJsonRpc
|
|
76
76
|
include RawServerJsonRpc
|
77
77
|
# sets the port for serving. Optimal you can add a logger object to log
|
78
78
|
# server activities.
|
79
|
-
def initialize(port
|
79
|
+
def initialize(port)
|
80
80
|
@port = port
|
81
|
-
@log = logger
|
82
|
-
end
|
83
|
-
private
|
84
|
-
#checks logger
|
85
|
-
def check(logger, para)
|
86
|
-
if @log != nil
|
87
|
-
logger.call(para)
|
88
|
-
end
|
89
81
|
end
|
82
|
+
|
90
83
|
public
|
91
84
|
# Starts the servering the methods for clients
|
92
85
|
def serve
|
93
|
-
|
94
|
-
|
95
|
-
client = server.accept
|
86
|
+
ser = TCPServer.new(@port)
|
87
|
+
client = ser.accept
|
96
88
|
loop do
|
97
89
|
begin
|
98
90
|
data = client.gets
|
99
91
|
if data == nil or data == "END\n"
|
100
|
-
check @log.info, "client closed connection"
|
101
92
|
client.close
|
102
93
|
client = server.accept
|
103
94
|
next
|
104
95
|
end
|
105
|
-
check @log.info, "recived from client " + data
|
106
96
|
data = execute(data)
|
107
97
|
if data != nil
|
108
|
-
check @log.info, "send to client " + data
|
109
98
|
client.puts(data)
|
110
99
|
end
|
111
100
|
rescue SocketError
|
112
|
-
check @log.info, "client closed connection"
|
113
101
|
client.close
|
114
102
|
client = server.accept
|
115
103
|
# Exception from get killed
|
116
104
|
rescue Errno::EPIPE
|
117
|
-
check @log.info, "server get killed"
|
118
105
|
exit
|
119
106
|
rescue => ex
|
120
|
-
check @log.fatal, "server get killed from: " + ex.message
|
121
107
|
client.close
|
122
108
|
raise ex
|
123
109
|
end
|
@@ -126,7 +112,7 @@ module RawJsonRpc
|
|
126
112
|
end
|
127
113
|
# Implements the RawServerJsonRpcBase as GServer the stdlib SocketServer. For
|
128
114
|
# more information go one to the stdlib.
|
129
|
-
class
|
115
|
+
class JSONTCPServer < GServer
|
130
116
|
include RawServerJsonRpc
|
131
117
|
end
|
132
118
|
end
|
Binary file
|
data/rawjsonrpc.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "rawjsonrpc"
|
8
|
-
s.version = "0.1.
|
8
|
+
s.version = "0.1.5"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Alexander Schrode"]
|
@@ -70,6 +70,7 @@ Gem::Specification.new do |s|
|
|
70
70
|
"rawjsonrpc-0.1.0.gem",
|
71
71
|
"rawjsonrpc-0.1.2.gem",
|
72
72
|
"rawjsonrpc-0.1.3.gem",
|
73
|
+
"rawjsonrpc-0.1.4.gem",
|
73
74
|
"rawjsonrpc.gemspec",
|
74
75
|
"test/helper.rb",
|
75
76
|
"test/test_rawjsonrpc.rb"
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rawjsonrpc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2012-01-13 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
16
|
-
requirement: &
|
16
|
+
requirement: &70563080 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 1.0.0
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70563080
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: jeweler
|
27
|
-
requirement: &
|
27
|
+
requirement: &70562780 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,7 +32,7 @@ dependencies:
|
|
32
32
|
version: 1.6.4
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70562780
|
36
36
|
description: A basic libary for json rpc that allow you to easly create one for your
|
37
37
|
streamtype. It includes tcp json rpc on socket connections. Version for single clients
|
38
38
|
server, one for multiple clients server based on gserver are served and a TCP client.
|
@@ -96,6 +96,7 @@ files:
|
|
96
96
|
- rawjsonrpc-0.1.0.gem
|
97
97
|
- rawjsonrpc-0.1.2.gem
|
98
98
|
- rawjsonrpc-0.1.3.gem
|
99
|
+
- rawjsonrpc-0.1.4.gem
|
99
100
|
- rawjsonrpc.gemspec
|
100
101
|
- test/helper.rb
|
101
102
|
- test/test_rawjsonrpc.rb
|
@@ -114,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
114
115
|
version: '0'
|
115
116
|
segments:
|
116
117
|
- 0
|
117
|
-
hash:
|
118
|
+
hash: -94339075
|
118
119
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
119
120
|
none: false
|
120
121
|
requirements:
|