solis 0.93.0 → 0.96.0

data/lib/solis/query/construct.rb

@@ -6,7 +6,8 @@ module Solis
       def initialize(model)
         @model = model
         @sparql_endpoint = @model.class.sparql_endpoint
-        @sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name, read_timeout: 120)
+        #@sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name, read_timeout: 120)
+        @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint, graph: @model.class.graph_name, read_timeout: 120)
         @construct_cache = File.absolute_path(Solis::Options.instance.get[:cache])
         @moneta = Moneta.new(:File, dir: "#{@construct_cache}/construct", expires: Solis::Options.instance.get[:cache_expire])
       end
@@ -38,7 +39,7 @@ module Solis
           if @moneta.key?(file_path_hash) && from_cache.eql?('1')
             sparql_repository = @moneta[file_path_hash]
           else
-            @sparql_client = SPARQL::Client.new(@sparql_endpoint, read_timeout: 120)
+            #@sparql_client = SPARQL::Client.new(@sparql_endpoint, read_timeout: 120)
             result = @sparql_client.query(construct_query)
             repository=RDF::Repository.new
             result.each {|s| repository << [s[:s], s[:p], s[:o]]}

data/lib/solis/query/filter.rb

@@ -114,13 +114,11 @@ module Solis
                   v=normalize_string(v)
                   filter = "?concept <#{metadata[:path]}> ?__search#{i} FILTER(?__search#{i} #{not_operator}#{value[:operator]} \"#{v}\"#{datatype}) .\n"
                 end
-
-
               end
             else # if "~" contains
               if metadata[:datatype_rdf].eql?( 'http://www.w3.org/2001/XMLSchema#anyURI') || !metadata[:node].nil?
                 model_graph_name = Solis::Options.instance.get.key?(:graphs) ? Solis::Options.instance.get[:graphs].select{|s| s['type'].eql?(:data)}&.first['name'] : @model.class.graph_name
-                filter = "?CONCEPT <#{metadata[:path]}> ?__search#{i} . ?__search#{i} <#{model_graph_name}id> ?__search#{i}_#{i} FILTER(?__search#{i}_#{i} = \"#{value[:value].first}\")."
+                filter = "?concept <#{metadata[:path]}> ?__search#{i} . ?__search#{i} <#{model_graph_name}id> ?__search#{i}_#{i} filter(?__search#{i}_#{i} = \"#{value[:value].first}\")."
               else
                 filter = "?concept <#{metadata[:path]}> ?__search#{i} FILTER(#{contains.empty? ? '""' : contains}) .\n"
               end

data/lib/solis/query/run.rb

@@ -15,7 +15,7 @@ class Solis::Query::Runner
 }
    )
 
-      c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], graph_name)
+      c = Solis::Store::Sparql::Client.new(Solis::Options.instance.get[:sparql_endpoint], graph_name: graph_name)
       r = c.query(query, options)
       if r.is_a?(SPARQL::Client)
         g = RDF::Graph.new
@@ -109,6 +109,7 @@ class Solis::Query::Runner
     end
 
     def self.graph_name
+      raise Solis::Error::NotFoundError, 'No graph name found' if Solis::Options.instance.get.key?(:graphs).nil?
       Solis::Options.instance.get.key?(:graphs) ? Solis::Options.instance.get[:graphs].select{|s| s['type'].eql?(:main)}&.first['name'] : ''
     end
 end

data/lib/solis/query.rb

@@ -11,8 +11,8 @@ module Solis
     include Enumerable
     include Solis::QueryFilter
 
-    def self.run(entity, query)
-      Solis::Query::Runner.run(entity, query)
+    def self.run(entity, query, options = {})
+      Solis::Query::Runner.run(entity, query, options)
     end
 
     def self.run_construct_with_file(filename, id_name, entity, ids, from_cache = '1')
@@ -65,11 +65,10 @@ module Solis
       @metadata = @model.class.metadata
       @sparql_endpoint = @model.class.sparql_endpoint
       if Solis::Options.instance.get.key?(:graphs) && Solis::Options.instance.get[:graphs].size > 0
-        @sparql_client = SPARQL::Client.new(@sparql_endpoint)
+        @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint)
       else
-        @sparql_client = SPARQL::Client.new(@sparql_endpoint, graph: @model.class.graph_name)
+        @sparql_client = Solis::Store::Sparql::Client.new(@sparql_endpoint, graph: @model.class.graph_name)
       end
-
       @filter = {values: ["VALUES ?type {#{target_class}}"], concepts: ['?concept a ?type .'] }
       @sort = 'ORDER BY ?s'
       @sort_select = ''
