upfluence-thrift 2.6.8 → 2.7.4

data/lib/types/value/value_types.rb

@@ -0,0 +1,330 @@
+#
+# Autogenerated by Thrift Compiler (2.7.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+module Types
+  module Value
+    class NullValue; end
+
+    class ListValue; end
+
+    class MapEntry; end
+
+    class MapValue; end
+
+    class Value < ::Thrift::Union; end
+
+    class StructValue; end
+
+    class NullValue
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+
+      NAME = 'NullValue'.freeze
+      NAMESPACE = 'types.value'.freeze
+
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+
+      FIELDS = {
+
+      }.freeze
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+      ::Thrift.register_struct_type self
+    end
+
+    class ListValue
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+
+      NAME = 'ListValue'.freeze
+      NAMESPACE = 'types.value'.freeze
+
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_INDEX_VALUES = 1
+
+      THRIFT_FIELD_VALUES_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_VALUES_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      FIELDS = {
+        THRIFT_FIELD_INDEX_VALUES => {type: ::Thrift::Types::LIST, name: 'values', element: {type: ::Thrift::Types::STRUCT, class: ::Types::Value::Value}, legacy_annotations: THRIFT_FIELD_VALUES_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_VALUES_STRUCTURED_ANNOTATIONS}
+      }.freeze
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field values is unset!') unless @values
+      end
+
+      ::Thrift::Struct.generate_accessors self
+      ::Thrift.register_struct_type self
+    end
+
+    class MapEntry
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+
+      NAME = 'MapEntry'.freeze
+      NAMESPACE = 'types.value'.freeze
+
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_INDEX_KEY = 1
+      THRIFT_FIELD_INDEX_VALUE = 2
+
+      THRIFT_FIELD_KEY_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_KEY_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      FIELDS = {
+        THRIFT_FIELD_INDEX_KEY => {type: ::Thrift::Types::STRUCT, name: 'key', class: ::Types::Value::Value, legacy_annotations: THRIFT_FIELD_KEY_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_KEY_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_VALUE => {type: ::Thrift::Types::STRUCT, name: 'value', class: ::Types::Value::Value, legacy_annotations: THRIFT_FIELD_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_VALUE_STRUCTURED_ANNOTATIONS}
+      }.freeze
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field key is unset!') unless @key
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field value is unset!') unless @value
+      end
+
+      ::Thrift::Struct.generate_accessors self
+      ::Thrift.register_struct_type self
+    end
+
+    class MapValue
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+
+      NAME = 'MapValue'.freeze
+      NAMESPACE = 'types.value'.freeze
+
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_INDEX_ENTRIES = 1
+
+      THRIFT_FIELD_ENTRIES_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_ENTRIES_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      FIELDS = {
+        THRIFT_FIELD_INDEX_ENTRIES => {type: ::Thrift::Types::LIST, name: 'entries', element: {type: ::Thrift::Types::STRUCT, class: ::Types::Value::MapEntry}, legacy_annotations: THRIFT_FIELD_ENTRIES_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_ENTRIES_STRUCTURED_ANNOTATIONS}
+      }.freeze
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field entries is unset!') unless @entries
+      end
+
+      ::Thrift::Struct.generate_accessors self
+      ::Thrift.register_struct_type self
+    end
+
+    class Value < ::Thrift::Union
+      include ::Thrift::Struct_Union
+
+      NAME = 'Value'.freeze
+      NAMESPACE = 'types.value'.freeze
+
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      class << self
+        def null_value(val)
+          Value.new(:null_value, val)
+        end
+
+        def string_value(val)
+          Value.new(:string_value, val)
+        end
+
+        def binary_value(val)
+          Value.new(:binary_value, val)
+        end
+
+        def integer_value(val)
+          Value.new(:integer_value, val)
+        end
+
+        def double_value(val)
+          Value.new(:double_value, val)
+        end
+
+        def bool_value(val)
+          Value.new(:bool_value, val)
+        end
+
+        def list_value(val)
+          Value.new(:list_value, val)
+        end
+
+        def map_value(val)
+          Value.new(:map_value, val)
+        end
+
+        def struct_value(val)
+          Value.new(:struct_value, val)
+        end
+      end
+
+      THRIFT_FIELD_INDEX_NULL_VALUE = 1
+      THRIFT_FIELD_INDEX_STRING_VALUE = 2
+      THRIFT_FIELD_INDEX_BINARY_VALUE = 3
+      THRIFT_FIELD_INDEX_INTEGER_VALUE = 4
+      THRIFT_FIELD_INDEX_DOUBLE_VALUE = 5
+      THRIFT_FIELD_INDEX_BOOL_VALUE = 6
+      THRIFT_FIELD_INDEX_LIST_VALUE = 7
+      THRIFT_FIELD_INDEX_MAP_VALUE = 8
+      THRIFT_FIELD_INDEX_STRUCT_VALUE = 9
+
+      THRIFT_FIELD_NULL_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_NULL_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_STRING_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_STRING_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_BINARY_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_BINARY_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_INTEGER_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_INTEGER_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_DOUBLE_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_DOUBLE_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_BOOL_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_BOOL_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_LIST_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_LIST_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_MAP_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_MAP_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_STRUCT_VALUE_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_STRUCT_VALUE_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      FIELDS = {
+        THRIFT_FIELD_INDEX_NULL_VALUE => {type: ::Thrift::Types::STRUCT, name: 'null_value', class: ::Types::Value::NullValue, optional: true, legacy_annotations: THRIFT_FIELD_NULL_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_NULL_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_STRING_VALUE => {type: ::Thrift::Types::STRING, name: 'string_value', optional: true, legacy_annotations: THRIFT_FIELD_STRING_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_STRING_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_BINARY_VALUE => {type: ::Thrift::Types::STRING, name: 'binary_value', binary: true, optional: true, legacy_annotations: THRIFT_FIELD_BINARY_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_BINARY_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_INTEGER_VALUE => {type: ::Thrift::Types::I64, name: 'integer_value', optional: true, legacy_annotations: THRIFT_FIELD_INTEGER_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_INTEGER_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_DOUBLE_VALUE => {type: ::Thrift::Types::DOUBLE, name: 'double_value', optional: true, legacy_annotations: THRIFT_FIELD_DOUBLE_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_DOUBLE_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_BOOL_VALUE => {type: ::Thrift::Types::BOOL, name: 'bool_value', optional: true, legacy_annotations: THRIFT_FIELD_BOOL_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_BOOL_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_LIST_VALUE => {type: ::Thrift::Types::STRUCT, name: 'list_value', class: ::Types::Value::ListValue, optional: true, legacy_annotations: THRIFT_FIELD_LIST_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_LIST_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_MAP_VALUE => {type: ::Thrift::Types::STRUCT, name: 'map_value', class: ::Types::Value::MapValue, optional: true, legacy_annotations: THRIFT_FIELD_MAP_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_MAP_VALUE_STRUCTURED_ANNOTATIONS},
+        THRIFT_FIELD_INDEX_STRUCT_VALUE => {type: ::Thrift::Types::STRUCT, name: 'struct_value', class: ::Types::Value::StructValue, optional: true, legacy_annotations: THRIFT_FIELD_STRUCT_VALUE_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_STRUCT_VALUE_STRUCTURED_ANNOTATIONS}
+      }.freeze
+
+      def struct_fields; FIELDS; end
+
+      def validate
+        raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+      end
+
+      ::Thrift::Union.generate_accessors self
+      ::Thrift.register_struct_type self
+    end
+
+    class StructValue
+      include ::Thrift::Struct, ::Thrift::Struct_Union
+
+      NAME = 'StructValue'.freeze
+      NAMESPACE = 'types.value'.freeze
+
+      LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      THRIFT_FIELD_INDEX_FIELDS = 1
+
+      THRIFT_FIELD_FIELDS_LEGACY_ANNOTATIONS = {
+      }.freeze
+
+      THRIFT_FIELD_FIELDS_STRUCTURED_ANNOTATIONS = [
+      ].freeze
+
+      FIELDS = {
+        THRIFT_FIELD_INDEX_FIELDS => {type: ::Thrift::Types::MAP, name: 'fields', key: {type: ::Thrift::Types::STRING}, value: {type: ::Thrift::Types::STRUCT, class: ::Types::Value::Value}, optional: true, legacy_annotations: THRIFT_FIELD_FIELDS_LEGACY_ANNOTATIONS, structured_annotations: THRIFT_FIELD_FIELDS_STRUCTURED_ANNOTATIONS}
+      }.freeze
+
+      def struct_fields; FIELDS; end
+
+      def validate
+      end
+
+      ::Thrift::Struct.generate_accessors self
+      ::Thrift.register_struct_type self
+    end
+
+  end
+end

data/spec/{gen-rb/base → base}/base_service.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler ()
+# Autogenerated by Thrift Compiler (v0.0.1-upfluence)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -123,7 +123,7 @@ module Base
       ].freeze
 
       METHODS = {
-        'greeting' => { args_klass: Greeting_args, oneway: false, legacy_annotations: THRIFT_METHOD_GREETING_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_GREETING_STRUCTURED_ANNOTATIONS},
+        'greeting' => { args_klass: Greeting_args, result_klass: Greeting_result, oneway: false, legacy_annotations: THRIFT_METHOD_GREETING_STRUCTURED_ANNOTATIONS, structured_annotations: THRIFT_METHOD_GREETING_STRUCTURED_ANNOTATIONS},
       }.freeze
 
       def execute_greeting(args)

data/spec/{gen-rb/base → base}/base_service_constants.rb

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

data/spec/{gen-rb/base → base}/base_service_types.rb

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

data/spec/base_protocol_spec.rb

@@ -22,41 +22,46 @@ require 'spec_helper'
 describe 'BaseProtocol' do
 
   before(:each) do
-    @trans = mock("MockTransport")
+    @trans = double("MockTransport")
     @prot = Thrift::BaseProtocol.new(@trans)
   end
 
   describe Thrift::BaseProtocol do
     # most of the methods are stubs, so we can ignore them
 
+    it "should provide a reasonable to_s" do
+      expect(@trans).to receive(:to_s).once.and_return("trans")
+      expect(@prot.to_s).to eq("trans")
+    end
+
     it "should make trans accessible" do
-      @prot.trans.should eql(@trans)
+      expect(@prot.trans).to eql(@trans)
     end
 
     it 'should write out a field nicely (deprecated write_field signature)' do
-      @prot.should_receive(:write_field_begin).with('field', 'type', 'fid').ordered
-      @prot.should_receive(:write_type).with({:name => 'field', :type => 'type'}, 'value').ordered
-      @prot.should_receive(:write_field_end).ordered
+      expect(@prot).to receive(:write_field_begin).with('field', 'type', 'fid').ordered
+      expect(@prot).to receive(:write_type).with({:name => 'field', :type => 'type'}, 'value').ordered
+      expect(@prot).to receive(:write_field_end).ordered
       @prot.write_field('field', 'type', 'fid', 'value')
     end
 
     it 'should write out a field nicely' do
-      @prot.should_receive(:write_field_begin).with('field', 'type', 'fid').ordered
-      @prot.should_receive(:write_type).with({:name => 'field', :type => 'type', :binary => false}, 'value').ordered
-      @prot.should_receive(:write_field_end).ordered
+      expect(@prot).to receive(:write_field_begin).with('field', 'type', 'fid').ordered
+      expect(@prot).to receive(:write_type).with({:name => 'field', :type => 'type', :binary => false}, 'value').ordered
+      expect(@prot).to receive(:write_field_end).ordered
       @prot.write_field({:name => 'field', :type => 'type', :binary => false}, 'fid', 'value')
     end
 
     it 'should write out the different types (deprecated write_type signature)' do
-      @prot.should_receive(:write_bool).with('bool').ordered
-      @prot.should_receive(:write_byte).with('byte').ordered
-      @prot.should_receive(:write_double).with('double').ordered
-      @prot.should_receive(:write_i16).with('i16').ordered
-      @prot.should_receive(:write_i32).with('i32').ordered
-      @prot.should_receive(:write_i64).with('i64').ordered
-      @prot.should_receive(:write_string).with('string').ordered
-      struct = mock('Struct')
-      struct.should_receive(:write).with(@prot).ordered
+      expect(@prot).to receive(:write_bool).with('bool').ordered
+      expect(@prot).to receive(:write_byte).with('byte').ordered
+      expect(@prot).to receive(:write_double).with('double').ordered
+      expect(@prot).to receive(:write_i16).with('i16').ordered
+      expect(@prot).to receive(:write_i32).with('i32').ordered
+      expect(@prot).to receive(:write_i64).with('i64').ordered
+      expect(@prot).to receive(:write_string).with('string').ordered
+      struct = double('Struct')
+      expect(struct).to receive(:write).with(@prot).ordered
       @prot.write_type(Thrift::Types::BOOL, 'bool')
       @prot.write_type(Thrift::Types::BYTE, 'byte')
       @prot.write_type(Thrift::Types::DOUBLE, 'double')
@@ -72,16 +77,16 @@ describe 'BaseProtocol' do
     end
 
     it 'should write out the different types' do
-      @prot.should_receive(:write_bool).with('bool').ordered
-      @prot.should_receive(:write_byte).with('byte').ordered
-      @prot.should_receive(:write_double).with('double').ordered
-      @prot.should_receive(:write_i16).with('i16').ordered
-      @prot.should_receive(:write_i32).with('i32').ordered
-      @prot.should_receive(:write_i64).with('i64').ordered
-      @prot.should_receive(:write_string).with('string').ordered
-      @prot.should_receive(:write_binary).with('binary').ordered
-      struct = mock('Struct')
-      struct.should_receive(:write).with(@prot).ordered
+      expect(@prot).to receive(:write_bool).with('bool').ordered
+      expect(@prot).to receive(:write_byte).with('byte').ordered
+      expect(@prot).to receive(:write_double).with('double').ordered
+      expect(@prot).to receive(:write_i16).with('i16').ordered
+      expect(@prot).to receive(:write_i32).with('i32').ordered
+      expect(@prot).to receive(:write_i64).with('i64').ordered
+      expect(@prot).to receive(:write_string).with('string').ordered
+      expect(@prot).to receive(:write_binary).with('binary').ordered
+      struct = double('Struct')
+      expect(struct).to receive(:write).with(@prot).ordered
       @prot.write_type({:type => Thrift::Types::BOOL}, 'bool')
       @prot.write_type({:type => Thrift::Types::BYTE}, 'byte')
       @prot.write_type({:type => Thrift::Types::DOUBLE}, 'double')
@@ -98,13 +103,13 @@ describe 'BaseProtocol' do
     end
 
     it 'should read the different types (deprecated read_type signature)' do
-      @prot.should_receive(:read_bool).ordered
-      @prot.should_receive(:read_byte).ordered
-      @prot.should_receive(:read_i16).ordered
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_i64).ordered
-      @prot.should_receive(:read_double).ordered
-      @prot.should_receive(:read_string).ordered
+      expect(@prot).to receive(:read_bool).ordered
+      expect(@prot).to receive(:read_byte).ordered
+      expect(@prot).to receive(:read_i16).ordered
+      expect(@prot).to receive(:read_i32).ordered
+      expect(@prot).to receive(:read_i64).ordered
+      expect(@prot).to receive(:read_double).ordered
+      expect(@prot).to receive(:read_string).ordered
       @prot.read_type(Thrift::Types::BOOL)
       @prot.read_type(Thrift::Types::BYTE)
       @prot.read_type(Thrift::Types::I16)
@@ -120,14 +125,14 @@ describe 'BaseProtocol' do
     end
 
     it 'should read the different types' do
-      @prot.should_receive(:read_bool).ordered
-      @prot.should_receive(:read_byte).ordered
-      @prot.should_receive(:read_i16).ordered
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_i64).ordered
-      @prot.should_receive(:read_double).ordered
-      @prot.should_receive(:read_string).ordered
-      @prot.should_receive(:read_binary).ordered
+      expect(@prot).to receive(:read_bool).ordered
+      expect(@prot).to receive(:read_byte).ordered
+      expect(@prot).to receive(:read_i16).ordered
+      expect(@prot).to receive(:read_i32).ordered
+      expect(@prot).to receive(:read_i64).ordered
+      expect(@prot).to receive(:read_double).ordered
+      expect(@prot).to receive(:read_string).ordered
+      expect(@prot).to receive(:read_binary).ordered
       @prot.read_type({:type => Thrift::Types::BOOL})
       @prot.read_type({:type => Thrift::Types::BYTE})
       @prot.read_type({:type => Thrift::Types::I16})
@@ -144,13 +149,13 @@ describe 'BaseProtocol' do
     end
 
     it "should skip the basic types" do
-      @prot.should_receive(:read_bool).ordered
-      @prot.should_receive(:read_byte).ordered
-      @prot.should_receive(:read_i16).ordered
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_i64).ordered
-      @prot.should_receive(:read_double).ordered
-      @prot.should_receive(:read_string).ordered
+      expect(@prot).to receive(:read_bool).ordered
+      expect(@prot).to receive(:read_byte).ordered
+      expect(@prot).to receive(:read_i16).ordered
+      expect(@prot).to receive(:read_i32).ordered
+      expect(@prot).to receive(:read_i64).ordered
+      expect(@prot).to receive(:read_double).ordered
+      expect(@prot).to receive(:read_string).ordered
       @prot.skip(Thrift::Types::BOOL)
       @prot.skip(Thrift::Types::BYTE)
       @prot.skip(Thrift::Types::I16)
@@ -158,52 +163,51 @@ describe 'BaseProtocol' do
       @prot.skip(Thrift::Types::I64)
       @prot.skip(Thrift::Types::DOUBLE)
       @prot.skip(Thrift::Types::STRING)
-      @prot.skip(Thrift::Types::STOP) # should do absolutely nothing
     end
 
     it "should skip structs" do
       real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_struct_begin).ordered
-      @prot.should_receive(:read_field_begin).exactly(4).times.and_return(
+      expect(@prot).to receive(:read_struct_begin).ordered
+      expect(@prot).to receive(:read_field_begin).exactly(4).times.and_return(
         ['field 1', Thrift::Types::STRING, 1],
         ['field 2', Thrift::Types::I32, 2],
         ['field 3', Thrift::Types::MAP, 3],
         [nil, Thrift::Types::STOP, 0]
       )
-      @prot.should_receive(:read_field_end).exactly(3).times
-      @prot.should_receive(:read_string).exactly(3).times
-      @prot.should_receive(:read_i32).ordered
-      @prot.should_receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRING, 1])
+      expect(@prot).to receive(:read_field_end).exactly(3).times
+      expect(@prot).to receive(:read_string).exactly(3).times
+      expect(@prot).to receive(:read_i32).ordered
+      expect(@prot).to receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRING, 1])
       # @prot.should_receive(:read_string).exactly(2).times
