datafoodconsortium-connector-v1 1.4.0.pre.beta5 → 1.4.0.pre.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27438bdd56db9cc8507caa167937a8fbee9606b680a9492bd3a0ac983ad48491
-  data.tar.gz: 9c92288a6c9bc1d45734b38d3e793945ac5c8ce710c59ec9e1a6819164f3e0be
+  metadata.gz: 8dbb736da92bf2f5df51d9052b426ec6ca17ed972dc08aead5be138319fe33bb
+  data.tar.gz: edb49f84b8d22c32803235db0d37b365974d7e0cc2cb4f0e811478a4ae359a09
 SHA512:
-  metadata.gz: cebe1ddaf45b03e656ab5854ec5ff99b62f1f6f2ba78ceaaeeef29c1630d99c73f2b421c6eb2b91e7fbd63153b3eaa58c9e2650b8d4c7f08b9beaf7c2ebce630
-  data.tar.gz: 06311d04ec5662f6cc1e120e208b8e13005b97b029da345123f5d6a3b500de5d35cd0233e27dbbd58ce517a55a6d3f2ace90cc37a41a95da3c82f42cd0c5ee8a
+  metadata.gz: 2531bc7d5f6dd36cb52f033552ed37f13c1b4b909680d22217f1e2e71a1f22d317c15dd7539493ba3dae7c2101f6c836b233b0edfc7c94165444a39c0451d9b4
+  data.tar.gz: acbaa96688dd80a166ae3797e8fe8a63937648e446aabec7c3b6ed57839fc67d91f61883de0dc160247604310ed3b5e0e67c42a8c290cb41ec6f0b26f329c564

data/lib/datafoodconsortium/connector_v1/address.rb

@@ -37,7 +37,7 @@ class DataFoodConsortium::ConnectorV1::Address
 	# @return [String]
 	attr_accessor :city
 
-	# @return [String]
+	# @return [ISKOSConcept]
 	attr_accessor :country
 
 	# @return [Real]
@@ -53,7 +53,7 @@ class DataFoodConsortium::ConnectorV1::Address
 	# @param street [String]
 	# @param postalCode [String]
 	# @param city [String]
-	# @param country [String]
+	# @param country [ISKOSConcept]
 	# @param latitude [Real]
 	# @param longitude [Real]
 	# @param region [String]

data/lib/datafoodconsortium/connector_v1/customer_category.rb

@@ -28,15 +28,21 @@ class DataFoodConsortium::ConnectorV1::CustomerCategory
 
     SEMANTIC_TYPE = "dfc-b:CustomerCategory".freeze
 
+	# @return [String]
+	attr_accessor :name
+
 	# @return [String]
 	attr_accessor :description
 
 	# @param semanticId [String]
+	# @param name [String]
 	# @param description [String]
-	def initialize(semanticId, description: nil)
+	def initialize(semanticId, name: nil, description: nil)
 		super(semanticId)
+		@name = name
 		@description = description
 		self.semanticType = "dfc-b:CustomerCategory"
