solis 0.87.0 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d5926e4dab3d02865ae5333e319a8973c79e1b0b49d1fc86ec5cd17d32204ed
-  data.tar.gz: d33d664a73dcb56231d1fc0364314100a114d83b0c2c75c7c11479aa00fba4b7
+  metadata.gz: 2a994f808c376224e94848405da688602b0b3bc8a6e84271eccddaf2452e593e
+  data.tar.gz: b3158ae4c633f06f215e69f0bf3510499a1be90fe6ea030761213ea11e449fa5
 SHA512:
-  metadata.gz: 64bc93c8a1767fc786d2c2528762e7707aad9e33cbe1ec9d9d1208ccbd12f76d65e8bbd244ae88a7a2a89147eb7facc4194d41bcf38cc04c6c0d29a055da207f
-  data.tar.gz: ce928eaf3a1b43bf1a93678dd5f47544265f47e71df9c61c64d5c1819056aade67fd175fc54b611e03a6e8eb0d5d7c2b9c761b812c0e3a8a2c16a2557130d5c0
+  metadata.gz: 38ec27f39274069afd4cd982974aacdafe186a1e7ff301003f3cae878db55dd0a967ed0deea5c5819b162f5104c1b008834d65bdec29e01e9318480aedf1a11d
+  data.tar.gz: eef3af31f202871ee596148621caf7519e739fabca8feafe4f08d3fc550f2ba0df7b8505229888db534a0f2e0886bc742ebc754d9d90d1d2ed0d96d0e0b3fcaa

data/lib/solis/graph.rb

@@ -292,6 +292,23 @@ module Solis
                 "#{resource.class.graph_name.gsub(/\/$/,'')}/#{belongs_to_resource_name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
               end
             end
+          elsif (value[:mincount] && value[:mincount] == 1) || (value[:maxcount] && value[:maxcount] == 1)
+            has_one_resource_name = value[:datatype].nil? ? value[:class].gsub(self.model.graph_name, '') : value[:datatype].to_s.classify
+            LOGGER.info "\t\t\t#{resource_name}(#{resource_name.gsub('Resource','').tableize.singularize}) has_one #{has_one_resource_name}(#{key})"
+            resource.has_one(key.to_sym, foreign_key: :id, primary_key: :id, resource: graph.shape_as_resource("#{has_one_resource_name}", stack_level << has_one_resource_name)) do
+              link do |resource|
+                remote_resources = resource.instance_variable_get("@#{key}")
+                if remote_resources
+                  remote_resources = [remote_resources] unless remote_resources.is_a?(Array)
+                  resource_ids = remote_resources.map do |remote_resource|
+                    remote_resource.id =~ /^http/ ? remote_resource.id.split('/').last : remote_resource.id
+                  end
+
+                end
+
+                "#{resource.class.graph_name.gsub(/\/$/,'')}/#{has_one_resource_name.tableize}?filter[id]=#{resource_ids.join(',')}" unless remote_resources.nil? || resource_ids.empty?
+              end
+            end
           else
             has_many_resource_name = value[:datatype].nil? ? value[:class].gsub(self.model.graph_name, '') : value[:datatype].to_s.classify
             LOGGER.info "\t\t\t#{resource_name}(#{resource_name.gsub('Resource','').tableize.singularize}) has_many #{has_many_resource_name}(#{key})"

data/lib/solis/model.rb

