protobuf 2.8.0.beta9 → 2.8.0

data/spec/lib/protobuf/generators/file_generator_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+require 'protobuf/generators/file_generator'
+
+describe ::Protobuf::Generators::FileGenerator do
+
+  let(:base_descriptor_fields) { { :name => 'test/foo.proto' } }
+  let(:descriptor_fields) { base_descriptor_fields }
+  let(:file_descriptor) { ::Google::Protobuf::FileDescriptorProto.new(descriptor_fields) }
+
+  subject { described_class.new(file_descriptor) }
+  its(:file_name) { should eq 'test/foo.pb.rb' }
+
+  describe '#print_import_requires' do
+    let(:descriptor_fields) do
+      base_descriptor_fields.merge!({ :dependency => [ 'test/bar.proto',
+                                                       'test/baz.proto' ] })
+    end
+
+    it 'prints a ruby require for each dependency' do
+      subject.should_receive(:print_require).with('test/bar.pb')
+      subject.should_receive(:print_require).with('test/baz.pb')
+      subject.print_import_requires
+    end
+
+  end
+
+end
+

data/spec/lib/protobuf/generators/service_generator_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+require 'protobuf/generators/service_generator'
+
+describe ::Protobuf::Generators::ServiceGenerator do
+
+  let(:methods) {
+    [
+      { :name => 'Search', :input_type => 'FooRequest', :output_type => 'FooResponse' },
+      { :name => 'FooBar', :input_type => '.foo.Request', :output_type => '.bar.Response' }
+    ]
+  }
+  let(:service_fields) { { :name => 'TestService',
+                           :method => methods } }
+
+  let(:service) { ::Google::Protobuf::ServiceDescriptorProto.new(service_fields) }
+
+  subject { described_class.new(service) }
+
+  describe '#compile' do
+    let(:compiled) {
+      %q{class TestService < ::Protobuf::Rpc::Service
+  rpc :search, FooRequest, FooResponse
+  rpc :foo_bar, ::Foo::Request, ::Bar::Response
+end
+
+}
+    }
+
+    it 'compiles the service and it\'s rpc methods' do
+      subject.compile
+      subject.to_s.should eq(compiled)
+    end
+  end
+
+  describe '#build_method' do
+    it 'returns a string identifying the given method descriptor' do
+      subject.build_method(service.method.first).should eq("rpc :search, FooRequest, FooResponse")
+    end
+  end
+
+end
+

data/spec/lib/protobuf/lifecycle_spec.rb

@@ -27,7 +27,7 @@ describe ::Protobuf::Lifecycle do
   it "only registers blocks for event callbacks" do
     expect {
       subject.register("something")
-    }.to raise_error( /block/ ) 
+    }.to raise_error( /block/ )
   end
 
   it "calls the registered block when triggered" do
@@ -60,6 +60,36 @@ describe ::Protobuf::Lifecycle do
     that.should eq("not nil")
   end
 
+  context 'when the registered block has arity' do
+    context 'and the triggered event does not have args' do
+      it 'does not pass the args' do
+        outer_bar = nil
+
+        subject.register('foo') do |bar|
+          bar.should be_nil
+          outer_bar = 'triggered'
+        end
+
+        subject.trigger('foo')
+        outer_bar.should eq 'triggered'
+      end
+    end
+
+    context 'and the triggered event has arguments' do
+      it 'does not pass the args' do
+        outer_bar = nil
+
+        subject.register('foo') do |bar|
+          bar.should_not be_nil
+          outer_bar = bar
+        end
+
+        subject.trigger('foo', 'baz')
+        outer_bar.should eq 'baz'
+      end
+    end
+  end
+
   context "normalized event names" do
     specify { subject.normalized_event_name(:derp).should eq("derp") }
     specify { subject.normalized_event_name(:Derp).should eq("derp") }

data/spec/lib/protobuf/logger_spec.rb

@@ -1,5 +1,6 @@
 require 'protobuf/logger'
 require 'stringio'
+require 'fileutils'
 
 describe Protobuf::Logger do
 
@@ -11,6 +12,10 @@ describe Protobuf::Logger do
     Protobuf::Logger.level = ::Logger::INFO
   end
 
+  after(:all) do
+    ::FileUtils.rm_f('myfile.log')
+  end
+
   describe '.instance' do
 
     it 'doesn\'t create a logger if the file was not set' do

data/spec/lib/protobuf/message_spec.rb

@@ -2,6 +2,14 @@ require 'spec_helper'
 
 describe Protobuf::Message do
 
