datafoodconsortium-connector 2.0.0.pre.beta5 → 2.0.0.pre.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c22f2894c689b3fe1f5a3f3e6f74bdc3eb2bb3ebf8de0220c97c46d86d3c5c
-  data.tar.gz: 847ff1c84d90ae01263437f505261196634db0a9a2730c70029b990e38715944
+  metadata.gz: 6f5b061c92d1587c70f6e3dc657a1537d2bc96adfb4a8d92db56a5c07d1de812
+  data.tar.gz: '0728e0d48e9a2b891328e7407423874c59b2435b95abc163fafe44a78657036b'
 SHA512:
-  metadata.gz: 8f89e5399acab529e422fec75e3ab695ba268362dee20b9e033599c91919f97d9984d611c3de20a35b12dc65143aca5ed60a3c3cdb74a7a326076c522641c2e5
-  data.tar.gz: 1b7862a04bd52c519c0c743ccc0cdd4d3f49d956943d751089cffd38a6fca3523ed11995af4a2440a924ef2da7dfbbafbaa330eab41bebe0111ea756d3ce6489
+  metadata.gz: 3c4c69ff07e1d4e0d084c4f7d41b5371c41a6486284eb4cae1c409fef7b5224523f3802fa42ff89d578f2a0dbc8b385e087ecafc163ad81c9c1b23d4bdb19344
+  data.tar.gz: 230b2682c15c487c17929b0efc5432df25bbd7197d3210d0196b74d03c3473d8dba5fa0414e24cf504142ae7ceee1edbbbb4a04da8761c56af9faa5e1d1aaf56

data/lib/datafoodconsortium/connector/connector.rb

@@ -35,8 +35,8 @@ module DataFoodConsortium::Connector
     attr_reader :MEASURES
     attr_reader :PRODUCT_TYPES
 
-    def export(subject, *subjects)
-        return @exporter.process(subject, *subjects)
+    def export(*subjects)
+        @exporter.process(*subjects)
     end
 
     def import(json_string_or_io)

data/lib/datafoodconsortium/connector/context.rb

@@ -8,24 +8,34 @@ module DataFoodConsortium
     #
     # Similar to: https://github.com/ruby-rdf/json-ld-preloaded/
     class Context < JSON::LD::Context
-      URL = "https://www.datafoodconsortium.org"
+      URL = "https://w3id.org/dfc/ontology/context/context_2.0.0.json"
+      URL_NORMALISED = "http://w3id.org/dfc/ontology/context/context_2.0.0.json"
 
-      add_preloaded("http://www.datafoodconsortium.org/") { parse(json) }
+       # All context URIs have to use http because https is normalised to http
+      # during the lookup of preloaded contexts.
+      # And if the URI doesn't have a path, it must end with `/`.
+      add_preloaded(URL_NORMALISED) { parse(json) }
+
+      # The default context always pointing to the latest version:
+      alias_preloaded("http://www.datafoodconsortium.org/", URL_NORMALISED)
 
       # This is the current file the DFC website refers to in a link header.
       alias_preloaded(
-        "https://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context_2.0.0.jsonld",
-        "http://www.datafoodconsortium.org/"
+        "http://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context_2.0.0.jsonld",
+        URL_NORMALISED
       )
 
+      # This was the file the DFC website refers to in a link header.
       alias_preloaded(
-        "https://w3id.org/dfc/ontology/context/context_2.0.0.json",
-        "http://www.datafoodconsortium.org/"
+        "http://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context_2.0.0.jsonld",
+        URL_NORMALISED
       )
 
+      # This is the old URL that's not online anymore.
+      # Keep it for compatiblity with all versions before 1.8.
       alias_preloaded(
-        "https://cdn.jsdelivr.net/gh/datafoodconsortium/ontology/context/context_2.0.0.json",
-        "http://www.datafoodconsortium.org/"
+        "http://static.datafoodconsortium.org/ontologies/context.json",
+        URL_NORMALISED
       )
 
       # The hash serializer expects only string values in the context.

data/lib/datafoodconsortium/connector/json_ld_serializer.rb

@@ -31,8 +31,6 @@ class DataFoodConsortium::Connector::JsonLdSerializer
     end
 
     def process(*subjects)
-        return "" if subjects.empty?
-
         # 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.

data/lib/datafoodconsortium/connector/localized_product.rb

