datafoodconsortium-connector 2.0.0.pre.beta1 → 2.0.0.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e356ba982a9fff2482bb21802f6d899d851224c451212a8d95db595139f7be
-  data.tar.gz: 33e1c188c09cd6b7c859d04ca72f35163020d7ea63768a06acc4a067d06dbe70
+  metadata.gz: 581bae0586ebf6cf9dcb504c10bfaa0fbd1155fa8bb1d1330aba42f8f91337b2
+  data.tar.gz: 223421816663630ea42b0a65f6ea57497fd610f1fafea13a851fb619238d35e3
 SHA512:
-  metadata.gz: b1556596e524f6f8dd613142c91f5ec9416de7465f331be9588ee15b9aebb181fd9540d4fd78344133968b72bdc9307664a5759a65b0184949a098ee8a9795d5
-  data.tar.gz: 164ee84cd9f475081b94768da6321cb563b5e1ddf596ab84885dfa48adffa405caa1e45020b063fc290084acb3dff79e70b9612a8caf36c336ff34371a64bf46
+  metadata.gz: d5398d680c53a8ad2c62bd660e62c9f546fa7b0687db45da10d560cece279bfb02d15d518ef3c26c500c1bd3f2161aead2d715086a362616d62606a1d6ed6353
+  data.tar.gz: e638609b3097af42efc693f241712b91619152fa67ef59ce8863ec1085b54e847c97f4e3518a051d91be044b614584e64b2013080f0bfa0cf9730f227588e856

data/lib/datafoodconsortium/connector/agent.rb

@@ -22,6 +22,7 @@
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Agent

data/lib/datafoodconsortium/connector/catalog.rb

@@ -35,7 +35,7 @@ class DataFoodConsortium::Connector::Catalog
 	# @return [ICatalogItem]
 	attr_accessor :items
 
-	# @return [IEnterprise]
+	# @return [IOrganization]
 	attr_accessor :maintainers
 
 	# @return [DateTime]
@@ -46,7 +46,7 @@ class DataFoodConsortium::Connector::Catalog
 
 	# @param semanticId [String]
 	# @param items [ICatalogItem]
-	# @param maintainers [IEnterprise]
+	# @param maintainers [IOrganization]
 	# @param beginDate [DateTime]
 	# @param endDate [DateTime]
 	def initialize(semanticId, items: [], maintainers: [], beginDate: nil, endDate: nil)

data/lib/datafoodconsortium/connector/context.rb

@@ -18,16 +18,13 @@ module DataFoodConsortium
         "http://www.datafoodconsortium.org/"
       )
 
-      # This was the file the DFC website refers to in a link header.
       alias_preloaded(
-        "https://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context.jsonld",
+        "https://w3id.org/dfc/ontology/context/context_2.0.0.json",
         "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",
+        "https://cdn.jsdelivr.net/gh/datafoodconsortium/ontology/context/context_2.0.0.json",
         "http://www.datafoodconsortium.org/"
       )
 

data/lib/datafoodconsortium/connector/order.rb

@@ -24,6 +24,7 @@
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Order
@@ -58,6 +59,9 @@ class DataFoodConsortium::Connector::Order
 	# @return [ISKOSConcept]
 	attr_accessor :paymentStatus
 
+	# @return [IPaymentMethod]
+	attr_accessor :paymentMethod
+
 	# @param semanticId [String]
 	# @param number [String]
 	# @param date [String]
@@ -68,7 +72,8 @@ class DataFoodConsortium::Connector::Order
 	# @param fulfilmentStatus [ISKOSConcept]
 	# @param orderStatus [ISKOSConcept]
 	# @param paymentStatus [ISKOSConcept]
-	def initialize(semanticId, number: nil, date: nil, saleSession: nil, lines: [], client: nil, soldBy: nil, fulfilmentStatus: nil, orderStatus: nil, paymentStatus: nil)
+	# @param paymentMethod [IPaymentMethod]
+	def initialize(semanticId, number: nil, date: nil, saleSession: nil, lines: [], client: nil, soldBy: nil, fulfilmentStatus: nil, orderStatus: nil, paymentStatus: nil, paymentMethod: nil)
 		super(semanticId)
 		@number = number
 		@date = date
@@ -79,6 +84,7 @@ class DataFoodConsortium::Connector::Order
 		@fulfilmentStatus = fulfilmentStatus
 		@orderStatus = orderStatus
 		@paymentStatus = paymentStatus
+		@paymentMethod = paymentMethod
 		self.semanticType = "dfc-b:Order"
 		registerSemanticProperty("dfc-b:orderNumber", &method("number")).valueSetter = method("number=")
 		registerSemanticProperty("dfc-b:date", &method("date")).valueSetter = method("date=")
@@ -89,6 +95,7 @@ class DataFoodConsortium::Connector::Order
 		registerSemanticProperty("dfc-b:hasFulfilmentStatus", &method("fulfilmentStatus")).valueSetter = method("fulfilmentStatus=")
 		registerSemanticProperty("dfc-b:hasOrderStatus", &method("orderStatus")).valueSetter = method("orderStatus=")
 		registerSemanticProperty("dfc-b:hasPaymentStatus", &method("paymentStatus")).valueSetter = method("paymentStatus=")
+		registerSemanticProperty("dfc-b:hasPaymentMethod", &method("paymentMethod")).valueSetter = method("paymentMethod=")
 	end
 	
 

data/lib/datafoodconsortium/connector/person.rb

@@ -37,13 +37,13 @@ class DataFoodConsortium::Connector::Person < DataFoodConsortium::Connector::Age
 	# @return [String]
 	attr_accessor :lastName
 
-	# @return [IEnterprise]
+	# @return [IOrganization]
 	attr_accessor :affiliatedOrganizations
 
 	# @param semanticId [String]
 	# @param firstName [String]
 	# @param lastName [String]
-	# @param affiliatedOrganizations [IEnterprise]
+	# @param affiliatedOrganizations [IOrganization]
 	# @param localizations [IAddress]
 	# @param phoneNumbers [IPhoneNumber]
 	# @param emails [String]

data/lib/datafoodconsortium/connector/physical_place.rb

@@ -46,10 +46,10 @@ class DataFoodConsortium::Connector::PhysicalPlace
 	attr_accessor :openingHours
 
 	# @return [IAddress]
-	attr_accessor :addresses
+	attr_accessor :address
 
 	# @return [IPerson]
-	attr_accessor :mainContact
+	attr_accessor :mainContacts
 
 	# @return [ITheoreticalStock]
 	attr_accessor :theoreticalStocks
@@ -66,20 +66,20 @@ class DataFoodConsortium::Connector::PhysicalPlace
 	# @param hostedSaleSessions [ISaleSession]
 	# @param phoneNumbers [IPhoneNumber]
 	# @param openingHours [IOpeningHoursSpecification]
-	# @param addresses [IAddress]
-	# @param mainContact [IPerson]
+	# @param address [IAddress]
+	# @param mainContacts [IPerson]
 	# @param theoreticalStocks [ITheoreticalStock]
 	# @param realStocks [IRealStock]
 	# @param features [IGeoJsonFeature]
-	def initialize(semanticId, name: nil, description: nil, hostedSaleSessions: [], phoneNumbers: [], openingHours: [], addresses: [], mainContact: nil, theoreticalStocks: [], realStocks: [], features: [])
+	def initialize(semanticId, name: nil, description: nil, hostedSaleSessions: [], phoneNumbers: [], openingHours: [], address: nil, mainContacts: [], theoreticalStocks: [], realStocks: [], features: [])
 		super(semanticId)
 		@name = name
 		@description = description
 		@hostedSaleSessions = hostedSaleSessions
 		@phoneNumbers = phoneNumbers
 		@openingHours = openingHours
-		@addresses = addresses
-		@mainContact = mainContact
+		@address = address
+		@mainContacts = mainContacts
 		@theoreticalStocks = theoreticalStocks
 		@realStocks = realStocks
 		@features = features
@@ -89,8 +89,8 @@ class DataFoodConsortium::Connector::PhysicalPlace
 		registerSemanticProperty("dfc-b:hosts", &method("hostedSaleSessions")).valueSetter = method("hostedSaleSessions=")
 		registerSemanticProperty("dfc-b:hasPhoneNumber", &method("phoneNumbers")).valueSetter = method("phoneNumbers=")
 		registerSemanticProperty("dfc-b:hasOpeningHours", &method("openingHours")).valueSetter = method("openingHours=")
