V2

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0] - 2026-06-15
+
+To generate Ruby and TypeScript version based on the UML model version 4.0.0.
+
 ## [1.3.0] - 2026-06-15
 
 To generate Ruby and TypeScript version based on the UML model version 3.5.0.
@@ -24,12 +28,10 @@ To generate Ruby and TypeScript version based on the UML model version 3.4.0.
   - `getOperationsToImplementOrDeclare`.
 
 ### Changed
-
 TypeScript:
 - Ensure the entry point, `src/index.ts`, is always regenerated on fresh builds.
 
 ### Fixed
-
 TypeScript:
 - Fix setters for array properties so that all items are replaced.
 
@@ -94,7 +96,8 @@ This release requires [data-model-uml version 2.1.0](https://github.com/datafood
   - Update dfc prefix in skos_parser and change dfc-b:hasName.
   - Change dfc-b:hasName to dfc-b:name in tests.
 
-[unreleased]: https://github.com/datafoodconsortium/connector-codegen/compare/v1.3.0...HEAD
+[unreleased]: https://github.com/datafoodconsortium/connector-codegen/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/datafoodconsortium/connector-codegen/compare/v1.3.0...v2.0.0
 [1.3.0]: https://github.com/datafoodconsortium/connector-codegen/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/datafoodconsortium/connector-codegen/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/datafoodconsortium/connector-codegen/compare/v1.0.1...v1.1.0

src/org/datafoodconsortium/connector/codegen/ruby/class.mtl

@@ -7,16 +7,16 @@
 [import org::datafoodconsortium::connector::codegen::ruby::classifier /]
 
 [template public generateClass(model: Model, aClass : Class)]
-[file (getProperty('ruby_outputFolder_src') + 'connector_v1/' + generateFileName(aClass.name).concat('.rb'), false, 'UTF-8')]
+[file (getProperty('ruby_outputFolder_src') + 'connector/' + generateFileName(aClass.name).concat('.rb'), false, 'UTF-8')]
 [generateLicence()/]
 
 [generateImports(aClass)/]
-class DataFoodConsortium::ConnectorV1::[aClass.name.toUpperFirst()/][generateGeneralization(aClass)/]
+class DataFoodConsortium::Connector::[aClass.name.toUpperFirst()/][generateGeneralization(aClass)/]
 [if (aClass.isSemantic() and aClass.generalization->isEmpty())]
     include VirtualAssembly::Semantizer::SemanticObject
 [/if]
 [if (aClass.isSKOSConceptClass())]
-    include DataFoodConsortium::ConnectorV1::SKOSHelper
+    include DataFoodConsortium::Connector::SKOSHelper
 [/if]
 [if (aClass.isSemantic())]
 
@@ -41,5 +41,5 @@ end
 [/template]
 
 [template public generateGeneralization(classifier: Classifier)]
-[if (not (classifier.generalization->isEmpty()))] < [for (generalization: Generalization | classifier.generalization) separator(', ')]DataFoodConsortium::ConnectorV1::[generalization.general.name/][/for][/if]
+[if (not (classifier.generalization->isEmpty()))] < [for (generalization: Generalization | classifier.generalization) separator(', ')]DataFoodConsortium::Connector::[generalization.general.name/][/for][/if]
 [/template]

src/org/datafoodconsortium/connector/codegen/ruby/classifier.mtl

@@ -7,7 +7,7 @@
 [template public generateImports(classifier: Classifier)]
 [for (ei: ElementImport | classifier.elementImport->sortedBy(i: ElementImport | i.importedElement.name)) separator('\n')][if (ei.importedElement.oclIsTypeOf(Class))][generateImport(ei)/][/if][/for]
 [if (classifier.oclIsTypeOf(Class))]require "virtual_assembly/semantizer"[/if]
-[if (classifier.isSKOSConceptClass())]require 'datafoodconsortium/connector_v1/skos_helper'[/if]
+[if (classifier.isSKOSConceptClass())]require 'datafoodconsortium/connector/skos_helper'[/if]
 [/template]
 
-[template public generateImport(ei: ElementImport)]require "datafoodconsortium/connector_v1/[generateFileName(ei.importedElement.name) /]"[/template]
+[template public generateImport(ei: ElementImport)]require "datafoodconsortium/connector/[generateFileName(ei.importedElement.name) /]"[/template]

src/org/datafoodconsortium/connector/codegen/ruby/generate.mtl

@@ -8,16 +8,16 @@
 [template public generateRuby(model: Model)]
 [for (aClass: Class | model.getClasses())][generateClass(model, aClass)/][/for]
 
-[file (getProperty('ruby_outputFolder_src') + 'connector_v1.rb', false, 'UTF-8')]
+[file (getProperty('ruby_outputFolder_src') + 'connector.rb', false, 'UTF-8')]
 module DataFoodConsortium
-	module ConnectorV1
-		require 'datafoodconsortium/connector_v1/connector'
-		require 'datafoodconsortium/connector_v1/json_ld_serializer'
-		require 'datafoodconsortium/connector_v1/skos_parser_element'
-		require 'datafoodconsortium/connector_v1/skos_parser'
+	module Connector
+		require 'datafoodconsortium/connector/connector'
+		require 'datafoodconsortium/connector/json_ld_serializer'
+		require 'datafoodconsortium/connector/skos_parser_element'
+		require 'datafoodconsortium/connector/skos_parser'
 	[for (ip: PackageImport | model.packageImport->select(pi: PackageImport | pi.importedPackage.name <> 'org.datafoodconsortium.semantizer')->sortedBy(i: PackageImport | i.importedPackage.name))]
 		[for (member: NamedElement | ip.importedPackage.ownedMember->addAll(model.ownedMember)->select(ne: NamedElement | ne.oclIsTypeOf(Class))->sortedBy(m: NamedElement | m.name))]
-		require 'datafoodconsortium/connector_v1/[generateFileName(member.name) /].rb'
+		require 'datafoodconsortium/connector/[generateFileName(member.name) /].rb'
 		[/for]
 	[/for]
 

src/org/datafoodconsortium/connector/codegen/ruby/static/.github/workflows/ruby.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.2', '3.3', '3.4']
+        ruby-version: ['3.3', '3.4', '4.0']
 
     steps:
     - uses: actions/checkout@v3

src/org/datafoodconsortium/connector/codegen/ruby/static/CHANGELOG.md

@@ -7,7 +7,55 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.4.0] - 2026-06-15
+## [2.0.0] - 2026-06-16
+
+This version has been generated using:
+
+- [Connector code generator v2 branch](https://github.com/datafoodconsortium/connector-codegen/tree/v2).
+- [UML data model PR 29](https://github.com/datafoodconsortium/data-model-uml/pull/29).
+
+**This version contains breaking changes introduced by the ontology, see below.**
+
+### Added
+
+Classes:
+- Add `ical:Vevent`
+- Add `ical:Value_RECUR`
+- Add `geo:Feature`
+- Add `geo:Properties`
+- Add `geo:Geometry`
+- Add `geo:Point`
+- Add `geo:Polygon`
+- Add `Certification`
+- Add `DeliveryStep`
+- Add `Organization`
+- Add `PickUpStep`
+- Add `ProductOption`
+- Add `ProductOptionValue`
+- Add `Route`
+- Add `TemplateSaleSession`
+- Add `Variant`
+- Add `VariantCaracteristic`
+
+Properties:
+- Add `Catalog:startDate`
+- Add `PlannedLocalTransformation:startDate`
+- Add `RealizedTransformation:startDate`
+- Add `SuppliedProduct:referenceOf`.
+- Add `TechnicalProduct:referenceOf`.
+
+### Changed
+
+- `Stock:availabilityDate` is now a 1-1 property (**BREAKING CHANGE**)
+- `PaymentMethod:paymentMethodProvider` is now a 1-1 property (**BREAKING CHANGE**)
+- `PaymentMethod:paymentMethodType` is now a 1-1 property (**BREAKING CHANGE**)
+- `Variant:isVariantOf is now a `Variant` instead of `DefinedProduct` (**BREAKING CHANGE**)
+
+### Removed
+
+- Removed the `Enterprise` class. It was renamed to `Organization` (**BREAKING CHANGE**)
+
+## [1.4.0] - 2026-05-21
 
 Generated from [UML model 3.5.0](https://github.com/datafoodconsortium/data-model-uml/releases/tag/v3.5.0) using the [Connector codegen 1.3.0](https://github.com/datafoodconsortium/connector-codegen/releases/tag/v1.3.0).
 
@@ -63,16 +111,16 @@ Tests:
 
 ### Changed
 
-- `Address:country` is now a `ISKOSConcept` to reflect ontology v1.16 state (**breaking change**).
-- Rename `hasIncome` -> `hasInput` and `hasOutcome` -> `hasOutput` in `PlannedTransformation` (**breaking change**).
-- Rename `incomeOf` > `inputOf` in `PlannedConsumptionFlow` (**breaking change**).
-- Rename `outcomeOf` -> `outpufOf` in `PlannedProductionFlow` (**breaking change**).
-- Rename `PhysicalPlace:addresses` to `PhysicalPlace:address` (singular) to support correct cardinatility (**breaking change**).
-- Rename `PhysicalPlace:mainContact` to `PhysicalPlace:mainContacts` (plural) to support correct cardinatility (**breaking change**).
+- `Address:country` is now a `ISKOSConcept` to reflect ontology v1.16 state (**BREAKING CHANGE**).
+- Rename `hasIncome` -> `hasInput` and `hasOutcome` -> `hasOutput` in `PlannedTransformation` (**BREAKING CHANGE**).
+- Rename `incomeOf` > `inputOf` in `PlannedConsumptionFlow` (**BREAKING CHANGE**).
+- Rename `outcomeOf` -> `outpufOf` in `PlannedProductionFlow` (**BREAKING CHANGE**).
+- Rename `PhysicalPlace:addresses` to `PhysicalPlace:address` (singular) to support correct cardinatility (**BREAKING CHANGE**).
+- Rename `PhysicalPlace:mainContact` to `PhysicalPlace:mainContacts` (plural) to support correct cardinatility (**BREAKING CHANGE**).
 
 ### Removed
 
-- Remove the `Quantity` class as there is no such class in the ontology. We should use `QuantitativeValue` (**breaking change**).
+- Remove the `Quantity` class as there is no such class in the ontology. We should use `QuantitativeValue` (**BREAKING CHANGE**).
 
 ## [1.3.0] - 2025-12-17
 
@@ -258,7 +306,8 @@ This version has been generated using the [code generator](https://github.com/da
 
 - Initial version of this library.
 
-[unreleased]: https://github.com/datafoodconsortium/connector-ruby/compare/v1.4.0...HEAD
+[unreleased]: https://github.com/datafoodconsortium/connector-ruby/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/datafoodconsortium/connector-ruby/compare/v1.4.0...v2.0.0
 [1.4.0]: https://github.com/datafoodconsortium/connector-ruby/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/datafoodconsortium/connector-ruby/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/datafoodconsortium/connector-ruby/compare/v1.1.0...v1.2.0

src/org/datafoodconsortium/connector/codegen/ruby/static/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    datafoodconsortium-connector-v1 (1.4.0.pre.beta8)
+    datafoodconsortium-connector (2.0.0.pre.beta8)
       virtual_assembly-semantizer (~> 1.0, >= 1.0.5)
 
 GEM
@@ -59,13 +59,13 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  datafoodconsortium-connector-v1!
+  datafoodconsortium-connector!
   rspec
 
 CHECKSUMS
   bcp47_spec (0.2.1) sha256=3fd62edf96c126bd9624e4319ac74082a966081859d1ee0ef3c3041640a37810
   bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218
-  datafoodconsortium-connector-v1 (1.4.0.pre.beta8)
+  datafoodconsortium-connector (2.0.0.pre.beta8)
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
   htmlentities (4.4.2) sha256=bbafbdf69f2eca9262be4efef7e43e6a1de54c95eb600f26984f71d2fe96c5c3
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc

src/org/datafoodconsortium/connector/codegen/ruby/static/README.md

@@ -237,6 +237,6 @@ The Pull Requests should be made on our [source code generator repository](https
 
 To make the lockfile (*Gemfile.lock*), type `bundler lock`.
 
-To generate the *.gem*, type `gem build connector_v1.gemspec`.
+To generate the *.gem*, type `gem build connector.gemspec`.
 
 To push the generated gem to rubygem.org, type `gem push -k dfc datafoodconsortium-connector-<...>.gem` where *dfc* is your credential key.

src/org/datafoodconsortium/connector/codegen/ruby/static/connector_v1.gemspec → src/org/datafoodconsortium/connector/codegen/ruby/static/connector.gemspec

@@ -1,19 +1,19 @@
 Gem::Specification.new do |s|
-  s.name        = "datafoodconsortium-connector-v1"
-  s.version     = "1.4.0-beta8"
-  s.summary     = "Data Food Consortium connector version 1 (legacy)"
+  s.name        = "datafoodconsortium-connector"
+  s.version     = "2.0.0-beta8"
+  s.summary     = "Data Food Consortium connector"
   s.description = "A library to easily integrate the DFC standard within your application."
   s.authors     = ["Maxime Lecoq", "Maikel Linke"]
   s.email       = "maxime@lecoqlibre.fr"
   s.files       = Dir["lib/**/*.*"]
-  s.homepage    = "https://github.com/datafoodconsortium/connector-ruby/releases/tag/v1.4.0"
+  s.homepage    = "https://github.com/datafoodconsortium/connector-ruby/"
   s.license     = "MIT"
 
   s.metadata = {
     "changelog_uri" =>
-      "https://github.com/datafoodconsortium/connector-ruby/releases/tag/v1.4.0/blob/main/CHANGELOG.md",
+      "https://github.com/datafoodconsortium/connector-ruby/blob/main/CHANGELOG.md",
     "source_code_uri" =>
-      "https://github.com/datafoodconsortium/connector-ruby/releases/tag/v1.4.0/",
+      "https://github.com/datafoodconsortium/connector-ruby/",
   }
 
   s.add_runtime_dependency "virtual_assembly-semantizer", "~> 1.0", ">= 1.0.5"

src/org/datafoodconsortium/connector/codegen/ruby/static/lib/datafoodconsortium/connector_v1/connector.rb → src/org/datafoodconsortium/connector/codegen/ruby/static/lib/datafoodconsortium/connector/connector.rb

@@ -21,11 +21,11 @@
 # SOFTWARE.
 
 require 'singleton'
-require 'datafoodconsortium/connector_v1/context'
-require 'datafoodconsortium/connector_v1/importer'
-require 'datafoodconsortium/connector_v1/json_ld_serializer'
+require 'datafoodconsortium/connector/context'
+require 'datafoodconsortium/connector/importer'
+require 'datafoodconsortium/connector/json_ld_serializer'
 
-module DataFoodConsortium::ConnectorV1
+module DataFoodConsortium::Connector
   class Connector
     include Singleton
 

src/org/datafoodconsortium/connector/codegen/ruby/static/lib/datafoodconsortium/connector_v1/context.rb → src/org/datafoodconsortium/connector/codegen/ruby/static/lib/datafoodconsortium/connector/context.rb

@@ -3,15 +3,15 @@
 require 'json/ld'
 
 module DataFoodConsortium
-  module ConnectorV1
+  module Connector
     # Preload the DFC context.
     #
     # Similar to: https://github.com/ruby-rdf/json-ld-preloaded/
     class Context < JSON::LD::Context
-      URL = "https://w3id.org/dfc/ontology/context/context_1.16.0.json"
-      URL_NORMALISED = "http://w3id.org/dfc/ontology/context/context_1.16.0.json"
+      URL = "https://w3id.org/dfc/ontology/context/context_2.0.0.json"
+      URL_NORMALISED = "http://w3id.org/dfc/ontology/context/context_2.0.0.json"
 
-      # All context URIs have to use http because https is normalised to http
+       # All context URIs have to use http because https is normalised to http
       # during the lookup of preloaded contexts.
       # And if the URI doesn't have a path, it must end with `/`.
       add_preloaded(URL_NORMALISED) { parse(json) }
@@ -21,20 +21,12 @@ class Context < JSON::LD::Context
 
       # This is the current file the DFC website refers to in a link header.
       alias_preloaded(
-        "http://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context_1.16.0.jsonld",
+        "http://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context_2.0.0.jsonld",
         URL_NORMALISED
       )
 
-      # This was the file the DFC website refers to in a link header.
       alias_preloaded(
-        "http://www.datafoodconsortium.org/wp-content/plugins/wordpress-context-jsonld/context.jsonld",
-        URL_NORMALISED
-      )
-
-      # 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",
         URL_NORMALISED
       )
 
@@ -44,8 +36,8 @@ def self.inputContext
       end
 
       def self.json
-        @json ||= JSON.parse(File.read("#{__dir__}/context_1.16.0.json"))["@context"]
+        @json ||= JSON.parse(File.read("#{__dir__}/context_2.0.0.json"))["@context"]
       end
     end
   end
-end
+end