ruby-protocol-buffers 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/bin/ruby-protoc

@@ -45,9 +45,11 @@ end
 
 descriptor_set.file.each do |file_descriptor|
 
+  fullpath = filenames[filenames.index{|path| path.include? file_descriptor.name}]
+
   if ruby_out
-    path = File.join(ruby_out,
-                     File.basename(file_descriptor.name, ".proto") + ".pb.rb")
+    path = File.join(ruby_out,File.dirname(fullpath),File.basename(file_descriptor.name, ".proto") + ".pb.rb")
+    FileUtils.mkpath(File.dirname(path)) unless File.directory?(File.dirname(path))
     File.open(path, "wb") do |file|
       dumper = FileDescriptorToRuby.new(file_descriptor)
       dumper.write(file)

data/lib/protocol_buffers/compiler.rb

@@ -9,7 +9,6 @@ module ProtocolBuffers
       raise(ArgumentError, "Need at least one input file") if input_files.empty?
       other_opts = ""
       (opts[:include_dirs] || []).each { |d| other_opts += " -I#{d}" }
-      input_files.each { |f| other_opts += " -I#{File.dirname(f)}" }
 
       cmd = "protoc #{other_opts} -o#{output_filename} #{input_files.join(' ')}"
       rc = system(cmd)
@@ -21,8 +20,14 @@ module ProtocolBuffers
       require 'tempfile'
       require 'protocol_buffers/compiler/file_descriptor_to_ruby'
 
+      input_files = Array(input_files) unless input_files.is_a?(Array)
+
       tempfile = Tempfile.new("protocol_buffers_spec")
       tempfile.binmode
+
+      include_dirs = (opts[:include_dirs] ||= [])
+      include_dirs.concat(input_files.map { |i| File.dirname(i) }.uniq)
+
       compile(tempfile.path, input_files, opts)
       descriptor_set = FileDescriptorSet.parse(tempfile)
       tempfile.close(true)

data/lib/protocol_buffers/compiler/file_descriptor_to_ruby.rb

@@ -8,7 +8,7 @@ class FileDescriptorToRuby < Struct.new(:descriptor)
 
   def initialize(descriptor)
     super
-    @package = capfirst(descriptor.package_)
+    @package_modules = descriptor.package_ ? descriptor.package_.split('.') : []
     @ns = []
   end
 
@@ -22,21 +22,21 @@ class FileDescriptorToRuby < Struct.new(:descriptor)
 require 'protocol_buffers'
 
 HEADER
+
     descriptor.dependency.each do |dep|
       path = File.basename(dep, ".proto") + ".pb"
       @io.write("begin; require '#{path}'; rescue LoadError; end\n")
     end
     @io.write("\n") unless descriptor.dependency.empty?
 
-    # in_namespace correctly handles the case where @package.nil?
-    in_namespace("module", @package) do
+    in_namespace("module", @package_modules) do
       declare(descriptor.message_type, descriptor.enum_type)
 
       descriptor.message_type.each do |message|
         dump_message(message)
       end
     end
-
+    
   end
 
   protected
