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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e356ba982a9fff2482bb21802f6d899d851224c451212a8d95db595139f7be
-  data.tar.gz: 33e1c188c09cd6b7c859d04ca72f35163020d7ea63768a06acc4a067d06dbe70
+  metadata.gz: 21f3f3988c0fdd080af8e8c9a0c0343912648cc2c0f3fab972e5d6da1ee6671c
+  data.tar.gz: 919ae0069f01516cf456a82cf84ef9b6efe9d0dcdbca6feccaca26a249ce2c77
 SHA512:
-  metadata.gz: b1556596e524f6f8dd613142c91f5ec9416de7465f331be9588ee15b9aebb181fd9540d4fd78344133968b72bdc9307664a5759a65b0184949a098ee8a9795d5
-  data.tar.gz: 164ee84cd9f475081b94768da6321cb563b5e1ddf596ab84885dfa48adffa405caa1e45020b063fc290084acb3dff79e70b9612a8caf36c336ff34371a64bf46
+  metadata.gz: 75ff122063e028c2be3caa9512fb7da0972ac12923ee53989f26239cd3a2e43ccd9f59c6a6a9b3b1af1ac1bea2ba0072c267002130fc58045693e0c5480e2070
+  data.tar.gz: 709a67f6810fad8bf82e40297190ade26593bd58f1b45c57e52d9a3cb863738216acebbba192b7227b5e05f19261ff0137a8f7f4d37fdb310956b17125609dc1

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/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.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.beta2
 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