shex 0.6.2 → 0.7.1

data/lib/shex/algebra/stem_range.rb

@@ -102,7 +102,9 @@ module ShEx::Algebra
     def match?(value, depth: 0)
       initial_match = case operands.first
       when :wildcard then true
-      when RDF::Literal then value.language.to_s.start_with?(operands.first)
+      when RDF::Literal
+        value.language? &&
+        (operands.first.to_s.empty? || value.language.to_s.match?(%r(^#{operands.first}((-.*)?)$)))
       else false
       end
 

data/lib/shex/algebra/triple_constraint.rb

@@ -97,7 +97,7 @@ module ShEx::Algebra
         ref.is_a?(ShapeExpression) ||
         structure_error("#{json_type} must reference a ShapeExpression: #{ref}")
       else
-        structure_error("#{json_type} must reference a ShapeExpression: #{ref}")
+        structure_error("#{json_type} must be a ShapeExpression or reference: #{expresson.to_sxp}")
       end
       super
     end

data/lib/shex/algebra/triple_expression.rb

@@ -16,6 +16,24 @@ module ShEx::Algebra
       raise NotImplementedError, "#matches Not implemented in #{self.class}"
     end
 
+    ##
+    # expressions must be TripleExpressions or references to TripleExpressions
+    #
+    # @raise  [ShEx::StructureError] if the value is invalid
+    def validate_expressions!
+      expressions.each do |op|
+        case op
+        when TripleExpression
+        when RDF::Resource
+          ref = schema.find(op)
+          ref.is_a?(TripleExpression) ||
+          structure_error("#{json_type} must reference a TripleExpression: #{ref}")
+        else
+          structure_error("#{json_type} must be a TripleExpression or reference: #{op.to_sxp}")
+        end
+      end
+    end
+
     ##
     # Included TripleConstraints
     # @return [Array<TripleConstraints>]

data/lib/shex/algebra.rb

@@ -1,6 +1,5 @@
 $:.unshift(File.expand_path("../..", __FILE__))
 require 'sparql/algebra'
-require 'sxp'
 
 module ShEx
   # Based on the SPARQL Algebra, operators for executing a patch