rename get_expected_field to get, rename get_optional_field to get\!

codekitchen · Nov 13, 2013 · e844d45 · e844d45
1 parent 61d1451
commit e844d45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/lib/protocol_buffers/runtime/message.rb b/lib/protocol_buffers/runtime/message.rb
@@ -426,7 +426,8 @@ def value_for_tag?(tag)
  @set_fields[tag] || false
  end
 
- def get_expected_field(*nested_field_names)
+ # Gets the field, throwing ArgumentError if not set
+ def get(*nested_field_names)
  if nested_field_names.size == 1
  field_name = nested_field_names.first
  field = self.class.field_for_name(field_name)
@@ -448,7 +449,8 @@ def get_expected_field(*nested_field_names)
  last_proto.value_for_tag(last_field.tag)
  end
 
- def get_optional_field(*nested_field_names)
+ # Gets the field, returning nil if not set
+ def get!(*nested_field_names)
  if nested_field_names.size == 1
  field_name = nested_field_names.first
  field = self.class.field_for_name(field_name)

diff --git a/spec/message_spec.rb b/spec/message_spec.rb
@@ -117,25 +117,25 @@
  c.value_for_tag?(1).should == true
  end
 
- it "correctly handles get_expected_field" do
+ it "correctly handles get" do
  f = Featureful::A.new
  f.i3 = 4
  f.sub3.subsub1.subsub_payload = "sub3subsubpayload"
 
- f.get_expected_field(:sub3, :subsub1, :subsub_payload).should == "sub3subsubpayload"
- f.get_expected_field(:i3).should == 4
- proc { f.get_expected_field(:i2) }.should raise_error(ArgumentError)
- proc { f.get_expected_field(:sub2) }.should raise_error(ArgumentError)
+ f.get(:sub3, :subsub1, :subsub_payload).should == "sub3subsubpayload"
+ f.get(:i3).should == 4
+ proc { f.get(:i2) }.should raise_error(ArgumentError)
+ proc { f.get(:sub2) }.should raise_error(ArgumentError)
  end
 
- it "correctly handles get_optional_field" do
+ it "correctly handles get!" do
  f = Featureful::A.new
  f.i3 = 4
  f.sub3.subsub1.subsub_payload = "sub3subsubpayload"
 
- f.get_optional_field(:sub3, :subsub1, :subsub_payload).should == "sub3subsubpayload"
- f.get_optional_field(:i3).should == 4
- f.get_optional_field(:i2).should == nil
- f.get_optional_field(:sub2).should == nil
+ f.get!(:sub3, :subsub1, :subsub_payload).should == "sub3subsubpayload"
+ f.get!(:i3).should == 4
+ f.get!(:i2).should == nil
+ f.get!(:sub2).should == nil
  end
 end