thrift 0.7.0 → 0.8.0

data/benchmark/gen-rb/benchmark_constants.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/benchmark/gen-rb/benchmark_service.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/benchmark/gen-rb/benchmark_types.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/ext/strlcpy.c

@@ -0,0 +1,41 @@
+/**
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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.
+ */
+
+#include "strlcpy.h"
+
+#ifndef HAVE_STRLCPY
+#define HAVE_STRLCPY
+size_t
+strlcpy (char *dst, const char *src, size_t dst_sz)
+{
+    size_t n;
+
+    for (n = 0; n < dst_sz; n++) {
+      if ((*dst++ = *src++) == '\0')
+        break;
+    }
+
+    if (n < dst_sz)
+      return n;
+    if (n > 0)
+      *(dst - 1) = '\0';
+    return n + strlen (src);
+}
+#endif
+

data/ext/strlcpy.h

@@ -0,0 +1,30 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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.
+ */
+
+
+#include <sys/types.h>
+#include <string.h>
+
+#ifndef HAVE_STRLCPY
+size_t
+strlcpy (char *dst, const char *src, size_t dst_sz);
+#else
+extern size_t strlcpy(char *, const char *, size_t);
+#endif
+

data/ext/struct.c

@@ -20,33 +20,7 @@
 #include "struct.h"
 #include "constants.h"
 #include "macros.h"
-
-#ifndef HAVE_STRLCPY
-
-static
-size_t
-strlcpy (char *dst, const char *src, size_t dst_sz)
-{
-    size_t n;
-
-    for (n = 0; n < dst_sz; n++) {
-      if ((*dst++ = *src++) == '\0')
-        break;
-    }
-
-    if (n < dst_sz)
-      return n;
-    if (n > 0)
-      *(dst - 1) = '\0';
-    return n + strlen (src);
-}
-#else
-/*
-   Ruby 1.9.x includes the OpenBSD implementation of strlcpy.
-   See missing/strlcpy.c in Ruby 1.9 source
- */
-extern size_t strlcpy(char *, const char *, size_t);
-#endif
+#include "strlcpy.h"
 
 VALUE thrift_union_class;
 
