ruby_protobuf 0.4.4 → 0.4.5

data/History.txt

@@ -1,5 +1,7 @@
-=== 0.4.4 / 2010-06-04
+=== 0.4.5 / 2010-07-17
 
+* 0.4.5
+  * Bug fix. (enum value)
 * 0.4.4
   * Bug fix. (rprotoc)
 * 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/bin/rprotoc

@@ -21,6 +21,8 @@ opts.on('-o', '--out <OUT_DIR>', 'Specify the directory in which Ruby source fil
 opts.on_tail('-v', '--version', 'Show version.'){ puts(opts.ver); exit }
 opts.on_tail('-h', '--help', 'Show this message.'){ puts(opts.help); exit }
 
+Version = Protobuf::Version
+
 begin
   opts.order!
 rescue OptionParser::ParseError

data/lib/protobuf/common/util.rb

@@ -14,4 +14,10 @@ module Protobuf
       name.to_s.gsub(/\B[A-Z]/, '_\&').downcase
     end
   end
+
+  begin
+    Version = File.read(File.dirname(__FILE__) + '/../../../VERSION')
+  rescue
+    Version = 'unknown'
+  end
 end

data/lib/protobuf/message/enum.rb

@@ -46,7 +46,7 @@ module Protobuf
     end
   end
 
-  class EnumValue < SimpleDelegator
+  class EnumValue < DelegateClass(Fixnum)
 
     attr_reader :parent_class, :name, :value
 

data/lib/protobuf/message/field.rb

@@ -345,11 +345,8 @@ module Protobuf
       def encode(value)
         if value.respond_to?(:force_encoding)
           # Ruby 1.9
-          old_encoding = value.encoding
           result = VarintField.encode(value.bytesize)
-          result << value.force_encoding(Encoding::ASCII_8BIT)
-          value.force_encoding(old_encoding)
-          result
+          result << value.dup.force_encoding(Encoding::ASCII_8BIT)
         else
           # Ruby 1.8
           result = VarintField.encode(value.size)

data/test/proto/address_book_service.rb

@@ -0,0 +1,31 @@
+require 'protobuf/rpc/server'
+require 'protobuf/rpc/handler'
+require 'test/proto/rpc.pb'
+
+class Tutorial::SearchHandler < Protobuf::Rpc::Handler
+  request Tutorial::Person
+  response Tutorial::AddressBook
+
+  def self.process_request(request, response)
+    # TODO: edit this method
+  end
+end
+
+class Tutorial::AddHandler < Protobuf::Rpc::Handler
+  request Tutorial::Person
+  response Tutorial::Person
+
+  def self.process_request(request, response)
+    # TODO: edit this method
+  end
+end
+
+class Tutorial::AddressBookService < Protobuf::Rpc::Server
+  def setup_handlers
+    @handlers = {
+      :search => Tutorial::SearchHandler,
+      :add => Tutorial::AddHandler,
+    }
+  end
+end
+

data/test/proto/client_add.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'protobuf/rpc/client'
+require 'test/proto/rpc.pb'
+
+# build request
+request = Tutorial::Person.new
+# TODO: setup a request
+raise StandardError, 'setup a request'
+
+# create blunk response
+response = Tutorial::Person.new
+
+# execute rpc
+Protobuf::Rpc::Client.new('localhost', 9999).call :add, request, response
+
+# show response
+puts response
+

data/test/proto/client_search.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'protobuf/rpc/client'
+require 'test/proto/rpc.pb'
+
+# build request
+request = Tutorial::Person.new
+# TODO: setup a request
+raise StandardError, 'setup a request'
+
+# create blunk response
+response = Tutorial::AddressBook.new
+
+# execute rpc
+Protobuf::Rpc::Client.new('localhost', 9999).call :search, request, response
+
+# show response
+puts response
+

data/test/proto/float_default.pb.rb

@@ -0,0 +1,28 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/float_default.proto>
+# message M {  
+#   optional float f = 1 [default = 4.2];  
+#   optional float g = 2 [default = -4.2];  
+#   optional float h = 3 [default = 4352];
+#   optional float i = 4 [default = 23145.2 ];
+#   optional float j = 5 [default = -5 ];
+#   optional float k = 6 [default = +23 ];
+#   optional float l = 7 [default = +23.42 ];
+# }
+# 
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+class M < ::Protobuf::Message
+  defined_in __FILE__
+  optional :float, :f, 1, :default => 4.2
+  optional :float, :g, 2, :default => -4.2
+  optional :float, :h, 3, :default => 4352
+  optional :float, :i, 4, :default => 23145.2
+  optional :float, :j, 5, :default => -5
+  optional :float, :k, 6, :default => 23
+  optional :float, :l, 7, :default => 23.42
+end

data/test/proto/rpc.pb.rb

@@ -0,0 +1,16 @@
+### Generated by rprotoc. DO NOT EDIT!
+### <proto file: test/proto/rpc.proto>
+# package tutorial;
+# 
+# service AddressBookService {
+#   rpc Search (Person) returns (AddressBook);
+#   rpc Add (Person) returns (Person);
+# }
+
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module Tutorial
+end

data/test/test_serialize.rb

@@ -40,6 +40,13 @@ class SerializeTest < Test::Unit::TestCase
     assert_equal('山田 太郎', person2.name)
   end
 
+  def test_frozen_string
+    person = Tutorial::Person.new
+    person.id = 1234
+    person.name = 'a b c'.freeze
+    assert_nothing_raised { serialized_string = person.serialize_to_string }
+  end
+
   def test_unknown_field
     person = Tutorial::Person.new
     person.id = 1234

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - MATSUYAMA Kengo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +09:00
+date: 2010-07-17 00:00:00 +09:00
 default_executable: rprotoc
 dependencies: []
 
@@ -147,33 +147,38 @@ signing_key:
 specification_version: 3
 summary: Protocol Buffers for Ruby
 test_files: 
-- test/check_unbuild.rb
-- test/test_descriptor.rb
-- test/test_optional_field.rb
-- test/proto/merge.pb.rb
-- test/proto/ext_collision.pb.rb
-- test/proto/lowercase.pb.rb
-- test/proto/addressbook_base.pb.rb
 - test/proto/packed.pb.rb
-- test/proto/optional_field.pb.rb
+- test/proto/types.pb.rb
 - test/proto/addressbook.pb.rb
-- test/proto/addressbook_ext.pb.rb
-- test/proto/nested.pb.rb
 - test/proto/ext_range.pb.rb
-- test/proto/types.pb.rb
+- test/proto/nested.pb.rb
+- test/proto/client_search.rb
+- test/proto/addressbook_base.pb.rb
+- test/proto/rpc.pb.rb
+- test/proto/address_book_service.rb
 - test/proto/collision.pb.rb
-- test/test_enum_value.rb
-- test/test_repeated_types.rb
-- test/test_types.rb
-- test/test_extension.rb
-- test/test_serialize.rb
-- test/test_standard_message.rb
-- test/test_packed_field.rb
-- test/test_lowercase.rb
+- test/proto/optional_field.pb.rb
+- test/proto/merge.pb.rb
+- test/proto/addressbook_ext.pb.rb
+- test/proto/client_add.rb
+- test/proto/float_default.pb.rb
+- test/proto/lowercase.pb.rb
+- test/proto/ext_collision.pb.rb
 - test/test_compiler.rb
-- test/test_message.rb
 - test/test_parse.rb
 - test/test_addressbook.rb
+- test/test_extension.rb
+- test/test_lowercase.rb
+- test/test_standard_message.rb
+- test/test_enum_value.rb
+- test/test_message.rb
+- test/test_types.rb
+- test/test_repeated_types.rb
+- test/test_descriptor.rb
+- test/test_optional_field.rb
+- test/test_packed_field.rb
+- test/test_serialize.rb
+- test/check_unbuild.rb
+- examples/addressbook.pb.rb
 - examples/writing_a_message.rb
 - examples/reading_a_message.rb
-- examples/addressbook.pb.rb