+		registerSemanticProperty("dfc-b:name", &method("name")).valueSetter = method("name=")
 		registerSemanticProperty("dfc-b:description", &method("description")).valueSetter = method("description=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/{quantity.rb → opening_hours_specification.rb}

@@ -21,29 +21,35 @@
 # SOFTWARE.
 
 
-
 require "virtual_assembly/semantizer"
 
-class DataFoodConsortium::ConnectorV1::Quantity
+class DataFoodConsortium::ConnectorV1::OpeningHoursSpecification
     include VirtualAssembly::Semantizer::SemanticObject
 
-    SEMANTIC_TYPE = "dfc-b:Quantity".freeze
-
-	# @return [ISKOSConcept]
-	attr_accessor :unit
-
-	# @return [Real]
-	attr_accessor :value
-
-	# @param unit [ISKOSConcept]
-	# @param value [Real]
-	def initialize(unit: nil, value: nil)
-		super()
-		@unit = unit
-		@value = value
-		self.semanticType = "dfc-b:Quantity"
-		registerSemanticProperty("dfc-b:hasUnit", &method("unit")).valueSetter = method("unit=")
-		registerSemanticProperty("dfc-b:value", &method("value")).valueSetter = method("value=")
+    SEMANTIC_TYPE = "https://schema.org/OpeningHoursSpecification".freeze
+
+	# @return [String]
+	attr_accessor :dayOfWeek
+
+	# @return [Time]
+	attr_accessor :opens
+
+	# @return [Time]
+	attr_accessor :closes
+
+	# @param semanticId [String]
+	# @param dayOfWeek [String]
+	# @param opens [Time]
+	# @param closes [Time]
+	def initialize(semanticId, dayOfWeek: nil, opens: nil, closes: nil)
+		super(semanticId)
+		@dayOfWeek = dayOfWeek
+		@opens = opens
+		@closes = closes
+		self.semanticType = "https://schema.org/OpeningHoursSpecification"
+		registerSemanticProperty("https://schema.org/dayOfWeek", &method("dayOfWeek")).valueSetter = method("dayOfWeek=")
+		registerSemanticProperty("https://schema.org/opens", &method("opens")).valueSetter = method("opens=")
+		registerSemanticProperty("https://schema.org/closes", &method("closes")).valueSetter = method("closes=")
 	end
 	
 

data/lib/datafoodconsortium/connector_v1/order.rb

@@ -24,6 +24,7 @@
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::ConnectorV1::Order
@@ -58,6 +59,9 @@ class DataFoodConsortium::ConnectorV1::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::ConnectorV1::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::ConnectorV1::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::ConnectorV1::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_v1/physical_place.rb

@@ -45,10 +45,10 @@ class DataFoodConsortium::ConnectorV1::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
@@ -62,19 +62,19 @@ class DataFoodConsortium::ConnectorV1::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]
-	def initialize(semanticId, name: nil, description: nil, hostedSaleSessions: [], phoneNumbers: [], openingHours: [], addresses: [], mainContact: nil, theoreticalStocks: [], realStocks: [])
+	def initialize(semanticId, name: nil, description: nil, hostedSaleSessions: [], phoneNumbers: [], openingHours: [], address: nil, mainContacts: [], theoreticalStocks: [], realStocks: [])
 		super(semanticId)
 		@name = name
 		@description = description
 		@hostedSaleSessions = hostedSaleSessions
 		@phoneNumbers = phoneNumbers
 		@openingHours = openingHours
-		@addresses = addresses
-		@mainContact = mainContact
+		@address = address
+		@mainContacts = mainContacts
 		@theoreticalStocks = theoreticalStocks
 		@realStocks = realStocks
 		self.semanticType = "dfc-b:PhysicalPlace"
@@ -83,8 +83,8 @@ class DataFoodConsortium::ConnectorV1::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=")
 	end

data/lib/datafoodconsortium/connector_v1/planned_consumption_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::ConnectorV1::PlannedConsumptionFlow < DataFoodConsorti
 		@transformation = transformation
 		@product = product
 		self.semanticType = "dfc-b:AsPlannedConsumptionFlow"
