Skip to content

Prefer Hash-based payload data #3

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.

Sign up for GitHub

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

Open
ghost wants to merge 1 commit into
base: improve-messaging
Choose a base branch
from
Open

Prefer Hash-based payload data #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions lib/sheetah/headers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def result

missing_columns.each do |column|
@messenger.error(
Messaging::Messages::MissingColumn.new(code_data: column.header)
Messaging::Messages::MissingColumn.new(code_data: { value: column.header })
)
end
end
Expand All @@ -75,7 +75,7 @@ def add_ensure_column_is_specified(header, column)
unless @specification.ignore_unspecified_columns?
@failure = true
@messenger.error(
Messaging::Messages::InvalidHeader.new(code_data: header.value)
Messaging::Messages::InvalidHeader.new(code_data: { value: header.value })
)
end

Expand All @@ -87,7 +87,7 @@ def add_ensure_column_is_unique(header, column)

@failure = true
@messenger.error(
Messaging::Messages::DuplicatedHeader.new(code_data: header.value)
Messaging::Messages::DuplicatedHeader.new(code_data: { value: header.value })
)

false
Expand Down
7 changes: 6 additions & 1 deletion lib/sheetah/messaging/messages/duplicated_header.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ class DuplicatedHeader < Message
col

def validate_code_data(message)
message.code_data.is_a?(String)
case message.code_data
in { value: String }
true
else
false
end
end
end
end
Expand Down
7 changes: 6 additions & 1 deletion lib/sheetah/messaging/messages/invalid_header.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ class InvalidHeader < Message
col

def validate_code_data(message)
message.code_data.is_a?(String)
case message.code_data
in { value: String }
true
else
false
end
end
end
end
Expand Down
7 changes: 6 additions & 1 deletion lib/sheetah/messaging/messages/missing_column.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ class MissingColumn < Message
sheet

def validate_code_data(message)
message.code_data.is_a?(String)
case message.code_data
in { value: String }
true
else
false
end
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/sheetah/headers_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def stub_specification(column_by_header)
be_a(Sheetah::Messaging::Message) & have_attributes(
severity: "ERROR",
code: "invalid_header",
code_data: sheet_headers[4].value,
code_data: { value: sheet_headers[4].value },
scope: "COL",
scope_data: { col: sheet_headers[4].col }
)
Expand All @@ -122,7 +122,7 @@ def stub_specification(column_by_header)
be_a(Sheetah::Messaging::Message) & have_attributes(
severity: "ERROR",
code: "duplicated_header",
code_data: sheet_headers[1].value,
code_data: { value: sheet_headers[1].value },
scope: "COL",
scope_data: { col: sheet_headers[1].col }
)
Expand Down
2 changes: 1 addition & 1 deletion spec/sheetah/messaging/messages/duplicated_header_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
it "may be valid" do
msg = described_class.new(
code: "duplicated_header",
code_data: "header_foo",
code_data: { value: "header_foo" },
scope: "COL",
scope_data: { col: "FOO" },
validatable: true
Expand Down
2 changes: 1 addition & 1 deletion spec/sheetah/messaging/messages/invalid_header_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
it "may be valid" do
msg = described_class.new(
code: "invalid_header",
code_data: "header_foo",
code_data: { value: "header_foo" },
scope: "COL",
scope_data: { col: "FOO" },
validatable: true
Expand Down
2 changes: 1 addition & 1 deletion spec/sheetah/messaging/messages/missing_column_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
it "may be valid" do
msg = described_class.new(
code: "missing_column",
code_data: "header_foo",
code_data: { value: "header_foo" },
scope: "SHEET",
scope_data: nil,
validatable: true
Expand Down
8 changes: 4 additions & 4 deletions spec/sheetah_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ def process_to_a(*args, **opts)
messages: contain_exactly(
have_attributes(
code: "invalid_header",
code_data: "oof",
code_data: { value: "oof" },
scope: Sheetah::Messaging::SCOPES::COL,
scope_data: { col: "C" },
severity: Sheetah::Messaging::SEVERITIES::ERROR
),
have_attributes(
code: "invalid_header",
code_data: "rab",
code_data: { value: "rab" },
scope: Sheetah::Messaging::SCOPES::COL,
scope_data: { col: "F" },
severity: Sheetah::Messaging::SEVERITIES::ERROR
Expand Down Expand Up @@ -188,14 +188,14 @@ def process_to_a(*args, **opts)
messages: contain_exactly(
have_attributes(
code: "missing_column",
code_data: "Foo",
code_data: { value: "Foo" },
scope: Sheetah::Messaging::SCOPES::SHEET,
scope_data: nil,
severity: Sheetah::Messaging::SEVERITIES::ERROR
),
have_attributes(
code: "missing_column",
code_data: "Bar 5",
code_data: { value: "Bar 5" },
scope: Sheetah::Messaging::SCOPES::SHEET,
scope_data: nil,
severity: Sheetah::Messaging::SEVERITIES::ERROR
Expand Down