protobuffy 3.6.0 → 4.0.0

data/lib/protobuf/field/bool_field.rb

@@ -3,6 +3,10 @@ require 'protobuf/field/varint_field'
 module Protobuf
   module Field
     class BoolField < VarintField
+      FALSE_ENCODE = [0].pack('C')
+      FALSE_STRING = "false".freeze
+      TRUE_ENCODE = [1].pack('C')
+      TRUE_STRING = "true".freeze
 
       ##
       # Class Methods
@@ -12,13 +16,21 @@ module Protobuf
         false
       end
 
-
       ##
       # Public Instance Methods
       # #
 
       def acceptable?(val)
-        [true, false].include?(val)
+        val == true || val == false || val == TRUE_STRING || val == FALSE_STRING
+      end
+
+      def coerce!(val)
+        return true if val == true
+        return false if val == false
+        return true if val == TRUE_STRING
+        return false if val == FALSE_STRING
+
+        val
       end
 
       def decode(value)
@@ -26,7 +38,7 @@ module Protobuf
       end
 
       def encode(value)
-        [value ? 1 : 0].pack('C')
+        value ? TRUE_ENCODE : FALSE_ENCODE
       end
 
       private
@@ -35,19 +47,13 @@ module Protobuf
       # Private Instance Methods
       #
 
-      def define_getter
+      def define_accessor(simple_field_name, _fully_qualified_field_name)
         super
-
-        field = self
         message_class.class_eval do
-          define_method("#{field.getter_method_name}?") do
-            field.warn_if_deprecated
-            @values.fetch(field.name, field.default_value)
-          end
+          alias_method "#{simple_field_name}?", simple_field_name
         end
       end
 
     end
   end
 end
-

data/lib/protobuf/field/bytes_field.rb

@@ -8,7 +8,7 @@ module Protobuf
       # Constants
       #
 
-      BYTES_ENCODING = "ASCII-8BIT".freeze
+      BYTES_ENCODING = Encoding::BINARY
 
       ##
       # Class Methods
@@ -23,7 +23,7 @@ module Protobuf
       #
 
       def acceptable?(val)
-        val.nil? || val.is_a?(String) || val.is_a?(Symbol) || val.is_a?(::Protobuf::Message)
+        val.is_a?(String) || val.nil? || val.is_a?(Symbol) || val.is_a?(::Protobuf::Message)
       end
 
       def decode(bytes)
@@ -33,49 +33,35 @@ module Protobuf
       end
 
       def encode(value)
-        value_to_encode = value.dup
-        value_to_encode = value.encode if value.is_a?(::Protobuf::Message)
-        value_to_encode.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
+        value_to_encode =
+          if value.is_a?(::Protobuf::Message)
+            value.encode
+          else
+            value.dup
+          end
 
+        value_to_encode.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
         string_size = ::Protobuf::Field::VarintField.encode(value_to_encode.size)
-        string_size << value_to_encode
+
+        "#{string_size}#{value_to_encode}"
       end
 
       def wire_type
         ::Protobuf::WireType::LENGTH_DELIMITED
       end
 
-      private
-
-      ##
-      # Private Instance Methods
-      #
-
-      def define_setter
-        field = self
-        message_class.class_eval do
-          define_method(field.setter_method_name) do |val|
-            begin
-              field.warn_if_deprecated
-              val = "#{val}" if val.is_a?(Symbol)
-
-              if val.nil?
-                @values.delete(field.name)
-              elsif field.acceptable?(val)
-                @values[field.name] = val.dup
-              else
-                raise TypeError, "Unacceptable value #{val} for field #{field.name} of type #{field.type_class}"
-              end
-            rescue NoMethodError => ex
-              ::Protobuf::Logger.error { ex.message }
-              ::Protobuf::Logger.error { ex.backtrace.join("\n") }
-              raise TypeError, "Got NoMethodError attempting to set #{val} for field #{field.name} of type #{field.type_class}: #{ex.message}"
-            end
-          end
+      def coerce!(value)
+        case value
+        when String, Symbol
+          value.to_s
+        when NilClass
+          nil
+        when ::Protobuf::Message
+          value.dup
+        else
+          fail TypeError, "Unacceptable value #{value} for field #{name} of type #{type_class}"
         end
       end
-
     end
   end
 end
-

data/lib/protobuf/field/double_field.rb

@@ -23,4 +23,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/enum_field.rb

@@ -1,57 +1,58 @@
-require 'protobuf/field/varint_field'
+require 'protobuf/field/integer_field'
 
 module Protobuf
   module Field
-    class EnumField < VarintField
+    class EnumField < IntegerField
+
+      ##
+      # Class Methods
+      #
+
+      def self.default
+        fail NoMethodError, "#{self}.#{__method__} must be called on an instance"
+      end
 
       ##
       # Public Instance Methods
       #
 
       def acceptable?(val)
-        ! type_class.fetch(val).nil?
+        !type_class.fetch(val).nil?
       end
 
       def encode(value)
         super(value.to_i)
       end
 
+      def decode(value)
+        decoded = super(value)
+        decoded if acceptable?(decoded)
+      end
+
       def enum?
         true
       end
 
+      def coerce!(value)
+        enum_value = type_class.fetch(value)
+        fail TypeError, "Invalid Enum value: #{value.inspect} for #{name}" unless enum_value
+        enum_value
+      end
+
       private
 
       ##
       # Private Instance Methods
       #
 