@@ -49,7 +49,7 @@ class DataFoodConsortium::Connector::LocalizedProduct
 	# @return [Real]
 	attr_accessor :cost
 
-	# @return [Real]
+	# @return [ITheoreticalStock]
 	attr_accessor :theoreticalStocks
 
 	# @return [ISuppliedProduct]
@@ -70,7 +70,7 @@ class DataFoodConsortium::Connector::LocalizedProduct
 	# @param images [String]
 	# @param quantity [IQuantity]
 	# @param cost [Real]
-	# @param theoreticalStocks [Real]
+	# @param theoreticalStocks [ITheoreticalStock]
 	# @param suppliedProducts [ISuppliedProduct]
 	# @param physicalProducts [IPhysicalProduct]
 	# @param plannedLocalProductionFlows [IPlannedLocalProductionFlow]

data/lib/datafoodconsortium/connector/organization.rb

@@ -33,6 +33,7 @@ require "datafoodconsortium/connector/agent"
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Organization < DataFoodConsortium::Connector::Agent
@@ -72,6 +73,9 @@ class DataFoodConsortium::Connector::Organization < DataFoodConsortium::Connecto
 	# @return [ICertification]
 	attr_accessor :certifications
 
+	# @return [IPerson]
+	attr_accessor :affiliates
+
 	# @param semanticId [String]
 	# @param name [String]
 	# @param description [String]
@@ -84,6 +88,7 @@ class DataFoodConsortium::Connector::Organization < DataFoodConsortium::Connecto
 	# @param mainContact [IPerson]
 	# @param templateSaleSessions [ITemplateSaleSession]
 	# @param certifications [ICertification]
+	# @param affiliates [IPerson]
 	# @param localizations [IAddress]
 	# @param phoneNumbers [IPhoneNumber]
 	# @param emails [String]
@@ -91,7 +96,7 @@ class DataFoodConsortium::Connector::Organization < DataFoodConsortium::Connecto
 	# @param socialMedias [ISocialMedia]
 	# @param logo [String]
 	# @param customerCategoriesMembership [ICustomerCategory]
-	def initialize(semanticId, name: nil, description: nil, vatNumber: nil, customerCategories: [], catalogs: [], catalogItems: [], suppliedProducts: [], technicalProducts: [], mainContact: nil, templateSaleSessions: [], certifications: [], localizations: [], phoneNumbers: [], emails: [], websites: [], socialMedias: [], logo: nil, customerCategoriesMembership: [])
+	def initialize(semanticId, name: nil, description: nil, vatNumber: nil, customerCategories: [], catalogs: [], catalogItems: [], suppliedProducts: [], technicalProducts: [], mainContact: nil, templateSaleSessions: [], certifications: [], affiliates: [], localizations: [], phoneNumbers: [], emails: [], websites: [], socialMedias: [], logo: nil, customerCategoriesMembership: [])
 		super(semanticId, localizations: localizations, phoneNumbers: phoneNumbers, emails: emails, websites: websites, socialMedias: socialMedias, logo: logo, customerCategoriesMembership: customerCategoriesMembership)
 		@name = name
 		@description = description
@@ -104,6 +109,7 @@ class DataFoodConsortium::Connector::Organization < DataFoodConsortium::Connecto
 		@mainContact = mainContact
 		@templateSaleSessions = templateSaleSessions
 		@certifications = certifications
+		@affiliates = affiliates
 		self.semanticType = "dfc-b:Organization"
 		registerSemanticProperty("dfc-b:name", &method("name")).valueSetter = method("name=")
 		registerSemanticProperty("dfc-b:hasDescription", &method("description")).valueSetter = method("description=")
@@ -116,6 +122,7 @@ class DataFoodConsortium::Connector::Organization < DataFoodConsortium::Connecto
 		registerSemanticProperty("dfc-b:hasMainContact", &method("mainContact")).valueSetter = method("mainContact=")
 		registerSemanticProperty("dfc-b:hasTemplateSaleSession", &method("templateSaleSessions")).valueSetter = method("templateSaleSessions=")
 		registerSemanticProperty("dfc-b:isCertifiedBy", &method("certifications")).valueSetter = method("certifications=")
+		registerSemanticProperty("dfc-b:affiliates", &method("affiliates")).valueSetter = method("affiliates=")
 	end
 	
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datafoodconsortium-connector
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta5
+  version: 2.0.0.pre.beta7
 platform: ruby
 authors:
 - Maxime Lecoq