thrift 0.9.2.0 → 0.15.0

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.
Files changed (65) hide show
  1. checksums.yaml +7 -0
  2. data/ext/binary_protocol_accelerated.c +12 -12
  3. data/ext/compact_protocol.c +1 -0
  4. data/ext/struct.c +14 -1
  5. data/ext/thrift_native.c +17 -0
  6. data/lib/thrift/multiplexed_processor.rb +76 -0
  7. data/lib/thrift/processor.rb +24 -6
  8. data/lib/thrift/protocol/base_protocol.rb +11 -3
  9. data/lib/thrift/protocol/binary_protocol.rb +8 -1
  10. data/lib/thrift/protocol/binary_protocol_accelerated.rb +8 -0
  11. data/lib/thrift/protocol/compact_protocol.rb +8 -0
  12. data/lib/thrift/protocol/json_protocol.rb +21 -4
  13. data/lib/thrift/protocol/multiplexed_protocol.rb +44 -0
  14. data/lib/thrift/protocol/protocol_decorator.rb +194 -0
  15. data/lib/thrift/server/base_server.rb +8 -2
  16. data/lib/thrift/server/simple_server.rb +5 -1
  17. data/lib/thrift/server/thread_pool_server.rb +5 -1
  18. data/lib/thrift/server/threaded_server.rb +5 -1
  19. data/lib/thrift/transport/base_server_transport.rb +1 -1
  20. data/lib/thrift/transport/base_transport.rb +8 -0
  21. data/lib/thrift/transport/buffered_transport.rb +9 -1
  22. data/lib/thrift/transport/framed_transport.rb +9 -1
  23. data/lib/thrift/transport/http_client_transport.rb +7 -0
  24. data/lib/thrift/transport/io_stream_transport.rb +4 -1
  25. data/lib/thrift/transport/memory_buffer_transport.rb +4 -0
  26. data/lib/thrift/transport/server_socket.rb +6 -1
  27. data/lib/thrift/transport/socket.rb +21 -17
  28. data/lib/thrift/transport/ssl_server_socket.rb +41 -0
  29. data/lib/thrift/transport/ssl_socket.rb +51 -0
  30. data/lib/thrift/transport/unix_server_socket.rb +5 -1
  31. data/lib/thrift/transport/unix_socket.rb +5 -1
  32. data/lib/thrift/union.rb +3 -6
  33. data/lib/thrift.rb +8 -4
  34. data/spec/BaseService.thrift +27 -0
  35. data/spec/ExtendedService.thrift +25 -0
  36. data/spec/base_protocol_spec.rb +79 -71
  37. data/spec/base_transport_spec.rb +155 -117
  38. data/spec/binary_protocol_accelerated_spec.rb +6 -2
  39. data/spec/binary_protocol_spec.rb +16 -8
  40. data/spec/binary_protocol_spec_shared.rb +75 -72
  41. data/spec/bytes_spec.rb +38 -38
  42. data/spec/client_spec.rb +41 -42
  43. data/spec/compact_protocol_spec.rb +32 -17
  44. data/spec/exception_spec.rb +54 -54
  45. data/spec/flat_spec.rb +62 -0
  46. data/spec/http_client_spec.rb +74 -33
  47. data/spec/json_protocol_spec.rb +170 -131
  48. data/spec/namespaced_spec.rb +10 -5
  49. data/spec/nonblocking_server_spec.rb +16 -16
  50. data/spec/processor_spec.rb +26 -26
  51. data/spec/serializer_spec.rb +20 -20
  52. data/spec/server_socket_spec.rb +27 -22
  53. data/spec/server_spec.rb +91 -51
  54. data/spec/socket_spec.rb +23 -16
  55. data/spec/socket_spec_shared.rb +31 -31
  56. data/spec/spec_helper.rb +9 -1
  57. data/spec/ssl_server_socket_spec.rb +34 -0
  58. data/spec/ssl_socket_spec.rb +78 -0
  59. data/spec/struct_nested_containers_spec.rb +24 -24
  60. data/spec/struct_spec.rb +120 -120
  61. data/spec/thin_http_server_spec.rb +18 -18
  62. data/spec/types_spec.rb +56 -53
  63. data/spec/union_spec.rb +51 -40
  64. data/spec/unix_socket_spec.rb +43 -34
  65. metadata +205 -143
data/spec/base_protocol_spec.rb CHANGED
@@ -22,41 +22,46 @@ require 'spec_helper'
22
22
  describe 'BaseProtocol' do
23
23
 
24
24
  before(:each) do
25
- @trans = mock("MockTransport")
25
+ @trans = double("MockTransport")
26
26
  @prot = Thrift::BaseProtocol.new(@trans)
27
27
  end