@@ -166,7 +165,6 @@ module Solis
       offset = @offset || 0
 
       sparql_client = model_construct? ? Solis::Query::Construct.new(@model).run : @sparql_client
-      #sparql_client = model_construct? ? SPARQL::Client.new(run_construct) : @sparql_client
 
       relationship = ''
       if options.key?(:relationship)
@@ -196,7 +194,7 @@ order by ?s
 
       Solis::LOGGER.info(query) if ConfigFile[:debug]
 
-      query_key = "#{@model.name}-#{Digest::MD5.hexdigest(query)}"
+      query_key = "#{@model.model_class_name}-#{Digest::MD5.hexdigest(query)}"
 
       result = nil
 
@@ -277,7 +275,7 @@ PREFIX #{@model.class.graph_prefix}: <#{@model.class.graph_name}>"
               attribute = statement.p.value.split('/').last.underscore
 
               unless solution_model.metadata[:attributes].key?(attribute)
-                Solis::LOGGER.error "Attribute found in data that is not part of the model model #{solution_model.name}(#{record_uri.split('/').last}).#{attribute}"
+                Solis::LOGGER.error "Attribute found in data that is not part of the model model #{solution_model.model_class_name}(#{record_uri.split('/').last}).#{attribute}"
                 next
               end
 

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

@@ -117,6 +117,7 @@ module Solis
                 end
 
                 entities.store(e['name'].to_sym, { description: e['description'],
+                                                   order: e['order'],
                                                    plural: e['nameplural'],
                                                    label: e['name'].to_s.strip,
                                                    sub_class_of: e['subclassof'].nil? || e['subclassof'].empty? ? [] : [e['subclassof']],
@@ -178,6 +179,7 @@ module Solis
                       path: "#{graph_prefix}:#{property_name.to_s.classify}",
                       cardinality: { min: min_max['min'], max: min_max['max'] },
                       same_as: p['sameas'],
+                      order: p['order'],
                       description: p['description']
                     }
 
@@ -308,7 +310,7 @@ hide empty members
                     unless node.nil? || node.empty?
                       "\n    #{shacl_prefix}:node         #{node} ;"
                     end}
-                #{shacl_prefix}:name         "#{label}" ;
+    #{shacl_prefix}:name         "#{label}" ;
 )
                   metadata[:properties].each do |property, property_metadata|
                     attribute = property.to_s.strip
@@ -319,28 +321,36 @@ hide empty members
                     datatype = property_metadata[:datatype].strip
                     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
 
                     if datatype =~ /^#{graph_prefix}:/ || datatype =~ /^<#{graph_name}/
                       out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}" ;
-                 #{shacl_prefix}:description "#{description}" ;
+                 #{shacl_prefix}:description "#{description}" ;#{order.nil? ? '' : "\n                 #{shacl_prefix}:order #{order} ;"}
                  #{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} ;" : ''}
     ] ;
 )
                     else
-                      if datatype.eql?('rdf:langString')
+                      if datatype.eql?('rdf:langString') && max_count.eql?('1')
                         out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}";
-                 #{shacl_prefix}:description "#{description}" ;
+                 #{shacl_prefix}:description "#{description}" ;#{order.nil? ? '' : "\n                 #{shacl_prefix}:order #{order} ;"}
                  #{shacl_prefix}:uniqueLang true ;
                  #{shacl_prefix}:datatype #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}
     ] ;
+)
+                      elsif datatype.eql?('rdf:langString')
+                        out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
+                 #{shacl_prefix}:name "#{attribute}";
+                 #{shacl_prefix}:description "#{description}" ;#{order.nil? ? '' : "\n                 #{shacl_prefix}:order #{order} ;"}
+                 #{shacl_prefix}:datatype #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}#{max_count =~ /\d+/ ? "\n                 #{shacl_prefix}:maxCount #{max_count} ;" : ''}
+    ] ;
 )
                       else
                         out += %(    #{shacl_prefix}:property [#{shacl_prefix}:path #{path} ;
                  #{shacl_prefix}:name "#{attribute}";
-                 #{shacl_prefix}:description "#{description}" ;
+                 #{shacl_prefix}:description "#{description}" ;#{order.nil? ? '' : "\n                 #{shacl_prefix}:order #{order} ;"}
                  #{shacl_prefix}:datatype #{datatype} ;#{min_count =~ /\d+/ ? "\n                 #{shacl_prefix}:minCount #{min_count} ;" : ''}#{max_count =~ /\d+/ ? "\n                 #{shacl_prefix}:maxCount #{max_count} ;" : ''}
     ] ;
 )

data/lib/solis/shape.rb

@@ -100,6 +100,10 @@ module Solis
           attribute_node = solution.attributeNode if solution.bound?(:attributeNode)
           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_max_count =  1 if solution.bound?(:attributeUniqueLang) && solution.attributeUniqueLang.value.eql?('true')
+
           # if solution.bound?(:attributeOr)
           #   pp solution
           # end
@@ -117,6 +121,7 @@ module Solis
             datatype: lookup_datatype(attribute_datatype_rdf, attribute_node),
             mincount: attribute_min_count,
             maxcount: attribute_max_count,
+            order: attribute_order,
             node: attribute_node,
             node_kind: attribute_node_kind,
             class: attribute_class,
@@ -134,7 +139,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 ?o
+       ?attributeNode ?attributeNodeKind ?attributeComment ?attributeOrder ?attributeUniqueLang ?o
 WHERE {
 
   ?s a sh:NodeShape;
@@ -153,6 +158,8 @@ WHERE {
                            OPTIONAL{ ?attributes sh:nodeKind ?attributeNodeKind } .
                            OPTIONAL{ ?attributes sh:node     ?attributeNode } .
                            OPTIONAL{ ?attributes sh:description ?attributeComment } .
+                           OPTIONAL{ ?attributes sh:order ?attributeOrder } .
+                           OPTIONAL{ ?attributes sh:uniqueLang ?attributeUniqueLang } .
      }.
 }
 )
@@ -171,6 +178,7 @@ WHERE {
                     "datatype": "string",
                     "mincount": 1,
                     "maxcount": 1,
+                    "order": nil,
                     "node": nil,
                     "node_kind": nil,
                     "class": nil,

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

@@ -7,13 +7,22 @@ module Solis
   module Store
     module Sparql
       class Client
-        def initialize(endpoint, graph_name)
+        def initialize(endpoint, options = {})
           @endpoint = endpoint
-          @graph_name = graph_name
+          @graph_name = options[:graph_name] || ''
+          @read_timeout = options[:read_timeout] || 120
+          @logger = options[:logger] || Solis::LOGGER
 
             @pool = ConnectionPool.new(size:5, timeout: 160) do
-            SPARQL::Client.new(@endpoint, graph: @graph_name)
-            #SPARQL::Client.new(@endpoint)
+              Solis::LOGGER.level = Logger::DEBUG if ConfigFile[:debug]
+
+              if @graph_name
+                client = SPARQL::Client.new(@endpoint, graph: @graph_name, read_timeout: @read_timeout, logger: @logger)
+              else
+                client = SPARQL::Client.new(@endpoint, read_timeout: @read_timeout, logger: @logger)
+              end
+
+              client
           end
         end
 

data/lib/solis/version.rb

@@ -1,3 +1,3 @@
 module Solis
-  VERSION = "0.93.0"
+  VERSION = "0.96.0"
 end

data/solis.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '~> 8.0'
   spec.add_runtime_dependency 'http', '~> 5.2'
-  spec.add_runtime_dependency 'graphiti', '~> 1.7'
+  spec.add_runtime_dependency 'graphiti', '~> 1.8'
   spec.add_runtime_dependency 'moneta', '~> 1.6'
   spec.add_runtime_dependency 'linkeddata', '~> 3.3'
   spec.add_runtime_dependency 'google_drive', '~> 3.0'
@@ -40,9 +40,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'uuidtools', '~> 2.2.0'
   spec.add_runtime_dependency 'dry-struct', '~> 1.6'
   spec.add_runtime_dependency 'psych', '~> 5.1'
-  spec.add_runtime_dependency 'csv'
-  spec.add_runtime_dependency 'mutex_m'
-  spec.add_runtime_dependency 'ostruct'
+  spec.add_runtime_dependency 'csv', '~> 3.2'
+  spec.add_runtime_dependency 'mutex_m', '~> 0.1'
+  spec.add_runtime_dependency 'ostruct', '~> 0.5'
   #  spec.add_runtime_dependency 'rdf-edtf', '~> 1.1.2'
 
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solis
 version: !ruby/object:Gem::Version
-  version: 0.93.0
+  version: 0.96.0
 platform: ruby
 authors:
 - Mehmet Celik
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -195,44 +195,44 @@ dependencies:
   name: csv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mutex_m
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
 - lib/solis/error/query_error.rb
 - lib/solis/graph.rb
 - lib/solis/model.rb
+- lib/solis/model.rb.ok
 - lib/solis/options.rb
 - lib/solis/query.rb
 - lib/solis/query/construct.rb
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Turn any SHACL file into an API, ORM, documentation, ...
 test_files: []