datafoodconsortium-connector 1.0.0.pre.alpha.4 → 1.0.0.pre.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 730da5a9c16ad3380e7374e8cb2ef7c6ce1e85b5dedc262843a77b9facce6eb0
-  data.tar.gz: 8ec5484fe9a2e862b6077b64ef20e17df76a81fadb9d1ea124c2d9c7ede0463d
+  metadata.gz: a824076ba3dcb7d84a5c79b1a234cfe93df085e210eaf3e4afdc75fa2a0d08d2
+  data.tar.gz: da11b64f9b159ae00eb6dedd3340aa8de443a44cc43f57325b6b73ba6d96cc91
 SHA512:
-  metadata.gz: fc53bf8269ffa64dd5c39b5fe4c2f0fdc9ed1105ffe3dbef20f432b2b708e5339188ae06d9cb2457097f0702467af70bed06d9ae63f3193cb528d81311dff694
-  data.tar.gz: 1d4c609a3fa0a3976c51c51294ab41a2786a391522e7dc4aeac6e517c0677fc830eefacb9b92d43c724f12bf4cdcbe2bf5446c0c14ccaf05781acfdc6db0976e
+  metadata.gz: 5d2717adafc6a45469a2c1e690f9d3721ff1c4fa6ecc9210b8da21e31aa123ece3b1621f866631578bb6356cafe0d1e128ae170eccd2174da96795a53566ed75
+  data.tar.gz: b4f8bf9eb7d8057564d5f5891a1a66009cee8e11eb725798985bb8efc7098741548cf01ec528908c9fc1feed9f3916d2532f0dabe7c842ba12bceace2e65bf8f

data/lib/datafoodconsortium/connector/address.rb

@@ -27,19 +27,30 @@ class DataFoodConsortium::Connector::Address
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
+	# @return [String]
 	attr_accessor :street
+
+	# @return [String]
 	attr_accessor :postalCode
+
+	# @return [String]
 	attr_accessor :city
+
+	# @return [String]
 	attr_accessor :country
 
-	def initialize(street, postalCode, city, country)
-		super()
+	# @param semanticId [String]
+	# @param street [String]
+	# @param postalCode [String]
+	# @param city [String]
+	# @param country [String]
+	def initialize(semanticId, street: "", postalCode: "", city: "", country: "")
+		super(semanticId)
+		@street = street
+		@postalCode = postalCode
+		@city = city
+		@country = country
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Address"
-		self.street = street
-		self.postalCode = postalCode
-		self.city = city
-		self.country = country
-		
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasStreet") { self.street }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasPostalCode") { self.postalCode }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasCity") { self.city }

data/lib/datafoodconsortium/connector/agent.rb

@@ -29,33 +29,42 @@ class DataFoodConsortium::Connector::Agent
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
+	# @return [Contactable]
 	attr_accessor :contacts
+
+	# @return [Localizable]
 	attr_accessor :localizations
 
-	def initialize()
-		super()
+	# @param semanticId [String]
+	# @param contacts [Contactable]
+	# @param localizations [Localizable]
+	def initialize(semanticId, contacts: [], localizations: [])
+		super(semanticId)
+		@contacts = contacts
+		@localizations = localizations
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Agent"
-		
-		self.contacts = []
-		self.localizations = []
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasAddress") { self.localizations }
 	end
 	
 
+	
 	def addContact(contact)
 		self.contacts.push(contact)
 	end
 	
+	
 	def addLocalization(localization)
 		self.localizations.push(localization)
 	end
 	
+	
 	def removeContact(contact)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removeLocalization(localization)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
 

data/lib/datafoodconsortium/connector/allergen_characteristic.rb

@@ -21,22 +21,25 @@
 # SOFTWARE.
 
 
+require "datafoodconsortium/connector/characteristic"
 
 
-require "datafoodconsortium/connector/characteristic"
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::AllergenCharacteristic < DataFoodConsortium::Connector::Characteristic
 
 	
 
+	# @return [IAllergenDimension]
 	attr_accessor :allergenDimension
 
