protobuf 2.5.2 → 2.5.3

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - "1.9.2"
   - "1.9.3"
   - jruby-19mode
-  - rbx-19mode
   - ruby-head
   - jruby-head
 script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec

data/lib/protobuf/message.rb

@@ -40,7 +40,7 @@ module Protobuf
     def self.extensions(range)
       extension_fields.add_range(range)
     end
-    
+
     def self.extension_field_name_to_tag
       @extension_fields_by_name ||= {}
     end
@@ -150,7 +150,7 @@ module Protobuf
     def each_field
       all_fields.each do |field|
         value = __send__(field.name)
-        yield(field, value) 
+        yield(field, value)
       end
     end
 
@@ -164,7 +164,7 @@ module Protobuf
           # Only way you can get here is if you are required and nil
           raise ::Protobuf::SerializationError, "#{field.name} is required on #{field.message_class}"
         else
-          yield(field, value) 
+          yield(field, value)
         end
       end
     end
@@ -217,7 +217,7 @@ module Protobuf
     end
 
     def respond_to_has_and_present?(key)
-      self.respond_to_has?(key) && 
+      self.respond_to_has?(key) &&
         (self.__send__(key).present? || [true, false].include?(self.__send__(key)))
     end
 
@@ -261,8 +261,8 @@ module Protobuf
       return result
     end
 
-    def to_json
-      to_hash.to_json
+    def to_json(options = {})
+      to_hash.to_json(options)
     end
 
     def to_proto

data/lib/protobuf/rpc/service_filters.rb

@@ -17,6 +17,7 @@ module Protobuf
           define_method "#{type}_filter" do |*args|
             set_filters(type, *args)
           end
+          alias_method "#{type}_action", "#{type}_filter"
         end
 
         # Filters hash keyed based on filter type (e.g. :before, :after, :around),

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.5.2'
+  VERSION = '2.5.3'
   PROTOC_VERSION = '2.4.1'
 end

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

@@ -55,6 +55,9 @@ describe Protobuf::Rpc::ServiceFilters do
       FilterTest.before_filter(:foo)
     end
 
+    specify { subject.class.should respond_to(:before_filter) }
+    specify { subject.class.should respond_to(:before_action) }
+
     it 'calls filters in the order they were defined' do
       subject.__send__(:run_filters, :endpoint)
       subject.called.should eq [ :verify_before, :foo, :endpoint ]
@@ -286,6 +289,9 @@ describe Protobuf::Rpc::ServiceFilters do
       FilterTest.after_filter(:foo)
     end
 
+    specify { subject.class.should respond_to(:after_filter) }
+    specify { subject.class.should respond_to(:after_action) }
+
     it 'calls filters in the order they were defined' do
       subject.__send__(:run_filters, :endpoint)
       subject.called.should eq [ :endpoint, :verify_after, :foo ]
@@ -320,6 +326,9 @@ describe Protobuf::Rpc::ServiceFilters do
       FilterTest.around_filter(:inner_around)
     end
 
+    specify { subject.class.should respond_to(:around_filter) }
+    specify { subject.class.should respond_to(:around_action) }
+
     it 'calls filters in the order they were defined' do
       subject.__send__(:run_filters, :endpoint)
       subject.called.should eq([ :outer_around_top,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152836940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152836940
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152835280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152835280
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152832940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152832940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152832000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152832000
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152831080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152831080
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152830180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,15 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152830180
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152826140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -118,15 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152826140
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152825640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,15 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152825640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152824140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -150,15 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152824140
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152821940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,15 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152821940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152820960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -182,15 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152820960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152819380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,15 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152819380
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2152816340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -214,12 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2152816340
 description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
   Ruby.
 email:
@@ -497,7 +432,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3168278352702760437
+      hash: -2693083503849752754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -506,12 +441,91 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3168278352702760437
+      hash: -2693083503849752754
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
-test_files: []
+test_files:
+- spec/benchmark/tasks.rb
+- spec/functional/embedded_service_spec.rb
+- spec/functional/evented_server_spec.rb
+- spec/functional/socket_server_spec.rb
+- spec/functional/zmq_server_spec.rb
+- spec/lib/protobuf/cli_spec.rb
+- spec/lib/protobuf/enum_spec.rb
+- spec/lib/protobuf/enum_value_spec.rb
+- spec/lib/protobuf/logger_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
+- spec/lib/protobuf/rpc/connectors/common_spec.rb
+- spec/lib/protobuf/rpc/connectors/socket_spec.rb
+- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
+- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
+- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
+- spec/lib/protobuf/rpc/service_dispatcher_spec.rb
+- spec/lib/protobuf/rpc/service_filters_spec.rb
+- spec/lib/protobuf/rpc/service_spec.rb
+- spec/lib/protobuf_spec.rb
+- spec/spec_helper.rb
+- spec/support/all.rb
+- spec/support/server.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
+- test/data/data_source.py
+- test/data/types.bin
+- test/data/types_source.py
+- test/data/unk.png
+- 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_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_repeated_types.rb
+- test/test_serialize.rb
+- test/test_standard_message.rb
+- test/test_types.rb
 has_rdoc: