solis 0.127.0 → 0.128.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7cf89eceec897d7b5fe15ef1669b031480a7aab2850bd5638cfac379e4798ae
-  data.tar.gz: 56a9ce9652925e1be2904dc150bba6d31f3f2ca13870641c883fb0dde65b341c
+  metadata.gz: 8200228367f2710bad52af70fd0430ca70ec589fe284e19e22bdfe4e1a659a98
+  data.tar.gz: 337d425fa58afb14c95cfd3703d848a9093e563a335f1d37b08d420981389761
 SHA512:
-  metadata.gz: 499ff31724baaa76c0ae960916d5b01c0f25f535e07e89fd0cba72cbc042fe271898b5c422842201463daef4903d1207bf4fdcbd248e3bbff346153f4dba1765
-  data.tar.gz: 264f64d77cf8b15d708da87cbf0602a6f8be5282c04a365f52966e865895032e9c08b4952e99abbcb6e5f4aa80fcbd20887e3e4d9c961398e350a4cbaff17b0b
+  metadata.gz: 64cae66429794837abf0e51b72e43847337c195a69b9f6ca5cbffa22bf6888dc472592d7c186d31ca9a7b4eca826d3ecdf1a4c1b0853d047d778cc7931f4ab47
+  data.tar.gz: 449810be62118c3def433b580a8e794f3b19ef84413d8b14ca1fbda72c95986ebe8787ddb5a019cb9d63c2dc73f756983b0fc6249977241585c490217a494a12

data/lib/solis/model.rb

@@ -590,7 +590,10 @@ values ?s {<#{self.graph_id}>}
                            description: attribute_metadata[:comment]&.value
         }
         attribute_data[:order] = attribute_metadata[:order]&.value.to_i if attribute_metadata.key?(:order) && !attribute_metadata[:order].nil?
-        attribute_data[:group] = attribute_metadata[:group]&.value.gsub(graph_name,'').gsub(/Group$/,'') if attribute_metadata.key?(:group) && !attribute_metadata[:group].nil?
+        if attribute_metadata.key?(:group) && !attribute_metadata[:group].nil?
+          attribute_data[:group] = { name: attribute_metadata[:group][:name],
+                                     label: attribute_metadata[:group][:label] || {} }
+        end
         attribute_data[:attributes] = cm[:attributes] if cm && cm[:attributes]
 
         m[:attributes] << attribute_data

data/lib/solis/shape/reader/sheet.rb

@@ -45,7 +45,8 @@ module Solis
 
               if sheets.key?('_CATEGORIES')
                 categories = sheets['_CATEGORIES']
-                raise "_CATEGORIES tab must have ['name'] as a header at row 1" unless (%w[name] - categories.header).length == 0
+                has_name = categories.header.include?('name') || categories.header.any? { |h| language_column('name').match?(h.to_s) }
+                raise "_CATEGORIES tab must have ['name'] or ['name_XX', ...] as a header at row 1" unless has_name
               end
 
               sheets.each do |sheet_name, sheet|
@@ -141,17 +142,20 @@ module Solis
               raise Solis::Error::GeneralError, e.message
             end
 
-            # Matches the 'Label_XX' columns (header is downcased by ::Sheet#header) where
-            # XX is a language tag, ex. 'Label_NL', 'Label_EN', 'Label_nl-BE'
-            LANGUAGE_LABEL_COLUMN = /\Alabel_(?<language>[a-z]{2,3}([-_][a-z0-9]{2,8})*)\z/.freeze
+            # Matches the '<prefix>_XX' columns (header is downcased by ::Sheet#header) where
+            # XX is a language tag, ex. 'Label_NL', 'Label_EN', 'Label_nl-BE', 'Name_nl'
+            def language_column(prefix)
+              /\A#{Regexp.escape(prefix.to_s.downcase)}_(?<language>[a-z]{2,3}([-_][a-z0-9]{2,8})*)\z/
+            end
 
-            # Collects all 'Label_XX' columns of a row into { nl: 'Publiceren', en: 'Publish' }
-            def parse_labels(row)
+            # Collects all 'Label_XX' (or '<prefix>_XX') columns of a row into { nl: 'Publiceren', en: 'Publish' }
+            def parse_labels(row, prefix = 'label')
               labels = {}
               return labels unless row.respond_to?(:each_pair)
 
+              column_pattern = language_column(prefix)
               row.each_pair do |column, value|
-                match = LANGUAGE_LABEL_COLUMN.match(column.to_s)
+                match = column_pattern.match(column.to_s)
                 next if match.nil?
                 next if value.nil? || value.to_s.strip.empty?
 
@@ -283,7 +287,7 @@ hide empty members
               "\n#{indent}#{rdfs_prefix}:label #{literals.join(', ')} ;"
             end
 
-            def build_shacl(datas)
+            def build_shacl(datas, categories = [])
               shacl_prefix = datas.first[:ontologies][:all].select { |_, v| v[:uri] =~ /shacl/ }.keys.first
               shacl_prefix = 'sh' if shacl_prefix.nil?
 
@@ -385,10 +389,17 @@ hide empty members
                   out += ".\n"
 
                   groups.each do |group, category|
+                    # use the per language names from _CATEGORIES when the category is referenced by any of them
+                    category_labels = categories.find { |c| c[:name].eql?(category) || c[:labels].value?(category) }&.dig(:labels)
+                    group_label = if category_labels.nil? || category_labels.empty?
+                                    %(#{rdfs_prefix}:label "#{category}")
+                                  else
+                                    build_labels(category_labels, rdfs_prefix, '').strip.chomp(' ;')
+                                  end
                     out += %(
 #{graph_prefix}:#{group}
 	a #{shacl_prefix}:PropertyGroup ;
-	#{rdfs_prefix}:label "#{category}" .
+	#{group_label} .
 
 )
                   end
@@ -526,7 +537,7 @@ hide empty members
               # categories are uninflected, singular and plural are the same word.
               # an entity by the same name keeps its own plural.
               # categories.each do |category|
-              #   name = category.to_s.strip
+              #   name = category[:name].to_s.strip
               #   next if name.empty?
               #
               #   inflections[name.to_sym] = name unless inflections.key?(name.to_sym) || inclections.value?(name.to_s)
@@ -780,7 +791,19 @@ hide empty members
           options[:metadata] = metadata
 
           # like _REFERENCES, _CATEGORIES only lives in the main sheet
-          categories = sheet_data.is_a?(Hash) && sheet_data.key?('_CATEGORIES') ? sheet_data['_CATEGORIES'].map { |c| c['name'] } : []
+          # a category can have a name per language ('Name_nl', 'Name_en', ...) next to, or instead of, 'Name'.
+          # entity sheets refer to a category by 'Name' or, when missing, by the first 'Name_XX' column.
+          categories = []
+          if sheet_data.is_a?(Hash) && sheet_data.key?('_CATEGORIES')
+            categories = sheet_data['_CATEGORIES'].map do |c|
+              labels = parse_labels(c, 'name')
+              name = c['name'].to_s.strip
+              name = labels.values.first.to_s if name.empty?
+              next if name.empty?
+
+              { name: name, labels: labels }
+            end.compact
+          end
           Solis::LOGGER.info("Found #{categories.length} categories") unless categories.empty?
 
           #TODO: cleanup
@@ -820,7 +843,7 @@ hide empty members
           end
 
           Solis::LOGGER.info('Generating SHACL')
-          shacl = build_shacl(datas)
+          shacl = build_shacl(datas, categories)
           Solis::LOGGER.info('Generating PLANTUML')
           plantuml = build_plantuml(datas)
           Solis::LOGGER.info('Generating SCHEMA')

data/lib/solis/shape.rb

@@ -156,12 +156,25 @@ module Solis
               next if attribute.nil?
 
               attribute[:label] = labels_of(graph, property.object)
+              attribute[:group] = group_of(graph, attribute[:group]) unless attribute[:group].nil?
             end
           end
 
           shapes
         end
 
+        # Turns a sh:PropertyGroup URI into
+        #   { uri: RDF::URI, name: 'OpleidingEnLoopbaan', label: { nl: 'opleiding_en_loopbaan', en: 'education_and_career' } }
+        def group_of(graph, group)
+          return group if group.is_a?(Hash)
+
+          {
+            uri: group,
+            name: group.to_s.split(%r{[/#]}).last.to_s.gsub(/Group$/, ''),
+            label: labels_of(graph, group)
+          }
+        end
+
         def name_of(graph, subject)
           graph.query([subject, RDF::Vocab::SHACL.name, nil]).first&.object&.value
         end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.127.0"
+  VERSION = "0.128.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.127.0
+  version: 0.128.0
 platform: ruby
 authors:
 - Mehmet Celik