solis 0.116.0 → 0.117.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: affbb3891268851909a6a35684c11a36f6e67d617dea1e977015124ca0bd8118
-  data.tar.gz: 920ad82dc52d0bdefe3bd1e08b631e6907d6f13952f5573fc3bb8f392b03521d
+  metadata.gz: fa9ba6d86b36ebd75e9e0280928ce458f1ae70e4c64f44832c0963870f319b2f
+  data.tar.gz: 23c8bd2bcbbb4fe97dc133b3310d1527bab161dbce43e2939b45a8fa1a9b7712
 SHA512:
-  metadata.gz: 9b42751289ba605e41d7e02c85a6a7df99a41a80237ca282a4502d3c4a48198ba8057a35b884a51914b828657a88b1d6c3899d3dd703f10c30a0b9ff779dd364
-  data.tar.gz: 8d627312e95e719ab5ddabbd8bdbd0f964aa0a98ed6372df07f18462ecf69a9bdd4ce1e53f21b29392ad450a5874ebfb6bc5b510bc2adbb5fe634a1edf325cc0
+  metadata.gz: f15183cf04d168b3d06425bfe987d4cc446d0fad1e1b1f94532b8dfedf39b3401d39641226d91a63400f4a4e1c7096a0c995b64e2629d6d07424bae7e4c14375
+  data.tar.gz: d7219d14c2290aa045ca80a32a97df1f12fcc4aa0df31fc3628fe91dbd5e2ee7e6239474aef27f4f43caf45fb9347e8cd059a0deabff12a3b2bd754ad1e98342

data/lib/solis/model.rb

@@ -583,10 +583,11 @@ values ?s {<#{self.graph_id}>}
         attribute_data = { name: attribute,
                            data_type: attribute_metadata[:datatype],
                            mandatory: (attribute_metadata[:mincount].to_i > 0),
+                           repeatable: (attribute_metadata[:maxcount].to_i > 1 || attribute_metadata[:maxcount].nil?),
                            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[:category] = attribute_metadata[:category]&.value if attribute_metadata.key?(:category) && !attribute_metadata[:category].nil?
+        attribute_data[:group] = attribute_metadata[:group]&.value.gsub(graph_name,'').gsub(/Group$/,'') if attribute_metadata.key?(:group) && !attribute_metadata[:group].nil?
         attribute_data[:attributes] = cm[:attributes] if cm && cm[:attributes]
 
         m[:attributes] << attribute_data

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

@@ -52,28 +52,20 @@ module Solis
             end
 
             def read_sheets(key, spreadsheet_id, options)
-              data = nil
               prefixes = options[:prefixes] || nil
               metadata = options[:metadata] || nil
 
-              cache_dir = ConfigFile.include?(:cache) ? ConfigFile[:cache] : '/tmp'
-
-              if ::File.exist?("#{cache_dir}/#{spreadsheet_id}.json") && (options.include?(:from_cache) && options[:from_cache])
-                Solis::LOGGER.info("from cache #{cache_dir}/#{spreadsheet_id}.json")
-                data = JSON.parse(::File.read("#{cache_dir}/#{spreadsheet_id}.json"), { symbolize_names: true })
-                return data
-              else
-                Solis::LOGGER.info("from source #{spreadsheet_id}")
-                session = SimpleSheets.new(key, spreadsheet_id)
-                session.key = key
-                sheets = {}
-                session.worksheets.each do |worksheet|
-                  sheet = ::Sheet.new(worksheet)
-                  sheets[sheet.title] = sheet
-                end
-
-                validate(sheets, prefixes, metadata)
+              Solis::LOGGER.info("from source #{spreadsheet_id}")
+              session = SimpleSheets.new(key, spreadsheet_id)
+              session.key = key
+              sheets = {}
+              session.worksheets.each do |worksheet|
+                sheet = ::Sheet.new(worksheet)
+                sheets[sheet.title] = sheet
               end
+
+              validate(sheets, prefixes, metadata)
+
               sheets
             end
 
@@ -118,6 +110,7 @@ module Solis
 
                 entities.store(e['name'].to_sym, { description: e['description'],
                                                    order: e['order'],
+                                                   category: e['categories'],
                                                    plural: e['nameplural'],
                                                    label: e['name'].to_s.strip,
                                                    sub_class_of: e['subclassof'].nil? || e['subclassof'].empty? ? [] : [e['subclassof']],
@@ -137,12 +130,6 @@ module Solis
                 metadata: ontology_metadata
               }
 
-              cache_dir = ConfigFile.include?(:cache) ? ConfigFile[:cache] : '/tmp'
-              # ::File.open("#{::File.absolute_path(cache_dir)}/#{spreadsheet_id}.json", 'wb') do |f|
-              ::File.open("#{::File.absolute_path(cache_dir)}/#{sheet_id}.json", 'wb') do |f|
-                f.puts data.to_json
-              end
-
               data
             rescue StandardError => e
               raise Solis::Error::GeneralError, e.message
@@ -180,6 +167,7 @@ module Solis
                       cardinality: { min: min_max['min'], max: min_max['max'] },
                       same_as: p['sameas'],
                       order: p['order'],
+                      category: p['categories'],
                       description: p['description']
                     }
 
@@ -302,6 +290,8 @@ hide empty members
                     node = target_class
                   end
 
+                  groups = {}
+
                   out += %(
 #{graph_prefix}:#{entity_name}Shape
     a               #{shacl_prefix}:NodeShape ;
@@ -322,11 +312,19 @@ hide empty members
                     min_count = property_metadata[:cardinality][:min].strip
                     max_count = property_metadata[:cardinality][:max].strip
                     order = property_metadata.key?(:order) && property_metadata[:order] ? property_metadata[:order]&.strip : nil
+                    category = property_metadata.key?(:category) && property_metadata[:category] ? property_metadata[:category]&.strip : nil
+                    category = category.nil? || category.empty? ? nil : category
+
+                    unless category.nil?
+                      group = "#{category.classify}Group"
+                      groups[group] = category unless groups.key?(group)
+                    end
 
                     if datatype =~ /^#{graph_prefix}:/ || datatype =~ /^<#{graph_name}/
                       out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}" ;
                  #{shacl_prefix}:description "#{description}" ;#{order.nil? ? '' : "\n                 #{shacl_prefix}:order #{order} ;"}
+                 #{category.nil? ? '' : "\n                 #{shacl_prefix}:group #{graph_prefix}:#{group} ;"}
                  #{shacl_prefix}:nodeKind #{shacl_prefix}:IRI ;
                  #{shacl_prefix}:class    #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}#{max_count =~ /\d+/ ? "\n                 #{shacl_prefix}:maxCount #{max_count} ;" : ''}
     ] ;
@@ -344,6 +342,7 @@ hide empty members
                         out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}";
                  #{shacl_prefix}:description "#{description}" ;#{order.nil? ? '' : "\n                 #{shacl_prefix}:order #{order} ;"}
+                 #{category.nil? ? '' : "\n                 #{shacl_prefix}:group #{graph_prefix}:#{group} ;"}
                  #{shacl_prefix}:datatype #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}#{max_count =~ /\d+/ ? "\n                 #{shacl_prefix}:maxCount #{max_count} ;" : ''}
     ] ;
 )
@@ -359,6 +358,15 @@ hide empty members
                     end
                   end
                   out += ".\n"
+
+                  groups.each do |group, category|
+                    out += %(
+#{graph_prefix}:#{group}
+	a sh:PropertyGroup ;
+	rdfs:label "#{category}" .
+
+)
+                  end
                 end
               end
               out
@@ -716,6 +724,14 @@ hide empty members
             end
           end
 
+          cache_dir = ConfigFile.include?(:cache) ? ConfigFile[:cache] : '/tmp'
+          cache_file = "#{::File.absolute_path(cache_dir)}/#{spreadsheet_id}.json"
+
+          if options[:from_cache] && ::File.exist?(cache_file)
+            Solis::LOGGER.info("Loading cached result from #{cache_file}")
+            return JSON.parse(::File.read(cache_file), symbolize_names: true)
+          end
+
           sheet_data = read_sheets(key, spreadsheet_id, options)
           prefixes = sheet_data['_PREFIXES']
           metadata = sheet_data['_METADATA']
@@ -736,10 +752,6 @@ hide empty members
               { sheet_url: reference['sheeturl'], description: reference['description'] }
             end
 
-            cache_dir = ConfigFile.include?(:cache) ? ConfigFile[:cache] : '/tmp'
-            ::File.open("#{::File.absolute_path(cache_dir)}/#{spreadsheet_id}.json", 'wb') do |f|
-              f.puts references.to_json
-            end
           else
             references = sheet_data
           end
@@ -778,7 +790,16 @@ hide empty members
           Solis::LOGGER.info('Generating JSON SCHEMA')
           json_schema = build_json_schema(shacl)
 
-          { inflections: inflections, shacl: shacl, schema: schema, plantuml: plantuml, json_schema: json_schema }
+          result = { inflections: inflections, shacl: shacl, schema: schema, plantuml: plantuml, json_schema: json_schema }
+
+          begin
+            ::File.open(cache_file, 'wb') { |f| f.puts result.to_json }
+            Solis::LOGGER.info("Cached result to #{cache_file}")
+          rescue StandardError => e
+            Solis::LOGGER.warn("Failed to write cache: #{e.message}")
+          end
+
+          result
         end
       end
     end

data/lib/solis/shape.rb

@@ -104,6 +104,7 @@ module Solis
           attribute_class = solution.attributeClass if solution.bound?(:attributeClass)
           attribute_comment = solution.attributeComment if solution.bound?(:attributeComment)
           attribute_order = solution.attributeOrder if solution.bound?(:attributeOrder)
+          attribute_group = solution.attributeGroup if solution.bound?(:attributeGroup)
 
           attribute_max_count =  1 if solution.bound?(:attributeUniqueLang) && solution.attributeUniqueLang.value.eql?('true')
 
@@ -125,6 +126,7 @@ module Solis
             mincount: attribute_min_count,
             maxcount: attribute_max_count,
             order: attribute_order,
+            group: attribute_group,
             node: attribute_node,
             node_kind: attribute_node_kind,
             class: attribute_class,
@@ -142,7 +144,7 @@ PREFIX rdfv: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 
 SELECT ?targetClass ?targetNode ?comment ?className ?attributePath ?attributeName ?attributeDatatype
        ?attributeMinCount ?attributeMaxCount ?attributeOr ?attributeClass
-       ?attributeNode ?attributeNodeKind ?attributeComment ?attributeOrder ?attributeUniqueLang ?o
+       ?attributeNode ?attributeNodeKind ?attributeComment ?attributeOrder ?attributeGroup ?attributeUniqueLang ?o
 WHERE {
 
   ?s a sh:NodeShape;
@@ -162,6 +164,7 @@ WHERE {
                            OPTIONAL{ ?attributes sh:node     ?attributeNode } .
                            OPTIONAL{ ?attributes sh:description ?attributeComment } .
                            OPTIONAL{ ?attributes sh:order ?attributeOrder } .
+                           OPTIONAL{ ?attributes sh:group ?attributeGroup } .
                            OPTIONAL{ ?attributes sh:uniqueLang ?attributeUniqueLang } .
      }.
 }
@@ -182,6 +185,7 @@ WHERE {
                     "mincount": 1,
                     "maxcount": 1,
                     "order": nil,
+                    "group": nil,
                     "node": nil,
                     "node_kind": nil,
                     "class": nil,

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.116.0"
+  VERSION = "0.117.0"
 end

metadata

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