-      @prot.should_receive(:read_map_end).ordered
-      @prot.should_receive(:read_struct_end).ordered
+      expect(@prot).to receive(:read_map_end).ordered
+      expect(@prot).to receive(:read_struct_end).ordered
       real_skip.call(Thrift::Types::STRUCT)
     end
 
     it "should skip maps" do
       real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRUCT, 1])
-      @prot.should_receive(:read_string).ordered
-      @prot.should_receive(:read_struct_begin).ordered.and_return(["some_struct"])
-      @prot.should_receive(:read_field_begin).ordered.and_return([nil, Thrift::Types::STOP, nil]);
-      @prot.should_receive(:read_struct_end).ordered
-      @prot.should_receive(:read_map_end).ordered
+      expect(@prot).to receive(:read_map_begin).ordered.and_return([Thrift::Types::STRING, Thrift::Types::STRUCT, 1])
+      expect(@prot).to receive(:read_string).ordered
+      expect(@prot).to receive(:read_struct_begin).ordered.and_return(["some_struct"])
+      expect(@prot).to receive(:read_field_begin).ordered.and_return([nil, Thrift::Types::STOP, nil]);
+      expect(@prot).to receive(:read_struct_end).ordered
+      expect(@prot).to receive(:read_map_end).ordered
       real_skip.call(Thrift::Types::MAP)
     end
 
     it "should skip sets" do
       real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_set_begin).ordered.and_return([Thrift::Types::I64, 9])
-      @prot.should_receive(:read_i64).ordered.exactly(9).times
-      @prot.should_receive(:read_set_end)
+      expect(@prot).to receive(:read_set_begin).ordered.and_return([Thrift::Types::I64, 9])
+      expect(@prot).to receive(:read_i64).ordered.exactly(9).times
+      expect(@prot).to receive(:read_set_end)
       real_skip.call(Thrift::Types::SET)
     end
 
     it "should skip lists" do
       real_skip = @prot.method(:skip)
-      @prot.should_receive(:read_list_begin).ordered.and_return([Thrift::Types::DOUBLE, 11])
-      @prot.should_receive(:read_double).ordered.exactly(11).times
-      @prot.should_receive(:read_list_end)
+      expect(@prot).to receive(:read_list_begin).ordered.and_return([Thrift::Types::DOUBLE, 11])
+      expect(@prot).to receive(:read_double).ordered.exactly(11).times
+      expect(@prot).to receive(:read_list_end)
       real_skip.call(Thrift::Types::LIST)
     end
   end
@@ -211,7 +215,11 @@ describe 'BaseProtocol' do
   describe Thrift::BaseProtocolFactory do
     it "should raise NotImplementedError" do
       # returning nil since Protocol is just an abstract class
-      lambda {Thrift::BaseProtocolFactory.new.get_protocol(mock("MockTransport"))}.should raise_error(NotImplementedError)
+      expect {Thrift::BaseProtocolFactory.new.get_protocol(double("MockTransport"))}.to raise_error(NotImplementedError)
+    end
+
+    it "should provide a reasonable to_s" do
+      expect(Thrift::BaseProtocolFactory.new.to_s).to eq("base")
     end
   end
 end