-	def initialize(quantityUnit, quantityValue, allergenDimension)
-		super(quantityUnit, quantityValue)
+	# @param allergenDimension [IAllergenDimension]
+	# @param unit [IUnit]
+	# @param value [Real]
+	def initialize(allergenDimension: nil, unit: nil, value: 0.0)
+		super(unit: unit, value: value)
+		@allergenDimension = allergenDimension
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#AllergenCharacteristic"
-		self.allergenDimension = allergenDimension
-		
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasAllergenDimension") { self.allergenDimension }
 	end
 	

data/lib/datafoodconsortium/connector/allergen_dimension.rb

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 require "datafoodconsortium/connector/characteristic_dimension"
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::AllergenDimension < DataFoodConsortium::Connector::CharacteristicDimension

data/lib/datafoodconsortium/connector/catalog_item.rb

@@ -29,18 +29,30 @@ class DataFoodConsortium::Connector::CatalogItem
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
+	# @return [IDefinedProduct]
 	attr_accessor :product
+
+	# @return [String]
 	attr_accessor :sku
+
+	# @return [Real]
 	attr_accessor :stockLimitation
+
+	# @return [IOffer]
 	attr_accessor :offers
 
-	def initialize(product)
-		super()
+	# @param semanticId [String]
+	# @param product [IDefinedProduct]
+	# @param sku [String]
+	# @param stockLimitation [Real]
+	# @param offers [IOffer]
+	def initialize(semanticId, product: nil, sku: "", stockLimitation: 0.0, offers: [])
+		super(semanticId)
+		@product = product
+		@sku = sku
+		@stockLimitation = stockLimitation
+		@offers = offers
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#CatalogItem"
-		self.product = product
-		self.sku = nil
-		self.stockLimitation = nil
-		self.offers = []
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#references") { self.product }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#sku") { self.sku }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#stockLimitation") { self.stockLimitation }
@@ -50,13 +62,7 @@ class DataFoodConsortium::Connector::CatalogItem
 
 	
 
-	def addOffer(offer)
-		self.offers.push(offer)
-	end
 	
-	def addOffer(offer)
-		self.offers.push(offer)
-	end
 	
 
 end

data/lib/datafoodconsortium/connector/certification.rb

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 require "datafoodconsortium/connector/skos_concept"
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Certification < DataFoodConsortium::Connector::SKOSConcept

data/lib/datafoodconsortium/connector/characteristic.rb

@@ -23,6 +23,7 @@
 
 
 require "datafoodconsortium/connector/quantitative_value"
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Characteristic < DataFoodConsortium::Connector::QuantitativeValue
@@ -30,9 +31,10 @@ class DataFoodConsortium::Connector::Characteristic < DataFoodConsortium::Connec
 	
 
 
-	def initialize(quantityUnit, quantityValue)
-		super(quantityUnit, quantityValue)
-		
+	# @param unit [IUnit]
+	# @param value [Real]
+	def initialize(unit: nil, value: 0.0)
+		super(unit: unit, value: value)
 		
 		
 		

data/lib/datafoodconsortium/connector/connector.rb

@@ -54,8 +54,21 @@ class DataFoodConsortium::Connector::Connector
     def initialize()
         super()
 
+        # used to prefix properties
+        # so the DFC's context can be used.
+        # See https://github.com/datafoodconsortium/connector-ruby/issues/11.
+        inputContext = {
+            "dfc-b" => "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#",
+            "dfc-p" => "http://static.datafoodconsortium.org/ontologies/DFC_ProductOntology.owl#",
+            "dfc-t" => "http://static.datafoodconsortium.org/ontologies/DFC_TechnicalOntology.owl#",
+            "dfc-m" => "http://static.datafoodconsortium.org/data/measures.rdf#",
+		    "dfc-pt" => "http://static.datafoodconsortium.org/data/productTypes.rdf#",
+		    "dfc-f" => "http://static.datafoodconsortium.org/data/facets.rdf#"
+        }
+
         @context = "http://static.datafoodconsortium.org/ontologies/context.json"
-        @exporter = DataFoodConsortium::Connector::JsonLdSerializer.new(@context)
+
+        @exporter = DataFoodConsortium::Connector::JsonLdSerializer.new(@context, inputContext)
         @parser = DataFoodConsortium::Connector::SKOSParser.new
 
         @FACETS = []

data/lib/datafoodconsortium/connector/customer_category.rb

@@ -27,16 +27,15 @@ class DataFoodConsortium::Connector::CustomerCategory
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
-	attr_accessor :name
+	# @return [String]
 	attr_accessor :description
 
-	def initialize(name, description)
-		super()
+	# @param semanticId [String]
+	# @param description [String]
+	def initialize(semanticId, description: "")
+		super(semanticId)
+		@description = description
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#CustomerCategory"
-		self.name = name
-		self.description = description
-		
-		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#name") { self.name }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#description") { self.description }
 	end
 	

data/lib/datafoodconsortium/connector/defined_product.rb

@@ -38,42 +38,90 @@ class DataFoodConsortium::Connector::DefinedProduct
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
+	# @return [String]
 	attr_accessor :name
+
+	# @return [String]
 	attr_accessor :description
+
+	# @return [IProductType]
 	attr_accessor :productType
+
+	# @return [Quantifiable]
 	attr_accessor :quantity
+
+	# @return [Real]
 	attr_accessor :alcoholPercentage
+
+	# @return [String]
 	attr_accessor :lifetime
+
+	# @return [Claimable]
 	attr_accessor :claims
+
+	# @return [String]
 	attr_accessor :usageOrStorageConditions
+
+	# @return [IAllergenCharacteristic]
 	attr_accessor :allergenCharacteristics
+
+	# @return [INutrientCharacteristic]
 	attr_accessor :nutrientCharacteristics
+
+	# @return [IPhysicalCharacteristic]
 	attr_accessor :physicalCharacteristics
+
+	# @return [IGeographicalOrigin]
 	attr_accessor :geographicalOrigin
+
+	# @return [ICatalogItem]
 	attr_accessor :catalogItems
+
+	# @return [ICertification]
 	attr_accessor :certifications
+
+	# @return [INatureOrigin]
 	attr_accessor :natureOrigin
+
+	# @return [IPartOrigin]
 	attr_accessor :partOrigin
 
-	def initialize(name, description)
-		super()
+	# @param semanticId [String]
+	# @param name [String]
+	# @param description [String]
+	# @param productType [IProductType]
+	# @param quantity [Quantifiable]
+	# @param alcoholPercentage [Real]
+	# @param lifetime [String]
+	# @param claims [Claimable]
+	# @param usageOrStorageConditions [String]
+	# @param allergenCharacteristics [IAllergenCharacteristic]
+	# @param nutrientCharacteristics [INutrientCharacteristic]
+	# @param physicalCharacteristics [IPhysicalCharacteristic]
+	# @param geographicalOrigin [IGeographicalOrigin]
+	# @param catalogItems [ICatalogItem]
+	# @param certifications [ICertification]
+	# @param natureOrigin [INatureOrigin]
+	# @param partOrigin [IPartOrigin]
+	def initialize(semanticId, name: "", description: "", productType: nil, quantity: nil, alcoholPercentage: 0.0, lifetime: "", claims: [], usageOrStorageConditions: "", allergenCharacteristics: [], nutrientCharacteristics: [], physicalCharacteristics: [], geographicalOrigin: nil, catalogItems: [], certifications: [], natureOrigin: [], partOrigin: [])
+		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
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#DefinedProduct"
-		self.name = name
-		self.description = description
-		self.productType = nil
-		self.quantity = nil
-		self.alcoholPercentage = nil
-		self.lifetime = nil
-		self.claims = []
-		self.usageOrStorageConditions = nil
-		self.allergenCharacteristics = []
-		self.nutrientCharacteristics = []
-		self.physicalCharacteristics = []
-		self.geographicalOrigin = nil
-		self.catalogItems = []
-		self.certifications = []
-		self.natureOrigin = []
-		self.partOrigin = []
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#name") { self.name }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#description") { self.description }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasType") { self.productType }
@@ -93,64 +141,79 @@ class DataFoodConsortium::Connector::DefinedProduct
 	end
 	
 
+	
 	def addClaim(claim)
 		self.claims.push(claim)
 	end
 	
+	
 	def removeClaim(claim)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def addAllergenCharacteristic(allergenCharacteristic)
 		self.allergenCharacteristics.push(allergenCharacteristic)
 	end
 	
+	
 	def addNutrientCharacteristic(nutrientCharacteristic)
 		self.nutrientCharacteristics.push(nutrientCharacteristic)
 	end
 	
+	
 	def addPhysicalCharacteristic(physicalCharacteristic)
 		self.physicalCharacteristics.push(physicalCharacteristic)
 	end
 	
+	
 	def addNatureOrigin(natureOrigin)
 		self.natureOrigin.push(natureOrigin)
 	end
 	
+	
 	def addPartOrigin(partOrigin)
 		self.partOrigin.push(partOrigin)
 	end
 	
+	
 	def removeAllergenCharacteristic(allergenCharacteristic)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removeNutrientCharacteristic(nutrientCharacteristic)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removePhysicalCharacteristic(physicalCharacteristic)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removeNatureOrigin(natureOrigin)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removePartOrigin(partOrigin)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def addCatalogItem(catalogItem)
 		self.catalogItems.push(catalogItem)
 	end
 	
+	
 	def addCertification(certification)
 		self.certifications.push(certification)
 	end
 	
+	
 	def removeCertification(certification)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
 

data/lib/datafoodconsortium/connector/enterprise.rb

@@ -20,35 +20,55 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require "datafoodconsortium/connector/supplied_product"
 
 
 
-require "datafoodconsortium/connector/supplied_product"
-
 require "datafoodconsortium/connector/agent"
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::Enterprise < DataFoodConsortium::Connector::Agent
 
 	
 
+	# @return [String]
 	attr_accessor :name
+
+	# @return [String]
 	attr_accessor :description
+
+	# @return [String]
 	attr_accessor :vatNumber
+
+	# @return [ICustomerCategory]
 	attr_accessor :customerCategories
+
+	# @return [SuppliedProduct]
 	attr_accessor :suppliedProducts
+
+	# @return [ICatalogItem]
 	attr_accessor :catalogItems
 
-	def initialize(name)
-		super()
+	# @param semanticId [String]
+	# @param name [String]
+	# @param description [String]
+	# @param vatNumber [String]
+	# @param customerCategories [ICustomerCategory]
+	# @param suppliedProducts [SuppliedProduct]
+	# @param catalogItems [ICatalogItem]
+	# @param contacts [Contactable]
+	# @param localizations [Localizable]
+	def initialize(semanticId, name: "", description: "", vatNumber: "", customerCategories: [], suppliedProducts: [], catalogItems: [], contacts: [], localizations: [])
+		super(semanticId, contacts: contacts, localizations: localizations)
+		@name = name
+		@description = description
+		@vatNumber = vatNumber
+		@customerCategories = customerCategories
+		@suppliedProducts = suppliedProducts
+		@catalogItems = catalogItems
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Enterprise"
-		self.name = name
-		self.description = nil
-		self.vatNumber = nil
-		self.customerCategories = []
-		self.suppliedProducts = []
-		self.catalogItems = []
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasName") { self.name }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasDescription") { self.description }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#VATnumber") { self.vatNumber }
@@ -58,25 +78,6 @@ class DataFoodConsortium::Connector::Enterprise < DataFoodConsortium::Connector:
 	end
 	
 
-	def addCustomerCategory(customerCategory)
-		self.customerCategories.push(customerCategory)
-	end
-	
-	def addSupplyProduct(suppliedProduct)
-		self.suppliedProducts.push(suppliedProduct)
-	end
-	
-	def addCatalogItem(catalogItem)
-		self.catalogItems.push(catalogItem)
-	end
-	
-	def addSupplyProduct(suppliedProduct)
-		self.suppliedProducts.push(suppliedProduct)
-	end
-	
-	def addCatalogItem(catalogItem)
-		self.catalogItems.push(catalogItem)
-	end
 	
 	def addCustomerCategory(customerCategory)
 		self.customerCategories.push(customerCategory)

