Skip to content

Commit 51b90ae

Browse files
committed
Change InvalidContextMember to InvalidContextEntry.
1 parent 1318b71 commit 51b90ae

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

lib/json/ld.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class ConflictingIndexes < JsonLdError; @code = "conflicting indexes"; end
115115
class CyclicIRIMapping < JsonLdError; @code = "cyclic IRI mapping"; end
116116
class InvalidBaseIRI < JsonLdError; @code = "invalid base IRI"; end
117117
class InvalidContainerMapping < JsonLdError; @code = "invalid container mapping"; end
118-
class InvalidContextMember < JsonLdError; @code = "invalid context member"; end
118+
class InvalidContextEntry < JsonLdError; @code = "invalid context entry"; end
119119
class InvalidContextNullification < JsonLdError; @code = "invalid context nullification"; end
120120
class InvalidDefaultLanguage < JsonLdError; @code = "invalid default language"; end
121121
class InvalidIdValue < JsonLdError; @code = "invalid @id value"; end

lib/json/ld/context.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ def vocab=(value, **options)
500500
#
501501
# @param [Boolean] value
502502
def propagate=(value, **options)
503-
raise JsonLdError::InvalidContextMember, "@propagate may only be set in 1.1 mode" if processingMode("json-ld-1.0")
503+
raise JsonLdError::InvalidContextEntry, "@propagate may only be set in 1.1 mode" if processingMode("json-ld-1.0")
504504
raise JsonLdError::InvalidPropagateValue, "@propagate must be boolean valued: #{value.inspect}" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
505505
value
506506
end
@@ -634,7 +634,7 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
634634
next unless context.has_key?(key)
635635
if key == '@import'
636636
# Retrieve remote context and merge the remaining context object into the result.
637-
raise JsonLdError::InvalidContextMember, "@import may only be used in 1.1 mode}" if result.processingMode("json-ld-1.0")
637+
raise JsonLdError::InvalidContextEntry, "@import may only be used in 1.1 mode}" if result.processingMode("json-ld-1.0")
638638
raise JsonLdError::InvalidImportValue, "@import must be a string: #{context['@import'].inspect}" unless context['@import'].is_a?(String)
639639
source = RDF::URI(result.context_base || result.base).join(context['@import'])
640640
begin
@@ -648,7 +648,7 @@ def parse(local_context, remote_contexts: [], protected: false, override_protect
648648
raise JsonLdError::InvalidRemoteContext, "#{source}" unless remote_doc.document.is_a?(Hash) && remote_doc.document.has_key?('@context')
649649
import_context = remote_doc.document['@context']
650650
raise JsonLdError::InvalidRemoteContext, "#{import_context.to_json} must be an object" unless import_context.is_a?(Hash)
651-
raise JsonLdError::InvalidContextMember, "#{import_context.to_json} must not include @import entry" if import_context.has_key?('@import')
651+
raise JsonLdError::InvalidContextEntry, "#{import_context.to_json} must not include @import entry" if import_context.has_key?('@import')
652652
context.delete(key)
653653
context = import_context.merge(context)
654654
end

spec/context_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -553,12 +553,12 @@ def containers
553553
end
554554
end
555555

556-
it "generates InvalidContextMember if using @propagate" do
557-
expect {context.parse({'@propagate' => true})}.to raise_error(JSON::LD::JsonLdError::InvalidContextMember)
556+
it "generates InvalidContextEntry if using @propagate" do
557+
expect {context.parse({'@propagate' => true})}.to raise_error(JSON::LD::JsonLdError::InvalidContextEntry)
558558
end
559559

560-
it "generates InvalidContextMember if using @import" do
561-
expect {context.parse({'@import' => "location"})}.to raise_error(JSON::LD::JsonLdError::InvalidContextMember)
560+
it "generates InvalidContextEntry if using @import" do
561+
expect {context.parse({'@import' => "location"})}.to raise_error(JSON::LD::JsonLdError::InvalidContextEntry)
562562
end
563563

564564
(JSON::LD::KEYWORDS - %w(@base @language @version @protected @propagate @vocab)).each do |kw|

0 commit comments

Comments
 (0)