ruby_protobuf 0.4.1 → 0.4.4

data/History.txt

@@ -1,5 +1,9 @@
-=== 0.4.1 / 2010-04-30
+=== 0.4.4 / 2010-06-04
 
+* 0.4.4
+  * Bug fix. (rprotoc)
+* 0.4.3
+  * Bug fixes.
 * 0.4.1
   * Switched to 'jeweler'.
 * 0.4.0 alpha

data/Manifest.txt

@@ -38,7 +38,6 @@ lib/protobuf/message/service.rb
 lib/protobuf/rpc/client.rb
 lib/protobuf/rpc/handler.rb
 lib/protobuf/rpc/server.rb
-lib/ruby_protobuf.rb
 script/mk_parser
 test/check_unbuild.rb
 test/data/data.bin

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.4

data/bin/rprotoc

@@ -8,7 +8,6 @@ else
   require 'rubygems'
   gem 'ruby_protobuf'
 end
-require 'ruby_protobuf'
 require 'protobuf/compiler/compiler'
 
 
@@ -22,8 +21,6 @@ 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 = RubyProtobuf::VERSION
-
 begin
   opts.order!
 rescue OptionParser::ParseError

data/lib/protobuf/common/util.rb

@@ -5,5 +5,13 @@ module Protobuf
     def camelize(name)
       name.to_s.gsub(/(?:\A|_)(\w)/) { $1.upcase }
     end
+
+    def modulize(name)
+      name.to_s.sub(/\A[a-z]/) {|c| c.upcase }
+    end
+
+    def underscore(name)
+      name.to_s.gsub(/\B[A-Z]/, '_\&').downcase
+    end
   end
 end

data/lib/protobuf/compiler/nodes.rb

@@ -107,9 +107,7 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        class_name = @name.to_s
-        class_name.gsub!(/\A[a-z]/) {|c| c.upcase}
-        visitor.write("class #{class_name} < ::Protobuf::Message")
+        visitor.write("class #{Util.modulize(@name)} < ::Protobuf::Message")
         visitor.in_context(self.class) do
           define_in_the_file(visitor)
           @children.each {|child| child.accept_message_visitor(visitor) }
@@ -133,7 +131,7 @@ require 'protobuf/message/extend'
 
       def accept_message_visitor(visitor)
         name = @name.is_a?(Array) ? @name.join : name.to_s
-        visitor.write("class #{name} < ::Protobuf::Message")
+        visitor.write("class #{Util.modulize(name)} < ::Protobuf::Message")
         visitor.in_context(self.class) do
           define_in_the_file(visitor)
           @children.each {|child| child.accept_message_visitor(visitor) }
@@ -152,7 +150,7 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write("class #{@name} < ::Protobuf::Enum")
+        visitor.write("class #{Util.modulize(@name)} < ::Protobuf::Enum")
         visitor.in_context(self.class) do
           define_in_the_file(visitor)
           @children.each {|child| child.accept_message_visitor(visitor) }
@@ -175,7 +173,7 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write("define :#{@name}, #{@value}")
+        visitor.write("#{Util.modulize(@name)} = value(:#{@name}, #{@value})")
       end
 
       def accept_descriptor_visitor(visitor)

data/lib/protobuf/compiler/template/rpc_bin.erb

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require '<%= underscored_name %>'
 
-<%= module_name %>::<%= service_name %>.new(:Port => <%= default_port %>).start
+<%= module_name %>::<%= Util.modulize(service_name) %>.new(:Port => <%= default_port %>).start

data/lib/protobuf/compiler/template/rpc_client.erb

@@ -3,15 +3,15 @@ require 'protobuf/rpc/client'
 require '<%= required_file %>'
 
 # build request
-request = <%= message_module %>::<%= request %>.new
+request = <%= message_module %>::<%= Util.modulize(request) %>.new
 # TODO: setup a request
 raise StandardError, 'setup a request'
 
-# create blunk response
-response = <%= message_module %>::<%= response %>.new
+# create blank response
+response = <%= message_module %>::<%= Util.modulize(response) %>.new
 
 # execute rpc
-Protobuf::Rpc::Client.new('localhost', <%= default_port %>).call :<%= underscore name %>, request, response
+Protobuf::Rpc::Client.new('localhost', <%= default_port %>).call :<%= Util.underscore(name) %>, request, response
 
 # show response
 puts response

data/lib/protobuf/compiler/template/rpc_service.erb

@@ -3,9 +3,9 @@ require 'protobuf/rpc/handler'
 require '<%= required_file %>'
 
 <%- rpcs.each do |name, request, response| -%>
