datafoodconsortium-connector 1.0.0.pre.alpha.9 → 1.0.0.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5225fd19ef0b6bf69a76d49a056356e3b597fc0a1218f49987cb7d067fa1ffc
-  data.tar.gz: 399517064eca65753f2d915f7807c105f87e08eb68bf00b1d5b4c18bc4fc16d4
+  metadata.gz: b7948a960df0e1c5980954d67ab8b386029789fe867d06bcef4b1ff8944bacec
+  data.tar.gz: 8ad3b6dd4c57b621e4a712424b8fcfa7a8b1c0efec75cde535554617ad72e6d6
 SHA512:
-  metadata.gz: a6164d4c281396c07d80f69011fbf391ff92a5eac637d8028f95bee0efba3f41856bc8bd2a174775cacd3f9630e58ff4d9bbb8f98d932a3ff6cb62b26b4331b9
-  data.tar.gz: d94f2752a2c5eac1d675c1bce1248dea25f2491f96ce17a2535592af8c725af915ac7bd2b97e7261259367cd167611737ad96bb7cb5cb99434aa65df70bae263
+  metadata.gz: 45c695953704de93af40ed04d87e73abc0084d93cce29c28fca0925ec5d61d69b0db467370ad6a7b4e5ae6c93897b16a97d67b6ba8f82940241d9edda285f473
+  data.tar.gz: 125396ea6bbc7ed9f9313f14e95f6a8568896c0e7f219a268a3f5419e24a8bae292f470fc7f6abb58b977c5129e0953b06398c7eea657bcd5fe0faa137bdc0a3

data/lib/datafoodconsortium/connector/address.rb

@@ -24,8 +24,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Address
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:Address".freeze
 
 	# @return [String]
 	attr_accessor :street
@@ -51,10 +52,10 @@ class DataFoodConsortium::Connector::Address
 		@city = city
 		@country = country
 		self.semanticType = "dfc-b:Address"
-		registerSemanticProperty("dfc-b:hasStreet") { self.street }
-		registerSemanticProperty("dfc-b:hasPostalCode") { self.postalCode }
-		registerSemanticProperty("dfc-b:hasCity") { self.city }
-		registerSemanticProperty("dfc-b:hasCountry") { self.country }
+		registerSemanticProperty("dfc-b:hasStreet", &method("street")).valueSetter = method("street=")
+		registerSemanticProperty("dfc-b:hasPostalCode", &method("postalCode")).valueSetter = method("postalCode=")
+		registerSemanticProperty("dfc-b:hasCity", &method("city")).valueSetter = method("city=")
+		registerSemanticProperty("dfc-b:hasCountry", &method("country")).valueSetter = method("country=")
 	end
 	
 

data/lib/datafoodconsortium/connector/agent.rb

@@ -25,8 +25,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Agent
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:Agent".freeze
 
 	# @return [IAddress]
 	attr_accessor :localizations
@@ -57,11 +58,11 @@ class DataFoodConsortium::Connector::Agent
 		@websites = websites
 		@socialMedias = socialMedias
 		self.semanticType = "dfc-b:Agent"
-		registerSemanticProperty("dfc-b:hasAddress") { self.localizations }
-		registerSemanticProperty("dfc-b:hasPhoneNumber") { self.phoneNumbers }
-		registerSemanticProperty("dfc-b:email") { self.emails }
-		registerSemanticProperty("dfc-b:websitePage") { self.websites }
-		registerSemanticProperty("dfc-b:hasSocialMedia") { self.socialMedias }
+		registerSemanticProperty("dfc-b:hasAddress", &method("localizations")).valueSetter = method("localizations=")
+		registerSemanticProperty("dfc-b:hasPhoneNumber", &method("phoneNumbers")).valueSetter = method("phoneNumbers=")
+		registerSemanticProperty("dfc-b:email", &method("emails")).valueSetter = method("emails=")
+		registerSemanticProperty("dfc-b:websitePage", &method("websites")).valueSetter = method("websites=")
+		registerSemanticProperty("dfc-b:hasSocialMedia", &method("socialMedias")).valueSetter = method("socialMedias=")
 	end
 	
 

data/lib/datafoodconsortium/connector/allergen_characteristic.rb

@@ -20,14 +20,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 require "datafoodconsortium/connector/characteristic"
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::AllergenCharacteristic < DataFoodConsortium::Connector::Characteristic
 
-	
+    SEMANTIC_TYPE = "dfc-b:AllergenCharacteristic".freeze
 
 	# @return [ISKOSConcept]
 	attr_accessor :allergenDimension
@@ -39,7 +39,7 @@ class DataFoodConsortium::Connector::AllergenCharacteristic < DataFoodConsortium
 		super(unit: unit, value: value)
 		@allergenDimension = allergenDimension
 		self.semanticType = "dfc-b:AllergenCharacteristic"
-		registerSemanticProperty("dfc-b:hasAllergenDimension") { self.allergenDimension }
+		registerSemanticProperty("dfc-b:hasAllergenDimension", &method("allergenDimension")).valueSetter = method("allergenDimension=")
 	end
 	
 

data/lib/datafoodconsortium/connector/catalog.rb

@@ -27,8 +27,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Catalog
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:Catalog".freeze
 
 	# @return [ICatalogItem]
 	attr_accessor :items
@@ -44,8 +45,8 @@ class DataFoodConsortium::Connector::Catalog
 		@items = items
 		@maintainers = maintainers
 		self.semanticType = "dfc-b:Catalog"
-		registerSemanticProperty("dfc-b:lists") { self.items }
-		registerSemanticProperty("dfc-b:maintainedBy") { self.maintainers }
+		registerSemanticProperty("dfc-b:lists", &method("items")).valueSetter = method("items=")
+		registerSemanticProperty("dfc-b:maintainedBy", &method("maintainers")).valueSetter = method("maintainers=")
 	end
 	
 

data/lib/datafoodconsortium/connector/catalog_item.rb

@@ -27,8 +27,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::CatalogItem
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:CatalogItem".freeze
 
 	# @return [IDefinedProduct]
 	attr_accessor :product
@@ -59,11 +60,11 @@ class DataFoodConsortium::Connector::CatalogItem
 		@offers = offers
 		@catalogs = catalogs
 		self.semanticType = "dfc-b:CatalogItem"
-		registerSemanticProperty("dfc-b:references") { self.product }
-		registerSemanticProperty("dfc-b:sku") { self.sku }
-		registerSemanticProperty("dfc-b:stockLimitation") { self.stockLimitation }
-		registerSemanticProperty("dfc-b:offeredThrough") { self.offers }
-		registerSemanticProperty("dfc-b:listedIn") { self.catalogs }
+		registerSemanticProperty("dfc-b:references", &method("product")).valueSetter = method("product=")
+		registerSemanticProperty("dfc-b:sku", &method("sku")).valueSetter = method("sku=")
+		registerSemanticProperty("dfc-b:stockLimitation", &method("stockLimitation")).valueSetter = method("stockLimitation=")
+		registerSemanticProperty("dfc-b:offeredThrough", &method("offers")).valueSetter = method("offers=")
+		registerSemanticProperty("dfc-b:listedIn", &method("catalogs")).valueSetter = method("catalogs=")
 	end
 	
 

data/lib/datafoodconsortium/connector/characteristic.rb

@@ -21,14 +21,12 @@
 # SOFTWARE.
 
 
-require "datafoodconsortium/connector/quantitative_value"
 
+require "datafoodconsortium/connector/quantitative_value"
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Characteristic < DataFoodConsortium::Connector::QuantitativeValue
 
-	
-
 
 	# @param unit [ISKOSConcept]
 	# @param value [Real]

data/lib/datafoodconsortium/connector/connector.rb

@@ -21,6 +21,8 @@
 # SOFTWARE.
 
 require 'singleton'
+require 'datafoodconsortium/connector/context'
+require 'datafoodconsortium/connector/importer'
 require 'datafoodconsortium/connector/json_ld_serializer'
 
 class DataFoodConsortium::Connector::Connector
@@ -37,6 +39,10 @@ class DataFoodConsortium::Connector::Connector
         return @exporter.process(subject, *subjects)
     end
 
+    def import(json_string_or_io)
+        DataFoodConsortium::Connector::Importer.new.import(json_string_or_io)
+    end
+
     def loadFacets(data)
         @FACETS = loadThesaurus(data)
     end
@@ -57,14 +63,7 @@ class DataFoodConsortium::Connector::Connector
         # used to prefix properties
         # so the DFC's context can be used.
         # See https://github.com/datafoodconsortium/connector-ruby/issues/11.
-        inputContext = {
-            "dfc-b" => "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#",
-            "dfc-p" => "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_ProductGlossary.owl#",
-            "dfc-t" => "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_TechnicalOntology.owl#",
-            "dfc-m" => "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/measures.rdf#",
-		    "dfc-pt" => "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#",
-		    "dfc-f" => "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/facets.rdf#"
-        }
+        inputContext = DataFoodConsortium::Connector::Context.inputContext
 
         @context = "https://www.datafoodconsortium.org"
 
@@ -77,7 +76,9 @@ class DataFoodConsortium::Connector::Connector
     end
     
     def loadThesaurus(data)
-        return @parser.parse(data[0]["@graph"])
+        # The root element may be an array or the ontology.
+        data = data[0] if data.is_a?(Array)
+        @parser.parse(data["@graph"])
     end
     
 end

data/lib/datafoodconsortium/connector/context.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'json/ld'
+
+# Preload the DFC context.
+#
+# Similar to: https://github.com/ruby-rdf/json-ld-preloaded/
+module DataFoodConsortium
+  module Connector
+    class Context < JSON::LD::Context
+      VERSION_1_8 = JSON.parse <<~JSON
+        {
+          "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+          "skos" : "http://www.w3.org/2004/02/skos/core#",
+          "dfc": "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_FullModel.owl#",
+          "dc": "http://purl.org/dc/elements/1.1/#",
+          "dfc-b": "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_BusinessOntology.owl#",
+          "dfc-p": "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_ProductGlossary.owl#",
+          "dfc-t": "https://github.com/datafoodconsortium/ontology/releases/latest/download/DFC_TechnicalOntology.owl#",
+          "dfc-m": "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/measures.rdf#",
+          "dfc-pt": "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/productTypes.rdf#",
+          "dfc-f": "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/facets.rdf#",
+          "ontosec": "http://www.semanticweb.org/ontologies/2008/11/OntologySecurity.owl#",
+          "dfc-p:hasUnit":{ "@type":"@id" },
+          "dfc-b:hasUnit":{ "@type":"@id" },
+          "dfc-b:hasQuantity":{ "@type":"@id" },
+          "dfc-p:hasType":{ "@type":"@id" },
+          "dfc-b:hasType":{ "@type":"@id" },
+          "dfc-b:references":{ "@type":"@id" },
+          "dfc-b:referencedBy":{ "@type":"@id" },
+          "dfc-b:offeres":{ "@type":"@id" },
+          "dfc-b:supplies":{ "@type":"@id" },
+          "dfc-b:defines":{ "@type":"@id" },
+          "dfc-b:affiliates":{ "@type":"@id" },
+          "dfc-b:hasCertification":{ "@type":"@id" },
+          "dfc-b:manages":{ "@type":"@id" },
+          "dfc-b:offeredThrough":{ "@type":"@id" },
+          "dfc-b:hasBrand":{ "@type":"@id" },
+          "dfc-b:hasGeographicalOrigin":{ "@type":"@id" },
+          "dfc-b:hasClaim":{ "@type":"@id" },
+          "dfc-b:hasAllergenDimension":{ "@type":"@id" },
+          "dfc-b:hasNutrientDimension":{ "@type":"@id" },
+          "dfc-b:hasPhysicalDimension":{ "@type":"@id" },
+          "dfc:owner":{ "@type":"@id" },
+          "dfc-t:hostedBy":{ "@type":"@id" },
+          "dfc-t:hasPivot":{ "@type":"@id" },
+          "dfc-t:represent":{ "@type":"@id" }
+        }
+      JSON
+
+      add_preloaded("http://www.datafoodconsortium.org/") { parse(VERSION_1_8) }
+
+      # This is the actual file the DFC website refers to in a link header.
+      alias_preloaded(
+        "https://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context.jsonld",
+        "http://www.datafoodconsortium.org/"
+      )
+
+      # This is the old URL that's not online anymore.
+      # Keep it for compatiblity with all versions before 1.8.
+      alias_preloaded(
+        "http://static.datafoodconsortium.org/ontologies/context.json",
+        "http://www.datafoodconsortium.org/"
+      )
+
+      # The hash serializer expects only string values in the context.
+      def self.inputContext
+        @inputContext = VERSION_1_8.select { |key, value| value.is_a? String }
+      end
+    end
+  end
+end

data/lib/datafoodconsortium/connector/customer_category.rb

@@ -24,8 +24,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::CustomerCategory
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:CustomerCategory".freeze
 
 	# @return [String]
 	attr_accessor :description
@@ -36,7 +37,7 @@ class DataFoodConsortium::Connector::CustomerCategory
 		super(semanticId)
 		@description = description
 		self.semanticType = "dfc-b:CustomerCategory"
-		registerSemanticProperty("dfc-b:description") { self.description }
+		registerSemanticProperty("dfc-b:description", &method("description")).valueSetter = method("description=")
 	end
 	
 

data/lib/datafoodconsortium/connector/defined_product.rb

@@ -30,8 +30,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::DefinedProduct
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:DefinedProduct".freeze
 
 	# @return [String]
 	attr_accessor :name
@@ -117,22 +118,22 @@ class DataFoodConsortium::Connector::DefinedProduct
 		@natureOrigin = natureOrigin
 		@partOrigin = partOrigin
 		self.semanticType = "dfc-b:DefinedProduct"
-		registerSemanticProperty("dfc-b:name") { self.name }
-		registerSemanticProperty("dfc-b:description") { self.description }
-		registerSemanticProperty("dfc-b:hasType") { self.productType }
-		registerSemanticProperty("dfc-b:hasQuantity") { self.quantity }
-		registerSemanticProperty("dfc-b:alcoholPercentage") { self.alcoholPercentage }
-		registerSemanticProperty("dfc-b:lifetime") { self.lifetime }
-		registerSemanticProperty("dfc-b:hasClaim") { self.claims }
-		registerSemanticProperty("dfc-b:usageOrStorageCondition") { self.usageOrStorageConditions }
-		registerSemanticProperty("dfc-b:hasAllergenCharacteristic") { self.allergenCharacteristics }
-		registerSemanticProperty("dfc-b:hasNutrientCharacteristic") { self.nutrientCharacteristics }
-		registerSemanticProperty("dfc-b:hasPhysicalCharacteristic") { self.physicalCharacteristics }
-		registerSemanticProperty("dfc-b:hasGeographicalOrigin") { self.geographicalOrigin }
-		registerSemanticProperty("dfc-b:referencedBy") { self.catalogItems }
-		registerSemanticProperty("dfc-b:hasCertification") { self.certifications }
-		registerSemanticProperty("dfc-b:hasNatureOrigin") { self.natureOrigin }
-		registerSemanticProperty("dfc-b:hasPartOrigin") { self.partOrigin }
+		registerSemanticProperty("dfc-b:name", &method("name")).valueSetter = method("name=")
+		registerSemanticProperty("dfc-b:description", &method("description")).valueSetter = method("description=")
+		registerSemanticProperty("dfc-b:hasType", &method("productType")).valueSetter = method("productType=")
+		registerSemanticProperty("dfc-b:hasQuantity", &method("quantity")).valueSetter = method("quantity=")
+		registerSemanticProperty("dfc-b:alcoholPercentage", &method("alcoholPercentage")).valueSetter = method("alcoholPercentage=")
+		registerSemanticProperty("dfc-b:lifetime", &method("lifetime")).valueSetter = method("lifetime=")
+		registerSemanticProperty("dfc-b:hasClaim", &method("claims")).valueSetter = method("claims=")
+		registerSemanticProperty("dfc-b:usageOrStorageCondition", &method("usageOrStorageConditions")).valueSetter = method("usageOrStorageConditions=")
+		registerSemanticProperty("dfc-b:hasAllergenCharacteristic", &method("allergenCharacteristics")).valueSetter = method("allergenCharacteristics=")
+		registerSemanticProperty("dfc-b:hasNutrientCharacteristic", &method("nutrientCharacteristics")).valueSetter = method("nutrientCharacteristics=")
+		registerSemanticProperty("dfc-b:hasPhysicalCharacteristic", &method("physicalCharacteristics")).valueSetter = method("physicalCharacteristics=")
+		registerSemanticProperty("dfc-b:hasGeographicalOrigin", &method("geographicalOrigin")).valueSetter = method("geographicalOrigin=")
+		registerSemanticProperty("dfc-b:referencedBy", &method("catalogItems")).valueSetter = method("catalogItems=")
+		registerSemanticProperty("dfc-b:hasCertification", &method("certifications")).valueSetter = method("certifications=")
+		registerSemanticProperty("dfc-b:hasNatureOrigin", &method("natureOrigin")).valueSetter = method("natureOrigin=")
+		registerSemanticProperty("dfc-b:hasPartOrigin", &method("partOrigin")).valueSetter = method("partOrigin=")
 	end
 	
 

data/lib/datafoodconsortium/connector/enterprise.rb

@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 require "datafoodconsortium/connector/agent"
 
 
@@ -31,11 +30,12 @@ require "datafoodconsortium/connector/agent"
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Enterprise < DataFoodConsortium::Connector::Agent
 
-	
+    SEMANTIC_TYPE = "dfc-b:Enterprise".freeze
 
 	# @return [String]
 	attr_accessor :name
@@ -91,15 +91,15 @@ class DataFoodConsortium::Connector::Enterprise < DataFoodConsortium::Connector:
 		@technicalProducts = technicalProducts
 		@mainContact = mainContact
 		self.semanticType = "dfc-b:Enterprise"
-		registerSemanticProperty("dfc-b:name") { self.name }
-		registerSemanticProperty("dfc-b:hasDescription") { self.description }
-		registerSemanticProperty("dfc-b:VATnumber") { self.vatNumber }
-		registerSemanticProperty("dfc-b:defines") { self.customerCategories }
-		registerSemanticProperty("dfc-b:maintains") { self.catalogs }
-		registerSemanticProperty("dfc-b:manages") { self.catalogItems }
-		registerSemanticProperty("dfc-b:supplies") { self.suppliedProducts }
-		registerSemanticProperty("dfc-b:proposes") { self.technicalProducts }
-		registerSemanticProperty("dfc-b:hasMainContact") { self.mainContact }
+		registerSemanticProperty("dfc-b:name", &method("name")).valueSetter = method("name=")
+		registerSemanticProperty("dfc-b:hasDescription", &method("description")).valueSetter = method("description=")
+		registerSemanticProperty("dfc-b:VATnumber", &method("vatNumber")).valueSetter = method("vatNumber=")
+		registerSemanticProperty("dfc-b:defines", &method("customerCategories")).valueSetter = method("customerCategories=")
+		registerSemanticProperty("dfc-b:maintains", &method("catalogs")).valueSetter = method("catalogs=")
+		registerSemanticProperty("dfc-b:manages", &method("catalogItems")).valueSetter = method("catalogItems=")
+		registerSemanticProperty("dfc-b:supplies", &method("suppliedProducts")).valueSetter = method("suppliedProducts=")
+		registerSemanticProperty("dfc-b:proposes", &method("technicalProducts")).valueSetter = method("technicalProducts=")
+		registerSemanticProperty("dfc-b:hasMainContact", &method("mainContact")).valueSetter = method("mainContact=")
 	end
 	
 