-      def define_setter
-        field = self
-        message_class.class_eval do
-          define_method("#{field.name}=") do |value|
-            orig_value = value
-            if value.nil?
-              @values.delete(field.name)
-            else
-              value = field.type_class.fetch(value)
-              raise TypeError, "Invalid Enum value: #{orig_value.inspect} for #{field.name}" unless value
-
-              @values[field.name] = value
-            end
-          end
-        end
-      end
-
       def typed_default_value
         if default.is_a?(Symbol)
           type_class.const_get(default)
         else
-          self.class.default
+          type_class.fetch(default) || type_class.enums.first
         end
       end
 
     end
   end
 end
-

data/lib/protobuf/field/field_array.rb

@@ -41,7 +41,7 @@ module Protobuf
       # Return a hash-representation of the given values for this field type.
       # The value in this case would be an array.
       def to_hash_value
-        self.map do |value|
+        map do |value|
           value.respond_to?(:to_hash_value) ? value.to_hash_value : value
         end
       end
@@ -62,10 +62,12 @@ module Protobuf
 
       def normalize(value)
         value = value.to_proto if value.respond_to?(:to_proto)
-        raise TypeError, "Unacceptable value #{value} for field #{field.name} of type #{field.type_class}" unless field.acceptable?(value)
+        fail TypeError, "Unacceptable value #{value} for field #{field.name} of type #{field.type_class}" unless field.acceptable?(value)
 
         if field.is_a?(::Protobuf::Field::EnumField)
           field.type_class.fetch(value)
+        elsif field.is_a?(::Protobuf::Field::MessageField) && value.is_a?(field.type_class)
+          value
         elsif field.is_a?(::Protobuf::Field::MessageField) && value.respond_to?(:to_hash)
           field.type_class.new(value.to_hash)
         else
@@ -74,7 +76,7 @@ module Protobuf
       end
 
       def raise_type_error(val)
-        raise TypeError, <<-TYPE_ERROR
+        fail TypeError, <<-TYPE_ERROR
           Expected repeated value of type '#{field.type_class}'
           Got '#{val.class}' for repeated protobuf field #{field.name}
         TYPE_ERROR
@@ -83,4 +85,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/fixed32_field.rb

@@ -17,7 +17,7 @@ module Protobuf
       end
 
       def wire_type
-       ::Protobuf::WireType::FIXED32
+        ::Protobuf::WireType::FIXED32
       end
 
     end

data/lib/protobuf/field/fixed64_field.rb

@@ -26,4 +26,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/float_field.rb

@@ -20,6 +20,10 @@ module Protobuf
         val.respond_to?(:to_f)
       end
 
+      def coerce!(val)
+        Float(val)
+      end
+
       def decode(bytes)
         bytes.unpack('e').first
       end
@@ -35,4 +39,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/int32_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/int64_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/integer_field.rb

@@ -21,4 +21,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/message_field.rb

@@ -9,11 +9,7 @@ module Protobuf
       #
 
       def acceptable?(val)
-        unless val.instance_of?(type_class) || val.respond_to?(:to_hash)
-          raise TypeError, "Expected value of type '#{type_class}' for field #{name}, but got '#{val.class}'"
-        end
-
-        true
+        val.is_a?(type_class) || val.respond_to?(:to_hash) || val.respond_to?(:to_proto)
       end
 
       def decode(bytes)
@@ -34,33 +30,22 @@ module Protobuf
         ::Protobuf::WireType::LENGTH_DELIMITED
       end
 
-      private
+      def coerce!(value)
+        return nil if value.nil?
 
-      ##
-      # Private Instance Methods
-      #
+        coerced_value = if value.respond_to?(:to_proto)
+                          value.to_proto
+                        elsif value.respond_to?(:to_hash)
+                          type_class.new(value.to_hash)
+                        else
+                          value
+                        end
+
+        return coerced_value if coerced_value.is_a?(type_class)
 
-      def define_setter
-        field = self
-        message_class.class_eval do
-          define_method("#{field.name}=") do |val|
-            case
-            when val.nil? then
-              @values.delete(field.name)
-            when val.is_a?(field.type_class) then
-              @values[field.name] = val
-            when val.respond_to?(:to_proto) then
-              @values[field.name] = val.to_proto
-            when val.respond_to?(:to_hash) then
-              @values[field.name] = field.type_class.new(val.to_hash)
-            else
-              raise TypeError, "Expected value of type '#{field.type_class}' for field #{field.name}, but got '#{val.class}'"
-            end
-          end
-        end
+        fail TypeError, "Expected value of type '#{type_class}' for field #{name}, but got '#{value.class}'"
       end
 
     end
   end
 end
-

data/lib/protobuf/field/sfixed32_field.rb

@@ -25,4 +25,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sfixed64_field.rb

@@ -26,4 +26,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/signed_integer_field.rb

@@ -27,4 +27,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sint32_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/sint64_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/field/string_field.rb

@@ -8,7 +8,7 @@ module Protobuf
       # Constants
       #
 
-      ENCODING = 'UTF-8'.freeze
+      ENCODING = Encoding::UTF_8
 
       ##
       # Public Instance Methods
@@ -25,11 +25,9 @@ module Protobuf
         value_to_encode.encode!(::Protobuf::Field::StringField::ENCODING, :invalid => :replace, :undef => :replace, :replace => "")
         value_to_encode.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING)
 
-        string_size = ::Protobuf::Field::VarintField.encode(value_to_encode.size)
-        string_size << value_to_encode
+        "#{::Protobuf::Field::VarintField.encode(value_to_encode.size)}#{value_to_encode}"
       end
 
     end
   end
 end
-

data/lib/protobuf/field/uint32_field.rb

@@ -19,4 +19,3 @@ module Protobuf
     end
   end
 end
-