-class <%= module_name %>::<%= name %>Handler < Protobuf::Rpc::Handler
-  request <%= module_name %>::<%= request %>
-  response <%= module_name %>::<%= response %>
+class <%= module_name %>::<%= Util.modulize(name) %>Handler < Protobuf::Rpc::Handler
+  request <%= module_name %>::<%= Util.modulize(request) %>
+  response <%= module_name %>::<%= Util.modulize(response) %>
 
   def self.process_request(request, response)
     # TODO: edit this method
@@ -13,11 +13,11 @@ class <%= module_name %>::<%= name %>Handler < Protobuf::Rpc::Handler
 end
 
 <%- end -%>
-class <%= module_name %>::<%= service_name %> < Protobuf::Rpc::Server
+class <%= module_name %>::<%= Util.modulize(service_name) %> < Protobuf::Rpc::Server
   def setup_handlers
     @handlers = {
       <%- rpcs.each do |name, | -%>
-      :<%= underscore name %> => <%= module_name %>::<%= name %>Handler,
+      :<%= Util.underscore(name) %> => <%= module_name %>::<%= Util.modulize(name) %>Handler,
       <%- end -%>
     }
   end

data/lib/protobuf/compiler/visitors.rb

@@ -1,5 +1,6 @@
 require 'erb'
 require 'fileutils'
+require 'protobuf/common/util'
 require 'protobuf/descriptor/descriptor_proto'
 
 module Protobuf
@@ -107,9 +108,9 @@ module Protobuf
 
       def create_files(filename, out_dir, file_create)
         begin
-          Class.new.class_eval(to_s) # check the message
-        rescue LoadError => e
-          puts "Warning, couldn't test load proto file because of imports"
+          eval(to_s, TOPLEVEL_BINDING)  # check the message
+        rescue LoadError
+          $stderr.puts "Warning, couldn't test load proto file because of imports"
         end
         if file_create
           log_writing(filename)
@@ -143,8 +144,8 @@ module Protobuf
         @create_file = create_file
         default_port = 9999
         @services.each do |service_name, rpcs|
-          underscored_name = underscore service_name.to_s
-          message_module = package.map{|p| p.to_s.capitalize}.join('::')
+          underscored_name = Util.underscore(service_name.to_s)
+          message_module = package.map{|p| Util.camelize(p.to_s)}.join('::')
           required_file = message_file.sub(/^\.\//, '').sub(/\.rb$/, '')
 
           create_bin(out_dir, underscored_name, message_module, service_name, default_port)
@@ -165,17 +166,15 @@ module Protobuf
         @file_contents[bin_filename] = bin_contents
       end
 
-      def create_service(message_file, out_dir, underscored_name, module_name, service_name,
-        default_port, rpcs, required_file)
+      def create_service(message_file, out_dir, underscored_name, module_name, service_name, default_port, rpcs, required_file)
         service_filename = "#{out_dir}/#{underscored_name}.rb"
         service_contents = template_erb('rpc_service').result(binding)
         create_file_with_backup(service_filename, service_contents) if @create_file
         @file_contents[service_filename] = service_contents
       end
 
-      def create_client(out_dir, underscored_name, default_port, name, request, response,
-        message_module, required_file)
-        client_filename = "#{out_dir}/client_#{underscore name}.rb"
+      def create_client(out_dir, underscored_name, default_port, name, request, response, message_module, required_file)
+        client_filename = "#{out_dir}/client_#{Util.underscore(name)}.rb"
         client_contents = template_erb('rpc_client').result binding
         create_file_with_backup(client_filename, client_contents, true) if @create_file
         @file_contents[client_filename] = client_contents
@@ -183,10 +182,6 @@ module Protobuf
 
       private
 
-      def underscore(str)
-        str.to_s.gsub(/\B[A-Z]/, '_\&').downcase
-      end
-
       def template_erb(template)
         ERB.new(File.read("#{File.dirname(__FILE__)}/template/#{template}.erb"), nil, '-')
       end

data/lib/protobuf/descriptor/descriptor.rb

@@ -26,6 +26,7 @@ module Protobuf
       def unbuild(parent_proto)
         message_proto = Google::Protobuf::DescriptorProto.new
         message_proto.name = @message_class.to_s.split('::').last
+        @message_class.new  # XXX: Setup field proxies.
         @message_class.fields.each do |tag, field|
           field.descriptor.unbuild(message_proto)
         end

data/lib/protobuf/message/enum.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'protobuf/common/util'
 require 'protobuf/descriptor/enum_descriptor'
 require 'protobuf/message/protoable'
 
@@ -13,7 +14,7 @@ module Protobuf
         if not defined?(@values)
           constants.find {|c| const_get(c) == value}  # for compatibility
         else
-          @values_index ||= @values.inject({}) {|hash, (n, v)| hash[v.value] = n; hash }
+          @values_index ||= @values.inject({}) {|hash, (n, v)| hash[v.value.to_i] = n; hash }
           @values_index[value]
         end
       end
@@ -30,11 +31,17 @@ module Protobuf
 
       private
 
+      # for compatibility
       def define(name, value)
         enum_value = EnumValue.new(self, name, value)
-        const_set(name, enum_value)
-        @values ||= {}
-        @values[name] = enum_value
+        const_set(Util.modulize(name), enum_value)
+        (@values ||= {})[name] = enum_value
+      end
+
+      def value(name, val)
+        enum_value = EnumValue.new(self, name, val)
+        (@values ||= {})[name] = enum_value
+        enum_value
       end
     end
   end

data/test/proto/addressbook.pb.rb

@@ -47,9 +47,9 @@ module Tutorial
     optional :string, :email, 3
     class PhoneType < ::Protobuf::Enum
       defined_in __FILE__
-      define :MOBILE, 0
-      define :HOME, 1
-      define :WORK, 2
+      MOBILE = value(:MOBILE, 0)
+      HOME = value(:HOME, 1)
+      WORK = value(:WORK, 2)
     end
     class PhoneNumber < ::Protobuf::Message
       defined_in __FILE__

data/test/proto/addressbook_base.pb.rb

@@ -40,9 +40,9 @@ module TutorialExt
     optional :string, :email, 3
     class PhoneType < ::Protobuf::Enum
       defined_in __FILE__
-      define :MOBILE, 0
-      define :HOME, 1
-      define :WORK, 2
+      MOBILE = value(:MOBILE, 0)
+      HOME = value(:HOME, 1)
+      WORK = value(:WORK, 2)
     end
     class PhoneNumber < ::Protobuf::Message
       defined_in __FILE__

data/test/proto/lowercase.pb.rb

@@ -1,14 +1,24 @@
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/lowercase.proto>
-# package test.lowercase;
+# package test.lower_case.lowerCamelCase;
 # 
 # message foo {  
 #   message bar {
+#     message fooBar {
+#     }
 #   } 
 # }
 # message baaz {  
 #   required foo.bar x = 1;
 # }
+# enum baaaz {
+#   abc = 0;
+#   def = 1;
+# }
+# 
+# service qux {
+#   rpc quuuux(baaz) returns (foo);
+# }
 
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
@@ -16,16 +26,26 @@ require 'protobuf/message/service'
 require 'protobuf/message/extend'
 
 module Test
-  module Lowercase
-    class Foo < ::Protobuf::Message
-      defined_in __FILE__
-      class Bar < ::Protobuf::Message
+  module LowerCase
+    module LowerCamelCase
+      class Foo < ::Protobuf::Message
         defined_in __FILE__
+        class Bar < ::Protobuf::Message
+          defined_in __FILE__
+          class FooBar < ::Protobuf::Message
+            defined_in __FILE__
+          end
+        end
+      end
+      class Baaz < ::Protobuf::Message
+        defined_in __FILE__
+        required :'foo::bar', :x, 1
+      end
+      class Baaaz < ::Protobuf::Enum
+        defined_in __FILE__
+        define :abc, 0
+        define :def, 1
       end
-    end
-    class Baaz < ::Protobuf::Message
-      defined_in __FILE__
-      required :'foo::bar', :x, 1
     end
   end
 end

data/test/proto/lowercase.proto

@@ -1,9 +1,19 @@
-package test.lowercase;
+package test.lower_case.lowerCamelCase;
 
 message foo {  
   message bar {
+    message fooBar {
+    }
   } 
 }
 message baaz {  
   required foo.bar x = 1;
 }
+enum baaaz {
+  abc = 0;
+  def = 1;
+}
+
+service qux {
+  rpc quuuux(baaz) returns (foo);
+}

data/test/proto/optional_field.pb.rb

@@ -24,8 +24,8 @@ module Test
       defined_in __FILE__
       class Enum < ::Protobuf::Enum
         defined_in __FILE__
-        define :A, 1
-        define :B, 2
+        A = value(:A, 1)
+        B = value(:B, 2)
       end
       optional :uint32, :number, 1, :default => 20
       optional :string, :text, 2, :default => "default string"

data/test/test_compiler.rb

@@ -2,6 +2,20 @@ require 'test/unit'
 require 'protobuf/compiler/compiler'
 
 class CompilerTest < Test::Unit::TestCase
+  def save_const(parent_class, const_name)
+    if parent_class.const_defined?(const_name)
+      saved = parent_class.const_get(const_name)
+      parent_class.__send__(:remove_const, const_name)
+    end
+
+    yield
+
+    if saved
+      parent_class.__send__(:remove_const, const_name) if parent_class.const_defined?(const_name)
+      parent_class.const_set(const_name, saved)
+    end
+  end
+
   # Issue 12:    Parse error on float default value
   def test_compile_float_default
     assert_compile_proto(<<-EOS, 'test/proto/float_default.proto')
@@ -37,7 +51,8 @@ end
   end
 
   def test_create_message
-    assert_compile_proto(<<-EOS, 'test/proto/addressbook.proto')
+    save_const(Object, :Tutorial) do
+      assert_compile_proto(<<-EOS, 'test/proto/addressbook.proto')
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/addressbook.proto>
 # package tutorial;
@@ -88,9 +103,9 @@ module Tutorial
     
     class PhoneType < ::Protobuf::Enum
       defined_in __FILE__
-      define :MOBILE, 0
-      define :HOME, 1
-      define :WORK, 2
+      MOBILE = value(:MOBILE, 0)
+      HOME = value(:HOME, 1)
+      WORK = value(:WORK, 2)
     end
     
     class PhoneNumber < ::Protobuf::Message
@@ -110,11 +125,13 @@ module Tutorial
     repeated :Person, :person, 1
   end
 end
-    EOS
+      EOS
+    end
   end
 
   def test_create_nested_message
-    assert_compile_proto(<<-EOS, 'test/proto/nested.proto')
+    save_const(Test, :Nested) do
+      assert_compile_proto(<<-EOS, 'test/proto/nested.proto')
 ### Generated by rprotoc. DO NOT EDIT!
 ### <proto file: test/proto/nested.proto>
 # package test.nested;
@@ -146,14 +163,16 @@ module Test
     end
   end
 end
-    EOS
+      EOS
+    end
   end
 
   def test_nested_message
-    file_contents = Protobuf::Compiler.new.create_message('test/proto/nested.proto', '.', '.', false)
-    assert_nothing_raised {Object.class_eval file_contents}
-    assert_raise(TypeError) {Test::Nested::Baaz.new.x = 1}
-    assert_nothing_raised {Test::Nested::Baaz.new.x = Test::Nested::Foo::Bar.new}
+    save_const(Test, :Nested) do
+      file_contents = Protobuf::Compiler.new.create_message('test/proto/nested.proto', '.', '.', false)
+      assert_raise(TypeError) {Test::Nested::Baaz.new.x = 1}
+      assert_nothing_raised {Test::Nested::Baaz.new.x = Test::Nested::Foo::Bar.new}
+    end
   end
 
   def test_create_rpc
@@ -209,7 +228,7 @@ request = Tutorial::Person.new
 # TODO: setup a request
 raise StandardError, 'setup a request'
 
-# create blunk response
+# create blank response
 response = Tutorial::AddressBook.new
 
 # execute rpc
@@ -229,7 +248,7 @@ request = Tutorial::Person.new
 # TODO: setup a request
 raise StandardError, 'setup a request'
 
-# create blunk response
+# create blank response
 response = Tutorial::Person.new
 
 # execute rpc

data/test/test_lowercase.rb

@@ -4,8 +4,16 @@ require 'test/proto/lowercase.pb'
 class LowercaseTest < Test::Unit::TestCase
   def test_lowercase
     message = nil
-    assert_nothing_raised { message = Test::Lowercase::Baaz.new }
-    assert_nothing_raised { message.x = Test::Lowercase::Foo::Bar.new }
-    assert_equal(Test::Lowercase::Foo::Bar, message.get_field_by_name(:x).type)
+    assert_nothing_raised { message = Test::LowerCase::LowerCamelCase::Baaz.new }
+    assert_nothing_raised { message.x = Test::LowerCase::LowerCamelCase::Foo::Bar.new }
+    assert_equal(Test::LowerCase::LowerCamelCase::Foo::Bar, message.get_field_by_name(:x).type)
+  end
+
+  def test_lowercased_enum_members
+    klass = Test::LowerCase::LowerCamelCase::Baaaz
+    assert_equal(0, klass::Abc)
+    assert_equal(1, klass::Def)
+    assert_equal(0, klass.values[:abc])
+    assert_equal(1, klass.values[:def])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - MATSUYAMA Kengo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 +09:00
+date: 2010-06-04 00:00:00 +09:00
 default_executable: rprotoc
 dependencies: []
 
@@ -69,7 +69,6 @@ files:
 - lib/protobuf/rpc/client.rb
 - lib/protobuf/rpc/handler.rb
 - lib/protobuf/rpc/server.rb
-- lib/ruby_protobuf.rb
 - script/mk_parser
 - test/check_unbuild.rb
 - test/data/data.bin

data/lib/ruby_protobuf.rb

@@ -1,3 +0,0 @@
-class RubyProtobuf
-  VERSION = '0.4.1'
-end