protobuf 2.5.2-java → 2.5.4-java

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/field/base_field.rb

@@ -32,6 +32,8 @@ module Protobuf
         @message_class, @rule, @type, @name, @tag = \
           message_class, rule, type, name, tag
 
+        set_rule_predicates
+
         @getter_method_name = name
         @setter_method_name = "#{name}=".to_sym
         @default   = options.delete(:default)
@@ -39,7 +41,6 @@ module Protobuf
         @packed    = repeated? && options.delete(:packed)
         @deprecated = options.delete(:deprecated)
 
-        set_rule_predicates
         set_default_value
         warn_excess_options(options) unless options.empty?
         validate_packed_field if packed?
@@ -165,7 +166,7 @@ module Protobuf
         @message_class.class_eval do
           define_method(field.setter_method_name) do |val|
             field.warn_if_deprecated
-            
+
             if val.is_a?(Array)
               val = val.dup
               val.compact!
@@ -216,7 +217,7 @@ module Protobuf
       end
 
       def set_default_value
-        @default_value = case 
+        @default_value = case
                          when repeated? then ::Protobuf::Field::FieldArray.new(self).freeze
                          when required? then nil
                          when optional? then typed_default_value

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.4'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/field/int32_field_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Protobuf::Field::Int32Field do
+
+  it_behaves_like :packable_field, described_class
+
+end

data/spec/lib/protobuf/message_spec.rb

@@ -2,26 +2,26 @@ require 'spec_helper'
 
 describe Protobuf::Message do
 
-  describe '#initialize' do 
-    it "does not try to set attributes which have nil values" do 
+  describe '#initialize' 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)
     end
 
-    it "takes a hash as an initialization argument" do 
+    it "takes a hash as an initialization argument" do
       test_enum = Test::EnumTestMessage.new(:non_default_enum => 2)
       test_enum.non_default_enum.should eq(2)
     end
 
-    it "initializes with an object that responds to #to_hash" do 
-      hashie_object = OpenStruct.new(:to_hash => { :non_default_enum => 2 })      
+    it "initializes with an object that responds to #to_hash" do
+      hashie_object = OpenStruct.new(:to_hash => { :non_default_enum => 2 })
       test_enum = Test::EnumTestMessage.new(hashie_object)
       test_enum.non_default_enum.should eq(2)
     end
   end
 
   describe '#encode' do
-    context "encoding" do 
+    context "encoding" do
       it "accepts UTF-8 strings into string fields" do
         message = ::Test::Resource.new(:name => "Kyle Redfearn\u0060s iPad")
 
@@ -46,7 +46,7 @@ describe Protobuf::Message do
       end
     end
 
-    context "repeated fields" do 
+    context "repeated fields" do
       let(:message) { ::Test::Resource.new(:name => "something") }
 
       it "does not raise an error when repeated fields are []" do
@@ -56,24 +56,24 @@ describe Protobuf::Message do
         }.to_not raise_error
       end
 
-      it "sets the value to nil when empty array is passed" do 
+      it "sets the value to nil when empty array is passed" do
         message.repeated_enum = []
         message.instance_variable_get("@values")[:repeated_enum].should be_nil
       end
 
-      it "does not compact the edit original array" do 
+      it "does not compact the edit original array" do
         a = [nil].freeze
         message.repeated_enum = a
         message.repeated_enum.should eq([])
         a.should eq([nil].freeze)
       end
 
-      it "compacts the set array" do 
+      it "compacts the set array" do
         message.repeated_enum = [nil]
         message.repeated_enum.should eq([])
       end
 
-      it "raises TypeError when a non-array replaces it" do 
+      it "raises TypeError when a non-array replaces it" do
         expect {
           message.repeated_enum = 2
         }.to raise_error(/value of type/)
@@ -81,66 +81,66 @@ describe Protobuf::Message do
     end
   end
 
-  describe "boolean predicate methods" do 
+  describe "boolean predicate methods" do
     subject { Test::ResourceFindRequest.new(:name => "resource") }
 
     it { should respond_to(:active?) }
 
-    it "sets the predicate to true when the boolean value is true" do 
+    it "sets the predicate to true when the boolean value is true" do
       subject.active = true
       subject.active?.should be_true
     end
 
-    it "sets the predicate to false when the boolean value is false" do 
+    it "sets the predicate to false when the boolean value is false" do
       subject.active = false
       subject.active?.should be_false
     end
 
-    it "does not put predicate methods on non-boolean fields" do 
+    it "does not put predicate methods on non-boolean fields" do
       Test::ResourceFindRequest.new(:name => "resource").should_not respond_to(:name?)
     end
   end
 
-  describe "#respond_to_and_has?" do 
+  describe "#respond_to_and_has?" do
     subject { Test::EnumTestMessage.new(:non_default_enum => 2) }
 
-    it "is false when the message does not have the field" do 
+    it "is false when the message does not have the field" do
       subject.respond_to_and_has?(:other_field).should be_false
     end
 
-    it "is true when the message has the field" do 
+    it "is true when the message has the field" do
       subject.respond_to_and_has?(:non_default_enum).should be_true
     end
   end
 
-  describe "#respond_to_has_and_present?" do 
+  describe "#respond_to_has_and_present?" do
     subject { Test::EnumTestMessage.new(:non_default_enum => 2) }
 
-    it "is false when the message does not have the field" do 
+    it "is false when the message does not have the field" do
       subject.respond_to_and_has_and_present?(:other_field).should be_false
     end
 
-    it "is false when the field is repeated and a value is not present" do 
+    it "is false when the field is repeated and a value is not present" do
       subject.respond_to_and_has_and_present?(:repeated_enums).should be_false
     end
 
-    it "is false when the field is repeated and the value is empty array" do 
+    it "is false when the field is repeated and the value is empty array" do
       subject.repeated_enums = []
       subject.respond_to_and_has_and_present?(:repeated_enums).should be_false
     end
 
-    it "is true when the field is repeated and a value is present" do 
+    it "is true when the field is repeated and a value is present" do
       subject.repeated_enums = [2]
       subject.respond_to_and_has_and_present?(:repeated_enums).should be_true
     end
 
-    it "is true when the message has the field" do 
+    it "is true when the message has the field" do
       subject.respond_to_and_has_and_present?(:non_default_enum).should be_true
     end
 
-    context "#API" do 
+    context "#API" do
       subject { Test::EnumTestMessage.new(:non_default_enum => 2) }
-        
+
       it { should respond_to(:respond_to_and_has_and_present?) }
       it { should respond_to(:responds_to_and_has_and_present?) }
       it { should respond_to(:responds_to_has?) }
@@ -150,7 +150,7 @@ describe Protobuf::Message do
       it { should respond_to(:respond_to_and_has_present?) }
       it { should respond_to(:responds_to_and_has_present?) }
     end
-   
+
   end
 
   describe '#to_hash' do
@@ -230,13 +230,13 @@ describe Protobuf::Message do
     end
   end
 
-  describe "#define_setter" do 
+  describe "#define_setter" do
     subject { ::Test::Resource.new }
-    it "allows string fields to be set to nil" do 
+    it "allows string fields to be set to nil" do
       expect { subject.name = nil }.to_not raise_error
     end
 
-    it "does not allow string fields to be set to Numeric" do 
+    it "does not allow string fields to be set to Numeric" do
       expect { subject.name = 1}.to raise_error(/name/)
     end
   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,

data/spec/support/all.rb

@@ -1,3 +1,4 @@
+require 'support/packed_field'
 require 'support/tolerance_matcher'
 require 'support/server'
 

data/spec/support/packed_field.rb

@@ -0,0 +1,21 @@
+shared_examples_for :packable_field do |klass|
+
+  before(:all) do
+    unless defined?(PackableFieldTest)
+      class PackableFieldTest < ::Protobuf::Message; end
+    end
+
+    field_klass = klass
+    field_name = "#{klass.name.split('::').last.underscore}_packed_field".to_sym
+    tag_num = PackableFieldTest.fields.size + 1
+    PackableFieldTest.repeated(field_klass, field_name, tag_num, :packed => true)
+  end
+
+  let(:field_name) { "#{klass.name.split('::').last.underscore}_packed_field" }
+  let(:message_instance) { PackableFieldTest.new(field_name => [100, 200, 300]) }
+
+  subject { message_instance.fields.last }
+
+ it { should be_packed }
+
+end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.2
+  version: 2.5.4
 platform: java
 authors: 
   - BJ Neilsen
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-05 00:00:00 Z
+date: 2012-12-17 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -348,6 +348,7 @@ files:
   - spec/lib/protobuf/cli_spec.rb
   - spec/lib/protobuf/enum_spec.rb
   - spec/lib/protobuf/enum_value_spec.rb
+  - spec/lib/protobuf/field/int32_field_spec.rb
   - spec/lib/protobuf/logger_spec.rb
   - spec/lib/protobuf/message_spec.rb
   - spec/lib/protobuf/rpc/client_spec.rb
@@ -368,6 +369,7 @@ files:
   - spec/lib/protobuf_spec.rb
   - spec/spec_helper.rb
   - spec/support/all.rb
+  - spec/support/packed_field.rb
   - spec/support/server.rb
   - spec/support/test/enum.pb.rb
   - spec/support/test/enum.proto