data/lib/datafoodconsortium/connector/importer.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require_relative "skos_parser"
+
+module DataFoodConsortium
+  module Connector
+    class Importer
+      def self.type_map
+        unless @type_map
+          @type_map = {}
+          DataFoodConsortium::Connector.semantic_types.each do |type|
+            register_type(type)
+          end
+        end
+
+        @type_map
+      end
+
+      def self.register_type(clazz)
+        type_map[clazz::SEMANTIC_TYPE] = clazz
+      end
+
+      def self.prefixed_name(uri)
+        RDF::URI.new(uri).pname(prefixes: Context::VERSION_1_8)
+      end
+
+      def import(json_string_or_io)
+        @subjects = {}
+
+        graph = parse_rdf(json_string_or_io)
+        build_subjects(graph)
+        apply_statements(graph)
+
+        if @subjects.size > 1
+          @subjects.values
+        else
+          @subjects.values.first
+        end
+      end
+
+      private
+
+      # The `io` parameter can be a String or an IO instance.
+      def parse_rdf(io)
+        io = StringIO.new(io) if io.is_a?(String)
+        RDF::Graph.new << JSON::LD::API.toRdf(io)
+      end
+
+      def build_subjects(graph)
+        graph.query({ predicate: RDF.type }).each do |statement|
+          @subjects[statement.subject] = build_subject(statement)
+        end
+      end
+
+      def build_subject(type_statement)
+        # Not all subjects have an id, some are anonymous.
+        id = if type_statement.subject.respond_to?(:value)
+               type_statement.subject.value
+             end
+        type = type_statement.object.value
+        key = self.class.prefixed_name(type)
+        clazz = self.class.type_map[key]
+
+        clazz.new(*[id].compact)
+      end
+
+      def apply_statements(statements)
+        statements.each do |statement|
+          apply_statement(statement)
+        end
+      end
+
+      def apply_statement(statement)
+        subject = subject_of(statement)
+        property_uri = statement.predicate.value
+        value = resolve_object(statement.object)
+
+        property_id = self.class.prefixed_name(property_uri)
+
+        return unless subject.hasSemanticProperty?(property_id)
+
+        property = subject.semanticProperty(property_id)
+
+        if property.value.is_a?(Enumerable)
+          property.value << value
+        else
+          property.value = value
+        end
+      end
+
+      def subject_of(statement)
+        @subjects[statement.subject]
+      end
+
+      def resolve_object(object)
+        @subjects[object] || skos_concept(object) || object.object
+      end
+
+      def skos_concept(object)
+        return unless object.uri?
+
+        id = object.value.sub(
+          "http://static.datafoodconsortium.org/data/measures.rdf#", "dfc-m:"
+        ).sub(
+          "https://github.com/datafoodconsortium/taxonomies/releases/latest/download/measures.rdf#",
+          "dfc-m:"
+        )
+        SKOSParser.concepts[id]
+      end
+    end
+  end
+end

data/lib/datafoodconsortium/connector/json_ld_serializer.rb

@@ -30,27 +30,20 @@ class DataFoodConsortium::Connector::JsonLdSerializer
         @hashSerializer = VirtualAssembly::Semantizer::HashSerializer.new(inputContext)
     end
 
-    def process(subject, *subjects)
-        subjects.insert(0, subject)
+    def process(*subjects)
+        return "" if subjects.empty?
 
-        if (subjects.empty?)
-            return ""
-        end
-
-        inputs = []
-        
         # Insert an input context on each subject so the properties could be prefixed. This way,
         # the DFC's context can be used.
         # See https://github.com/datafoodconsortium/connector-ruby/issues/11.
-        subjects.each do |subject|
-            input = { "@context" => "https://www.datafoodconsortium.org" }
-            input.merge!(subject.serialize(@hashSerializer))
-            inputs.push(input)
+        inputs = subjects.map do |subject|
+          # JSON::LD needs a context on every input using prefixes.
+          subject.serialize(@hashSerializer).merge("@context" => @outputContext)
         end
 
         jsonLd = JSON::LD::API.compact(inputs, @outputContext)
 