+  describe '.decode' do
+    let(:message) { ::Test::Resource.new(:name => "Jim") }
+
+    it 'creates a new message object decoded from the given bytes' do
+      ::Test::Resource.decode(message.encode).should eq message
+    end
+  end
+
   describe '.define_field' do
     context 'when defining a field with a tag that has already been used' do
       it 'raises a TagCollisionError' do
@@ -50,6 +58,14 @@ describe Protobuf::Message do
     end
   end
 
+  describe '.encode' do
+    let(:values) { { :name => "Jim" } }
+
+    it 'creates a new message object with the given values and returns the encoded bytes' do
+      ::Test::Resource.encode(values).should eq ::Test::Resource.new(values).encode
+    end
+  end
+
   describe '#initialize' do
     it "initializes the enum getter to 0" do
       test_enum = Test::EnumTestMessage.new
@@ -69,7 +85,7 @@ describe Protobuf::Message do
 
     it "does not try to set attributes which have nil values" do
       Test::EnumTestMessage.any_instance.should_not_receive("non_default_enum=")
-      test_enum = Test::EnumTestMessage.new(:non_default_enum => nil)
+      Test::EnumTestMessage.new(:non_default_enum => nil)
     end
 
     it "takes a hash as an initialization argument" do
@@ -89,7 +105,7 @@ describe Protobuf::Message do
       it "accepts UTF-8 strings into string fields" do
         message = ::Test::Resource.new(:name => "Kyle Redfearn\u0060s iPad")
 
-        expect { message.serialize_to_string }.to_not raise_error
+        expect { message.encode }.to_not raise_error
       end
 
       it "keeps utf-8 when utf-8 is input for string fields" do
@@ -97,8 +113,7 @@ describe Protobuf::Message do
         name.force_encoding("UTF-8")
 
         message = ::Test::Resource.new(:name => name)
-        new_message = ::Test::Resource.new
-        new_message.parse_from_string(message.serialize_to_string)
+        new_message = ::Test::Resource.decode(message.encode)
         (new_message.name == name).should be_true
       end
 
@@ -107,8 +122,7 @@ describe Protobuf::Message do
         name.force_encoding("ASCII-8BIT")
 
         message = ::Test::Resource.new(:name => name)
-        new_message = ::Test::Resource.new
-        new_message.parse_from_string(message.serialize_to_string)
+        new_message = ::Test::Resource.decode(message.encode)
         (new_message.name == "my name").should be_true
       end
     end
@@ -118,7 +132,7 @@ describe Protobuf::Message do
 
       it "raises a 'message not initialized' error" do
         expect {
-          message.serialize_to_string
+          message.encode
         }.to raise_error(Protobuf::SerializationError, /required/i)
       end
     end
@@ -129,7 +143,7 @@ describe Protobuf::Message do
       it "does not raise an error when repeated fields are []" do
         expect {
           message.repeated_enum = []
-          message.serialize_to_string
+          message.encode
         }.to_not raise_error
       end
 

data/spec/lib/protobuf/rpc/connectors/common_spec.rb

@@ -87,7 +87,7 @@ describe Protobuf::Rpc::Connectors::Common do
     before { subject.stub(:validate_request_type!).and_return(true) }
     before { subject.should_not_receive(:fail) }
 
-    its(:request_bytes) { should eq expected.serialize_to_string }
+    its(:request_bytes) { should eq expected.encode }
   end
 
   describe "#verify_callbacks" do

data/spec/lib/protobuf/rpc/service_directory_spec.rb

@@ -58,17 +58,55 @@ describe ::Protobuf::Rpc::ServiceDirectory do
     end
   end
 
+  describe '#add_listing_for' do
+    let(:server) { double('server', { :uuid => '123',
+                                      :services => ['Known::Service'],
+                                      :address => "0.0.0.0",
+                                      :port => 9999,
+                                      :ttl => 15 }) }
+
+    it 'adds the listing to the known @listings' do
+      expect {
+        ::Protobuf::Lifecycle.should_receive(:trigger)
+                              .with('directory.listing.added', an_instance_of(::Protobuf::Rpc::ServiceDirectory::Listing))
+                              .once
+        instance.add_listing_for(server)
+      }.to change(listings, :size).from(0).to(1)
+    end
+  end
+
+  describe '#each_listing' do
+    let(:listing_doubles) { { '1' => double('listing 1'),
+                              '2' => double('listing 2'),
+                              '3' => double('listing 3') } }
+
+    before do
+      instance.instance_variable_set(:@listings, listing_doubles)
+    end
+
+    it 'invokes the given block for each listing known by the directory' do
+      yielded_listings = []
+      instance.each_listing do |listing|
+        yielded_listings << listing
+      end
+      yielded_listings.should eq(listing_doubles.values)
+    end
+  end
+
   describe "#remove_expired_listings" do
+    let(:listing_doubles) { { '1' => double(:expired? => true),
+                              '2' => double(:expired? => true),
+                              '3' => double(:expired? => false) } }
+
     before do
-      instance.instance_variable_set(:@listings, {
-        '1' => double(:expired? => true),
-        '2' => double(:expired? => true),
-        '3' => double(:expired? => false),
-      })
+      instance.instance_variable_set(:@listings, listing_doubles)
     end
 
     it "removes expired listings" do
       expect {
+        ::Protobuf::Lifecycle.should_receive(:trigger)
+                              .with('directory.listing.removed', an_instance_of(RSpec::Mocks::Mock))
+                              .twice
         instance.remove_expired_listings
       }.to change(listings, :size).from(3).to(1)
       listings.keys.should eq ['3']
@@ -121,7 +159,7 @@ describe ::Protobuf::Rpc::ServiceDirectory do
         :server => server,
         :beacon_type => ::Protobuf::Rpc::DynamicDiscovery::BeaconType::HEARTBEAT
       )}
-      let(:payload) { beacon.serialize_to_string }
+      let(:payload) { beacon.encode }
 
       it "adds a listing" do
         instance.should_receive(:add_listing_for).with(server)
@@ -137,7 +175,7 @@ describe ::Protobuf::Rpc::ServiceDirectory do
         :server => server,
         :beacon_type => ::Protobuf::Rpc::DynamicDiscovery::BeaconType::FLATLINE
       )}
-      let(:payload) { beacon.serialize_to_string }
+      let(:payload) { beacon.encode }
 
       it "removes a listing" do
         instance.should_receive(:remove_listing_for).with(server)

data/spec/lib/protobuf/rpc/service_spec.rb

@@ -131,7 +131,7 @@ describe Protobuf::Rpc::Service do
 
       context 'when calling the rpc method' do
         context 'when response is implied' do
-          subject { NewTestService.new(:find_with_implied_response, request.serialize_to_string) }
+          subject { NewTestService.new(:find_with_implied_response, request.encode) }
 
           before { subject.find_with_implied_response }
           its(:response) { should be_a(Test::Resource) }
@@ -139,7 +139,7 @@ describe Protobuf::Rpc::Service do
         end
 
         context 'when using respond_with paradigm' do
-          subject { NewTestService.new(:find_with_respond_with, request.serialize_to_string) }
+          subject { NewTestService.new(:find_with_respond_with, request.encode) }
 
           before { subject.find_with_respond_with }
           its(:response) { should be_a(Test::Resource) }
@@ -148,7 +148,7 @@ describe Protobuf::Rpc::Service do
       end
 
       context 'when calling rpc_failed in the method' do
-        subject { NewTestService.new(:find_with_rpc_failed, request.serialize_to_string) }
+        subject { NewTestService.new(:find_with_rpc_failed, request.encode) }
 
         it 'invokes the rpc_failed callback with the error' do
           error = nil

data/spec/spec_helper.rb

@@ -6,15 +6,17 @@ require 'bundler'
 Bundler.setup :default, :development, :test
 require 'pry'
 
-$: << ::File.expand_path('..', File.dirname(__FILE__))
-$: << ::File.expand_path('../spec/support', File.dirname(__FILE__))
-#$: << ::File.expand_path('../lib', File.dirname(__FILE__))
+$: << ::File.expand_path('../..', __FILE__)
+$: << ::File.expand_path('../support', __FILE__)
 
 require 'protobuf'
-require ::File.dirname(__FILE__) + '/support/all'
+require ::File.expand_path('../support/all', __FILE__)
+
+$: << ::File.expand_path("../../lib/protobuf/descriptors", __FILE__)
+require 'google/protobuf/compiler/plugin.pb'
 
 # Including a way to turn on debug logger for spec runs
-if ENV["DEBUG"]
+if ENV.key?('DEBUG')
   debug_log = ::File.expand_path('../debug_specs.log', File.dirname(__FILE__) )
   ::Protobuf::Logger.configure(:file => debug_log, :level => ::Logger::DEBUG)
 end
@@ -27,21 +29,18 @@ ENV.delete("PB_IGNORE_DEPRECATIONS")
   c.mock_with :rspec
 
   c.before(:suite) do
-    unless defined?(JRUBY_VERSION)
-      unless ENV['NO_COMPILE_TEST_PROTOS']
-        $stdout.puts 'Compiling test protos (use NO_COMPILE_TEST_PROTOS=1 to skip)'
-        proto_path = File.expand_path("../support/", __FILE__)
-        cmd = %Q{ rprotoc --proto_path=#{proto_path} --ruby_out=#{proto_path} #{File.join(proto_path, '**', '*.proto')} }
-        puts cmd
-        %x{#{cmd}}
-      end
+    unless ENV['NO_COMPILE_TEST_PROTOS']
+      $stdout.puts 'Compiling test protos (use NO_COMPILE_TEST_PROTOS=1 to skip)'
+      proto_path = File.expand_path("../support/", __FILE__)
+      cmd = %Q{protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{proto_path} -I #{proto_path} #{File.join(proto_path, '**', '*.proto')}}
+      puts cmd
+      %x{#{cmd}}
     end
   end
 end
 
-Dir[File.expand_path('../support/**/*.pb.rb', __FILE__)].each do |proto_file|
-  require proto_file
-end
+support_proto_glob = File.expand_path('../support/**/*.pb.rb', __FILE__)
+Dir[support_proto_glob].each { |proto_file| require proto_file }
 
 class ::Protobuf::Rpc::Client
   def ==(other)

data/spec/support/test/all_types.data.txt

@@ -0,0 +1,119 @@
+optional_int32: 101
+optional_int64: 102
+optional_uint32: 103
+optional_uint64: 104
+optional_sint32: 105
+optional_sint64: 106
+optional_fixed32: 107
+optional_fixed64: 108
+optional_sfixed32: 109
+optional_sfixed64: 110
+optional_float: 111
+optional_double: 112
+optional_bool: true
+optional_string: "115"
+optional_bytes: "116"
+optional_nested_message {
+  bb: 118
+}
+optional_foreign_message {
+  c: 119
+}
+optional_import_message {
+  d: 120
+}
+optional_nested_enum: BAZ
+optional_foreign_enum: FOREIGN_BAZ
+optional_import_enum: IMPORT_BAZ
+optional_string_piece: "124"
+optional_cord: "125"
+optional_public_import_message {
+  e: 126
+}
+optional_lazy_message {
+  bb: 127
+}
+repeated_int32: 201
+repeated_int32: 301
+repeated_int64: 202
+repeated_int64: 302
+repeated_uint32: 203
+repeated_uint32: 303
+repeated_uint64: 204
+repeated_uint64: 304
+repeated_sint32: 205
+repeated_sint32: 305
+repeated_sint64: 206
+repeated_sint64: 306
+repeated_fixed32: 207
+repeated_fixed32: 307
+repeated_fixed64: 208
+repeated_fixed64: 308
+repeated_sfixed32: 209
+repeated_sfixed32: 309
+repeated_sfixed64: 210
+repeated_sfixed64: 310
+repeated_float: 211
+repeated_float: 311
+repeated_double: 212
+repeated_double: 312
+repeated_bool: true
+repeated_bool: false
+repeated_string: "215"
+repeated_string: "315"
+repeated_bytes: "216"
+repeated_bytes: "316"
+repeated_nested_message {
+  bb: 218
+}
+repeated_nested_message {
+  bb: 318
+}
+repeated_foreign_message {
+  c: 219
+}
+repeated_foreign_message {
+  c: 319
+}
+repeated_import_message {
+  d: 220
+}
+repeated_import_message {
+  d: 320
+}
+repeated_nested_enum: BAR
+repeated_nested_enum: BAZ
+repeated_foreign_enum: FOREIGN_BAR
+repeated_foreign_enum: FOREIGN_BAZ
+repeated_import_enum: IMPORT_BAR
+repeated_import_enum: IMPORT_BAZ
+repeated_string_piece: "224"
+repeated_string_piece: "324"
+repeated_cord: "225"
+repeated_cord: "325"
+repeated_lazy_message {
+  bb: 227
+}
+repeated_lazy_message {
+  bb: 327
+}
+default_int32: 401
+default_int64: 402
+default_uint32: 403
+default_uint64: 404
+default_sint32: 405
+default_sint64: 406
+default_fixed32: 407
+default_fixed64: 408
+default_sfixed32: 409
+default_sfixed64: 410
+default_float: 411
+default_double: 412
+default_bool: false
+default_string: "415"
+default_bytes: "416"
+default_nested_enum: FOO
+default_foreign_enum: FOREIGN_FOO
+default_import_enum: IMPORT_FOO
+default_string_piece: "424"
+default_cord: "425"