ruby_protobuf 0.2.0 → 0.3.0

data/test/addressbook_base.rb

@@ -0,0 +1,62 @@
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+module TutorialExt
+  
+  class Person < ::Protobuf::Message
+    required :string, :name, 1
+    required :int32, :id, 2
+    optional :string, :email, 3
+    
+    class PhoneType < ::Protobuf::Enum
+      MOBILE = 0
+      HOME = 1
+      WORK = 2
+    end
+    
+    class PhoneNumber < ::Protobuf::Message
+      required :string, :number, 1
+      optional :PhoneType, :type, 2, {:default => :HOME}
+    end
+    
+    repeated :PhoneNumber, :phone, 4
+    
+    extensions 100..200
+  end
+  
+  # see: addressbool_ext.rb
+  #class Person < ::Protobuf::Message
+  #  optional :int32, :age, 100, :extension => true
+  #end
+  
+  class AddressBook < ::Protobuf::Message
+    repeated :Person, :person, 1
+  end
+
+  #class SearchService < Protobuf::Service
+  #  rpc :Search => :SearchRequest, :returns => :SearchResponse
+  #end
+
+  #Protobuf::OPTIONS[:optimize_for] = :SPEED
+  #Protobuf::OPTIONS[:java_package] = :'com.example.foo'
+end
+
+=begin
+tutorial = Object.const_set :Tutorial, Module.new
+person = tutorial.const_set :Person, Class.new(Protobuf::Message)
+person.required :string, :name, 1
+person.required :int32, :id, 2
+person.optional :string, :email, 3
+phone_type = person.const_set :PhoneType, Class.new(Protobuf::Enum)
+phone_type.const_set :MOBILE, 0
+phone_type.const_set :HOME, 1
+phone_type.const_set :WORK, 2
+phone_number = person.const_set :PhoneNumber, Class.new(Protobuf::Message)
+phone_number.required :string, :number, 1
+phone_number.optional :PhoneType, :type, 2, {:default => :HOME}
+person.repeated :PhoneNumber, :phone, 4
+address_book = tutorial.const_set :AddressBook, Class.new(Protobuf::Message)
+address_book.repeated :Person, :person, 1
+=end

data/test/addressbook_ext.proto

@@ -0,0 +1,6 @@
+import "test/addressbook_base.proto";
+package tutorial;
+
+extend Person {
+  optional int32 age = 100;
+}

data/test/addressbook_ext.rb

@@ -0,0 +1,12 @@
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'protobuf/message/service'
+require 'protobuf/message/extend'
+
+require 'addressbook_base'
+
+module TutorialExt
+  class Person < ::Protobuf::Message
+    optional :int32, :age, 100, :extension => true
+  end
+end

data/test/rpc.proto

@@ -0,0 +1,6 @@
+package tutorial;
+
+service AddressBookService {
+  rpc Search (Person) returns (AddressBook);
+  rpc Add (Person) returns (Person);
+}

data/test/test_addressbook.rb

@@ -19,9 +19,10 @@ class AddressbookTest < Test::Unit::TestCase
 
   def test_initial_value
     person = Tutorial::Person.new
-    assert_equal '', person.name
-    assert_equal 0, person.id
+    assert_nil person.name
+    assert_nil person.id
     assert_equal [], person.phone
+    assert_equal '', person.email
   end
 
   def test_repeatable

data/test/test_compiler.rb

@@ -1,9 +1,10 @@
 require 'test/unit'
+#require 'protobuf/compiler/compiler_old'
 require 'protobuf/compiler/compiler'
 
 class CompilerTest < Test::Unit::TestCase
-  def test_compile
-    assert_equal <<-eos.strip, Protobuf::Compiler.compile('test/addressbook.proto').strip
+  def test_create_message
+    assert_equal <<-eos.gsub(/^\s*\n/, '').strip, Protobuf::Compiler.new.create_message('test/addressbook.proto', '.', '.', false).gsub(/^\s*\n/, '').strip
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
 require 'protobuf/message/service'
@@ -24,10 +25,16 @@ module Tutorial
     
     class PhoneNumber < ::Protobuf::Message
       required :string, :number, 1
-      optional :PhoneType, :type, 2, {:default => :HOME}
+      optional :PhoneType, :type, 2, :default => :HOME
     end
     
     repeated :PhoneNumber, :phone, 4
+    
+    extensions 100..200
+  end
+  
+  class Person < ::Protobuf::Message
+    optional :int32, :age, 100, :extension => true
   end
   
   class AddressBook < ::Protobuf::Message
@@ -36,4 +43,92 @@ module Tutorial
 end
     eos
   end
