protobuf 2.0.0.rc2 → 2.0.0.rc3

data/spec/{proto/test.proto → support/test/resource.proto}

@@ -1,4 +1,4 @@
-package spec.proto;
+package test;
 
 enum StatusType {
   PENDING = 0;
@@ -26,6 +26,6 @@ message Nested {
   optional StatusType status = 4;
 }
 
-service TestService {
+service ResourceService {
   rpc Find (ResourceFindRequest) returns (Resource);
 }

data/spec/support/test/resource_service.rb

@@ -0,0 +1,14 @@
+require ::File.expand_path('../resource.pb', __FILE__)
+
+module Test
+  class ResourceService
+
+    # request -> Test::ResourceFindRequest
+    # response -> Test::Resource
+    def find
+      response.name = request.name
+      response.status = request.active ? 1 : 0
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000Z
+date: 2012-10-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152624820 !ruby/object:Gem::Requirement
+  requirement: &2153942300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152624820
+  version_requirements: *2153942300
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2152624040 !ruby/object:Gem::Requirement
+  requirement: &2153941880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152624040
+  version_requirements: *2153941880
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152622960 !ruby/object:Gem::Requirement
+  requirement: &2153941460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152622960
+  version_requirements: *2153941460
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152622180 !ruby/object:Gem::Requirement
+  requirement: &2153941040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152622180
+  version_requirements: *2153941040
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152621360 !ruby/object:Gem::Requirement
+  requirement: &2153940620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152621360
+  version_requirements: *2153940620
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &2152619940 !ruby/object:Gem::Requirement
+  requirement: &2153940200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152619940
+  version_requirements: *2153940200
 - !ruby/object:Gem::Dependency
   name: perftools.rb
-  requirement: &2152618420 !ruby/object:Gem::Requirement
+  requirement: &2153939780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152618420
+  version_requirements: *2153939780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152617440 !ruby/object:Gem::Requirement
+  requirement: &2153939360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152617440
+  version_requirements: *2153939360
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2152616260 !ruby/object:Gem::Requirement
+  requirement: &2153938940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152616260
+  version_requirements: *2153938940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152609200 !ruby/object:Gem::Requirement
+  requirement: &2153938520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152609200
+  version_requirements: *2153938520
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2152606820 !ruby/object:Gem::Requirement
+  requirement: &2153938100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152606820
+  version_requirements: *2153938100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152605700 !ruby/object:Gem::Requirement
+  requirement: &2153937680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152605700
+  version_requirements: *2153937680
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152603620 !ruby/object:Gem::Requirement
+  requirement: &2153953620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152603620
+  version_requirements: *2153953620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152596160 !ruby/object:Gem::Requirement
+  requirement: &2153953200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152596160
+  version_requirements: *2153953200
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -197,7 +197,6 @@ files:
 - examples/addressbook.proto
 - examples/reading_a_message.rb
 - examples/writing_a_message.rb
-- ext/Makefile
 - ext/protobuf-2.4.1/src/google/protobuf/compiler/code_generator.h
 - ext/protobuf-2.4.1/src/google/protobuf/compiler/command_line_interface.h
 - ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_enum.h
@@ -283,15 +282,18 @@ files:
 - ext/protobuf-2.4.1/src/google/protobuf/wire_format.h
 - ext/protobuf-2.4.1/src/google/protobuf/wire_format_lite.h
 - ext/protobuf-2.4.1/src/google/protobuf/wire_format_lite_inl.h
+- ext/ruby_generator/Makefile
 - ext/ruby_generator/RubyGenerator.cpp
 - ext/ruby_generator/RubyGenerator.h
 - ext/ruby_generator/extconf.rb
+- ext/ruby_generator/protoc-ruby
 - lib/protobuf.rb
 - lib/protobuf/cli.rb
 - lib/protobuf/common/exceptions.rb
 - lib/protobuf/common/logger.rb
 - lib/protobuf/common/wire_type.rb
 - lib/protobuf/enum.rb
+- lib/protobuf/enum_value.rb
 - lib/protobuf/evented.rb
 - lib/protobuf/ext/eventmachine.rb
 - lib/protobuf/field.rb
@@ -363,9 +365,10 @@ files:
 - spec/functional/zmq_server_spec.rb
 - spec/lib/protobuf/cli_spec.rb
 - spec/lib/protobuf/common/logger_spec.rb
+- spec/lib/protobuf/enum_spec.rb
+- spec/lib/protobuf/enum_value_spec.rb
 - spec/lib/protobuf/message/encoder_spec.rb
-- spec/lib/protobuf/message/enum_spec.rb
-- spec/lib/protobuf/message/message_spec.rb
+- spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb
 - spec/lib/protobuf/rpc/connector_spec.rb
 - spec/lib/protobuf/rpc/connectors/base_spec.rb
@@ -379,14 +382,15 @@ files:
 - spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
 - spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
 - spec/lib/protobuf/rpc/service_spec.rb
-- spec/proto/test.pb.rb
-- spec/proto/test.proto
-- spec/proto/test_service.rb
-- spec/proto/test_service_impl.rb
+- spec/lib/protobuf_spec.rb
 - spec/spec_helper.rb
 - spec/support/all.rb
 - spec/support/server.rb
-- spec/support/silent_constants.rb
+- spec/support/test/enum.pb.rb
+- spec/support/test/enum.proto
+- spec/support/test/resource.pb.rb
+- spec/support/test/resource.proto
+- spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
 - spec/support/tolerance_matcher.rb
 - test/data/data.bin
@@ -444,9 +448,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2728139943989483754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -468,9 +469,10 @@ test_files:
 - spec/functional/zmq_server_spec.rb
 - spec/lib/protobuf/cli_spec.rb
 - spec/lib/protobuf/common/logger_spec.rb
+- spec/lib/protobuf/enum_spec.rb
+- spec/lib/protobuf/enum_value_spec.rb
 - spec/lib/protobuf/message/encoder_spec.rb
-- spec/lib/protobuf/message/enum_spec.rb
-- spec/lib/protobuf/message/message_spec.rb
+- spec/lib/protobuf/message_spec.rb
 - spec/lib/protobuf/rpc/client_spec.rb
 - spec/lib/protobuf/rpc/connector_spec.rb
 - spec/lib/protobuf/rpc/connectors/base_spec.rb
@@ -484,14 +486,15 @@ test_files:
 - spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
 - spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
 - spec/lib/protobuf/rpc/service_spec.rb
-- spec/proto/test.pb.rb
-- spec/proto/test.proto
-- spec/proto/test_service.rb
-- spec/proto/test_service_impl.rb
+- spec/lib/protobuf_spec.rb
 - spec/spec_helper.rb
 - spec/support/all.rb
 - spec/support/server.rb
-- spec/support/silent_constants.rb
+- spec/support/test/enum.pb.rb
+- spec/support/test/enum.proto
+- spec/support/test/resource.pb.rb
+- spec/support/test/resource.proto
+- spec/support/test/resource_service.rb
 - spec/support/test_app_file.rb
 - spec/support/tolerance_matcher.rb
 - test/data/data.bin

data/ext/Makefile

@@ -1,11 +0,0 @@
-all: \
-	RubyGenerator.h \
-	RubyGenerator.cpp \
-	main.cpp
-	g++ -Wall -I/code/src/utilities/protobuf-2.4.1/src -lprotoc -lprotobuf -lpthread -o protoc-ruby RubyGenerator.cpp main.cpp
-
-test:
-	rm -rf test/out/*
-	./protoc-ruby --proto_path=defs --ruby_out=out defs/atlas/util.proto defs/atlas/newman/*.proto
-
-.PHONY: all test

data/spec/lib/protobuf/message/enum_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-require 'spec/proto/test.pb'
-
-describe Protobuf::Enum do
-  context 'when coercing from enum' do
-    subject { Spec::Proto::StatusType::PENDING }
-    it { should eq(0) }
-  end
-
-  context 'when coercing from integer' do
-    it { 0.should eq(Spec::Proto::StatusType::PENDING) }
-  end
-end

data/spec/lib/protobuf/message/message_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-require 'spec/proto/test.pb'
-
-describe Protobuf::Message do
-  
-  context 'when converting to json' do
-    
-    it "should be jsonable" do
-      msg = Spec::Proto::ResourceFindRequest.new
-      msg.should respond_to(:to_json)
-      msg.name = 'Jeff'
-      msg.active = false
-      msg.to_json.should == '{"name":"Jeff","active":false}'
-    end
-    
-    it 'should generate nested messages into nested json objects' do
-      date_created = Time.now.to_i
-      
-      nested = Spec::Proto::Nested.new
-      nested.name = 'NESTED'
-      nested.resource = Spec::Proto::Resource.new.tap do |r|
-        r.name = 'RESOURCE SINGLE'
-        r.date_created = date_created
-        r.status = Spec::Proto::StatusType::PENDING
-      end
-      2.times do |i|
-        nested.multiple_resources << Spec::Proto::Resource.new.tap do |r|
-          r.name = 'RESOURCE MULTIPLE %d' % i
-          r.date_created = date_created
-          r.status = Spec::Proto::StatusType::PENDING
-        end
-      end
-      nested.status = Spec::Proto::StatusType::ENABLED
-      
-      nested.to_json.should == %Q{{"name":"NESTED","resource":{"name":"RESOURCE SINGLE","date_created":#{date_created},"status":0,"repeated_enum":[]},"multiple_resources":[{"name":"RESOURCE MULTIPLE 0","date_created":#{date_created},"status":0,"repeated_enum":[]},{"name":"RESOURCE MULTIPLE 1","date_created":#{date_created},"status":0,"repeated_enum":[]}],"status":1}}
-    end
-    
-    
-  end
-  
-  context 'when converting to a hash' do
-    
-    context 'when message has repeated enum field' do
-      
-      it 'provides an array of integers' do
-        resource = Spec::Proto::Resource.new :repeated_enum => [
-          Spec::Proto::StatusType::PENDING,
-          Spec::Proto::StatusType::ENABLED,
-          Spec::Proto::StatusType::ENABLED,
-          Spec::Proto::StatusType::DISABLED,
-          Spec::Proto::StatusType::DELETED
-        ]
-        
-        resource.to_hash[:repeated_enum].should == [
-          Spec::Proto::StatusType::PENDING.value,
-          Spec::Proto::StatusType::ENABLED.value,
-          Spec::Proto::StatusType::ENABLED.value,
-          Spec::Proto::StatusType::DISABLED.value,
-          Spec::Proto::StatusType::DELETED.value
-        ]
-      end
-      
-    end
-    
-  end
-  
-end

data/spec/proto/test.pb.rb

@@ -1,54 +0,0 @@
-##
-# This file is auto-generated. DO NOT EDIT!
-#
-require 'protobuf/message'
-require 'protobuf/rpc/service'
-
-module Spec
-  module Proto
-    ##
-    # Enum Classes
-    #
-    class StatusType < ::Protobuf::Enum; end
-    
-    ##
-    # Message Classes
-    #
-    class ResourceFindRequest < ::Protobuf::Message; end
-    class Resource < ::Protobuf::Message; end
-    class Nested < ::Protobuf::Message; end
-    
-    ##
-    # Enum Values
-    #
-    ::Spec::Proto::StatusType.define :PENDING, 0
-    ::Spec::Proto::StatusType.define :ENABLED, 1
-    ::Spec::Proto::StatusType.define :DISABLED, 2
-    ::Spec::Proto::StatusType.define :DELETED, 3
-    
-    
-    ##
-    # Message Fields
-    #
-    ::Spec::Proto::ResourceFindRequest.required(::Protobuf::Field::StringField, :name, 1)
-    ::Spec::Proto::ResourceFindRequest.optional(::Protobuf::Field::BoolField, :active, 2)
-    
-    ::Spec::Proto::Resource.required(::Protobuf::Field::StringField, :name, 1)
-    ::Spec::Proto::Resource.optional(::Protobuf::Field::Int64Field, :date_created, 2)
-    ::Spec::Proto::Resource.optional(::Spec::Proto::StatusType, :status, 3)
-    ::Spec::Proto::Resource.repeated(::Spec::Proto::StatusType, :repeated_enum, 4)
-    
-    ::Spec::Proto::Nested.optional(::Protobuf::Field::StringField, :name, 1)
-    ::Spec::Proto::Nested.optional(::Spec::Proto::Resource, :resource, 2)
-    ::Spec::Proto::Nested.repeated(::Spec::Proto::Resource, :multiple_resources, 3)
-    ::Spec::Proto::Nested.optional(::Spec::Proto::StatusType, :status, 4)
-    
-    
-    ##
-    # Services
-    #
-    class TestService < ::Protobuf::Rpc::Service
-      rpc :find, ::Spec::Proto::ResourceFindRequest, ::Spec::Proto::Resource
-    end
-  end
-end