protobuf 1.1.2 → 1.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    protobuf (1.1.2)
+    protobuf (1.1.3)
       eventmachine (~> 0.12.10)
       eventually (~> 0.1.0)
       json_pure (~> 1.6.4)

data/lib/protobuf/common/util.rb

@@ -13,10 +13,10 @@ module Protobuf
       end
     end
 
-    # Expects: SomeLongName
+    # Expects: SomeLongName, SOMELongName
     # Returns: some_long_name
     def underscore(str)
-      str.to_s.gsub(/\B[A-Z]/, '_\&').downcase
+      str.to_s.gsub(/\B[A-Z](?:[a-z])/, '_\&').downcase
     end
   
     # Expects: SomeModule::Path

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

@@ -18,8 +18,8 @@ require '<%= required_file %>'
 <%- rpcs.each do |name, request, response| -%>
 ## <%= class_indent %>	# request -> <%= module_name %>::<%= request %>
 ## <%= class_indent %>	# response -> <%= module_name %>::<%= response %>
-## <%= class_indent %>	def <%= underscore name %>
-## <%= class_indent %>		# TODO: implement <%= underscore name %>
+## <%= class_indent %>	def <%= Util.underscore(name) %>
+## <%= class_indent %>		# TODO: implement <%= Util.underscore(name) %>
 ## <%= class_indent %>	end
 ## <%= class_indent %>
 <%- end -%>
@@ -34,7 +34,7 @@ require '<%= required_file %>'
 <%- end -%>
 <%= class_indent %>class <%= service_name %> < Protobuf::Rpc::Service
 <%- rpcs.each do |name, request, response| -%>
-<%= class_indent %>  rpc :<%= underscore name %>, <%= request %>, <%= response %>
+<%= class_indent %>  rpc :<%= Util.underscore(name) %>, <%= request %>, <%= response %>
 <%- end -%>
 <%= class_indent %>end
 <%- (module_array.size-1).downto(0) do |i| -%>

data/lib/protobuf/compiler/visitors.rb

@@ -153,21 +153,20 @@ module Protobuf
 
       def create_files(message_file, out_dir, create_file=true)
         @create_file = create_file
-        default_port = 9999
         @services.each do |service_name, rpcs|
-          underscored_name = underscore service_name.to_s
+          underscored_name = Util.underscore(service_name.to_s)
           message_module = package.map{|p| p.to_s.capitalize}.join('::')
           required_file = [
             Util.module_to_path(message_module),
-            File.basename(message_file.sub(/^\.\//, '').sub(/\.rb$/, ''))
+            File.basename(message_file, '.rb')
           ].join('/').gsub(/\/{2,}/, '/')
 
-          create_service(message_file, out_dir, underscored_name, message_module, service_name, default_port, rpcs, required_file)
+          create_service(message_file, out_dir, underscored_name, message_module, service_name, rpcs, required_file)
         end
         @file_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, rpcs, required_file)
         service_filename = "#{out_dir}/#{Util.module_to_path(module_name)}/#{underscored_name}.rb"
         service_contents = template_erb('rpc_service_implementation').result(binding)
         create_file_with_backup(service_filename, service_contents) if @create_file
@@ -176,10 +175,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/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/unit/common/util_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Protobuf::Util do
+  
+  describe '.underscore' do
+    it 'underscores constant name' do
+      Protobuf::Util.underscore("HelloMoto").should eq "hello_moto"
+    end
+    
+    context 'when constant name has uppercased word' do
+      it 'keeps the uppercased word together' do
+        Protobuf::Util.underscore("UPPERCase").should eq "upper_case"
+        Protobuf::Util.underscore("MDXService").should eq "mdx_service"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2165510400 !ruby/object:Gem::Requirement
+  requirement: &2152846700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2165510400
+  version_requirements: *2152846700
 - !ruby/object:Gem::Dependency
   name: eventually
-  requirement: &2165509320 !ruby/object:Gem::Requirement
+  requirement: &2152845660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165509320
+  version_requirements: *2152845660
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2165507640 !ruby/object:Gem::Requirement
+  requirement: &2152844280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2165507640
+  version_requirements: *2152844280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165506400 !ruby/object:Gem::Requirement
+  requirement: &2152843280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2165506400
+  version_requirements: *2152843280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165505500 !ruby/object:Gem::Requirement
+  requirement: &2152817360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2165505500
+  version_requirements: *2152817360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2165504360 !ruby/object:Gem::Requirement
+  requirement: &2152816600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *2165504360
+  version_requirements: *2152816600
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2165503160 !ruby/object:Gem::Requirement
+  requirement: &2152815800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *2165503160
+  version_requirements: *2152815800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2165501280 !ruby/object:Gem::Requirement
+  requirement: &2152814840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2165501280
+  version_requirements: *2152814840
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -192,6 +192,7 @@ files:
 - spec/proto/test_service_impl.rb
 - spec/spec_helper.rb
 - spec/unit/common/logger_spec.rb
+- spec/unit/common/util_spec.rb
 - spec/unit/enum_spec.rb
 - spec/unit/message_spec.rb
 - spec/unit/rpc/client_spec.rb
@@ -288,6 +289,7 @@ test_files:
 - spec/proto/test_service_impl.rb
 - spec/spec_helper.rb
 - spec/unit/common/logger_spec.rb
+- spec/unit/common/util_spec.rb
 - spec/unit/enum_spec.rb
 - spec/unit/message_spec.rb
 - spec/unit/rpc/client_spec.rb