protobuf 2.7.6-java → 2.7.7-java

data/lib/protobuf.rb

@@ -2,7 +2,16 @@ require 'logger'
 require 'socket'
 require 'pp'
 require 'stringio'
-require 'active_support/all'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
+require 'active_support/inflector'
+require 'active_support/json'
+
+begin # master
+require 'active_support/core_ext/object/deep_dup'
+rescue LoadError # 3.2.x
+require 'active_support/core_ext/hash/deep_dup'
+end
 
 module Protobuf
 

data/lib/protobuf/message.rb

@@ -78,7 +78,8 @@ module Protobuf
 
     # Find a field object by +name+.
     def self.get_field_by_name(name)
-      tag = field_name_to_tag[name.to_sym]
+      name = name.to_sym if name.respond_to?(:to_sym)
+      tag = field_name_to_tag[name]
       fields[tag] unless tag.nil?
     end
 
@@ -87,7 +88,6 @@ module Protobuf
       fields[tag]
     rescue TypeError => e
       tag = tag.nil? ? 'nil' : tag.to_s
-      raise
       raise FieldNotDefinedError.new("Tag '#{tag}' does not reference a message field for '#{self.name}'")
     end
 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.7.6'
+  VERSION = '2.7.7'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/lib/protobuf/message_spec.rb

@@ -8,12 +8,12 @@ describe Protobuf::Message do
       test_enum.non_default_enum.should eq(0)
     end
 
-    it "exposes the enum getter raw value through ! method" do 
+    it "exposes the enum getter raw value through ! method" do
       test_enum = Test::EnumTestMessage.new
       test_enum.non_default_enum!.should be_nil
     end
 
-    it "exposes the enum getter raw value through ! method (when set)" do 
+    it "exposes the enum getter raw value through ! method (when set)" do
       test_enum = Test::EnumTestMessage.new
       test_enum.non_default_enum = 1
       test_enum.non_default_enum!.should eq(1)
@@ -227,21 +227,15 @@ describe Protobuf::Message do
 
     context 'when name is not a valid field' do
       specify do
-        expect {
-          subject.get_field_by_name(1)
-        }.to raise_error(::Protobuf::FieldNotDefinedError, /.*1.*#{subject.class.name}/)
+        subject.get_field_by_name(1).should be_nil
       end
 
       specify do
-        expect {
-          subject.get_field_by_name(:nothere)
-        }.to raise_error(::Protobuf::FieldNotDefinedError, /.*nothere.*#{subject.class.name}/)
+        subject.get_field_by_name(:nothere).should be_nil
       end
 
       specify do
-        expect {
-          subject.get_field_by_name(nil)
-        }.to raise_error(::Protobuf::FieldNotDefinedError, /.*nil.*#{subject.class.name}/)
+        subject.get_field_by_name(nil).should be_nil
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: protobuf
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 2.7.6
+  version: 2.7.7
 platform: java
 authors:
 - BJ Neilsen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000Z
+date: 2013-03-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport