Bump DFC taxonomies to v1.0.2

Finally replacing the last of the old DFC context URLs that are not valid any more.
openfoodfoundation · Nov 16, 2023 · ff2af57 · ff2af57
1 parent 5f3e176
commit ff2af57
Show file tree

Hide file tree

Showing 9 changed files with 2,584 additions and 2,471 deletions.
diff --git a/engines/dfc_provider/app/services/quantitative_value_builder.rb b/engines/dfc_provider/app/services/quantitative_value_builder.rb
@@ -19,11 +19,11 @@ def self.quantity(variant)
   def self.unit(variant)
     case variant.product.variant_unit
     when "volume"
-      DfcLoader.connector.MEASURES.UNIT.QUANTITYUNIT.LITRE
+      DfcLoader.connector.MEASURES.LITRE
     when "weight"
-      DfcLoader.connector.MEASURES.UNIT.QUANTITYUNIT.GRAM
+      DfcLoader.connector.MEASURES.GRAM
     else
-      DfcLoader.connector.MEASURES.UNIT.QUANTITYUNIT.PIECE
+      DfcLoader.connector.MEASURES.PIECE
     end
   end
 
@@ -67,7 +67,7 @@ def self.apply(quantity, product)
   #
   # Until then, we can ignore Rubocop metrics, IMO.
   def self.map_unit(unit) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
-    quantity_unit = DfcLoader.connector.MEASURES.UNIT.QUANTITYUNIT
+    quantity_unit = DfcLoader.connector.MEASURES
 
     # The unit name is only set for items. The name is implied for weight and
     # volume and filled in by `WeightsAndMeasures`.
@@ -110,7 +110,8 @@ def self.map_unit(unit) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/
     else
       # Labels may be provided one day:
       # https://github.com/datafoodconsortium/connector-ruby/issues/18
-      label = unit.try(:semanticId)&.split("#")&.last || "items"
+      unit_id = unit.try(:semanticId)&.split("#")&.last&.split(":")&.last
+      label = unit_id || "items"
       ["items", label, 1]
     end
   end

diff --git a/engines/dfc_provider/lib/data_food_consortium/connector/connector.rb b/engines/dfc_provider/lib/data_food_consortium/connector/connector.rb
@@ -13,6 +13,13 @@ class Connector
       def import(json_string_or_io)
         Importer.new.import(json_string_or_io)
       end
+
+      # Monkey patch private method until fixed upstream:
+      # https://github.com/datafoodconsortium/connector-ruby/issues/19
+      def loadThesaurus(data)
+        taxonomy = data&.try(:[], 0) || data
+        return @parser.parse(taxonomy["@graph"])
+      end
     end
   end
 end
diff --git a/engines/dfc_provider/script/update-dfc-vocabularies b/engines/dfc_provider/script/update-dfc-vocabularies
@@ -2,9 +2,10 @@
 
 set -e
 
+src="https://github.com/datafoodconsortium/taxonomies/releases/latest/download"
 dst="`dirname $0`/../vendor"
 mkdir -p "$dst"
 
-curl 'http://static.datafoodconsortium.org/data/facets.json' > "$dst/facets.json"
-curl 'http://static.datafoodconsortium.org/data/measures.json' > "$dst/measures.json"
-curl 'http://static.datafoodconsortium.org/data/productTypes.json' > "$dst/productTypes.json"
+curl --location "$src/facets.json" > "$dst/facets.json"
+curl --location "$src/measures.json" > "$dst/measures.json"
+curl --location "$src/productTypes.json" > "$dst/productTypes.json"
diff --git a/engines/dfc_provider/spec/lib/data_food_consortium/connector/importer_spec.rb b/engines/dfc_provider/spec/lib/data_food_consortium/connector/importer_spec.rb
@@ -94,7 +94,7 @@
     unless connector.MEASURES.respond_to?(:UNIT)
       connector.loadMeasures(read_file("measures"))
     end
-    connector.MEASURES.UNIT.QUANTITYUNIT.PIECE
+    connector.MEASURES.PIECE
   end
 
   it "imports a single object with simple properties" do

diff --git a/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb b/engines/dfc_provider/spec/services/quantitative_value_builder_spec.rb
@@ -45,7 +45,7 @@
   end
 
   describe ".apply" do
-    let(:quantity_unit) { DfcLoader.connector.MEASURES.UNIT.QUANTITYUNIT }
+    let(:quantity_unit) { DfcLoader.connector.MEASURES }
     let(:product) { Spree::Product.new }
 
     it "uses items for anything unknown" do