-        return JSON.generate(jsonLd)
+        JSON.generate(jsonLd)
     end
 
-end
+end

data/lib/datafoodconsortium/connector/nutrient_characteristic.rb

@@ -27,7 +27,7 @@ require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::NutrientCharacteristic < DataFoodConsortium::Connector::Characteristic
 
-	
+    SEMANTIC_TYPE = "dfc-b:NutrientCharacteristic".freeze
 
 	# @return [ISKOSConcept]
 	attr_accessor :nutrientDimension
@@ -39,7 +39,7 @@ class DataFoodConsortium::Connector::NutrientCharacteristic < DataFoodConsortium
 		super(unit: unit, value: value)
 		@nutrientDimension = nutrientDimension
 		self.semanticType = "dfc-b:NutrientCharacteristic"
-		registerSemanticProperty("dfc-b:hasNutrientDimension") { self.nutrientDimension }
+		registerSemanticProperty("dfc-b:hasNutrientDimension", &method("nutrientDimension")).valueSetter = method("nutrientDimension=")
 	end
 	
 

data/lib/datafoodconsortium/connector/offer.rb

@@ -27,8 +27,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Offer
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:Offer".freeze
 
 	# @return [IPrice]
 	attr_accessor :price
@@ -54,10 +55,10 @@ class DataFoodConsortium::Connector::Offer
 		@offeredItem = offeredItem
 		@offeredTo = offeredTo
 		self.semanticType = "dfc-b:Offer"
-		registerSemanticProperty("dfc-b:hasPrice") { self.price }
-		registerSemanticProperty("dfc-b:stockLimitation") { self.stockLimitation }
-		registerSemanticProperty("dfc-b:offeredItem") { self.offeredItem }
-		registerSemanticProperty("dfc-b:offeredTo") { self.offeredTo }
+		registerSemanticProperty("dfc-b:hasPrice", &method("price")).valueSetter = method("price=")
+		registerSemanticProperty("dfc-b:stockLimitation", &method("stockLimitation")).valueSetter = method("stockLimitation=")
+		registerSemanticProperty("dfc-b:offeredItem", &method("offeredItem")).valueSetter = method("offeredItem=")
+		registerSemanticProperty("dfc-b:offeredTo", &method("offeredTo")).valueSetter = method("offeredTo=")
 	end
 	
 

data/lib/datafoodconsortium/connector/order.rb

@@ -27,8 +27,9 @@
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Order
+    include VirtualAssembly::Semantizer::SemanticObject
 
-	include VirtualAssembly::Semantizer::SemanticObject
+    SEMANTIC_TYPE = "dfc-b:Order".freeze
 
 	# @return [String]
 	attr_accessor :number
@@ -59,11 +60,11 @@ class DataFoodConsortium::Connector::Order
 		@lines = lines
 		@client = client
 		self.semanticType = "dfc-b:Order"
-		registerSemanticProperty("dfc-b:orderNumber") { self.number }
-		registerSemanticProperty("dfc-b:date") { self.date }
-		registerSemanticProperty("dfc-b:belongsTo") { self.saleSession }
-		registerSemanticProperty("dfc-b:hasPart") { self.lines }
-		registerSemanticProperty("dfc-b:orderedBy") { self.client }
+		registerSemanticProperty("dfc-b:orderNumber", &method("number")).valueSetter = method("number=")
+		registerSemanticProperty("dfc-b:date", &method("date")).valueSetter = method("date=")
+		registerSemanticProperty("dfc-b:belongsTo", &method("saleSession")).valueSetter = method("saleSession=")
+		registerSemanticProperty("dfc-b:hasPart", &method("lines")).valueSetter = method("lines=")
+		registerSemanticProperty("dfc-b:orderedBy", &method("client")).valueSetter = method("client=")
 	end