data/lib/datafoodconsortium/connector/geographical_origin.rb

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 require "datafoodconsortium/connector/skos_concept"
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::GeographicalOrigin < DataFoodConsortium::Connector::SKOSConcept

data/lib/datafoodconsortium/connector/json_ld_serializer.rb

@@ -25,9 +25,9 @@ require 'json/ld'
 
 class DataFoodConsortium::Connector::JsonLdSerializer
 
-    def initialize(context = nil)
-        @context = context
-        @hashSerializer = VirtualAssembly::Semantizer::HashSerializer.new
+    def initialize(outputContext = nil, inputContext = nil)
+        @outputContext = outputContext
+        @hashSerializer = VirtualAssembly::Semantizer::HashSerializer.new(inputContext)
     end
 
     def process(subject, *subjects)
@@ -39,11 +39,16 @@ class DataFoodConsortium::Connector::JsonLdSerializer
 
         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|
-            inputs.push(subject.serialize(@hashSerializer))
+            input = { "@context" => "http://static.datafoodconsortium.org/ontologies/context.json" }
+            input.merge!(subject.serialize(@hashSerializer))
+            inputs.push(input)
         end
-        
-        jsonLd = JSON::LD::API.compact(inputs, @context)
+
+        jsonLd = JSON::LD::API.compact(inputs, @outputContext)
 
         return JSON.generate(jsonLd)
     end

data/lib/datafoodconsortium/connector/nutrient_characteristic.rb

@@ -22,21 +22,24 @@
 
 
 
-
 require "datafoodconsortium/connector/characteristic"
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::NutrientCharacteristic < DataFoodConsortium::Connector::Characteristic
 
 	
 
+	# @return [INutrientDimension]
 	attr_accessor :nutrientDimension
 
-	def initialize(quantityUnit, quantityValue, nutrientDimension)
-		super(quantityUnit, quantityValue)
+	# @param nutrientDimension [INutrientDimension]
+	# @param unit [IUnit]
+	# @param value [Real]
+	def initialize(nutrientDimension: nil, unit: nil, value: 0.0)
+		super(unit: unit, value: value)
+		@nutrientDimension = nutrientDimension
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#NutrientCharacteristic"
-		self.nutrientDimension = nutrientDimension
-		
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasNutrientDimension") { self.nutrientDimension }
 	end
 	

data/lib/datafoodconsortium/connector/offer.rb

@@ -29,18 +29,30 @@ class DataFoodConsortium::Connector::Offer
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
+	# @return [IPrice]
 	attr_accessor :price
+
+	# @return [Real]
 	attr_accessor :stockLimitation
+
+	# @return [ICatalogItem]
 	attr_accessor :offeredItem
+
+	# @return [ICustomerCategory]
 	attr_accessor :offeredTo
 
-	def initialize(offeredItem, offeredTo)
-		super()
+	# @param semanticId [String]
+	# @param price [IPrice]
+	# @param stockLimitation [Real]
+	# @param offeredItem [ICatalogItem]
+	# @param offeredTo [ICustomerCategory]
+	def initialize(semanticId, price: nil, stockLimitation: 0.0, offeredItem: nil, offeredTo: nil)
+		super(semanticId)
+		@price = price
+		@stockLimitation = stockLimitation
+		@offeredItem = offeredItem
+		@offeredTo = offeredTo
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Offer"
-		self.offeredItem = offeredItem
-		self.offeredTo = offeredTo
-		self.price = nil
-		self.stockLimitation = nil
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#price") { self.price }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#stockLimitation") { self.stockLimitation }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#offeredItem") { self.offeredItem }
@@ -48,9 +60,6 @@ class DataFoodConsortium::Connector::Offer
 	end
 	
 
-	def addOffer(offer)
-		self..push(offer)
-	end
 	
 
 end

data/lib/datafoodconsortium/connector/part_origin.rb

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
 require "datafoodconsortium/connector/skos_concept"
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::PartOrigin < DataFoodConsortium::Connector::SKOSConcept

data/lib/datafoodconsortium/connector/person.rb

@@ -29,28 +29,41 @@ class DataFoodConsortium::Connector::Person < DataFoodConsortium::Connector::Age
 
 	
 
+	# @return [String]
 	attr_accessor :firstName
+
+	# @return [String]
 	attr_accessor :lastName
+
+	# @return [Onboardable]
 	attr_accessor :affiliatedOrganizations
 
-	def initialize(firstName, lastName)
-		super()
+	# @param semanticId [String]
+	# @param firstName [String]
+	# @param lastName [String]
+	# @param affiliatedOrganizations [Onboardable]
+	# @param contacts [Contactable]
+	# @param localizations [Localizable]
+	def initialize(semanticId, firstName: "", lastName: "", affiliatedOrganizations: [], contacts: [], localizations: [])
+		super(semanticId, contacts: contacts, localizations: localizations)
+		@firstName = firstName
+		@lastName = lastName
+		@affiliatedOrganizations = affiliatedOrganizations
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Person"
-		self.firstName = firstName
-		self.lastName = lastName
-		self.affiliatedOrganizations = []
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#firstName") { self.firstName }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#familyName") { self.lastName }
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#affiliates") { self.affiliatedOrganizations }
 	end
 	
 
+	
 	def affiliateTo(organization)
 		self.affiliatedOrganizations.push(organization)
 	end
 	
+	
 	def leaveAffiliatedOrganization(organization)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
 

data/lib/datafoodconsortium/connector/physical_characteristic.rb

@@ -20,9 +20,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require "datafoodconsortium/connector/characteristic"
 
 
-require "datafoodconsortium/connector/characteristic"
 
 require "virtual_assembly/semantizer"
 
@@ -30,13 +30,16 @@ class DataFoodConsortium::Connector::PhysicalCharacteristic < DataFoodConsortium
 
 	
 
+	# @return [IPhysicalDimension]
 	attr_accessor :physicalDimension
 
-	def initialize(quantityUnit, quantityValue, physicalDimension)
-		super(quantityUnit, quantityValue)
+	# @param physicalDimension [IPhysicalDimension]
+	# @param unit [IUnit]
+	# @param value [Real]
+	def initialize(physicalDimension: nil, unit: nil, value: 0.0)
+		super(unit: unit, value: value)
+		@physicalDimension = physicalDimension
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#PhysicalCharacteristic"
-		self.physicalDimension = physicalDimension
-		
 		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasPhysicalDimension") { self.physicalDimension }
 	end
 	

data/lib/datafoodconsortium/connector/price.rb

@@ -0,0 +1,55 @@
+# 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 "virtual_assembly/semantizer"
+
+class DataFoodConsortium::Connector::Price
+
+	include VirtualAssembly::Semantizer::SemanticObject
+
+	# @return [Real]
+	attr_accessor :value
+
+	# @return [Real]
+	attr_accessor :vatRate
+
+	# @return [IUnit]
+	attr_accessor :unit
+
+	# @param value [Real]
+	# @param vatRate [Real]
+	# @param unit [IUnit]
+	def initialize(value: 0.0, vatRate: 0.0, unit: nil)
+		super()
+		@value = value
+		@vatRate = vatRate
+		@unit = unit
+		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#Price"
+		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#value") { self.value }
+		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#VATrate") { self.vatRate }
+		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasUnit") { self.unit }
+	end
+	
+
+
+end

data/lib/datafoodconsortium/connector/quantitative_value.rb

@@ -21,23 +21,28 @@
 # SOFTWARE.
 
 
+
 require "virtual_assembly/semantizer"
 
 class DataFoodConsortium::Connector::QuantitativeValue
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
-	attr_accessor :quantityUnit
-	attr_accessor :quantityValue
+	# @return [IUnit]
+	attr_accessor :unit
+
+	# @return [Real]
+	attr_accessor :value
 
-	def initialize(quantityUnit, quantityValue)
+	# @param unit [IUnit]
+	# @param value [Real]
+	def initialize(unit: nil, value: 0.0)
 		super()
+		@unit = unit
+		@value = value
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#QuantitativeValue"
-		self.quantityUnit = quantityUnit
-		self.quantityValue = quantityValue
-		
-		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasUnit") { self.quantityUnit }
-		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#value") { self.quantityValue }
+		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#hasUnit") { self.unit }
+		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#value") { self.value }
 	end
 	
 

data/lib/datafoodconsortium/connector/skos_concept.rb

@@ -29,19 +29,29 @@ class DataFoodConsortium::Connector::SKOSConcept
 
 	include VirtualAssembly::Semantizer::SemanticObject
 
+	# @return [ISKOSConcept]
 	attr_accessor :broaders
+
+	# @return [ISKOSConceptScheme]
 	attr_accessor :schemes
+
+	# @return [ISKOSConcept]
 	attr_accessor :narrowers
+
+	# @return [ISKOSLabel]
 	attr_accessor :prefLabels
 
-	def initialize()
+	# @param broaders [ISKOSConcept]
+	# @param schemes [ISKOSConceptScheme]
+	# @param narrowers [ISKOSConcept]
+	# @param prefLabels [ISKOSLabel]
+	def initialize(broaders: [], schemes: [], narrowers: [], prefLabels: [])
 		super()
+		@broaders = broaders
+		@schemes = schemes
+		@narrowers = narrowers
+		@prefLabels = prefLabels
 		self.semanticType = "http://www.w3.org/2004/02/skos/core#Concept"
-		
-		self.broaders = []
-		self.schemes = []
-		self.narrowers = []
-		self.prefLabels = []
 		registerSemanticProperty("http://www.w3.org/2004/02/skos/core#broader") { self.broaders }
 		registerSemanticProperty("http://www.w3.org/2004/02/skos/core#inScheme") { self.schemes }
 		registerSemanticProperty("http://www.w3.org/2004/02/skos/core#narrower") { self.narrowers }
@@ -49,36 +59,28 @@ class DataFoodConsortium::Connector::SKOSConcept
 	end
 	
 
-	def addBroader(broader)
-		self.broaders.push(broader)
-	end
 	
-	def addScheme(scheme)
-		self.schemes.push(scheme)
-	end
 	
-	def addNarrower(narrower)
-		self.narrowers.push(narrower)
-	end
 	
-	def addPrefLabel(prefLabel)
-		self.prefLabels.push(prefLabel)
-	end
+	
 	
 	def removeBroader(broader)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removeScheme(scheme)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removeNarrower(narrower)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
+	
 	def removePrefLabel(prefLabel)
-		raise "Not implemented"
+		raise "Not yet implemented."
 	end
 	
 

data/lib/datafoodconsortium/connector/supplied_product.rb

@@ -27,15 +27,38 @@ class DataFoodConsortium::Connector::SuppliedProduct < DataFoodConsortium::Conne
 
 	
 
+	# @return [Real]
+	attr_accessor :totalTheoreticalStock
 
-	def initialize(name, description)
-		super(name, description)
+	# @param semanticId [String]
+	# @param totalTheoreticalStock [Real]
+	# @param name [String]
+	# @param description [String]
+	# @param productType [IProductType]
+	# @param quantity [Quantifiable]
+	# @param alcoholPercentage [Real]
+	# @param lifetime [String]
+	# @param claims [Claimable]
+	# @param usageOrStorageConditions [String]
+	# @param allergenCharacteristics [IAllergenCharacteristic]
+	# @param nutrientCharacteristics [INutrientCharacteristic]
+	# @param physicalCharacteristics [IPhysicalCharacteristic]
+	# @param geographicalOrigin [IGeographicalOrigin]
+	# @param catalogItems [ICatalogItem]
+	# @param certifications [ICertification]
+	# @param natureOrigin [INatureOrigin]
+	# @param partOrigin [IPartOrigin]
+	def initialize(semanticId, totalTheoreticalStock: 0.0, name: "", description: "", productType: nil, quantity: nil, alcoholPercentage: 0.0, lifetime: "", claims: [], usageOrStorageConditions: "", allergenCharacteristics: [], nutrientCharacteristics: [], physicalCharacteristics: [], geographicalOrigin: nil, catalogItems: [], certifications: [], natureOrigin: [], partOrigin: [])
+		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)
+		@totalTheoreticalStock = totalTheoreticalStock
 		self.semanticType = "http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#SuppliedProduct"
-		
-		
-		
+		registerSemanticProperty("http://static.datafoodconsortium.org/ontologies/DFC_BusinessOntology.owl#totalTheoreticalStock") { self.totalTheoreticalStock }
 	end
 	
 
+	
+
+	
+
 
 end

data/lib/datafoodconsortium/connector.rb

@@ -6,26 +6,27 @@ module DataFoodConsortium
 		require 'datafoodconsortium/connector/skos_parser'
 		require 'datafoodconsortium/connector/agent.rb'
 		require 'datafoodconsortium/connector/enterprise.rb'
-		require 'datafoodconsortium/connector/customer_category.rb'
 		require 'datafoodconsortium/connector/person.rb'
+		require 'datafoodconsortium/connector/customer_category.rb'
+		require 'datafoodconsortium/connector/offer.rb'
 		require 'datafoodconsortium/connector/repository.rb'
-		require 'datafoodconsortium/connector/catalog_item.rb'
+		require 'datafoodconsortium/connector/price.rb'
 		require 'datafoodconsortium/connector/order.rb'
-		require 'datafoodconsortium/connector/offer.rb'
+		require 'datafoodconsortium/connector/catalog_item.rb'
 		require 'datafoodconsortium/connector/order_line.rb'
-		require 'datafoodconsortium/connector/address.rb'
-		require 'datafoodconsortium/connector/geographical_origin.rb'
-		require 'datafoodconsortium/connector/physical_characteristic.rb'
 		require 'datafoodconsortium/connector/allergen_dimension.rb'
-		require 'datafoodconsortium/connector/allergen_characteristic.rb'
-		require 'datafoodconsortium/connector/nutrient_characteristic.rb'
 		require 'datafoodconsortium/connector/characteristic.rb'
-		require 'datafoodconsortium/connector/product_type.rb'
+		require 'datafoodconsortium/connector/address.rb'
+		require 'datafoodconsortium/connector/characteristic_dimension.rb'
+		require 'datafoodconsortium/connector/nutrient_characteristic.rb'
 		require 'datafoodconsortium/connector/part_origin.rb'
-		require 'datafoodconsortium/connector/quantitative_value.rb'
 		require 'datafoodconsortium/connector/unit.rb'
+		require 'datafoodconsortium/connector/quantitative_value.rb'
 		require 'datafoodconsortium/connector/certification.rb'
-		require 'datafoodconsortium/connector/characteristic_dimension.rb'
+		require 'datafoodconsortium/connector/product_type.rb'
+		require 'datafoodconsortium/connector/physical_characteristic.rb'
+		require 'datafoodconsortium/connector/allergen_characteristic.rb'
+		require 'datafoodconsortium/connector/geographical_origin.rb'
 		require 'datafoodconsortium/connector/nature_origin.rb'
 		require 'datafoodconsortium/connector/defined_product.rb'
 		require 'datafoodconsortium/connector/supplied_product.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datafoodconsortium-connector
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.4
+  version: 1.0.0.pre.alpha.6
 platform: ruby
 authors:
 - Maxime Lecoq
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtual_assembly-semantizer
@@ -19,7 +19,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,35 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library to easily integrate the DFC standard within your application.
 email: maxime@lecoqlibre.fr
 executables: []
@@ -59,6 +87,7 @@ files:
 - lib/datafoodconsortium/connector/part_origin.rb
 - lib/datafoodconsortium/connector/person.rb
 - lib/datafoodconsortium/connector/physical_characteristic.rb
+- lib/datafoodconsortium/connector/price.rb
 - lib/datafoodconsortium/connector/product_type.rb
 - lib/datafoodconsortium/connector/quantitative_value.rb
 - lib/datafoodconsortium/connector/repository.rb