-		registerSemanticProperty("dfc-b:hasAddress", &method("addresses")).valueSetter = method("addresses=")
-		registerSemanticProperty("dfc-b:hasMainContact", &method("mainContact")).valueSetter = method("mainContact=")
+		registerSemanticProperty("dfc-b:hasAddress", &method("address")).valueSetter = method("address=")
+		registerSemanticProperty("dfc-b:hasMainContact", &method("mainContacts")).valueSetter = method("mainContacts=")
 		registerSemanticProperty("dfc-b:localizes", &method("theoreticalStocks")).valueSetter = method("theoreticalStocks=")
 		registerSemanticProperty("dfc-b:stores", &method("realStocks")).valueSetter = method("realStocks=")
 		registerSemanticProperty("dfc-b:hasGeoJsonFeature", &method("features")).valueSetter = method("features=")

data/lib/datafoodconsortium/connector/supplied_product.rb

@@ -30,6 +30,7 @@ require "datafoodconsortium/connector/defined_product"
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::SuppliedProduct < DataFoodConsortium::Connector::DefinedProduct
@@ -39,12 +40,16 @@ class DataFoodConsortium::Connector::SuppliedProduct < DataFoodConsortium::Conne
 	# @return [Real]
 	attr_accessor :totalTheoreticalStock
 
+	# @return [ILocalizedProduct]
+	attr_accessor :localizedProducts
+
 	
 
 	
 
 	# @param semanticId [String]
 	# @param totalTheoreticalStock [Real]
+	# @param localizedProducts [ILocalizedProduct]
 	# @param name [String]
 	# @param description [String]
 	# @param productType [ISKOSConcept]
@@ -64,11 +69,13 @@ class DataFoodConsortium::Connector::SuppliedProduct < DataFoodConsortium::Conne
 	# @param images [String]
 	# @param variants [IDefinedProduct]
 	# @param referenceProductOptions [IProductOption]
-	def initialize(semanticId, totalTheoreticalStock: nil, name: nil, description: nil, productType: nil, quantity: nil, alcoholPercentage: nil, lifetime: nil, claims: [], usageOrStorageConditions: nil, allergenCharacteristics: [], nutrientCharacteristics: [], physicalCharacteristics: [], geographicalOrigin: nil, catalogItems: [], certifications: [], natureOrigin: [], partOrigin: [], images: [], variants: [], referenceProductOptions: [])
+	def initialize(semanticId, totalTheoreticalStock: nil, localizedProducts: [], name: nil, description: nil, productType: nil, quantity: nil, alcoholPercentage: nil, lifetime: nil, claims: [], usageOrStorageConditions: nil, allergenCharacteristics: [], nutrientCharacteristics: [], physicalCharacteristics: [], geographicalOrigin: nil, catalogItems: [], certifications: [], natureOrigin: [], partOrigin: [], images: [], variants: [], referenceProductOptions: [])
 		super(semanticId, name: name, description: description, productType: productType, quantity: quantity, alcoholPercentage: alcoholPercentage, lifetime: lifetime, claims: claims, usageOrStorageConditions: usageOrStorageConditions, allergenCharacteristics: allergenCharacteristics, nutrientCharacteristics: nutrientCharacteristics, physicalCharacteristics: physicalCharacteristics, geographicalOrigin: geographicalOrigin, catalogItems: catalogItems, certifications: certifications, natureOrigin: natureOrigin, partOrigin: partOrigin, images: images, variants: variants, referenceProductOptions: referenceProductOptions)
 		@totalTheoreticalStock = totalTheoreticalStock
+		@localizedProducts = localizedProducts
 		self.semanticType = "dfc-b:SuppliedProduct"
 		registerSemanticProperty("dfc-b:totalTheoreticalStock", &method("totalTheoreticalStock")).valueSetter = method("totalTheoreticalStock=")
+		registerSemanticProperty("dfc-b:referenceOf", &method("localizedProducts")).valueSetter = method("localizedProducts=")
 	end
 	
 

data/lib/datafoodconsortium/connector.rb

@@ -7,7 +7,6 @@ module DataFoodConsortium
 		require 'datafoodconsortium/connector/agent.rb'
 		require 'datafoodconsortium/connector/certification.rb'
 		require 'datafoodconsortium/connector/customer_category.rb'
