protobuf 2.4.7 → 2.4.8

data/lib/protobuf/field/bytes_field.rb

@@ -22,6 +22,27 @@ module Protobuf
         bytes
       end
 
+      def define_setter
+        field = self
+        @message_class.class_eval do
+          define_method(field.setter_method_name) do |val|
+            begin
+              field.warn_if_deprecated
+
+              if val.nil?
+                @values.delete(field.name)
+              elsif field.acceptable?(val)
+                @values[field.name] = val.dup
+              else
+                raise TypeError, "unacceptable value #{val} for type #{field.type}"
+              end
+            rescue NoMethodError => ex
+              raise TypeError, "unacceptable value #{val} for type #{field.type} field #{field.name}"
+            end
+          end
+        end
+      end
+
       def encode(value)
         value = value.serialize_to_string if value.is_a?(::Protobuf::Message)
         value.force_encoding(::Protobuf::Field::BytesField::BYTES_ENCODING) 

data/lib/protobuf/field/string_field.rb

@@ -5,27 +5,6 @@ module Protobuf
     class StringField < BytesField
       ENCODING = 'UTF-8'.freeze
 
-      def define_setter
-        field = self
-        @message_class.class_eval do
-          define_method(field.setter_method_name) do |val|
-            begin
-              field.warn_if_deprecated
-
-              if val.nil? || val.empty?
-                @values.delete(field.name)
-              elsif field.acceptable?(val)
-                @values[field.name] = val.dup
-              else
-                raise TypeError, "unacceptable value #{val} for type #{field.type}"
-              end
-            rescue NoMethodError => ex
-              raise TypeError, "unacceptable value #{val} for type #{field.type} field #{field.name}"
-            end
-          end
-        end
-      end
-
       def encode(value)
         value.force_encoding(::Protobuf::Field::StringField::ENCODING) 
         string_size = ::Protobuf::Field::VarintField.encode(value.size)

data/lib/protobuf/message.rb

@@ -160,11 +160,11 @@ module Protobuf
 
         value = @values[field.name]
 
-        if value.present? || [true, false].include?(value)
-          yield(field, value) 
-        else
-          # Only way you can get here is if you are required and not present
+        if value.nil?
+          # Only way you can get here is if you are required and nil
           raise ::Protobuf::SerializationError, "#{field.name} is required on #{field.message_class}"
+        else
+          yield(field, value) 
         end
       end
     end
@@ -336,12 +336,7 @@ module Protobuf
     end
 
     def __field_must_be_serialized__?(field)
-      field.required? || __field_value_is_present__?(field)
-    end
-
-    def __field_value_is_present__?(field)
-      value = @values[field.name]
-      !value.nil? && (value.present? || [true, false].include?(value))
+      field.required? || !@values[field.name].nil?
     end
 
     # Encode key and value, and write to +stream+.

data/lib/protobuf/rpc/service.rb

@@ -147,7 +147,11 @@ module Protobuf
       # Request object for this rpc cycle. Not assignable.
       #
       def request
-        @_request ||= rpcs[@rpc].request_type.new.parse_from_string(@request_bytes)
+        @_request ||= if @request_bytes.present?
+            rpcs[@rpc].request_type.new.parse_from_string(@request_bytes)
+          else
+            rpcs[@rpc].request_type.new
+          end
       rescue => e
         raise BadRequestProto, "Unable to parse request: #{e.message}"
       end

data/lib/protobuf/rpc/service_dispatcher.rb

@@ -71,8 +71,10 @@ module Protobuf
       #
       def init_method
         method_name = outer_request.method_name.underscore.to_sym
+        request_proto = outer_request.has_field?(:request_proto) ? outer_request.request_proto : nil
+
         if service_klass.rpc_method?(method_name)
-          self.service = service_klass.new(method_name, outer_request.request_proto)
+          self.service = service_klass.new(method_name, request_proto)
           self.callable_method = service.callable_rpc_method(method_name)
           self.definition = service.rpcs[method_name]
         else

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.4.7'
+  VERSION = '2.4.8'
   PROTOC_VERSION = '2.4.1'
 end

data/proto/rpc.pb.rb

@@ -36,7 +36,7 @@ module Protobuf
     #
     ::Protobuf::Socketrpc::Request.required(::Protobuf::Field::StringField, :service_name, 1)
     ::Protobuf::Socketrpc::Request.required(::Protobuf::Field::StringField, :method_name, 2)
-    ::Protobuf::Socketrpc::Request.required(::Protobuf::Field::BytesField, :request_proto, 3)
+    ::Protobuf::Socketrpc::Request.optional(::Protobuf::Field::BytesField, :request_proto, 3)
     
     ::Protobuf::Socketrpc::Response.optional(::Protobuf::Field::BytesField, :response_proto, 1)
     ::Protobuf::Socketrpc::Response.optional(::Protobuf::Field::StringField, :error, 2)

data/proto/rpc.proto

@@ -33,7 +33,7 @@ message Request {
   required string method_name = 2;
   
   // RPC request proto
-  required bytes request_proto = 3;
+  optional bytes request_proto = 3;
 }
 
 message Response {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -498,7 +498,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1379767212789735468
+      hash: -3822315942507757741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -507,7 +507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1379767212789735468
+      hash: -3822315942507757741
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24