Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

instance level class access was removed, ask class for name instead of i... #187

Merged
merged 2 commits into from
Feb 26, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/protobuf/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def each_field_for_serialization
value = @values[field.name]

if value.nil?
raise ::Protobuf::SerializationError, "Required field #{self.name}##{field.name} does not have a value."
raise ::Protobuf::SerializationError, "Required field #{self.class.name}##{field.name} does not have a value."
else
yield(field, value)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/protobuf/message_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
end

context "when there's no value for a required field" do
let(:message) { ::Test::Resource.new }
let(:message) { ::Test::ResourceWithRequiredField.new }

it "raises a 'message not initialized' error" do
expect {
Expand Down
5 changes: 5 additions & 0 deletions spec/support/test/resource.pb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class StatusType < ::Protobuf::Enum
class ResourceFindRequest < ::Protobuf::Message; end
class ResourceSleepRequest < ::Protobuf::Message; end
class Resource < ::Protobuf::Message; end
class ResourceWithRequiredField < ::Protobuf::Message; end
class Searchable < ::Protobuf::Message
class SearchType < ::Protobuf::Enum
define :FLAT, 1
Expand Down Expand Up @@ -71,6 +72,10 @@ class Resource
optional :bool, :ext_dup_field, 106, :extension => true
end

class ResourceWithRequiredField
required :string, :foo_is_required, 1
end

class MessageParent
class MessageChild
optional :string, :child1, 1
Expand Down
4 changes: 4 additions & 0 deletions spec/support/test/resource.proto
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ message Resource {
repeated StatusType repeated_enum = 4;
}

message ResourceWithRequiredField {
required string foo_is_required = 1;
}

message Searchable {
enum SearchType {
FLAT = 1;
Expand Down