-		require 'datafoodconsortium/connector/enterprise.rb'
 		require 'datafoodconsortium/connector/organization.rb'
 		require 'datafoodconsortium/connector/person.rb'
 		require 'datafoodconsortium/connector/phone_number.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datafoodconsortium-connector
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta1
+  version: 2.0.0.pre.beta3
 platform: ruby
 authors:
 - Maxime Lecoq
@@ -51,7 +51,6 @@ files:
 - lib/datafoodconsortium/connector/defined_product.rb
 - lib/datafoodconsortium/connector/delivery_option.rb
 - lib/datafoodconsortium/connector/delivery_step.rb
-- lib/datafoodconsortium/connector/enterprise.rb
 - lib/datafoodconsortium/connector/flow.rb
 - lib/datafoodconsortium/connector/importer.rb
 - lib/datafoodconsortium/connector/json_ld_serializer.rb
@@ -70,7 +69,6 @@ files:
 - lib/datafoodconsortium/connector/pickup_option.rb
 - lib/datafoodconsortium/connector/pickup_step.rb
 - lib/datafoodconsortium/connector/planned_consumption_flow.rb
-- lib/datafoodconsortium/connector/planned_flow.rb
 - lib/datafoodconsortium/connector/planned_local_consumption_flow.rb
 - lib/datafoodconsortium/connector/planned_local_production_flow.rb
 - lib/datafoodconsortium/connector/planned_local_transformation.rb

data/lib/datafoodconsortium/connector/enterprise.rb

@@ -1,109 +0,0 @@
-# MIT License
-# 
-# Copyright (c) 2023 Maxime Lecoq <maxime@lecoqlibre.fr>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-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
-
-	# @return [String]
-	attr_accessor :description
-
-	# @return [String]
-	attr_accessor :vatNumber
-
-	# @return [ICustomerCategory]
-	attr_accessor :customerCategories
-
-	# @return [ICatalog]
-	attr_accessor :catalogs
-
-	# @return [ICatalogItem]
-	attr_accessor :catalogItems
-
-	# @return [ISuppliedProduct]
-	attr_accessor :suppliedProducts
-
-	# @return [ITechnicalProduct]
-	attr_accessor :technicalProducts
-
-	# @return [IPerson]
-	attr_accessor :mainContact
-
-	# @param semanticId [String]
-	# @param name [String]
-	# @param description [String]
-	# @param vatNumber [String]
-	# @param customerCategories [ICustomerCategory]
-	# @param catalogs [ICatalog]
-	# @param catalogItems [ICatalogItem]
-	# @param suppliedProducts [ISuppliedProduct]
-	# @param technicalProducts [ITechnicalProduct]
-	# @param mainContact [IPerson]
-	# @param localizations [IAddress]
-	# @param phoneNumbers [IPhoneNumber]
-	# @param emails [String]
-	# @param websites [String]
-	# @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, 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
-		@vatNumber = vatNumber
-		@customerCategories = customerCategories
-		@catalogs = catalogs
-		@catalogItems = catalogItems
-		@suppliedProducts = suppliedProducts
-		@technicalProducts = technicalProducts
-		@mainContact = mainContact
-		self.semanticType = "dfc-b:Enterprise"
-		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
-	
-
-
-end

data/lib/datafoodconsortium/connector/planned_flow.rb

@@ -1,42 +0,0 @@
-# MIT License
-# 
-# Copyright (c) 2023 Maxime Lecoq <maxime@lecoqlibre.fr>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require "datafoodconsortium/connector/flow"
-require "virtual_assembly/semantizer"
-
-class DataFoodConsortium::Connector::PlannedFlow < DataFoodConsortium::Connector::Flow
-
-	# @return [IPlannedTransformation]
-	attr_accessor :transformation
-
-	# @param transformation [IPlannedTransformation]
-	# @param quantity [IQuantity]
-	def initialize(transformation: nil, quantity: nil)
-		super(quantity: quantity)
-		@transformation = transformation
-		
-		registerSemanticProperty("dfc-b:incomeOf", &method("transformation")).valueSetter = method("transformation=")
-	end
-	
-
-
-end