28
28
 
29
29
  describe Thrift::BaseProtocol do
30
30
  # most of the methods are stubs, so we can ignore them
31
31
 
32
+ it "should provide a reasonable to_s" do
33
+ expect(@trans).to receive(:to_s).once.and_return("trans")
34
+ expect(@prot.to_s).to eq("trans")
35
+ end
36
+
32
37
  it "should make trans accessible" do
33
- @prot.trans.should eql(@trans)
38
+ expect(@prot.trans).to eql(@trans)
34
39
  end
35
40
 
36
41
  it 'should write out a field nicely (deprecated write_field signature)' do
37
- @prot.should_receive(:write_field_begin).with('field', 'type', 'fid').ordered
38
- @prot.should_receive(:write_type).with({:name => 'field', :type => 'type'}, 'value').ordered
39
- @prot.should_receive(:write_field_end).ordered
42
+ expect(@prot).to receive(:write_field_begin).with('field', 'type', 'fid').ordered
43
+ expect(@prot).to receive(:write_type).with({:name => 'field', :type => 'type'}, 'value').ordered
44
+ expect(@prot).to receive(:write_field_end).ordered
40
45
  @prot.write_field('field', 'type', 'fid', 'value')
41
46
  end
42
47
 
43
48
  it 'should write out a field nicely' do
44
- @prot.should_receive(:write_field_begin).with('field', 'type', 'fid').ordered
45
- @prot.should_receive(:write_type).with({:name => 'field', :type => 'type', :binary => false}, 'value').ordered
46
- @prot.should_receive(:write_field_end).ordered
49
+ expect(@prot).to receive(:write_field_begin).with('field', 'type', 'fid').ordered
50
+ expect(@prot).to receive(:write_type).with({:name => 'field', :type => 'type', :binary => false}, 'value').ordered
51
+ expect(@prot).to receive(:write_field_end).ordered
47
52
  @prot.write_field({:name => 'field', :type => 'type', :binary => false}, 'fid', 'value')
48
53
  end
49
54
 
50
55
  it 'should write out the different types (deprecated write_type signature)' do
51
- @prot.should_receive(:write_bool).with('bool').ordered
52
- @prot.should_receive(:write_byte).with('byte').ordered
53
- @prot.should_receive(:write_double).with('double').ordered
54
- @prot.should_receive(:write_i16).with('i16').ordered
55
- @prot.should_receive(:write_i32).with('i32').ordered
56
- @prot.should_receive(:write_i64).with('i64').ordered
57
- @prot.should_receive(:write_string).with('string').ordered
58
- struct = mock('Struct')
59
- struct.should_receive(:write).with(@prot).ordered
56
+ expect(@prot).to receive(:write_bool).with('bool').ordered
57
+ expect(@prot).to receive(:write_byte).with('byte').ordered
58
+ expect(@prot).to receive(:write_double).with('double').ordered
59
+ expect(@prot).to receive(:write_i16).with('i16').ordered
60
+ expect(@prot).to receive(:write_i32).with('i32').ordered
61
+ expect(@prot).to receive(:write_i64).with('i64').ordered
62
+ expect(@prot).to receive(:write_string).with('string').ordered
63
+ struct = double('Struct')
64
+ expect(struct).to receive(:write).with(@prot).ordered
60
65
  @prot.write_type(Thrift::Types::BOOL, 'bool')
61
66
  @prot.write_type(Thrift::Types::BYTE, 'byte')
62
67
  @prot.write_type(Thrift::Types::DOUBLE, 'double')
@@ -72,16 +77,16 @@ describe 'BaseProtocol' do
72
77
  end
73
78
 
74
79
  it 'should write out the different types' do
75
- @prot.should_receive(:write_bool).with('bool').ordered
76
- @prot.should_receive(:write_byte).with('byte').ordered
77
- @prot.should_receive(:write_double).with('double').ordered
78
- @prot.should_receive(:write_i16).with('i16').ordered
79
- @prot.should_receive(:write_i32).with('i32').ordered
80
- @prot.should_receive(:write_i64).with('i64').ordered
81
- @prot.should_receive(:write_string).with('string').ordered
82
- @prot.should_receive(:write_binary).with('binary').ordered
83
- struct = mock('Struct')
84
- struct.should_receive(:write).with(@prot).ordered
80
+ expect(@prot).to receive(:write_bool).with('bool').ordered
81
+ expect(@prot).to receive(:write_byte).with('byte').ordered
82
+ expect(@prot).to receive(:write_double).with('double').ordered
83
+ expect(@prot).to receive(:write_i16).with('i16').ordered
84
+ expect(@prot).to receive(:write_i32).with('i32').ordered
85
+ expect(@prot).to receive(:write_i64).with('i64').ordered
86
+ expect(@prot).to receive(:write_string).with('string').ordered
87
+ expect(@prot).to receive(:write_binary).with('binary').ordered
88
+ struct = double('Struct')
89
+ expect(struct).to receive(:write).with(@prot).ordered
85
90
  @prot.write_type({:type => Thrift::Types::BOOL}, 'bool')
