ruby_protobuf 0.3.3 → 0.4.1

data/History.txt

@@ -1,5 +1,14 @@
-=== 0.3.3 / 2009-07-10
+=== 0.4.1 / 2010-04-30
 
+* 0.4.1
+  * Switched to 'jeweler'.
+* 0.4.0 alpha
+  * Change coding styles.
+  * Support packed repeated field.
+  * Incompatibility issues.
+    * Use camel case for a generated module name.
+    * Internal API changes.
+    * Enum values.
 * 0.3.3 (rev.218)
   * Support C-like comment.
   * Optimize for speed.
@@ -17,4 +26,3 @@
 * 0.1.0 fixed a small bug
 * 0.0.1 major enhancement
   * Birthday!
-

data/Manifest.txt

@@ -2,12 +2,14 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-script/mk_parser
+TODO
 bin/rprotoc
-examples/addressbook.proto
 examples/addressbook.pb.rb
+examples/addressbook.proto
 examples/reading_a_message.rb
 examples/writing_a_message.rb
+lib/protobuf/common/exceptions.rb
+lib/protobuf/common/util.rb
 lib/protobuf/common/wire_type.rb
 lib/protobuf/compiler/compiler.rb
 lib/protobuf/compiler/nodes.rb
@@ -37,38 +39,50 @@ lib/protobuf/rpc/client.rb
 lib/protobuf/rpc/handler.rb
 lib/protobuf/rpc/server.rb
 lib/ruby_protobuf.rb
-test/addressbook.rb
-test/addressbook_base.rb
-test/addressbook_ext.rb
+script/mk_parser
 test/check_unbuild.rb
-test/collision.rb
 test/data/data.bin
 test/data/data_source.py
 test/data/types.bin
 test/data/types_source.py
 test/data/unk.png
-test/ext_collision.rb
-test/ext_range.rb
-test/merge.rb
-test/nested.rb
+test/proto/addressbook.pb.rb
 test/proto/addressbook.proto
+test/proto/addressbook_base.pb.rb
 test/proto/addressbook_base.proto
+test/proto/addressbook_ext.pb.rb
 test/proto/addressbook_ext.proto
+test/proto/collision.pb.rb
 test/proto/collision.proto
+test/proto/ext_collision.pb.rb
 test/proto/ext_collision.proto
+test/proto/ext_range.pb.rb
 test/proto/ext_range.proto
+test/proto/float_default.proto
+test/proto/lowercase.pb.rb
+test/proto/lowercase.proto
+test/proto/merge.pb.rb
 test/proto/merge.proto
+test/proto/nested.pb.rb
 test/proto/nested.proto
+test/proto/optional_field.pb.rb
+test/proto/optional_field.proto
+test/proto/packed.pb.rb
+test/proto/packed.proto
 test/proto/rpc.proto
+test/proto/types.pb.rb
 test/proto/types.proto
 test/test_addressbook.rb
 test/test_compiler.rb
 test/test_descriptor.rb
+test/test_enum_value.rb
 test/test_extension.rb
+test/test_lowercase.rb
 test/test_message.rb
+test/test_optional_field.rb
+test/test_packed_field.rb
 test/test_parse.rb
-test/test_ruby_protobuf.rb
+test/test_repeated_types.rb
 test/test_serialize.rb
 test/test_standard_message.rb
 test/test_types.rb
-test/types.rb

data/README.txt

@@ -24,11 +24,16 @@ Protocol Buffers for Ruby.
 
 * sudo gem install ruby_protobuf
 
+== AUTHORS:
+
+MATSUYAMA Kengo <macksx@gmail.com>
+ANDO Yasushi <andyjpn@gmail.com>
+
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 FIX
+Copyright (c) 2008 ANDO Yasushi
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,18 +1,55 @@
-# -*- ruby -*-
-
-$:.push(File.dirname(__FILE__) + '/lib')
 require 'rubygems'
-require 'hoe'
-require 'ruby_protobuf'
-
-Hoe.spec('ruby_protobuf') do |p|
-  p.version = RubyProtobuf::VERSION
-  p.rubyforge_name = 'ruby-protobuf'
-  p.developer('MATSUYAMA Kengo', 'macksx@gmail.com')
-  p.summary = 'Protocol Buffers for Ruby'
-  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-  p.url = 'http://code.google.com/p/ruby-protobuf'
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "ruby_protobuf"
+    gem.summary = %Q{Protocol Buffers for Ruby}
+    gem.description = %Q{Ruby implementation for Protocol Buffers.}
+    gem.email = "macksx@gmail.com"
+    gem.homepage = "http://code.google.com/p/ruby-protobuf"
+    gem.authors = ["MATSUYAMA Kengo"]
+    #gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |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"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "ruby_protobuf #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 # vim: syntax=ruby

