thrift 0.22.0 → 0.23.0

data/lib/thrift/server/simple_server.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -39,7 +39,7 @@ module Thrift
         @server_transport.close
       end
     end
-    
+
     def to_s
       "simple(#{super.to_s})"
     end

data/lib/thrift/server/thin_http_server.rb

@@ -32,7 +32,7 @@ module Thrift
     # * :ip
     # * :path
     # * :protocol_factory
-    def initialize(processor, options={})
+    def initialize(processor, options = {})
       port = options[:port] || 80
       ip = options[:ip] || "0.0.0.0"
       path = options[:path] || "/"
@@ -60,9 +60,9 @@ module Thrift
             run lambda { |env|
               request = Rack::Request.new(env)
               if RackApplication.valid_thrift_request?(request)
-                RackApplication.successful_request(request, processor, protocol_factory)
+                RackApplication.successful_request(request, processor, protocol_factory).finish
               else
-                RackApplication.failed_request
+                RackApplication.failed_request.finish
               end
             }
           end

data/lib/thrift/server/thread_pool_server.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,22 +6,22 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'thread'
 
 module Thrift
   class ThreadPoolServer < BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil, num=20)
+    def initialize(processor, server_transport, transport_factory = nil, protocol_factory = nil, num = 20)
       super(processor, server_transport, transport_factory, protocol_factory)
       @thread_q = SizedQueue.new(num)
       @exception_q = Queue.new
@@ -71,7 +71,7 @@ module Thrift
         @server_transport.close
       end
     end
-    
+
     def to_s
       "threadpool(#{super.to_s})"
     end

data/lib/thrift/server/threaded_server.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -43,7 +43,7 @@ module Thrift
         @server_transport.close
       end
     end
-    
+
     def to_s
       "threaded(#{super.to_s})"
     end

data/lib/thrift/struct.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,33 +6,33 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'set'
 
 module Thrift
   module Struct
-    def initialize(d={}, &block)
+    def initialize(d = {}, &block)
       # get a copy of the default values to work on, removing defaults in favor of arguments
       fields_with_defaults = fields_with_default_values.dup
-      
-      # check if the defaults is empty, or if there are no parameters for this 
+
+      # check if the defaults is empty, or if there are no parameters for this
       # instantiation, and if so, don't bother overriding defaults.
       unless fields_with_defaults.empty? || d.empty?
         d.each_key do |name|
           fields_with_defaults.delete(name.to_s)
         end
       end
-      
+
       # assign all the user-specified arguments
       unless d.empty?
         d.each do |name, value|
@@ -43,14 +43,14 @@ module Thrift
           instance_variable_set("@#{name}", value)
         end
       end
-      
+
       # assign all the default values
       unless fields_with_defaults.empty?
         fields_with_defaults.each do |name, default_value|
           instance_variable_set("@#{name}", (default_value.dup rescue default_value))
         end
       end
-      
+
       yield self if block_given?
     end
 
@@ -67,7 +67,7 @@ module Thrift
       end
       fields_with_default_values
     end
-    
+
     def inspect(skip_optional_nulls = true)
       fields = []
       each_field do |fid, field_info|

data/lib/thrift/struct_union.rb

@@ -1,4 +1,4 @@
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,6 +20,12 @@ require 'set'
 
 module Thrift
   module Struct_Union
+    def validate_container_size(size)
+      return size unless size < 0
+
+      raise ProtocolException.new(ProtocolException::NEGATIVE_SIZE, 'Negative size')
+    end
+
     def name_to_id(name)
       names_to_ids = self.class.instance_variable_get(:@names_to_ids)
       unless names_to_ids
@@ -55,6 +61,7 @@ module Thrift
         value.read(iprot)
       when Types::MAP
         key_type, val_type, size = iprot.read_map_begin
+        validate_container_size(size)
         # Skip the map contents if the declared key or value types don't match the expected ones.
         if (size != 0 && (key_type != field[:key][:type] || val_type != field[:value][:type]))
           size.times do
@@ -73,6 +80,7 @@ module Thrift
         iprot.read_map_end
       when Types::LIST
         e_type, size = iprot.read_list_begin
+        validate_container_size(size)
         # Skip the list contents if the declared element type doesn't match the expected one.
         if (e_type != field[:element][:type])
           size.times do
@@ -80,13 +88,15 @@ module Thrift
           end
           value = nil
         else
-          value = Array.new(size) do |n|
-            read_field(iprot, field_info(field[:element]))
+          value = []
+          size.times do
+            value << read_field(iprot, field_info(field[:element]))
           end
         end
         iprot.read_list_end
       when Types::SET
         e_type, size = iprot.read_set_begin
+        validate_container_size(size)
         # Skip the set contents if the declared element type doesn't match the expected one.
         if (e_type != field[:element][:type])
           size.times do