86
91
  @prot.write_type({:type => Thrift::Types::BYTE}, 'byte')
87
92
  @prot.write_type({:type => Thrift::Types::DOUBLE}, 'double')
@@ -98,13 +103,13 @@ describe 'BaseProtocol' do
98
103
  end
99
104
 
100
105
  it 'should read the different types (deprecated read_type signature)' do
101
- @prot.should_receive(:read_bool).ordered
102
- @prot.should_receive(:read_byte).ordered
103
- @prot.should_receive(:read_i16).ordered
104
- @prot.should_receive(:read_i32).ordered
105
- @prot.should_receive(:read_i64).ordered
106
- @prot.should_receive(:read_double).ordered
107
- @prot.should_receive(:read_string).ordered
106
+ expect(@prot).to receive(:read_bool).ordered
107
+ expect(@prot).to receive(:read_byte).ordered
108
+ expect(@prot).to receive(:read_i16).ordered
109
+ expect(@prot).to receive(:read_i32).ordered
110
+ expect(@prot).to receive(:read_i64).ordered
111
+ expect(@prot).to receive(:read_double).ordered
112
+ expect(@prot).to receive(:read_string).ordered
108
113
  @prot.read_type(Thrift::Types::BOOL)
109
114
  @prot.read_type(Thrift::Types::BYTE)
110
115
  @prot.read_type(Thrift::Types::I16)
@@ -120,14 +125,14 @@ describe 'BaseProtocol' do
120
125
  end
121
126
 
122
127
  it 'should read the different types' do
123
- @prot.should_receive(:read_bool).ordered
124
- @prot.should_receive(:read_byte).ordered
125
- @prot.should_receive(:read_i16).ordered
126
- @prot.should_receive(:read_i32).ordered
127
- @prot.should_receive(:read_i64).ordered
128
- @prot.should_receive(:read_double).ordered
129
- @prot.should_receive(:read_string).ordered
130
- @prot.should_receive(:read_binary).ordered
128
+ expect(@prot).to receive(:read_bool).ordered
129
+ expect(@prot).to receive(:read_byte).ordered
130
+ expect(@prot).to receive(:read_i16).ordered
131
+ expect(@prot).to receive(:read_i32).ordered
132
+ expect(@prot).to receive(:read_i64).ordered
133
+ expect(@prot).to receive(:read_double).ordered
134
+ expect(@prot).to receive(:read_string).ordered
135
+ expect(@prot).to receive(:read_binary).ordered
131
136
  @prot.read_type({:type => Thrift::Types::BOOL})
132
137
  @prot.read_type({:type => Thrift::Types::BYTE})
133
138
  @prot.read_type({:type => Thrift::Types::I16})
@@ -144,13 +149,13 @@ describe 'BaseProtocol' do
144
149
  end
145
150
 
146
151
  it "should skip the basic types" do
147
- @prot.should_receive(:read_bool).ordered
148
- @prot.should_receive(:read_byte).ordered
149
- @prot.should_receive(:read_i16).ordered
150
- @prot.should_receive(:read_i32).ordered
151
- @prot.should_receive(:read_i64).ordered
152
- @prot.should_receive(:read_double).ordered
153
- @prot.should_receive(:read_string).ordered
152
+ expect(@prot).to receive(:read_bool).ordered
153
+ expect(@prot).to receive(:read_byte).ordered
154
+ expect(@prot).to receive(:read_i16).ordered
155
+ expect(@prot).to receive(:read_i32).ordered
156
+ expect(@prot).to receive(:read_i64).ordered
157
+ expect(@prot).to receive(:read_double).ordered
158
+ expect(@prot).to receive(:read_string).ordered
154
159
  @prot.skip(Thrift::Types::BOOL)
155
160
  @prot.skip(Thrift::Types::BYTE)
156
161
  @prot.skip(Thrift::Types::I16)
@@ -158,52 +163,51 @@ describe 'BaseProtocol' do
158
163
  @prot.skip(Thrift::Types::I64)
159
164
  @prot.skip(Thrift::Types::DOUBLE)
160
165
  @prot.skip(Thrift::Types::STRING)
161
- @prot.skip(Thrift::Types::STOP) # should do absolutely nothing
162
166
  end
163
167
 
164
168
  it "should skip structs" do
165
169
  real_skip = @prot.method(:skip)