+
+  def test_create_rpc
+    file_contents = Protobuf::Compiler.new.create_rpc('test/rpc.proto', '.', '.', false)
+
+    assert_source <<-eos, file_contents['./address_book_service.rb']
+require 'protobuf/rpc/server'
+require 'protobuf/rpc/handler'
+require 'test/rpc'
+
+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
+    eos
+
+    assert_source <<-eos, file_contents['./start_address_book_service']
+#!/usr/bin/ruby
+require 'address_book_service'
+
+Tutorial::AddressBookService.new(:port => 9999).start
+    eos
+
+    assert_source <<-eos, file_contents['./client_search.rb']
+#!/usr/bin/ruby
+require 'protobuf/rpc/client'
+require 'test/rpc'
+
+# build request
+request = Tutorial::Person.new
+# TODO: setup a request
+raise StandardError.new('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
+    eos
+
+    assert_source <<-eos, file_contents['./client_add.rb']
+#!/usr/bin/ruby
+require 'protobuf/rpc/client'
+require 'test/rpc'
+
+# build request
+request = Tutorial::Person.new
+# TODO: setup a request
+raise StandardError.new('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
+    eos
+  end
+
+  def assert_source(ideal, real)
+    assert_equal ideal.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n"), real.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n")
+  end
 end

data/test/test_extension.rb

@@ -0,0 +1,40 @@
+require 'test/unit'
+require 'test/addressbook_ext.rb'
+
+class ExtensionTest < Test::Unit::TestCase
+  def test_accessor
+    assert TutorialExt::Person.extension_fields.to_a.map{|t, f| f.name}.include?(:age)
+    person = TutorialExt::Person.new
+    assert_nothing_raised {person.age = 100}
+    assert 100, person.age
+    #assert 100, person.extension.age
+    #assert_nothing_raised {person.extension.age = 200}
+    #assert 200, person.age
+    #assert 200, person.extension.age
+  end
+
+  def test_serialize
+    # serialize to string
+    person = TutorialExt::Person.new
+    person.id = 1234
+    person.age = 70
+    person.name = 'John Doe'
+    person.email = 'jdoe@example.com'
+    phone = TutorialExt::Person::PhoneNumber.new
+    phone.number = '555-4321'
+    phone.type = TutorialExt::Person::PhoneType::HOME
+    person.phone << phone
+    serialized_string = person.serialize_to_string
+
+    # parse the serialized string
+    person2 = TutorialExt::Person.new
+    person2.parse_from_string serialized_string
+    assert_equal 1234, person2.id
+    assert_equal 70, person2.age
+    assert_equal 'John Doe', person2.name
+    assert_equal 'jdoe@example.com', person2.email
+    assert_equal 1, person2.phone.size
+    assert_equal '555-4321', person2.phone[0].number
+    assert_equal TutorialExt::Person::PhoneType::HOME, person2.phone[0].type
+  end
+end

data/test/test_standard_message.rb

@@ -0,0 +1,83 @@
+require 'test/unit'
+require 'protobuf/message/message'
+require 'protobuf/message/enum'
+require 'test/addressbook'
+
+class StandardMessageTest < Test::Unit::TestCase
+  def test_initialized
+    person = Tutorial::Person.new
+    assert !person.initialized?
+    person.name = 'name'
+    assert !person.initialized?
+    person.id = 12
+    assert person.initialized?
+  end
+
+  def test_clear
+    person = Tutorial::Person.new
+    person.name = 'name'
+    person.id = 1234
+    person.email = 'abc@cde.fgh'
+    person.phone << Tutorial::Person::PhoneNumber.new
+    person.clear!
+
+    assert_nil person.name
+    assert_nil person.id
+    assert_equal '', person.email
+    assert_equal 0, person.phone.size
+  end
+
+  def test_dup
+    person = Tutorial::Person.new
+    person.name = 'name'
+    person.id = 1234
+    person.email = 'abc@cde.fgh'
+    person.phone << Tutorial::Person::PhoneNumber.new
+    person.phone.last.number = '123-456'
+    person.phone.last.type = Tutorial::Person::PhoneType::MOBILE
+    person.phone << Tutorial::Person::PhoneNumber.new
+    person.phone.last.number = '456-123'
+    person.phone.last.type = Tutorial::Person::PhoneType::WORK
+
+    person2 = person.dup
+    assert_not_equal person, person2
+    assert_equal person.name, person2.name
+    assert_equal person.id, person2.id
+    assert_equal person.email, person2.email
+    assert_equal person.phone.size, person2.phone.size
+    assert_not_equal person.phone.first, person2.phone.first
+    assert_equal person.phone.first.number, person2.phone.first.number
+    assert_equal person.phone.first.type, person2.phone.first.type
+    assert_not_equal person.phone.last, person2.phone.last
+    assert_equal person.phone.last.number, person2.phone.last.number
+    assert_equal person.phone.last.type, person2.phone.last.type
+  end
+
+  def test_to_s
+    person = Tutorial::Person.new
+    person.name = 'name'
+    person.id = 1234
+    person.email = 'abc@cde.fgh'
+    person.phone << Tutorial::Person::PhoneNumber.new
+    person.phone.last.number = '123-456'
+    person.phone.last.type = Tutorial::Person::PhoneType::MOBILE
+    person.phone << Tutorial::Person::PhoneNumber.new
+    person.phone.last.number = '456-123'
+    person.phone.last.type = Tutorial::Person::PhoneType::WORK
+
+    assert_equal <<-eos, person.to_s
+name: "name"
+id: 1234
+email: "abc@cde.fgh"
+phone {
+  number: "123-456"
+  type: MOBILE
+}
+phone {
+  number: "456-123"
+  type: WORK
+}
+    eos
+  end
+end
+

data/test/test_types.rb

@@ -31,7 +31,7 @@ class TypesTest < Test::Unit::TestCase
     assert_equal(-10, types2.type8)
     assert_equal 10000, types2.type9
     assert_equal 100000, types2.type10
-    assert_equal false, types2.type11
+    assert !types2.type11
     assert_equal 'hello all types', types2.type12
     #types2.type13
   end
@@ -152,7 +152,7 @@ class TypesTest < Test::Unit::TestCase
     types = Test::Types::TestTypes.new
     assert_nothing_raised do types.type11 = true end
     assert_nothing_raised do types.type11 = false end
-    assert_raise TypeError do types.type11 = nil end
+    assert_nothing_raised do types.type11 = nil end
     assert_raise TypeError do types.type11 = 0 end
     assert_raise TypeError do types.type11 = '' end
   end
@@ -161,7 +161,7 @@ class TypesTest < Test::Unit::TestCase
     types = Test::Types::TestTypes.new
     assert_nothing_raised do types.type12 = '' end
     assert_nothing_raised do types.type12 = 'hello' end
-    assert_raise TypeError do types.type12 = nil end
+    assert_nothing_raised do types.type12 = nil end
     assert_raise TypeError do types.type12 = 0 end
     assert_raise TypeError do types.type12 = true end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_protobuf
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - ANDO Yasushi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-03 00:00:00 +09:00
+date: 2008-08-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,9 +38,21 @@ files:
 - README.txt
 - Rakefile
 - bin/rprotoc
+- examples/addressbook.proto
+- examples/addressbook.rb
+- examples/reading_a_message.rb
+- examples/writing_a_message.rb
 - lib/protobuf/common/wire_type.rb
 - lib/protobuf/compiler/compiler.rb
-- lib/protobuf/compiler/parser.y
+- lib/protobuf/compiler/compiler_old.rb
+- lib/protobuf/compiler/nodes.rb
+- lib/protobuf/compiler/proto.y
+- lib/protobuf/compiler/proto2.ebnf
+- lib/protobuf/compiler/proto_parser.rb
+- lib/protobuf/compiler/template/rpc_bin.erb
+- lib/protobuf/compiler/template/rpc_client.erb
+- lib/protobuf/compiler/template/rpc_service.erb
+- lib/protobuf/compiler/visitors.rb
 - lib/protobuf/descriptor/descriptor.proto
 - lib/protobuf/descriptor/descriptor.rb
 - lib/protobuf/descriptor/descriptor_builder.rb
@@ -55,22 +67,31 @@ files:
 - lib/protobuf/message/field.rb
 - lib/protobuf/message/message.rb
 - lib/protobuf/message/service.rb
+- lib/protobuf/rpc/client.rb
+- lib/protobuf/rpc/handler.rb
+- lib/protobuf/rpc/server.rb
 - lib/ruby_protobuf.rb
 - test/addressbook.proto
 - test/addressbook.rb
+- test/addressbook_base.proto
+- test/addressbook_base.rb
+- test/addressbook_ext.proto
+- test/addressbook_ext.rb
 - test/check_unbuild.rb
 - test/data/data.bin
-- test/data/data2.bin
 - test/data/data_source.py
 - test/data/types.bin
 - test/data/types_source.py
+- test/rpc.proto
 - test/test_addressbook.rb
 - test/test_compiler.rb
 - test/test_descriptor.rb
+- test/test_extension.rb
 - test/test_message.rb
 - test/test_parse.rb
 - test/test_ruby_protobuf.rb
 - test/test_serialize.rb
+- test/test_standard_message.rb
 - test/test_types.rb
 - test/types.proto
 - test/types.rb
@@ -102,11 +123,13 @@ signing_key:
 specification_version: 2
 summary: Protocol Buffers for Ruby
 test_files: 
-- test/test_ruby_protobuf.rb
-- test/test_addressbook.rb
+- test/test_descriptor.rb
 - test/test_message.rb
+- test/test_ruby_protobuf.rb
+- test/test_extension.rb
 - test/test_parse.rb
-- test/test_types.rb
 - test/test_serialize.rb
+- test/test_types.rb
 - test/test_compiler.rb
-- test/test_descriptor.rb
+- test/test_addressbook.rb
+- test/test_standard_message.rb

data/lib/protobuf/compiler/parser.y

@@ -1,138 +0,0 @@
-class Protobuf::Parser
-rule
-  stmt_list : stmt
-            | stmt_list stmt
-
-  stmt : package_stmt
-       | import_stmt
-       | option_stmt
-       | message_def
-       | extend_def
-       | enum_def
-       | service_def
-
-  package_stmt : PACKAGE fqcn_package ';'
-
-  fqcn_package : ident
-               | fqcn_package '.' ident
-
-  import_stmt : IMPORT STRING ';'
-
-  option_stmt : OPTION ident '=' STRING ';'
-              | OPTION ident '=' ident ';'
-
-  message_def : MESSAGE ident '{' message_item_list '}'
-
-  message_item_list : message_item
-                    | message_item_list message_item 
-
-  message_item : RULE type ident '=' INTEGER ';'
-               | RULE type ident '=' INTEGER '[' DEFAULT '=' ident ']' ';'
-               | RULE type ident '=' INTEGER '[' DEFAULT '=' number ']' ';'
-	       | option_stmt
-	       | extend_stmt
-	       | message_def
-	       | extend_def
-	       | enum_def
-
-  type : TYPE | IDENT
-
-  number : INTEGER | FLOAT
-
-  extend_stmt | EXTENSIONS INTEGER TO INTEGER ';'
-
-  extend_def : EXTEND ident '{' message_item_list '}'
-
-  enum_def : ENUM ident '{' enum_item_list '}'
-
-  enum_item_list : enum_item
-                 | enum_item_list enum_item
-
-  enum_item : ident '=' INTEGER ';'
-
-  service_def : SERVICE ident '{' RPC ident '(' ident ')' RETURNS '(' ident ')' '}' ';'
-
-  ident : PACKAGE | IDENT | MESSAGE | RULE | TYPE | EXTENSIONS | EXTEND | ENUM | SERVICE | RPC | RETURNS | TO | DEFAULT
-
----- inner
-
-  def initialize
-    @indent = 0
-  end
-
-  RESERVED = {
-    'package' => :PACKAGE,
-    'message' => :MESSAGE,
-    'extensions' => :EXTENSIONS,
-    'extend' => :EXTEND,
-    'enum' => :ENUM,
-    'service' => :SERVICE,
-    'rpc' => :RPC, 
-    'returns' => :RETURNS,
-    'to' => :TO,
-    'default' => :DEFAULT,
-    'required' => :RULE,
-    'optional' => :RULE,
-    'repeated' => :RULE,
-    'double' => :TYPE,
-    'float' => :TYPE,
-    'int32' => :TYPE,
-    'int64' => :TYPE,
-    'uint32' => :TYPE,
-    'uint64' => :TYPE,
-    'sint32' => :TYPE,
-    'sint64' => :TYPE,
-    'fixed32' => :TYPE,
-    'fixed64' => :TYPE,
-    'sfixed32' => :TYPE,
-    'sfixed64' => :TYPE,
-    'bool' => :TYPE,
-    'string' => :TYPE,
-    'bytes' => :TYPE,
-  }
-
-  def parse(f)
-    @q = []
-    lineno = 1
-    f.each do |line|
-      line.strip!
-      until line.empty? do
-        case line
-	when /\A\s+/, /\A\/\/.*/
-	  ;
-	when /\A[a-zA-Z_]\w*/
-          word = $&
-	  @q.push [RESERVED[word] || :IDENT, [lineno, word.to_sym]]
-        when /\A\d+\.\d+/
-	  @q.push [:FLOAT, [lineno, $&.to_f]]
-        when /\A\d+/
-	  @q.push [:INTEGER, [lineno, $&.to_i]]
-	when /\A"(?:[^"\\]+|\\.)*"/, /\A'(?:[^'\\]+|\\.)*'/
-	  @q.push [:STRING, [lineno, eval($&)]]
-	when /\A./
-	  @q.push [$&, [lineno, $&]]
-	else
-	  raise RuntimeError, 'must not happen'
-	end
-	line = $'
-      end
-      lineno += 1
-    end
-    @q.push [false, '$']
-
-    do_parse
-  end
-
-  def next_token
-    @q.shift
-  end
-
-  def on_error(t, v, values)
-    raise Racc::ParseError, "syntax error on #{v[1].inspect} at line.#{v[0]}"
-  end
-
----- footer
-
-File.open(ARGV.shift, 'r') do |f|
-  Protobuf::Parser.new.parse f
-end

data/test/data/data2.bin

@@ -1,3 +0,0 @@
-
-John Doe�	jdoe@example.com"
-555-4321