@@ -159,7 +169,7 @@ module Thrift
     def inspect_field(value, field_info)
       if enum_class = field_info[:enum_class]
         "#{enum_class.const_get(:VALUE_MAP)[value]} (#{value})"
-      elsif value.is_a? Hash 
+      elsif value.is_a? Hash
         if field_info[:type] == Types::MAP
           map_buf = []
           value.each do |k, v|
@@ -180,13 +190,13 @@ module Thrift
         value.inspect
       end
     end
-    
+
     def inspect_collection(collection, field_info)
       buf = []
       collection.each do |k|
         buf << inspect_field(k, field_info[:element])
       end
-      "[" + buf.join(", ") + "]"      
+      "[" + buf.join(", ") + "]"
     end
   end
-end
+end

data/lib/thrift/thrift_native.rb

@@ -21,4 +21,4 @@ begin
   require "thrift_native"
 rescue LoadError
   puts "Unable to load thrift_native extension. Defaulting to pure Ruby libraries."
-end
+end

data/lib/thrift/transport/base_server_transport.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -7,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 module Thrift
   class BaseServerTransport
@@ -27,7 +27,7 @@ module Thrift
     def accept
       raise NotImplementedError
     end
-      
+
     def close; nil; end
 
     def closed?

data/lib/thrift/transport/base_transport.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -7,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 module Thrift
   class TransportException < Exception
@@ -28,7 +28,7 @@ module Thrift
 
     attr_reader :type
 
-    def initialize(type=UNKNOWN, message=nil)
+    def initialize(type = UNKNOWN, message = nil)
       super(message)
       @type = type
     end
@@ -48,12 +48,12 @@ module Thrift
 
   class BaseTransport
     def open?; end
-    
+
     def open; end
 
     def close; end
 
-    # Reads a number of bytes from the transports. In Ruby 1.9+, the String returned will have a BINARY (aka ASCII8BIT) encoding.
+    # Reads a number of bytes from the transports. The String returned will have a BINARY (aka ASCII-8BIT) encoding.
     #
     # sz - The number of bytes to read from the transport.
     #
@@ -62,7 +62,7 @@ module Thrift
       raise NotImplementedError
     end
 
-    # Returns an unsigned byte as a Fixnum in the range (0..255).
+    # Returns an unsigned byte as a Integer in the range (0..255).
     def read_byte
       buf = read_all(1)
       return Bytes.get_string_byte(buf, 0)
@@ -86,11 +86,11 @@ module Thrift
         chunk = read(size - buf.length)
         buf << chunk
       end
-    
+
       buf
     end
 
-    # Writes the byte buffer to the transport. In Ruby 1.9+, the buffer will be forced into BINARY encoding.
+    # Writes the byte buffer to the transport. The buffer will be forced into BINARY encoding.
     #
     # buf - A String acting as a byte buffer.
     #
@@ -104,12 +104,12 @@ module Thrift
       "base"
     end
   end
-  
+
   class BaseTransportFactory
     def get_transport(trans)
       return trans
     end
-    
+
     def to_s
       "base"
     end

data/lib/thrift/transport/buffered_transport.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,7 +21,7 @@
 module Thrift
   class BufferedTransport < BaseTransport
     DEFAULT_BUFFER = 4096
-    
+
     def initialize(transport)
       @transport = transport
       @wbuf = Bytes.empty_byte_buffer
@@ -101,7 +101,7 @@ module Thrift
         @transport.write(@wbuf)
         @wbuf = Bytes.empty_byte_buffer
       end
-      
+
       @transport.flush
     end
 
@@ -114,7 +114,7 @@ module Thrift
     def get_transport(transport)
       return BufferedTransport.new(transport)
     end
-    
+
     def to_s
       "buffered"
     end

data/lib/thrift/transport/framed_transport.rb

@@ -1,5 +1,5 @@
 # encoding: ascii-8bit
-# 
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,13 +20,13 @@
 
 module Thrift
   class FramedTransport < BaseTransport
-    def initialize(transport, read=true, write=true)
+    def initialize(transport, read = true, write = true)
       @transport = transport
       @rbuf      = Bytes.empty_byte_buffer
       @wbuf      = Bytes.empty_byte_buffer
       @read      = read
       @write     = write
-      @index      = 0
+      @index     = 0
     end
 
     def open?
@@ -77,7 +77,7 @@ module Thrift
       i
     end
 
-    def write(buf, sz=nil)
+    def write(buf, sz = nil)
       return @transport.write(buf) unless @write
 
       buf = Bytes.force_binary_encoding(buf)
@@ -117,7 +117,7 @@ module Thrift
     def get_transport(transport)
       return FramedTransport.new(transport)
     end
-    
+
     def to_s
       "framed"
     end