-		registerSemanticProperty("dfc-b:incomeOf", &method("transformation")).valueSetter = method("transformation=")
+		registerSemanticProperty("dfc-b:inputOf", &method("transformation")).valueSetter = method("transformation=")
 		registerSemanticProperty("dfc-b:consumes", &method("product")).valueSetter = method("product=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/planned_local_consumption_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::ConnectorV1::PlannedLocalConsumptionFlow < DataFoodCon
 		@transformation = transformation
 		@product = product
 		self.semanticType = "dfc-b:AsPlannedLocalConsumptionFlow"
-		registerSemanticProperty("dfc-b:incomeOf", &method("transformation")).valueSetter = method("transformation=")
+		registerSemanticProperty("dfc-b:inputOf", &method("transformation")).valueSetter = method("transformation=")
 		registerSemanticProperty("dfc-b:consumes", &method("product")).valueSetter = method("product=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/planned_local_production_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::ConnectorV1::PlannedLocalProductionFlow < DataFoodCons
 		@transformation = transformation
 		@product = product
 		self.semanticType = "dfc-b:AsPlannedLocalProductionFlow"
-		registerSemanticProperty("dfc-b:outcomeOf", &method("transformation")).valueSetter = method("transformation=")
+		registerSemanticProperty("dfc-b:outputOf", &method("transformation")).valueSetter = method("transformation=")
 		registerSemanticProperty("dfc-b:produces", &method("product")).valueSetter = method("product=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/planned_local_transformation.rb

@@ -70,8 +70,8 @@ class DataFoodConsortium::ConnectorV1::PlannedLocalTransformation
 		registerSemanticProperty("dfc-b:cost", &method("cost")).valueSetter = method("cost=")
 		registerSemanticProperty("dfc-b:startDate", &method("startDate")).valueSetter = method("startDate=")
 		registerSemanticProperty("dfc-b:endDate", &method("endDate")).valueSetter = method("endDate=")
-		registerSemanticProperty("dfc-b:hasIncome", &method("consumptionFlow")).valueSetter = method("consumptionFlow=")
-		registerSemanticProperty("dfc-b:hasOutcome", &method("productionFlow")).valueSetter = method("productionFlow=")
+		registerSemanticProperty("dfc-b:hasInput", &method("consumptionFlow")).valueSetter = method("consumptionFlow=")
+		registerSemanticProperty("dfc-b:hasOutput", &method("productionFlow")).valueSetter = method("productionFlow=")
 	end
 	
 

data/lib/datafoodconsortium/connector_v1/planned_production_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::ConnectorV1::PlannedProductionFlow < DataFoodConsortiu
 		@transformation = transformation
 		@product = product
 		self.semanticType = "dfc-b:AsPlannedProductionFlow"
-		registerSemanticProperty("dfc-b:outcomeOf", &method("transformation")).valueSetter = method("transformation=")
+		registerSemanticProperty("dfc-b:outputOf", &method("transformation")).valueSetter = method("transformation=")
 		registerSemanticProperty("dfc-b:produces", &method("product")).valueSetter = method("product=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/planned_transformation.rb

@@ -51,8 +51,8 @@ class DataFoodConsortium::ConnectorV1::PlannedTransformation
 		@productionFlow = productionFlow
 		self.semanticType = "dfc-b:AsPlannedTransformation"
 		registerSemanticProperty("dfc-b:hasTransformationType", &method("transformationType")).valueSetter = method("transformationType=")
-		registerSemanticProperty("dfc-b:hasIncome", &method("consumptionFlow")).valueSetter = method("consumptionFlow=")
-		registerSemanticProperty("dfc-b:hasOutcome", &method("productionFlow")).valueSetter = method("productionFlow=")
+		registerSemanticProperty("dfc-b:hasInput", &method("consumptionFlow")).valueSetter = method("consumptionFlow=")
+		registerSemanticProperty("dfc-b:hasOutput", &method("productionFlow")).valueSetter = method("productionFlow=")
 	end
 	
 

data/lib/datafoodconsortium/connector_v1/realized_consumption_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::ConnectorV1::RealizedConsumptionFlow < DataFoodConsort
 		@transformation = transformation
 		@product = product
 		self.semanticType = "dfc-b:AsRealizedConsumptionFlow"
-		registerSemanticProperty("dfc-b:incomeOf", &method("transformation")).valueSetter = method("transformation=")
+		registerSemanticProperty("dfc-b:inputOf", &method("transformation")).valueSetter = method("transformation=")
 		registerSemanticProperty("dfc-b:consumes", &method("product")).valueSetter = method("product=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/realized_production_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::ConnectorV1::RealizedProductionFlow < DataFoodConsorti
 		@transformation = transformation
 		@product = product
 		self.semanticType = "dfc-b:AsRealizedProductionFlow"
-		registerSemanticProperty("dfc-b:outcomeOf", &method("transformation")).valueSetter = method("transformation=")
+		registerSemanticProperty("dfc-b:outputOf", &method("transformation")).valueSetter = method("transformation=")
 		registerSemanticProperty("dfc-b:produces", &method("product")).valueSetter = method("product=")
 	end
 	

data/lib/datafoodconsortium/connector_v1/realized_transformation.rb

@@ -64,8 +64,8 @@ class DataFoodConsortium::ConnectorV1::RealizedTransformation
 		registerSemanticProperty("dfc-b:hasTransformationType", &method("transformationType")).valueSetter = method("transformationType=")
 		registerSemanticProperty("dfc-b:startDate", &method("startDate")).valueSetter = method("startDate=")
 		registerSemanticProperty("dfc-b:endDate", &method("endDate")).valueSetter = method("endDate=")
-		registerSemanticProperty("dfc-b:hasIncome", &method("consumptionFlow")).valueSetter = method("consumptionFlow=")
-		registerSemanticProperty("dfc-b:hasOutcome", &method("productionFlow")).valueSetter = method("productionFlow=")
+		registerSemanticProperty("dfc-b:hasInput", &method("consumptionFlow")).valueSetter = method("consumptionFlow=")
+		registerSemanticProperty("dfc-b:hasOutput", &method("productionFlow")).valueSetter = method("productionFlow=")
 	end
 	
 

data/lib/datafoodconsortium/connector_v1/supplied_product.rb

@@ -28,6 +28,7 @@ require "datafoodconsortium/connector_v1/defined_product"
 
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::ConnectorV1::SuppliedProduct < DataFoodConsortium::ConnectorV1::DefinedProduct
@@ -37,12 +38,16 @@ class DataFoodConsortium::ConnectorV1::SuppliedProduct < DataFoodConsortium::Con
 	# @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]
@@ -62,11 +67,13 @@ class DataFoodConsortium::ConnectorV1::SuppliedProduct < DataFoodConsortium::Con
 	# @param images [String]
 	# @param variants [IDefinedProduct]
 	# @param isVariantOf [IDefinedProduct]
-	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: [], isVariantOf: [])
+	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: [], isVariantOf: [])
 		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, isVariantOf: isVariantOf)
 		@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_v1.rb

@@ -14,9 +14,9 @@ module DataFoodConsortium
 		require 'datafoodconsortium/connector_v1/allergen_characteristic.rb'
 		require 'datafoodconsortium/connector_v1/characteristic.rb'
 		require 'datafoodconsortium/connector_v1/nutrient_characteristic.rb'
+		require 'datafoodconsortium/connector_v1/opening_hours_specification.rb'
 		require 'datafoodconsortium/connector_v1/physical_characteristic.rb'
 		require 'datafoodconsortium/connector_v1/quantitative_value.rb'
-		require 'datafoodconsortium/connector_v1/quantity.rb'
 		require 'datafoodconsortium/connector_v1/defined_product.rb'
 		require 'datafoodconsortium/connector_v1/flow.rb'
 		require 'datafoodconsortium/connector_v1/localized_product.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datafoodconsortium-connector-v1
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.beta5
+  version: 1.4.0.pre.beta6
 platform: ruby
 authors:
 - Maxime Lecoq
@@ -56,6 +56,7 @@ files:
 - lib/datafoodconsortium/connector_v1/localized_product.rb
 - lib/datafoodconsortium/connector_v1/nutrient_characteristic.rb
 - lib/datafoodconsortium/connector_v1/offer.rb
+- lib/datafoodconsortium/connector_v1/opening_hours_specification.rb
 - lib/datafoodconsortium/connector_v1/order.rb
 - lib/datafoodconsortium/connector_v1/order_line.rb
 - lib/datafoodconsortium/connector_v1/payment_method.rb
@@ -74,7 +75,6 @@ files:
 - lib/datafoodconsortium/connector_v1/price.rb
 - lib/datafoodconsortium/connector_v1/product_batch.rb
 - lib/datafoodconsortium/connector_v1/quantitative_value.rb
-- lib/datafoodconsortium/connector_v1/quantity.rb
 - lib/datafoodconsortium/connector_v1/real_stock.rb
 - lib/datafoodconsortium/connector_v1/realized_consumption_flow.rb
 - lib/datafoodconsortium/connector_v1/realized_production_flow.rb