ruby_protobuf 0.4.6 → 0.4.7

data/History.txt

@@ -1,5 +1,10 @@
-=== 0.4.6 / 2010-09-12
+=== 0.4.7 / 2010-09-28
 
+* 0.4.7
+  * Bug fixes.
+    * Compilation error for importing message.
+    * Fixes for Ruby 1.9.2
+    * Compilation problem of string literals.
 * 0.4.6
   * Implement Message#to_hash method.
   * Accept String value for enum fields.

data/Rakefile

@@ -20,7 +20,7 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'test:.'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
@@ -28,13 +28,13 @@ end
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
-    test.libs << 'test'
+    test.libs << 'test:.'
     test.pattern = 'test/**/test_*.rb'
     test.verbose = true
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install rcov"
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/lib/protobuf/common/util.rb

@@ -16,7 +16,7 @@ module Protobuf
   end
 
   begin
-    Version = File.read(File.dirname(__FILE__) + '/../../../VERSION')
+    Version = File.read(File.dirname(__FILE__) + '/../../../VERSION').strip
   rescue
     Version = 'unknown'
   end

data/lib/protobuf/compiler/proto.y

@@ -193,7 +193,7 @@ end
         yield [:OCT_INTEGER, @token.to_i(0)]
       when match(/(true|false)\b/)
         yield [:BOOLEAN_LITERAL, @token == 'true']
-      when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
+      when match(/"(?:[^"\\]|\\.)*"/, /'(?:[^'\\]|\\.)*'/)
         yield [:STRING_LITERAL, eval(@token)]
       when match(/[a-zA-Z_]\w*/)
         yield [:IDENT, @token.to_sym]

data/lib/protobuf/compiler/proto_parser.rb

@@ -498,7 +498,7 @@ module_eval <<'..end lib/protobuf/compiler/proto.y modeval..idf83c19ba1e', 'lib/
         yield [:OCT_INTEGER, @token.to_i(0)]
       when match(/(true|false)\b/)
         yield [:BOOLEAN_LITERAL, @token == 'true']
-      when match(/"(?:[^"\\]+|\\.)*"/, /'(?:[^'\\]+|\\.)*'/)
+      when match(/"(?:[^"\\]|\\.)*"/, /'(?:[^'\\]|\\.)*'/)
         yield [:STRING_LITERAL, eval(@token)]
       when match(/[a-zA-Z_]\w*/)
         yield [:IDENT, @token.to_sym]

data/lib/protobuf/compiler/visitors.rb

@@ -99,11 +99,10 @@ module Protobuf
       end
 
       def required_message_from_proto(proto_file)
-        rb_path = proto_file.sub(/\.proto\z/, '.pb.rb')
-        unless File.exist?("#{@out_dir}/#{rb_path}")
+        unless File.exist?(File.join(@out_dir, File.basename(proto_file, '.proto') + '.pb.rb'))
           Compiler.compile(proto_file, @proto_dir, @out_dir)
         end
-        rb_path.sub(/\.rb$/, '')
+        proto_file.sub(/\.proto\z/, '')
       end
 
       def create_files(filename, out_dir, file_create)

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/test_enum_value.rb

@@ -14,8 +14,8 @@ class EnumValueTest < Test::Unit::TestCase
     assert_equal('name', "#{e}")
     assert(e == 100)
     assert(100 == e)
-    assert(101, e + 1)
-    assert(101, 1 + e)
+    assert_equal(101, e + 1)
+    assert_equal(101, 1 + e)
   end
 
   def test_enum_field_and_enum_value

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_protobuf
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - MATSUYAMA Kengo
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 +09:00
+date: 2010-09-28 00:00:00 +09:00
 default_executable: rprotoc
 dependencies: []
 
@@ -116,6 +117,7 @@ files:
 - test/test_serialize.rb
 - test/test_standard_message.rb
 - test/test_types.rb
+- test/proto/float_default.pb.rb
 has_rdoc: true
 homepage: http://code.google.com/p/ruby-protobuf
 licenses: []
@@ -126,54 +128,59 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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/addressbook_base.pb.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/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