solis 0.94.0 → 0.96.0

data/lib/solis/query/run.rb

@@ -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')
@@ -194,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
 
@@ -275,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/version.rb

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

data/solis.gemspec

@@ -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.94.0
+  version: 0.96.0
 platform: ruby
 authors:
 - Mehmet Celik
@@ -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: []