tros 1.7.6.2 → 1.7.6.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tros (1.7.6.2)
+    tros (1.7.6.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/tros/ipc.rb

@@ -18,7 +18,7 @@ require "net/http"
 
 module Tros::IPC
 
-  class TrosRemoteError < Tros::AvroError; end
+  class AvroRemoteError < Tros::AvroError; end
 
   HANDSHAKE_REQUEST_SCHEMA = Tros::Schema.parse <<-JSON
   {
@@ -70,7 +70,7 @@ module Tros::IPC
   BUFFER_SIZE = 8192
 
   # Raised when an error message is sent by an Tros requestor or responder.
-  class TrosRemoteException < Tros::AvroError; end
+  class AvroRemoteException < Tros::AvroError; end
 
   class ConnectionClosedException < Tros::AvroError; end
 
@@ -226,7 +226,7 @@ module Tros::IPC
 
     def read_error(writers_schema, readers_schema, decoder)
       datum_reader = Tros::IO::DatumReader.new(writers_schema, readers_schema)
-      TrosRemoteError.new(datum_reader.read(decoder))
+      AvroRemoteError.new(datum_reader.read(decoder))
     end
   end
 
@@ -276,10 +276,10 @@ module Tros::IPC
         # perform server logic
         begin
           response = call(local_message, request)
-        rescue TrosRemoteError => e
+        rescue AvroRemoteError => e
           error = e
         rescue Exception => e
-          error = TrosRemoteError.new(e.to_s)
+          error = AvroRemoteError.new(e.to_s)
         end
 
         # write response using local protocol
@@ -293,7 +293,7 @@ module Tros::IPC
           write_error(writers_schema, error, buffer_encoder)
         end
       rescue Tros::AvroError => e
-        error = TrosRemoteException.new(e.to_s)
+        error = AvroRemoteException.new(e.to_s)
         buffer_encoder = Tros::IO::BinaryEncoder.new(StringIO.new)
         META_WRITER.write(response_metadata, buffer_encoder)
         buffer_encoder.write_boolean(true)

data/lib/tros/schema.rb

@@ -92,18 +92,18 @@ module Tros
     end
 
     # Determine if a ruby datum is an instance of a schema
-    def self.validate(expected_schema, datum)
-      return true if validate_strictly(expected_schema, datum)
+    def self.validate(expected_schema, datum, validator_method = :validate)
+      return true if validate_strictly(expected_schema, datum, validator_method)
       case expected_schema.type_sym
       when :float, :double
-        datum.is_a?(Float) || datum.is_a?(Fixnum) || datum.is_a?(Bignum)
+        datum.is_a?(Integer)
       else
         return false
       end
     end
 
     # Determine if a ruby datum is an instance of a schema
-    def self.validate_strictly(expected_schema, datum)
+    def self.validate_strictly(expected_schema, datum, validator_method = :validate_strictly)
       case expected_schema.type_sym
       when :null
         datum.nil?
@@ -112,11 +112,9 @@ module Tros
       when :string, :bytes
         datum.is_a? String
       when :int
-        (datum.is_a?(Fixnum) || datum.is_a?(Bignum)) &&
-            (INT_MIN_VALUE <= datum) && (datum <= INT_MAX_VALUE)
+        datum.is_a?(Integer) && (INT_MIN_VALUE <= datum) && (datum <= INT_MAX_VALUE)
       when :long
-        (datum.is_a?(Fixnum) || datum.is_a?(Bignum)) &&
-            (LONG_MIN_VALUE <= datum) && (datum <= LONG_MAX_VALUE)
+        datum.is_a?(Integer) && (LONG_MIN_VALUE <= datum) && (datum <= LONG_MAX_VALUE)
       when :float, :double
         datum.is_a?(Float)
       when :fixed
@@ -125,15 +123,15 @@ module Tros
         expected_schema.symbols.include? datum
       when :array
         datum.is_a?(Array) &&
-          datum.all?{|d| validate_strictly(expected_schema.items, d) }
+          datum.all?{|d| send(validator_method, expected_schema.items, d) }
       when :map
           datum.keys.all?{|k| k.is_a? String } &&
-          datum.values.all?{|v| validate_strictly(expected_schema.values, v) }
+          datum.values.all?{|v| send(validator_method, expected_schema.values, v) }
       when :union
-        expected_schema.schemas.any?{|s| validate_strictly(s, datum) }
+        expected_schema.schemas.any? { |s| send(validator_method, s, datum) }
       when :record, :error, :request
         datum.is_a?(Hash) &&
-          expected_schema.fields.all?{|f| validate_strictly(f.type, datum[f.name]) }
+          expected_schema.fields.all? { |f| send(validator_method, f.type, datum[f.name]) }
       else
         raise TypeError, "#{expected_schema.inspect} is not recognized as type."
       end
@@ -347,9 +345,7 @@ module Tros
       attr_reader :size
       def initialize(name, space, size, names=nil)
         # Ensure valid cto args
-        unless size.is_a?(Fixnum) || size.is_a?(Bignum)
-          raise AvroError, 'Fixed Schema requires a valid integer for size property.'
-        end
+        raise AvroError, 'Fixed Schema requires a valid integer for size property.' unless size.is_a?(Integer)
         super(:fixed, name, space, names)
         @size = size
       end

data/lib/tros/version.rb

@@ -1,3 +1,3 @@
 module Tros
-  VERSION = "1.7.6.2"
+  VERSION = "1.7.6.3"
 end

data/test/io_test.rb

@@ -172,7 +172,7 @@ EOS
     [-8193, '81 80 01'],
   ]
 
-  def tros_hexlify(reader)
+  def avro_hexlify(reader)
     bytes = []
     current_byte = reader.read(1)
     bytes << hexlify(current_byte)
@@ -196,7 +196,7 @@ EOS
       datum_writer.write(value, encoder)
 
       buffer.seek(0)
-      hex_val = tros_hexlify(buffer)
+      hex_val = avro_hexlify(buffer)
 
       assert_equal hex_encoding, hex_val
     end
@@ -211,7 +211,7 @@ EOS
 
       # read it out of the buffer and hexlify it
       buffer.seek(0)
-      hex_val = tros_hexlify(buffer)
+      hex_val = avro_hexlify(buffer)
 
       assert_equal hex_encoding, hex_val
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tros
 version: !ruby/object:Gem::Version
-  version: 1.7.6.2
+  version: 1.7.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 141493864149925103
+      hash: -3591240749969273251
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 141493864149925103
+      hash: -3591240749969273251
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23