@@ -231,10 +205,10 @@ static VALUE rb_thrift_struct_write(VALUE self, VALUE protocol);
 static void write_anything(int ttype, VALUE value, VALUE protocol, VALUE field_info);
 
 VALUE get_field_value(VALUE obj, VALUE field_name) {
-  char name_buf[RSTRING_LEN(field_name) + 1];
+  char name_buf[RSTRING_LEN(field_name) + 2];
 
   name_buf[0] = '@';
-  strlcpy(&name_buf[1], RSTRING_PTR(field_name), sizeof(name_buf));
+  strlcpy(&name_buf[1], RSTRING_PTR(field_name), RSTRING_LEN(field_name) + 1);
 
   VALUE value = rb_ivar_get(obj, rb_intern(name_buf));
 
@@ -417,10 +391,10 @@ static void skip_map_contents(VALUE protocol, VALUE key_type_value, VALUE value_
 static void skip_list_or_set_contents(VALUE protocol, VALUE element_type_value, int size);
 
 static void set_field_value(VALUE obj, VALUE field_name, VALUE value) {
-  char name_buf[RSTRING_LEN(field_name) + 1];
+  char name_buf[RSTRING_LEN(field_name) + 2];
 
   name_buf[0] = '@';
-  strlcpy(&name_buf[1], RSTRING_PTR(field_name), sizeof(name_buf));
+  strlcpy(&name_buf[1], RSTRING_PTR(field_name), RSTRING_LEN(field_name)+1);
 
   rb_ivar_set(obj, rb_intern(name_buf), value);
 }
@@ -484,7 +458,7 @@ static VALUE read_anything(VALUE protocol, int ttype, VALUE field_info) {
     if (!NIL_P(key_info) && !NIL_P(value_info)) {
       int specified_key_type = FIX2INT(rb_hash_aref(key_info, type_sym));
       int specified_value_type = FIX2INT(rb_hash_aref(value_info, type_sym));
-      if (specified_key_type == key_ttype && specified_value_type == value_ttype) {
+      if (num_entries == 0 || (specified_key_type == key_ttype && specified_value_type == value_ttype)) {
         result = rb_hash_new();
 
         for (i = 0; i < num_entries; ++i) {

data/lib/thrift/struct_union.rb

@@ -56,7 +56,7 @@ module Thrift
       when Types::MAP
         key_type, val_type, size = iprot.read_map_begin
         # Skip the map contents if the declared key or value types don't match the expected ones.
-        if (key_type != field[:key][:type] || val_type != field[:value][:type])
+        if (size != 0 && (key_type != field[:key][:type] || val_type != field[:value][:type]))
           size.times do
             iprot.skip(key_type)
             iprot.skip(val_type)

data/spec/base_protocol_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftBaseProtocolSpec < Spec::ExampleGroup
   include Thrift

data/spec/base_transport_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftBaseTransportSpec < Spec::ExampleGroup
   include Thrift

data/spec/binary_protocol_accelerated_spec.rb

@@ -17,8 +17,8 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/binary_protocol_spec_shared'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
 
 if defined? Thrift::BinaryProtocolAccelerated
 

data/spec/binary_protocol_spec.rb

@@ -17,8 +17,8 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/binary_protocol_spec_shared'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/binary_protocol_spec_shared")
 
 class ThriftBinaryProtocolSpec < Spec::ExampleGroup
   include Thrift

data/spec/binary_protocol_spec_shared.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 shared_examples_for 'a binary protocol' do
   before(:each) do

data/spec/client_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftClientSpec < Spec::ExampleGroup
   include Thrift

data/spec/compact_protocol_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 describe Thrift::CompactProtocol do
   TESTS = {
@@ -115,6 +115,17 @@ describe Thrift::CompactProtocol do
     brcp2.should == brcp
   end
   
+  it "should deserialize an empty map to an empty hash" do
+    struct = SingleMapTestStruct.new(:i32_map => {})
+    ser = Thrift::Serializer.new(Thrift::CompactProtocolFactory.new)
+    bytes = ser.serialize(struct)
+
+    deser = Thrift::Deserializer.new(Thrift::CompactProtocolFactory.new)
+    struct2 = SingleMapTestStruct.new
+    deser.deserialize(struct2, bytes)
+    struct.should == struct2
+  end
+  
   class JankyHandler
     def Janky(i32arg)
       i32arg * 2

data/spec/exception_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftExceptionSpec < Spec::ExampleGroup
   include Thrift

data/spec/gen-rb/nonblocking_service.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/spec/gen-rb/thrift_spec_constants.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/spec/gen-rb/thrift_spec_types.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/spec/http_client_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftHTTPClientTransportSpec < Spec::ExampleGroup
   include Thrift

data/spec/mongrel_http_server_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 require 'thrift/server/mongrel_http_server'
 
 class ThriftHTTPServerSpec < Spec::ExampleGroup

data/spec/nonblocking_server_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftNonblockingServerSpec < Spec::ExampleGroup
   include Thrift

data/spec/processor_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftProcessorSpec < Spec::ExampleGroup
   include Thrift

data/spec/serializer_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftSerializerSpec < Spec::ExampleGroup
   include Thrift

data/spec/server_socket_spec.rb

@@ -17,8 +17,8 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/socket_spec_shared"
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
 
 class ThriftServerSocketSpec < Spec::ExampleGroup
   include Thrift

data/spec/server_spec.rb

@@ -16,8 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftServerSpec < Spec::ExampleGroup
   include Thrift

data/spec/socket_spec.rb

@@ -17,8 +17,8 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/socket_spec_shared"
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
 
 class ThriftSocketSpec < Spec::ExampleGroup
   include Thrift

data/spec/socket_spec_shared.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 shared_examples_for "a socket" do
   it "should open a socket" do

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ Spec::Runner.configure do |configuration|
   end
 end
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. debug_proto_test gen-rb])
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. test debug_proto gen-rb])
 require "srv"
 require "debug_proto_test_constants"
 

data/spec/struct_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftStructSpec < Spec::ExampleGroup
   include Thrift

data/spec/types_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftTypesSpec < Spec::ExampleGroup
   include Thrift

data/spec/union_spec.rb

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
 
 class ThriftUnionSpec < Spec::ExampleGroup
   include Thrift

data/spec/unix_socket_spec.rb

@@ -17,8 +17,8 @@
 # under the License.
 #
 
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/socket_spec_shared"
+require File.expand_path("#{File.dirname(__FILE__)}/spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/socket_spec_shared")
 
 class ThriftUNIXSocketSpec < Spec::ExampleGroup
   include Thrift

data/{debug_proto_test → test/debug_proto}/gen-rb/debug_proto_test_constants.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.7.0)
+# Autogenerated by Thrift Compiler (0.8.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #