opencdd 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fef2d0d21f84980a8ecd470525ad52e687f511de1ca0c0567b08d55ca63d138
-  data.tar.gz: b5497fc0a22a1ccedabc62ed3424a99164e2c6b964cd049f5b139a2060316fbc
+  metadata.gz: 9fc81f8bcb07863fa5c69e681de61f2d198f39bc81a0fc59da37ec987c9b2a1f
+  data.tar.gz: 90e951f6174389ecab19ae8170b3e23ed8ff3e7d79602505f9ae2bd517369384
 SHA512:
-  metadata.gz: f4d40389beaf651c46c1acebf77d557ea6ee0b722e6048914bf5e9107937e82aadb65ed7cdce2ae421984cfabf722303145f9dd69c9715fdcabec6d94811da43
-  data.tar.gz: '083684e0064e581c101c3a906dca0e25e33d06c96c75d1170eef5b46c7a77a5380fb7ebd1d9782b7fac5602086ca0e44d74d7824cc39726c9a12f3f353686f00'
+  metadata.gz: c20ebb47fc6253b09cc1dc083066aadb552af65606c77400c932a3f78ac1ee08e78b431eb69a7409a1c9ec9dd2059b7d6d3a6ce78c0143393b6fd80f8c6a89dc
+  data.tar.gz: 50c2e7547728041faa53a8acc143e545628e5d3750d61dd55b36e2cd7ec980ee0a7af4755e2fafd8024f0d67a9e4c9cdb9f2140274ae893d8aba29906d26f185

data/lib/opencdd/entity.rb

@@ -69,6 +69,17 @@ module Opencdd
     def self.from_row(row, schema:, meta_class_irdi:, code_property_id: nil)
       code_property_id ||= default_code_property_id(meta_class_irdi)
       raw_code = code_property_id && row[code_property_id]
+      # Fall back to other known code property IDs when the entity-
+      # specific one is absent (happens with name-only header sheets
+      # where "Code" synthesizes to MDC_P001_5 regardless of type).
+      if raw_code.nil? || raw_code.to_s.strip.empty?
+        Opencdd::MetaClasses::CODE_PROPERTY_IDS.each_value do |alt_id|
+          val = row[alt_id]
+          next if val.nil? || val.to_s.strip.empty?
+          raw_code = val
+          break
+        end
+      end
       irdi = raw_code && Opencdd::IRDI.parse(raw_code)
 
       props = row.each_with_object({}) do |(k, v), h|

data/lib/opencdd/meta_class.rb

@@ -79,6 +79,7 @@ module Opencdd
         "MDC_C011" => "MDC_P001_13",
         "MDC_C009" => "MDC_P001_10",
         "MDC_C010" => "MDC_P001_11",
+        "MDC_C0100" => "C0101",
         "EXT_C001" => "EXT_P001",
       }.freeze
 
@@ -89,6 +90,7 @@ module Opencdd
         "MDC_C011" => :relation,
         "MDC_C009" => :unit,
         "MDC_C010" => :value_term,
+        "MDC_C0100" => :list_of_unit,
         "EXT_C001" => :view_control,
       }.freeze
 
@@ -252,6 +254,13 @@ module Opencdd
             type: :view_control,
             allowed_property_ids: common + %w[EXT_P002 EXT_P003],
           )
+          list_of_unit = MetaClass.new(
+            irdi: "MDC_C0100",
+            name: "ListOfUnit",
+            entity_class: Opencdd::Entity,
+            type: :list_of_unit,
+            allowed_property_ids: common,
+          )
           {
             klass_class.irdi    => klass_class,
             property_class.irdi => property_class,
@@ -260,6 +269,7 @@ module Opencdd
             unit.irdi           => unit,
             value_term.irdi     => value_term,
             view_control.irdi   => view_control,
+            list_of_unit.irdi   => list_of_unit,
           }
         end
       end

data/lib/opencdd/parcel/flat_dir_reader.rb

@@ -23,6 +23,7 @@ module Opencdd
         "UNIT"       => :unit,
         "VALUELIST"  => :value_list,
         "VALUETERMS" => :value_term,
+        "LISTOFUNITS" => :list_of_unit,
       }.freeze
 
       attr_reader :path

data/lib/opencdd/parcel/layout_detector.rb

@@ -32,7 +32,7 @@ module Opencdd
 
       # Per-type export filename produced by cdd.iec.ch's download
       # endpoint.
-      FILE_PATTERN = /\Aexport_(CLASS|PROPERTY|RELATION|UNIT|VALUELIST|VALUETERMS)_[^\.]+\.(xls|xlsx)\z/i.freeze
+      FILE_PATTERN = /\Aexport_(CLASS|PROPERTY|RELATION|UNIT|VALUELIST|VALUETERMS|LISTOFUNITS)_[^\.]+\.(xls|xlsx)\z/i.freeze
 
       module_function
 

data/lib/opencdd/parcel/sheet_schema.rb

@@ -159,6 +159,9 @@ module Opencdd
 
       def finalize!
         ids = @column_directives["PROPERTY_ID"] || []
+        if ids.empty? || ids.all? { |id| id.nil? || id.to_s.strip.empty? }
+          ids = synthesize_ids_from_names
+        end
         ids.each_with_index do |id, idx|
           next if id.nil? || id.to_s.strip.empty?
 
@@ -194,6 +197,81 @@ module Opencdd
         freeze
       end
 
+      # When a sheet has no #PROPERTY_ID directive row (only
+      # #PROPERTY_NAME), synthesize property IDs from the names.
+      # This happens with some export formats (notably RELATION
+      # exports from cdd.iec.ch) that omit the PROPERTY_ID row.
+      NAME_TO_PROPERTY_ID = {
+        "Code"                   => "MDC_P001_5",
+        "Version"                => "MDC_P002_1",
+        "Revision"               => "MDC_P002_2",
+        "VersionInitiationDate"  => "MDC_P003_1",
+        "VersionReleaseDate"     => "MDC_P003_2",
+        "RevisionReleaseDate"    => "MDC_P003_3",
+        "PreferredName"          => "MDC_P004",
+        "SynonymousName"         => "MDC_P007",
+        "ShortName"              => "MDC_P005",
+        "Definition"             => "MDC_P006",
+        "DefinitionSource"       => "MDC_P006_1",
+        "Note"                   => "MDC_P008",
+        "Remark"                 => "MDC_P009",
+        "Drawing"                => "MDC_P008_1",
+        "GUID"                   => "MDC_P066",
+        "TimeStamp"              => "MDC_P067",
+        "ClassType"              => "MDC_P011",
+        "Superclass"             => "MDC_P010",
+        "IsCaseOf"               => "MDC_P013",
+        "ApplicableProperties"   => "MDC_P014",
+        "ImportedProperties"     => "MDC_P090",
+        "SubClassSelection"      => "MDC_P016",
+        "DataType"               => "MDC_P022",
+        "ValueFormat"            => "MDC_P024",
+        "DefinitionClass"        => "MDC_P021",
+        "Unit"                   => "MDC_P041",
+        "Condition"              => "MDC_P028",
+        "ListType"               => "MDC_P046",
+        "CodeList"               => "MDC_P044",
+        "TermList"               => "MDC_P043",
+        "EnumerationCode"        => "MDC_P044",
+        "RelationType"           => "MDC_P200",
+        "RelationDomain"         => "MDC_P201",
+        "FunctionDomain"         => "MDC_P202",
+        "FunctionCodomain"       => "MDC_P203",
+        "Formula"                => "MDC_P204",
+        "FormulaLanguage"        => "MDC_P205",
+        "FormulaExternalSolver"  => "MDC_P206",
+        "TriggerEvent"           => "MDC_P207",
+        "DomainElementType"      => "MDC_P208",
+        "CodomainElementType"    => "MDC_P209",
+        "Role"                   => "MDC_P210",
+        "Segment"                => "MDC_P211",
+        "SuperRelation"          => "MDC_P212",
+      }.freeze
+
+      def synthesize_ids_from_names
+        names = nil
+        @column_directives.each do |key, vals|
+          base, = key.split(".", 2)
+          next unless base == "PROPERTY_NAME"
+          names = vals
+          break
+        end
+        return [] unless names
+        Array.new(names.size) do |idx|
+          val = names[idx]
+          next nil if val.nil? || val.to_s.strip.empty?
+          raw = val.to_s.strip
+          if raw =~ /\A(.+)\.([A-Za-z]{2})\z/
+            base = $1
+            lang = $2
+            pid = NAME_TO_PROPERTY_ID[base]
+            pid ? "#{pid}.#{lang.downcase}" : nil
+          else
+            NAME_TO_PROPERTY_ID[raw]
+          end
+        end
+      end
+
       def [](property_id_or_name)
         find_by_property_id(property_id_or_name) || find_by_name(property_id_or_name)
       end

data/lib/opencdd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Opencdd
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opencdd
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - OpenCDD contributors