data/TODO

@@ -0,0 +1,15 @@
+TODO
+
+* Documents
+ * RDoc.
+* Compiler
+ * Identifier names.
+ * Check validity for default value. (Enum class)
+* Encoder/Decoder
+ * Unknown fields.
+* Implementation
+ * DynamicMessage class.
+ * Improve descriptor.
+ * Rewrite extension fields.
+* Tests
+ * RPC tests.

data/VERSION

@@ -0,0 +1 @@
+0.4.1

data/bin/rprotoc

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
+
 require 'optparse'
-if File.exist? "#{File.dirname(__FILE__)}/../lib"
+
+if File.directory?("#{File.dirname(__FILE__)}/../lib")
   $: << "#{File.dirname(__FILE__)}/../lib"
 else
   require 'rubygems'
@@ -10,17 +12,20 @@ require 'ruby_protobuf'
 require 'protobuf/compiler/compiler'
 
 
-options = {}
+options = {
+  :proto_path => '.',
+  :out => '.',
+}
 opts = OptionParser.new("#{$0} [OPTIONS] PROTO_FILE")
 opts.on('-p', '--proto_path <PATH>', 'Specify the directory in which to search for imports. The current directory is default.'){|v| options[:proto_path] = v}
 opts.on('-o', '--out <OUT_DIR>', 'Specify the directory in which Ruby source file is generated. The current directory is default.'){|v| options[:out] = v}
-opts.on_tail('-v', '--version', 'Show version.'){puts(opts.ver); exit}
-opts.on_tail('-h', '--help', 'Show this message.'){puts(opts.help); exit}
+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! ARGV
+  opts.order!
 rescue OptionParser::ParseError
   $stderr.puts $!.to_s
   exit 1
@@ -33,4 +38,4 @@ unless proto_file
   exit
 end
 
-Protobuf::Compiler.compile(proto_file, (options[:proto_path] or '.'), (options[:out] or '.'))
+Protobuf::Compiler.compile(proto_file, options[:proto_path], options[:out])

data/lib/protobuf/common/exceptions.rb

@@ -0,0 +1,11 @@
+module Protobuf
+
+  class Error < StandardError; end
+
+  class InvalidWireType < Error; end
+
+  class NotInitializedError < Error; end
+
+  class TagCollisionError < Error; end
+
+end

data/lib/protobuf/common/util.rb

@@ -0,0 +1,9 @@
+module Protobuf
+  module Util
+    module_function
+
+    def camelize(name)
+      name.to_s.gsub(/(?:\A|_)(\w)/) { $1.upcase }
+    end
+  end
+end

data/lib/protobuf/common/wire_type.rb

@@ -1,10 +1,10 @@
 module Protobuf
-  class WireType
-    VARINT = 0
-    FIXED64 = 1
+  module WireType
+    VARINT           = 0
+    FIXED64          = 1
     LENGTH_DELIMITED = 2
-    START_GROUP = 3
-    END_GROUP = 4
-    FIXED32 = 5
+    START_GROUP      = 3
+    END_GROUP        = 4
+    FIXED32          = 5
   end
 end

data/lib/protobuf/compiler/compiler.rb

@@ -6,45 +6,45 @@ require 'protobuf/compiler/visitors'
 module Protobuf
   class Compiler
     def self.compile(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      self.new.compile proto_file, proto_dir, out_dir, file_create
+      self.new.compile(proto_file, proto_dir, out_dir, file_create)
     end
 
     def compile(proto_file, proto_dir='.', out_dir='.', file_create=true)
-      create_message proto_file, proto_dir, out_dir, file_create
-      create_rpc proto_file, proto_dir, out_dir, file_create
+      create_message(proto_file, proto_dir, out_dir, file_create)
+      create_rpc(proto_file, proto_dir, out_dir, file_create)
     end
 
     def create_message(proto_file, proto_dir='.', out_dir='.', file_create=true)
       rb_file = File.join(out_dir, File.basename(proto_file).sub(/\.[^\0]*\z/, '') + '.pb.rb')
-      proto_path = validate_existence proto_file, proto_dir
+      proto_path = validate_existence(proto_file, proto_dir)
 
-      message_visitor = Protobuf::Visitor::CreateMessageVisitor.new proto_file, proto_dir, out_dir
-      File.open proto_path, 'r' do |file|
-        message_visitor.visit Protobuf::ProtoParser.new.parse(file)
+      message_visitor = Visitor::CreateMessageVisitor.new(proto_file, proto_dir, out_dir)
+      File.open(proto_path) do |file|
+        message_visitor.visit(ProtoParser.new.parse(file))
       end
-      message_visitor.create_files rb_file, out_dir, file_create
+      message_visitor.create_files(rb_file, out_dir, file_create)
     end
 
     def create_rpc(proto_file, proto_dir='.', out_dir='.', file_create=true)
       message_file = File.join(out_dir, File.basename(proto_file).sub(/\.[^\0]*\z/, '') + '.pb.rb')
-      proto_path = validate_existence proto_file, proto_dir
+      proto_path = validate_existence(proto_file, proto_dir)
 
-      rpc_visitor = Protobuf::Visitor::CreateRpcVisitor.new
-      File.open proto_path, 'r' do |file|
-        rpc_visitor.visit Protobuf::ProtoParser.new.parse(file)
+      rpc_visitor = Visitor::CreateRpcVisitor.new
+      File.open(proto_path) do |file|
+        rpc_visitor.visit(ProtoParser.new.parse(file))
       end
-      rpc_visitor.create_files message_file, out_dir, file_create
+      rpc_visitor.create_files(message_file, out_dir, file_create)
     end
 
     def validate_existence(path, base_dir)
-      if File.exist? path
+      if File.exist?(path)
         path
       else
         newpath = File.join(base_dir, path)
-        if File.exist? newpath
+        if File.exist?(newpath)
           newpath
         else
-          raise ArgumentError.new("File does not exist: #{path}")
+          raise ArgumentError, "File does not exist: #{path}"
         end
       end
     end

data/lib/protobuf/compiler/nodes.rb

@@ -1,10 +1,11 @@
+require 'protobuf/common/util'
 require 'protobuf/descriptor/descriptor_proto'
 
 module Protobuf
   module Node
     class Base
       def define_in_the_file(visitor)
-        visitor.write "defined_in __FILE__" if visitor.attach_proto?
+        visitor.write("defined_in __FILE__") if visitor.attach_proto?
       end
 
       def accept_message_visitor(visitor)
@@ -16,48 +17,48 @@ module Protobuf
       def accept_descriptor_visitor(visitor)
       end
     end
-  
+
     class ProtoNode < Base
       attr_reader :children
 
       def initialize(children)
-        @children = children
+        @children = children || []
       end
 
       def accept_message_visitor(visitor)
-        visitor.write '### Generated by rprotoc. DO NOT EDIT!'
-        visitor.write "### <proto file: #{visitor.proto_file}>" if visitor.attach_proto?
-        visitor.write visitor.commented_proto_contents if visitor.attach_proto?
-        visitor.write <<-eos
+        visitor.write('### Generated by rprotoc. DO NOT EDIT!')
+        visitor.write("### <proto file: #{visitor.proto_file}>") if visitor.attach_proto?
+        visitor.write(visitor.commented_proto_contents) if visitor.attach_proto?
+        visitor.write(<<-EOS)
 require 'protobuf/message/message'
 require 'protobuf/message/enum'
 require 'protobuf/message/service'
 require 'protobuf/message/extend'
-        eos
-        @children.map{|child| child.accept_message_visitor visitor}
+        EOS
+        @children.each {|child| child.accept_message_visitor(visitor) }
         visitor.close_ruby
       end
 
       def accept_rpc_visitor(visitor)
-        @children.map{|child| child.accept_rpc_visitor visitor}
+        @children.each {|child| child.accept_rpc_visitor(visitor) }
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::FileDescriptorProto.new :name => visitor.filename
+        descriptor = Google::Protobuf::FileDescriptorProto.new(:name => visitor.filename)
         visitor.file_descriptor = descriptor
-        visitor.in_context descriptor do
-          @children.map{|child| child.accept_descriptor_visitor visitor}
+        visitor.in_context(descriptor) do
+          @children.each {|child| child.accept_descriptor_visitor(visitor) }
         end
       end
     end
-  
+
     class ImportNode < Base
       def initialize(path)
         @path = path
       end
 
       def accept_message_visitor(visitor)
-        visitor.write "require '#{visitor.required_message_from_proto @path}'"
+        visitor.write("require '#{visitor.required_message_from_proto(@path)}'")
       end
 
       def accept_descriptor_visitor(visitor)
@@ -72,7 +73,7 @@ require 'protobuf/message/extend'
 
       def accept_message_visitor(visitor)
         @path_list.each do |path|
-          visitor.write "module #{path.to_s.capitalize}"
+          visitor.write("module #{Util.camelize(path)}")
           visitor.increment
         end
       end
@@ -82,7 +83,7 @@ require 'protobuf/message/extend'
       end
 
       def accept_descriptor_visitor(visitor)
-        visitor.current_descriptor.package = @path_list.join '.'
+        visitor.current_descriptor.package = @path_list.join('.')
       end
     end
 
@@ -92,11 +93,11 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write "::Protobuf::OPTIONS[:#{@name_list.join('.').inspect}] = #{@value.inspect}"
+        visitor.write("::Protobuf::OPTIONS[:#{@name_list.join('.').inspect}] = #{@value.inspect}")
       end
 
       def accept_descriptor_visitor(visitor)
-        visitor.add_option @name_list.join('.'), @value
+        visitor.add_option(@name_list.join('.'), @value)
       end
     end
 
@@ -108,21 +109,19 @@ require 'protobuf/message/extend'
       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.in_context self.class do 
-          define_in_the_file visitor
-          #@children.each {|child| child.accept_message_visitor visitor}
-          @children.each {|child| next if child == ';'; child.accept_message_visitor visitor}
-          # TODO: `next if child == ';';' is a monky patching. There must be a parser error.
+        visitor.write("class #{class_name} < ::Protobuf::Message")
+        visitor.in_context(self.class) do
+          define_in_the_file(visitor)
+          @children.each {|child| child.accept_message_visitor(visitor) }
         end
-        visitor.write "end"
+        visitor.write('end')
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::DescriptorProto.new :name => @name.to_s
+        descriptor = Google::Protobuf::DescriptorProto.new(:name => @name.to_s)
         visitor.descriptor = descriptor
-        visitor.in_context descriptor do
-          @children.each {|child| child.accept_descriptor_visitor visitor}
+        visitor.in_context(descriptor) do
+          @children.each {|child| child.accept_descriptor_visitor(visitor) }
         end
       end
     end
@@ -134,12 +133,12 @@ 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.in_context self.class do 
-          define_in_the_file visitor
-          @children.each {|child| child.accept_message_visitor visitor}
+        visitor.write("class #{name} < ::Protobuf::Message")
+        visitor.in_context(self.class) do
+          define_in_the_file(visitor)
+          @children.each {|child| child.accept_message_visitor(visitor) }
         end
-        visitor.write "end"
+        visitor.write('end')
       end
 
       def accept_descriptor_visitor(visitor)
@@ -153,19 +152,19 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write "class #{@name} < ::Protobuf::Enum"
-        visitor.in_context self.class do 
-          define_in_the_file visitor
-          @children.each {|child| child.accept_message_visitor visitor}
+        visitor.write("class #{@name} < ::Protobuf::Enum")
+        visitor.in_context(self.class) do
+          define_in_the_file(visitor)
+          @children.each {|child| child.accept_message_visitor(visitor) }
         end
-        visitor.write "end"
+        visitor.write('end')
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::EnumDescriptorProto.new :name => @name.to_s
+        descriptor = Google::Protobuf::EnumDescriptorProto.new(:name => @name.to_s)
         visitor.enum_descriptor = descriptor
-        visitor.in_context descriptor do
-          @children.each {|child| child.accept_descriptor_visitor visitor}
+        visitor.in_context(descriptor) do
+          @children.each {|child| child.accept_descriptor_visitor(visitor) }
         end
       end
     end
@@ -176,11 +175,11 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write "#{@name} = #{@value}"
+        visitor.write("define :#{@name}, #{@value}")
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::EnumValueDescriptorProto.new :name => @name.to_s, :number => @value
+        descriptor = Google::Protobuf::EnumValueDescriptorProto.new(:name => @name.to_s, :number => @value)
         visitor.enum_value_descriptor = descriptor
       end
     end
@@ -196,14 +195,14 @@ require 'protobuf/message/extend'
 
       def accept_rpc_visitor(visitor)
         visitor.current_service = @name
-        @children.each {|child| child.accept_rpc_visitor visitor}
+        @children.each {|child| child.accept_rpc_visitor(visitor) }
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::ServiceDescriptorProto.new :name => @name.to_s
+        descriptor = Google::Protobuf::ServiceDescriptorProto.new(:name => @name.to_s)
         visitor.service_descriptor = descriptor
-        visitor.in_context descriptor do 
-          @children.each {|child| child.accept_descriptor_visitor visitor}
+        visitor.in_context(descriptor) do
+          @children.each {|child| child.accept_descriptor_visitor(visitor) }
         end
       end
     end
@@ -218,11 +217,11 @@ require 'protobuf/message/extend'
       end
 
       def accept_rpc_visitor(visitor)
-        visitor.add_rpc @name, @request, @response
+        visitor.add_rpc(@name, @request, @response)
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::MethodDescriptorProto.new :name => @name.to_s, :input_type => @request.to_s, :output_type => @response.to_s
+        descriptor = Google::Protobuf::MethodDescriptorProto.new(:name => @name.to_s, :input_type => @request.to_s, :output_type => @response.to_s)
         visitor.method_descriptor = descriptor
       end
     end
@@ -233,11 +232,11 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
 
       def accept_descriptor_visitor(visitor)
-        raise NotImplementedError.new
+        raise NotImplementedError
       end
     end
 
@@ -248,20 +247,20 @@ require 'protobuf/message/extend'
 
       def accept_message_visitor(visitor)
         opts = @opts.empty? ? '' : ", #{@opts.map{|k, v| ":#{k} => #{v.inspect}" }.join(', ')}"
-        if visitor.context.first == Protobuf::Node::ExtendNode
-          opts += ', :extension => true'
+        if visitor.context.first == ExtendNode
+          opts << ', :extension => true'
         end
         type = if @type.is_a?(Array)
                then (@type.size > 1) ? "'#{@type.join '::'}'" : @type[0]
                else @type
                end
-        visitor.write "#{@label} :#{type}, :#{@name}, #{@value}#{opts}"
+        visitor.write("#{@label} :#{type}, :#{@name}, #{@value}#{opts}")
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::FieldDescriptorProto.new :name => @name.to_s, :number => @value
-        descriptor.label = Google::Protobuf::FieldDescriptorProto::Label.const_get "LABEL_#{@label.to_s.upcase}"
-        descriptor.type = Google::Protobuf::FieldDescriptorProto::Type.const_get "TYPE_#{@type.to_s.upcase}" if predefined_type?
+        descriptor = Google::Protobuf::FieldDescriptorProto.new(:name => @name.to_s, :number => @value)
+        descriptor.label = Google::Protobuf::FieldDescriptorProto::Label.const_get("LABEL_#{@label.to_s.upcase}")
+        descriptor.type = Google::Protobuf::FieldDescriptorProto::Type.const_get("TYPE_#{@type.to_s.upcase}") if predefined_type?
         descriptor.type_name = @type.is_a?(Array) ? @type.join : @type.to_s
         @opts.each do |key, val|
           case key.to_sym
@@ -272,8 +271,11 @@ require 'protobuf/message/extend'
         visitor.field_descriptor = descriptor
       end
 
+      private
+
       def predefined_type?
-        %w{double float int64 uint64 int32 fixed64 fixed32 bool string group message bytes uint32 enum sfixed32 sfixed64 sint32 sint64}.include? @type.to_s
+        # TODO: constantize
+        %w{double float int64 uint64 int32 fixed64 fixed32 bool string group message bytes uint32 enum sfixed32 sfixed64 sint32 sint64}.include?(@type.to_s)
       end
     end
 
@@ -283,15 +285,15 @@ require 'protobuf/message/extend'
       end
 
       def accept_message_visitor(visitor)
-        visitor.write "extensions #{@range.first.to_s}"
+        visitor.write("extensions #{@range.first.to_s}")
       end
 
       def accept_descriptor_visitor(visitor)
-        descriptor = Google::Protobuf::DescriptorProto::ExtensionRange.new :start => @range.first.low
+        descriptor = Google::Protobuf::DescriptorProto::ExtensionRange.new(:start => @range.first.low)
         case @range.first.high
-        when NilClass; # ignore
-        when :max;     descriptor.end = 1
-        else;          descriptor.end = @range.first.high
+        when NilClass then # ignore
+        when :max     then descriptor.end = 1
+        else               descriptor.end = @range.first.high
         end
         visitor.extension_range_descriptor = descriptor
       end
@@ -306,7 +308,7 @@ require 'protobuf/message/extend'
 
       #def accept_message_visitor(visitor)
       #end
-      
+
       def to_s
         if @high.nil?
           @low.to_s