protobuf 1.4.2 → 2.0.0.rc1

data/lib/protobuf/message/protoable.rb

@@ -1,38 +0,0 @@
-module Protobuf
-  module Protoable
-    def defined_filenames
-      @defined_filenames ||= []
-    end
-
-    def defined_in(filename)
-      path = File.expand_path(filename)
-      defined_filenames << path unless defined_filenames.include?(path)
-    end
-
-    def proto_filenames
-      defined_filenames.map do |filename|
-        retrieve_header(File.read(filename)).first
-      end
-    end
-
-    def proto_contents
-      #TODO: temporary implementation because the result includes not only this message but also all messages
-      ret = {}
-      defined_filenames.each do |filename|
-        header = retrieve_header(File.read(filename))
-        ret[header.first] = header.last
-      end
-      ret
-    end
-
-    def retrieve_header(contents)
-      if contents =~ /### Generated by rprotoc\. DO NOT EDIT!\n### <proto file: (.*)>\n((# .*\n)+)/
-        proto_filename = $1
-        proto_contents = $2.gsub(/^# /, '')
-        [proto_filename, proto_contents]
-      else
-        [nil, nil]
-      end
-    end
-  end
-end

data/spec/helper/all.rb

@@ -1,7 +0,0 @@
-require 'helper/tolerance_matcher'
-require 'helper/server'
-require 'helper/silent_constants'
-
-def now
-  Time.new.to_f
-end

data/spec/unit/common/util_spec.rb

@@ -1,17 +0,0 @@
-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

data/spec/unit/rpc/connector_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe Protobuf::Rpc::Connector do
-  
-  describe '.connector_for_client' do
-    
-    context 'when set to Socket connector' do
-      it 'returns a socket connector class reference' do
-        with_constants "Protobuf::ClientType" => "Socket" do
-          Protobuf::Rpc::Connector.connector_for_client.should eq(Protobuf::Rpc::Connectors::Socket)
-        end
-      end
-    end
-  
-    context 'when set to non Socket Connector' do
-      it 'returns an eventmachine connector class reference' do
-        with_constants "Protobuf::ClientType" => "EventMachine" do 
-          Protobuf::Rpc::Connector.connector_for_client.should eq Protobuf::Rpc::Connectors::EventMachine
-        end
-      end
-    end
-  
-    context 'when connector type not given' do
-      it 'returns an eventmachine connector class reference' do
-        Protobuf::Rpc::Connector.connector_for_client.should eq Protobuf::Rpc::Connectors::EventMachine
-      end
-    end
-  
-  end
-  
-end

data/spec/unit/rpc/connectors/eventmachine_client_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe ::Protobuf::Rpc::Connectors::EMClient do
-  describe '#send_data' do
-    context 'when sending data errs' do
-      let(:buffer_double) do
-        bd = double(Protobuf::Rpc::Buffer)
-        bd.should_receive(:set_data)
-        bd
-      end
-
-      it 'sets the error instance' do
-        buffer_double.should_receive(:write).and_raise(RuntimeError.new('Failure for testing'))
-        Protobuf::Rpc::Buffer.stub(:new).with(:read).and_return(Protobuf::Rpc::Buffer.new(:read))
-        Protobuf::Rpc::Buffer.stub(:new).with(:write).and_return(buffer_double)
-        error = nil
-        test_proc = Proc.new do
-          StubServer.new do |server|
-            client = ::Spec::Proto::TestService.client
-            client.find(:name => 'Test Name', :active => true) do |c|
-              c.on_failure do |f|
-                error = f
-              end
-            end
-          end
-        end
-        test_proc.call
-        error.should_not be_nil
-      end
-    end
-  end
-end

data/test/check_unbuild.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.push "#{File.dirname(__FILE__)}/../lib"
-
-require 'test/unit'
-require 'protobuf/descriptor/descriptor_builder' 
-require 'protobuf/descriptor/descriptor_proto'
-
-class DescriptorTest < Test::Unit::TestCase
-  def test_unbuild
-    tutorial_proto = Google::Protobuf::FileDescriptorProto.new
-    tutorial_proto.parse_from_file 'person.bin'
-    Protobuf::Descriptor::DescriptorBuilder.build tutorial_proto
-
-    assert_nothing_raised {Tutorial::Person}
-    assert_nothing_raised {Tutorial::Person.new}
-    assert_equal(['age', 'email', 'id', 'name', 'phone'], 
-      Tutorial::Person.fields.map{|tag, field| field.name}.sort)
-
-    assert_nothing_raised {Tutorial::Person::PhoneNumber}
-    assert_nothing_raised {Tutorial::Person::PhoneNumber.new}
-    assert_equal(['number', 'type'], 
-      Tutorial::Person::PhoneNumber.fields.map{|tag, field| field.name}.sort)
-
-    assert_nothing_raised {Tutorial::Person::PhoneType}
-    assert_equal(0, Tutorial::Person::PhoneType::MOBILE)
-    assert_equal(1, Tutorial::Person::PhoneType::HOME)
-    assert_equal(2, Tutorial::Person::PhoneType::WORK)
-  end
-end

data/test/test_compiler.rb

@@ -1,325 +0,0 @@
-require 'test/unit'
-require 'protobuf/compiler/compiler'
-
-class CompilerTest < Test::Unit::TestCase
-  # Issue 12:    Parse error on float default value
-  def test_compile_float_default
-    assert_compile_proto(<<-EOS, 'test/proto/float_default.proto')
-### 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/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
-    EOS
-  end
-
-  def test_create_message
-    assert_compile_proto(<<-EOS, 'test/proto/addressbook.proto')
-### Generated by rprotoc. DO NOT EDIT!
-### <proto file: test/proto/addressbook.proto>
-# package tutorial;
-# 
-# message Person {
-#   required string name = 1;
-#   required int32 id = 2;
-#   optional string email = 3;
-# 
-#   enum PhoneType {
-#     MOBILE = 0;
-#     HOME = 1;
-#     WORK = 2;
-#   }
-# 
-#   message PhoneNumber {
-#     required string number = 1;
-#     optional PhoneType type = 2 [default = HOME];
-#   }
-# 
-#   repeated PhoneNumber phone = 4;
-#   optional uint32 age = 5 [default = 20];
-# 
-#   extensions 100 to 200;
-# }
-# 
-# /*
-# extend Person {
-#   optional int32 age = 100;
-# }
-# */
-# 
-# message AddressBook {
-#   repeated Person person = 1;
-# }
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/extend'
-
-module Tutorial
-  
-  class Person < ::Protobuf::Message
-    defined_in __FILE__
-    required :string, :name, 1
-    required :int32, :id, 2
-    optional :string, :email, 3
-    
-    class PhoneType < ::Protobuf::Enum
-      defined_in __FILE__
-      define :MOBILE, 0
-      define :HOME, 1
-      define :WORK, 2
-    end
-    
-    class PhoneNumber < ::Protobuf::Message
-      defined_in __FILE__
-      required :string, :number, 1
-      optional :PhoneType, :type, 2, :default => :HOME
-    end
-    
-    repeated :PhoneNumber, :phone, 4
-    optional :uint32, :age, 5, :default => 20
-    
-    extensions 100..200
-  end
-  
-  class AddressBook < ::Protobuf::Message
-    defined_in __FILE__
-    repeated :Person, :person, 1
-  end
-end
-    EOS
-  end
-
-  def test_create_nested_message
-    assert_compile_proto(<<-EOS, 'test/proto/nested.proto')
-### Generated by rprotoc. DO NOT EDIT!
-### <proto file: test/proto/nested.proto>
-# package test.nested;
-# 
-# message Foo {  
-#   message Bar {
-#   } 
-# }
-# message Baaz {  
-#   optional Foo.Bar x = 1;
-# }
-
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/extend'
-
-module Test
-  module Nested
-    class Foo < ::Protobuf::Message
-      defined_in __FILE__
-      class Bar < ::Protobuf::Message
-        defined_in __FILE__
-      end
-    end
-    class Baaz < ::Protobuf::Message
-      defined_in __FILE__
-      optional :'Foo::Bar', :x, 1
-    end
-  end
-end
-    EOS
-  end
-
-  def test_nested_message
-    file_contents = Protobuf::Compiler.new.create_message('test/proto/nested.proto', '.', '.', false)
-    assert_nothing_raised {Object.class_eval file_contents}
-    assert_raise(TypeError) {Test::Nested::Baaz.new.x = 1}
-    assert_nothing_raised {Test::Nested::Baaz.new.x = Test::Nested::Foo::Bar.new}
-  end
-
-  def test_create_rpc
-    file_contents = Protobuf::Compiler.new.create_rpc('test/proto/rpc.proto', '.', 'test/proto', false)
-
-    assert_source(<<-EOS, file_contents['test/proto/address_book_service.rb'])
-require 'protobuf/rpc/server'
-require 'protobuf/rpc/handler'
-require 'test/proto/rpc.pb'
-
-class Tutorial::SearchHandler < Protobuf::Rpc::Handler
-  request Tutorial::Person
-  response Tutorial::AddressBook
-
-  def self.process_request(request, response)
-    # TODO: edit this method
-  end
-end
-
-class Tutorial::AddHandler < Protobuf::Rpc::Handler
-  request Tutorial::Person
-  response Tutorial::Person
-
-  def self.process_request(request, response)
-    # TODO: edit this method
-  end
-end
-
-class Tutorial::AddressBookService < Protobuf::Rpc::Server
-  def setup_handlers
-    @handlers = {
-      :search => Tutorial::SearchHandler,
-      :add => Tutorial::AddHandler,
-    }
-  end
-end
-    EOS
-
-    assert_source(<<-EOS, file_contents['test/proto/start_address_book_service'])
-#!/usr/bin/env ruby
-require 'address_book_service'
-
-Tutorial::AddressBookService.new(:Port => 9999).start
-    EOS
-
-    assert_source(<<-EOS, file_contents['test/proto/client_search.rb'])
-#!/usr/bin/env ruby
-require 'protobuf/rpc/client'
-require 'test/proto/rpc.pb'
-
-# build request
-request = Tutorial::Person.new
-# TODO: setup a request
-raise StandardError, 'setup a request'
-
-# create blunk response
-response = Tutorial::AddressBook.new
-
-# execute rpc
-Protobuf::Rpc::Client.new('localhost', 9999).call :search, request, response
-
-# show response
-puts response
-    EOS
-
-    assert_source(<<-EOS, file_contents['test/proto/client_add.rb'])
-#!/usr/bin/env ruby
-require 'protobuf/rpc/client'
-require 'test/proto/rpc.pb'
-
-# build request
-request = Tutorial::Person.new
-# TODO: setup a request
-raise StandardError, 'setup a request'
-
-# create blunk response
-response = Tutorial::Person.new
-
-# execute rpc
-Protobuf::Rpc::Client.new('localhost', 9999).call :add, request, response
-
-# show response
-puts response
-    EOS
-  end
-
-  def test_create_descriptor
-    proto_path = 'test/proto/addressbook.proto'
-    visitor = Protobuf::Visitor::CreateDescriptorVisitor.new(proto_path)
-    File.open(proto_path) do |file|
-      visitor.visit Protobuf::ProtoParser.new.parse(file)
-    end
-    file_descriptor = visitor.file_descriptor
-    assert_equal(proto_path, file_descriptor.name)
-    assert_equal('tutorial', file_descriptor.package)
-
-    person_descriptor = file_descriptor.message_type[0]
-    assert_equal('Person', person_descriptor.name)
-    assert_equal([:name, :id, :email, :phone, :age].size, person_descriptor.field.size)
-
-    name_field_descriptor = person_descriptor.field.find {|d| d.name == 'name'}
-    assert_equal(1, name_field_descriptor.number)
-    assert_equal(Google::Protobuf::FieldDescriptorProto::Type::TYPE_STRING, name_field_descriptor.type)
-    assert_equal(Google::Protobuf::FieldDescriptorProto::Label::LABEL_REQUIRED, name_field_descriptor.label)
-    assert_equal('string', name_field_descriptor.type_name)
-
-    phone_field_descriptor = person_descriptor.field.find {|d| d.name == 'phone'}
-    assert_equal(4, phone_field_descriptor.number)
-    assert_equal(0, phone_field_descriptor.type) #TODO: is this right?
-    assert_equal(Google::Protobuf::FieldDescriptorProto::Label::LABEL_REPEATED, phone_field_descriptor.label)
-    assert_equal('PhoneNumber', phone_field_descriptor.type_name)
-
-    age_field_descriptor = person_descriptor.field.find {|d| d.name == 'age'}
-    assert_equal(5, age_field_descriptor.number)
-    assert_equal(Google::Protobuf::FieldDescriptorProto::Type::TYPE_UINT32, age_field_descriptor.type)
-    assert_equal(Google::Protobuf::FieldDescriptorProto::Label::LABEL_OPTIONAL, age_field_descriptor.label)
-    assert_equal('uint32', age_field_descriptor.type_name)
-    assert_equal('20', age_field_descriptor.default_value)
-
-    phone_type_descriptor = person_descriptor.enum_type.first
-    assert_equal('PhoneType', phone_type_descriptor.name)
-    assert_equal(3, phone_type_descriptor.value.size)
-
-    phone_type_home_descriptor = phone_type_descriptor.value.find {|d| d.name == 'HOME'}
-    assert_equal('HOME', phone_type_home_descriptor.name)
-    assert_equal(1, phone_type_home_descriptor.number)
-
-    extensions_descriptor = person_descriptor.extension_range.first
-    assert_equal(100, extensions_descriptor.start)
-    assert_equal(200, extensions_descriptor.end)
-
-    phone_number_descriptor = person_descriptor.nested_type.first
-    assert_equal('PhoneNumber', phone_number_descriptor.name)
-    assert_equal([:number, :type].size, phone_number_descriptor.field.size)
-
-    #TODO: test extend
-    #extend_person_descriptor = ??
-    #assert_equal extend_person_descriptor
-
-    addressbook_descriptor = file_descriptor.message_type[1]
-    assert_equal('AddressBook', addressbook_descriptor.name)
-  end
-
-  def test_collision
-    assert_raise(Protobuf::TagCollisionError) do require 'test/proto/collision.pb' end
-    assert_raise(Protobuf::TagCollisionError) do
-      Protobuf::Compiler.new.create_message('test/proto/collision.proto', '.', '.', false)
-    end
-  end
-
-  def test_ext_collision
-    assert_raise(Protobuf::TagCollisionError) do require 'test/proto/ext_collision.pb' end
-    assert_raise(Protobuf::TagCollisionError) do
-      Protobuf::Compiler.new.create_message('test/proto/ext_collision.proto', '.', '.', false)
-    end
-  end
-
-  def test_ext_range
-    assert_raise(RangeError) do require 'test/proto/ext_range.pb' end
-    assert_raise(RangeError) do
-      Protobuf::Compiler.new.create_message('test/proto/ext_range.proto', '.', '.', false)
-    end
-  end
-
-  def assert_compile_proto(ideal, filename)
-    assert_equal(ideal.gsub(/^\s*\n/, '').strip, Protobuf::Compiler.new.create_message(filename, '.', '.', false).gsub(/^\s*\n/, '').strip)
-  end
-
-  def assert_source(ideal, real)
-    assert_equal(ideal.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n"), real.strip.gsub(/^\s*\n/, '').gsub(/\s+\n/, "\n"))
-  end
-end