166
- @prot.should_receive(:read_struct_begin).ordered
167
- @prot.should_receive(:read_field_begin).exactly(4).times.and_return(
170
+ expect(@prot).to receive(:read_struct_begin).ordered
171
+ expect(@prot).to receive(:read_field_begin).exactly(4).times.and_return(
168
172
  ['field 1', Thrift::Types::STRING, 1],
169
173
  ['field 2', Thrift::Types::I32, 2],
170
174
  ['field 3', Thrift::Types::MAP, 3],
171
175
  [nil, Thrift::Types::STOP, 0]
172
176
  )
173
- @prot.should_receive(:read_field_end).exactly(3).times
174
- @prot.should_receive(:read_string).exactly(3).times
175
- @prot.should_receive(:read_i32).ordered
176
- @prot.should_receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRING, 1])
177
+ expect(@prot).to receive(:read_field_end).exactly(3).times
178
+ expect(@prot).to receive(:read_string).exactly(3).times
179
+ expect(@prot).to receive(:read_i32).ordered
180
+ expect(@prot).to receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRING, 1])
177
181
  # @prot.should_receive(:read_string).exactly(2).times
178
- @prot.should_receive(:read_map_end).ordered
179
- @prot.should_receive(:read_struct_end).ordered
182
+ expect(@prot).to receive(:read_map_end).ordered
183
+ expect(@prot).to receive(:read_struct_end).ordered
180
184
  real_skip.call(Thrift::Types::STRUCT)
181
185
  end
182
186
 
183
187
  it "should skip maps" do
184
188
  real_skip = @prot.method(:skip)
185
- @prot.should_receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRUCT, 1])
186
- @prot.should_receive(:read_string).ordered
187
- @prot.should_receive(:read_struct_begin).ordered.and_return(["some_struct"])
188
- @prot.should_receive(:read_field_begin).ordered.and_return([nil, Thrift::Types::STOP, nil]);
189
- @prot.should_receive(:read_struct_end).ordered
190
- @prot.should_receive(:read_map_end).ordered
189
+ expect(@prot).to receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRUCT, 1])
190
+ expect(@prot).to receive(:read_string).ordered
191
+ expect(@prot).to receive(:read_struct_begin).ordered.and_return(["some_struct"])
192
+ expect(@prot).to receive(:read_field_begin).ordered.and_return([nil, Thrift::Types::STOP, nil]);
193
+ expect(@prot).to receive(:read_struct_end).ordered
194
+ expect(@prot).to receive(:read_map_end).ordered
191
195
  real_skip.call(Thrift::Types::MAP)
192
196
  end
193
197
 
194
198
  it "should skip sets" do
195
199
  real_skip = @prot.method(:skip)
196
- @prot.should_receive(:read_set_begin).ordered.and_return([Thrift::Types::I64, 9])
197
- @prot.should_receive(:read_i64).ordered.exactly(9).times
198
- @prot.should_receive(:read_set_end)
200
+ expect(@prot).to receive(:read_set_begin).ordered.and_return([Thrift::Types::I64, 9])
201
+ expect(@prot).to receive(:read_i64).ordered.exactly(9).times
202
+ expect(@prot).to receive(:read_set_end)
199
203
  real_skip.call(Thrift::Types::SET)
200
204
  end
201
205
 
202
206
  it "should skip lists" do
203
207
  real_skip = @prot.method(:skip)
204
- @prot.should_receive(:read_list_begin).ordered.and_return([Thrift::Types::DOUBLE, 11])
205
- @prot.should_receive(:read_double).ordered.exactly(11).times
206
- @prot.should_receive(:read_list_end)
208
+ expect(@prot).to receive(:read_list_begin).ordered.and_return([Thrift::Types::DOUBLE, 11])
209
+ expect(@prot).to receive(:read_double).ordered.exactly(11).times
210
+ expect(@prot).to receive(:read_list_end)
207
211
  real_skip.call(Thrift::Types::LIST)
208
212
  end
209
213
  end
@@ -211,7 +215,11 @@ describe 'BaseProtocol' do
211
215
  describe Thrift::BaseProtocolFactory do
212
216
  it "should raise NotImplementedError" do
213
217
  # returning nil since Protocol is just an abstract class
214
- lambda {Thrift::BaseProtocolFactory.new.get_protocol(mock("MockTransport"))}.should raise_error(NotImplementedError)
218
+ expect {Thrift::BaseProtocolFactory.new.get_protocol(double("MockTransport"))}.to raise_error(NotImplementedError)
219
+ end
220
+
221
+ it "should provide a reasonable to_s" do
222
+ expect(Thrift::BaseProtocolFactory.new.to_s).to eq("base")
215
223
  end
216
224
  end
217
225
  end