@@ -46,7 +46,7 @@ HEADER
 
     line %{# forward declarations}
     messages.each do |message|
-      line %{class #{name([@package, message.name])} < ::ProtocolBuffers::Message; end}
+      line %{class #{name([@package_modules, message.name].flatten)} < ::ProtocolBuffers::Message; end}
     end
 
     if enums.empty?
@@ -67,14 +67,17 @@ HEADER
     end
     @io.write("\n")
   end
-
-  def in_namespace(type, name, rest = "")
-    if !name || name == ""
-      yield
-    else
-      line "#{type} #{capfirst(name)}#{rest}"
-      @ns.push name
-      yield
+  
+  def in_namespace(type, namespace, rest = "")
+    
+    namespace_array = [namespace].flatten
+    
+    namespace_array.each do |n|
+      line "#{type} #{camelize(n)}#{rest}"
+      @ns.push n
+    end
+    yield
+    namespace_array.each do |n|
       @ns.pop
       line "end"
     end
@@ -83,7 +86,7 @@ HEADER
   def name(parts)
     ns = @ns.dup
     (parts.shift; ns.shift) while !parts.empty? && parts.first == ns.first
-    parts.map { |p| capfirst(p) }.join("::")
+    parts.map { |p| camelize(p) }.join("::")
   end
 
   LABEL_MAPPING = {
@@ -143,7 +146,7 @@ HEADER
   end
 
   def field_typename(field)
-    TYPE_MAPPING[field.type] || field.type_name.split(".").map { |t| capfirst(t) }.join("::")
+    TYPE_MAPPING[field.type] || field.type_name.split(".").map { |t| camelize(t) }.join("::")
   end
 
   # TODO: this probably doesn't work for all default values, expand
@@ -164,5 +167,9 @@ HEADER
   def capfirst(s)
     "#{s[0,1].capitalize}#{s[1..-1]}" if s
   end
+  
+  def camelize(lower_case_and_underscored_word)
+    lower_case_and_underscored_word.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }
+  end
 
 end

data/spec/proto_files/dotted_package.proto

@@ -0,0 +1,9 @@
+package polka.dot.bikini;
+
+message Test1 {
+  optional string test_field = 1;
+  
+  message Test1Child {
+    optional string test_child_field = 1;
+  }
+};

data/spec/proto_files/under_score_package.proto

@@ -0,0 +1,11 @@
+package under_score;
+
+message UnderTest {
+  optional string test_field = 1;
+  
+  message UnderTestChild {
+    optional string test_child_field = 1;
+  }
+  
+  repeated UnderTest.UnderTestChild children = 2;
+};

data/spec/runtime_spec.rb

@@ -486,5 +486,16 @@ describe ProtocolBuffers, "runtime" do
     res3 = TehUnknown3::MyResult.parse(serialized2)
     res3.field_1.should == 2
   end
+  
+  it "can compile and instantiate a message in a package with under_scores" do
+    Object.send(:remove_const, :UnderScore) if defined?(UnderScore)
+    
+    ProtocolBuffers::Compiler.compile_and_load(
+      File.join(File.dirname(__FILE__), "proto_files", "under_score_package.proto"))
+      
+    proc do
+      under_test = UnderScore::UnderTest.new
+    end.should_not raise_error()
+  end
 
 end

metadata

@@ -1,80 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ruby-protocol-buffers
-version: !ruby/object:Gem::Version
-  version: 1.1.0
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Brian Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-01 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70109784526400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
+        version: "2.5"
   type: :development
-  prerelease: false
-  version_requirements: *70109784526400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: autotest-standalone
-  requirement: &70109784526000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70109784526000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: autotest-growl
-  requirement: &70109784525540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70109784525540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &70109784525120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70109784525120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &70109784524700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70109784524700
+  version_requirements: *id005
 description: 
-email:
+email: 
 - brian@codekitchen.net
-executables:
+executables: 
 - ruby-protoc
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Changelog.md
-files:
+files: 
 - .document
 - .gitignore
 - Changelog.md
@@ -112,45 +136,59 @@ files:
 - spec/compiler_spec.rb
 - spec/fields_spec.rb
 - spec/proto_files/depends.proto
+- spec/proto_files/dotted_package.proto
 - spec/proto_files/featureful.proto
 - spec/proto_files/no_package.proto
 - spec/proto_files/simple.proto
 - spec/proto_files/top_level_enum.proto
+- spec/proto_files/under_score_package.proto
 - spec/runtime_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/mozy/ruby-protocol-buffers
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby compiler and runtime for the google protocol buffers library.
-test_files:
+test_files: 
 - spec/compiler_spec.rb
 - spec/fields_spec.rb
 - spec/proto_files/depends.proto
+- spec/proto_files/dotted_package.proto
 - spec/proto_files/featureful.proto
 - spec/proto_files/no_package.proto
 - spec/proto_files/simple.proto
 - spec/proto_files/top_level_enum.proto
+- spec/proto_files/under_score_package.proto
 - spec/runtime_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb