make descriptor.proto match Google's, add Google::Protobuf to Message…

…s in descriptors, recompile descriptor.proto
codekitchen · Aug 14, 2013 · e442ff3 · e442ff3
1 parent d7885df
commit e442ff3
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 252 deletions.
diff --git a/lib/protocol_buffers/compiler.rb b/lib/protocol_buffers/compiler.rb
@@ -29,7 +29,7 @@ def self.compile_and_load(input_files, opts = {})
       include_dirs.concat(input_files.map { |i| File.dirname(i) }.uniq)
 
       compile(tempfile.path, input_files, opts)
-      descriptor_set = FileDescriptorSet.parse(tempfile)
+      descriptor_set = Google::Protobuf::FileDescriptorSet.parse(tempfile)
       tempfile.close(true)
       descriptor_set.file.each do |file|
         parsed = FileDescriptorToRuby.new(file)