@@ -225,6 +225,9 @@ values ?s {<#{self.graph_id}>}
           end
         end
 
+        maxcount = original_klass.class.metadata[:attributes][key][:maxcount]
+        value = value.first if maxcount && maxcount == 1 && value.is_a?(Array)
+
         updated_klass.instance_variable_set("@#{key}", value)
       end
 
@@ -483,7 +486,12 @@ values ?s {<#{self.graph_id}>}
         end
       end
 
-      make_graph(graph, hierarchy, id, original_klass, klass_metadata, resolve_all)
+      begin
+        make_graph(graph, hierarchy, id, original_klass, klass_metadata, resolve_all)
+      rescue => e
+        Solis::LOGGER.error(e.message)
+        raise e
+      end
 
       hierarchy.pop
       id

data/lib/solis/query.rb

@@ -320,7 +320,7 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
 
               if data.key?(attribute) # attribute exists
                 raise "Cardinality error, max = #{solution_model.metadata[:attributes][attribute][:maxcount]}" if solution_model.metadata[:attributes][attribute][:maxcount] == 0
-                if solution_model.metadata[:attributes][attribute][:maxcount] == 1 && data.key?(attribute)
+                if solution_model.metadata[:attributes][attribute][:maxcount] == 1 && data.key?(attribute) && data[attribute].is_a?(Array) && data[attribute].length > 1
                   raise "Cardinality error, max = #{solution_model.metadata[:attributes][attribute][:maxcount]}"
                 elsif solution_model.metadata[:attributes][attribute][:maxcount] == 1
                   data[attribute] = object

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

@@ -18,11 +18,11 @@ module Solis
               end
             end
 
-            def validate(sheets)
+            def validate(sheets, prefixes = nil, metadata = nil)
               # raise "Please make sure the sheet contains '_PREFIXES', '_METADATA', '_ENTITIES' tabs" unless (%w[_PREFIXES _METADATA _ENTITIES] - sheets.keys).length == 0
 
-              prefixes = sheets['_PREFIXES']
-              metadata = sheets['_METADATA']
+              prefixes = sheets.key?('_PREFIXES') && prefixes.nil? ? sheets['_PREFIXES'] : prefixes
+              metadata = sheets.key?('_METADATA') && metadata.nil? ? sheets['_METADATA'] : metadata
 
               raise "_PREFIXES tab must have ['base', 'prefix', 'uri'] as a header at row 1" unless (%w[base prefix uri] - prefixes.header).length == 0
               raise '_PREFIXES.base can only have one base URI' if prefixes.map { |m| m['base'] }.grep(/\*/).count != 1
@@ -53,6 +53,8 @@ module Solis
 
             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'
 
@@ -70,7 +72,7 @@ module Solis
                   sheets[sheet.title] = sheet
                 end
 
-                validate(sheets)
+                validate(sheets, prefixes, metadata)
               end
               sheets
             end
@@ -151,6 +153,7 @@ module Solis
               if entity_data && !entity_data.nil? && (entity_data.count > 0)
                 entity_data.each do |p|
                   property_name = I18n.transliterate(p['name'].strip)
+                  next if property_name.empty?
                   min_max = {}
 
                   %w[min max].each do |n|
@@ -473,35 +476,75 @@ hide empty members
             end
 
             def build_json_schema(shacl_file)
-                graph = RDF::Graph.load(StringIO.new(shacl_file), format: :ttl)
-                json_schema = {
-                  "$schema" => "http://json-schema.org/draft-07/schema#",
-                  "type" => "object",
-                  "properties" => {},
-                  "required" => []
-                }
+              def map_rdf_datatype_to_json_schema(datatype)
+                # NOTE: "format" not supported by every client.
+                case datatype
+                when /string$/
+                  { "type" => "string" }
+                when /integer$/
+                  { "type" => "integer" }
+                when /decimal$/, /double$/, /float$/
+                  { "type" => "number" }
+                when /boolean$/
+                  { "type" => "boolean" }
+                when /date$/, /dateTime$/
+                  { "type" => "string", "format" => "date-time" }
+                when /anyURI$/
+                  { "type" => "string", "format" => "uri" }
+                else
+                  { "type" => "string" }
+                end
+              end
+
+              def self.default_value_for_type(type)
+                case type
+                when "string"
+                  ""
+                when "integer", "number"
+                  0
+                when "boolean"
+                  false
+                when "array"
+                  []
+                when "object"
+                  {}
+                else
+                  ""
+                end
+              end
 
-                graph.query([nil, RDF.type, RDF::Vocab::SHACL.NodeShape]) do |shape|
-                  shape_subject = shape.subject
+              graph = RDF::Graph.new
+              graph.from_ttl(shacl_file)
+
+              #graph = RDF::Graph.load(StringIO.new(shacl_file), format: :ttl, content_type: "text/turtle")
+              json_schema = {
+                "$schema" => "http://json-schema.org/draft-07/schema#",
+                "type" => "object",
+                "properties" => {},
+                "required" => []
+              }
 
-                  graph.query([shape_subject, RDF::Vocab::SHACL.property, nil]) do |prop_stmt|
-                    prop_subject = prop_stmt.object
-                    prop_name = graph.query([prop_subject, RDF::Vocab::SHACL.path, nil]).first&.object.to_s
-                    datatype = graph.query([prop_subject, RDF::Vocab::SHACL.datatype, nil]).first&.object
-                    min_count = graph.query([prop_subject, RDF::Vocab::SHACL.minCount, nil]).first&.object&.to_i
-                    max_count = graph.query([prop_subject, RDF::Vocab::SHACL.maxCount, nil]).first&.object&.to_i
-                    pattern = graph.query([prop_subject, RDF::Vocab::SHACL.pattern, nil]).first&.object&.to_s
+              graph.query([nil, RDF.type, RDF::Vocab::SHACL.NodeShape]) do |shape|
+                shape_subject = shape.subject
 
-                    json_schema["properties"][prop_name] = {}
-                    json_schema["properties"][prop_name]["type"] = datatype.to_s.split("#").last.downcase if datatype
-                    json_schema["properties"][prop_name]["pattern"] = pattern if pattern
+                graph.query([shape_subject, RDF::Vocab::SHACL.property, nil]) do |prop_stmt|
+                  prop_subject = prop_stmt.object
+                  prop_name = graph.query([prop_subject, RDF::Vocab::SHACL.path, nil]).first&.object.to_s
+                  datatype = map_rdf_datatype_to_json_schema(graph.query([prop_subject, RDF::Vocab::SHACL.datatype, nil]).first&.object)
+                  min_count = graph.query([prop_subject, RDF::Vocab::SHACL.minCount, nil]).first&.object&.to_i
+                  max_count = graph.query([prop_subject, RDF::Vocab::SHACL.maxCount, nil]).first&.object&.to_i
+                  pattern = graph.query([prop_subject, RDF::Vocab::SHACL.pattern, nil]).first&.object&.to_s
 
-                    json_schema["required"] << prop_name if min_count && min_count > 0
-                    json_schema["properties"][prop_name]["maxItems"] = max_count if max_count
-                  end
+                  json_schema["properties"][prop_name] = {}
+                  json_schema["properties"][prop_name]["type"] = datatype["type"] if datatype
+                  json_schema["properties"][prop_name]["pattern"] = pattern if pattern
+
+                  json_schema["required"] << prop_name if min_count && min_count > 0
+                  json_schema["properties"][prop_name]["maxItems"] = max_count if max_count
                 end
+              end
 
-                JSON.pretty_generate(json_schema)
+              JSON.pretty_generate(json_schema)
             end
 
             def every_entity(data)
@@ -652,6 +695,16 @@ hide empty members
           end
 
           sheet_data = read_sheets(key, spreadsheet_id, options)
+          prefixes = sheet_data['_PREFIXES']
+          metadata = sheet_data['_METADATA']
+
+          raise "_PREFIXES tab must have ['base', 'prefix', 'uri'] as a header at row 1" unless (%w[base prefix uri] - prefixes.header).length == 0
+          raise '_PREFIXES.base can only have one base URI' if prefixes.map { |m| m['base'] }.grep(/\*/).count != 1
+
+          raise "_METADATA tab must have ['key', 'value'] as a header at row 1" unless (%w[key value] - metadata.header).length == 0
+
+          options[:prefixes] = prefixes
+          options[:metadata] = metadata
           #TODO: cleanup
           if sheet_data.is_a?(Hash)
             raise "No _REFERENCES sheet found" unless sheet_data.key?("_REFERENCES")
@@ -670,10 +723,20 @@ hide empty members
           end
 
           datas = []
-          references.each do |v|
+          references.each_with_index do |v, i|
+            progress((100/(references.length+1))*(i+1), options[:progress] || {})
             sheet_id = spreadsheet_id_from_url(v[:sheet_url])
 
             sheet_data = read_sheets(key, sheet_id, options)
+
+            unless sheet_data.key?('_PREFIXES')
+              sheet_data['_PREFIXES'] = prefixes
+            end
+
+            unless sheet_data.key?('_METADATA')
+              sheet_data['_METADATA'] = metadata
+            end
+
             if sheet_data.key?("_PREFIXES")
               datas << process_sheet(key, sheet_id, sheet_data)
               sleep 30

data/lib/solis/store/sparql/client.rb

@@ -11,7 +11,7 @@ module Solis
           @endpoint = endpoint
           @graph_name = graph_name
 
-          @pool = ConnectionPool.new(size:5, timeout: 60) do
+            @pool = ConnectionPool.new(size:5, timeout: 160) do
             SPARQL::Client.new(@endpoint, graph: @graph_name)
             #SPARQL::Client.new(@endpoint)
           end

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.87.0"
+  VERSION = "0.89.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.87.0
+  version: 0.89.0
 platform: ruby
 authors:
 - Mehmet Celik
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []