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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2793b3c148d5db9d19bb82a711bf4cf7f438d40b338a30b5a40a7f0ff7a7df9e
-  data.tar.gz: 8c335762e0bbba6fd2afc6e50fce0ca4c82e54498f401d16d66133cdc0b77096
+  metadata.gz: e2c22f2894c689b3fe1f5a3f3e6f74bdc3eb2bb3ebf8de0220c97c46d86d3c5c
+  data.tar.gz: 847ff1c84d90ae01263437f505261196634db0a9a2730c70029b990e38715944
 SHA512:
-  metadata.gz: 422db860ac8f9404a7bc5e4eb8f50f8f84bb1809cabd2555a8d628756c331b84c7be5d7da69c944b35a68831bb5e2995e8a7cf5f4d95f516888852219592365c
-  data.tar.gz: 525d285d284ac07f9e7f4f0f3ee8cf000e54f499e5e609eac50b030299e4a07bf015b3ae350621e0d0358805fe3b97035ed2fab867961d8a13756e808f179968
+  metadata.gz: 8f89e5399acab529e422fec75e3ab695ba268362dee20b9e033599c91919f97d9984d611c3de20a35b12dc65143aca5ed60a3c3cdb74a7a326076c522641c2e5
+  data.tar.gz: 1b7862a04bd52c519c0c743ccc0cdd4d3f49d956943d751089cffd38a6fca3523ed11995af4a2440a924ef2da7dfbbafbaa330eab41bebe0111ea756d3ce6489

data/lib/datafoodconsortium/connector/address.rb

@@ -37,7 +37,7 @@ class DataFoodConsortium::Connector::Address
 	# @return [String]
 	attr_accessor :city
 
-	# @return [String]
+	# @return [ISKOSConcept]
 	attr_accessor :country
 
 	# @return [Real]
@@ -53,7 +53,7 @@ class DataFoodConsortium::Connector::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/context.rb

@@ -38,4 +38,4 @@ module DataFoodConsortium
       end
     end
   end
-end
+end

data/lib/datafoodconsortium/connector/customer_category.rb

@@ -29,6 +29,9 @@ class DataFoodConsortium::Connector::CustomerCategory
 
     SEMANTIC_TYPE = "dfc-b:CustomerCategory".freeze
 
+	# @return [String]
+	attr_accessor :name
+
 	# @return [String]
 	attr_accessor :description
 
@@ -36,13 +39,16 @@ class DataFoodConsortium::Connector::CustomerCategory
 	attr_accessor :members
 
 	# @param semanticId [String]
+	# @param name [String]
 	# @param description [String]
 	# @param members [IAgent]
-	def initialize(semanticId, description: nil, members: [])
+	def initialize(semanticId, name: nil, description: nil, members: [])
 		super(semanticId)
+		@name = name
 		@description = description
 		@members = members
 		self.semanticType = "dfc-b:CustomerCategory"
+		registerSemanticProperty("dfc-b:name", &method("name")).valueSetter = method("name=")
 		registerSemanticProperty("dfc-b:description", &method("description")).valueSetter = method("description=")
 		registerSemanticProperty("dfc-b:isMemberOf", &method("members")).valueSetter = method("members=")
 	end

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

@@ -21,29 +21,35 @@
 # SOFTWARE.
 
 
-
 require "virtual_assembly/semantizer"
 
-class DataFoodConsortium::Connector::Quantity
+class DataFoodConsortium::Connector::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/planned_consumption_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::Connector::PlannedConsumptionFlow < DataFoodConsortium
 		@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/planned_local_consumption_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::Connector::PlannedLocalConsumptionFlow < DataFoodConso
 		@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/planned_local_production_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::Connector::PlannedLocalProductionFlow < DataFoodConsor
 		@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/planned_local_transformation.rb

@@ -70,8 +70,8 @@ class DataFoodConsortium::Connector::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/planned_production_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::Connector::PlannedProductionFlow < DataFoodConsortium:
 		@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/planned_transformation.rb

@@ -51,8 +51,8 @@ class DataFoodConsortium::Connector::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/realized_consumption_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::Connector::RealizedConsumptionFlow < DataFoodConsortiu
 		@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/realized_production_flow.rb

@@ -47,7 +47,7 @@ class DataFoodConsortium::Connector::RealizedProductionFlow < DataFoodConsortium
 		@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/realized_transformation.rb

@@ -64,8 +64,8 @@ class DataFoodConsortium::Connector::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.rb

@@ -15,9 +15,9 @@ module DataFoodConsortium
 		require 'datafoodconsortium/connector/allergen_characteristic.rb'
 		require 'datafoodconsortium/connector/characteristic.rb'
 		require 'datafoodconsortium/connector/nutrient_characteristic.rb'
+		require 'datafoodconsortium/connector/opening_hours_specification.rb'
 		require 'datafoodconsortium/connector/physical_characteristic.rb'
 		require 'datafoodconsortium/connector/quantitative_value.rb'
-		require 'datafoodconsortium/connector/quantity.rb'
 		require 'datafoodconsortium/connector/value_recur.rb'
 		require 'datafoodconsortium/connector/vevent.rb'
 		require 'datafoodconsortium/connector/defined_product.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datafoodconsortium-connector
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta4
+  version: 2.0.0.pre.beta5
 platform: ruby
 authors:
 - Maxime Lecoq
@@ -57,6 +57,7 @@ files:
 - lib/datafoodconsortium/connector/localized_product.rb
 - lib/datafoodconsortium/connector/nutrient_characteristic.rb
 - lib/datafoodconsortium/connector/offer.rb
+- lib/datafoodconsortium/connector/opening_hours_specification.rb
 - lib/datafoodconsortium/connector/order.rb
 - lib/datafoodconsortium/connector/order_line.rb
 - lib/datafoodconsortium/connector/organization.rb
@@ -79,7 +80,6 @@ files:
 - lib/datafoodconsortium/connector/product_option.rb
 - lib/datafoodconsortium/connector/product_option_value.rb
 - lib/datafoodconsortium/connector/quantitative_value.rb
-- lib/datafoodconsortium/connector/quantity.rb
 - lib/datafoodconsortium/connector/real_stock.rb
 - lib/datafoodconsortium/connector/realized_consumption_flow.rb
 - lib/datafoodconsortium/connector/realized_production_flow.rb