shex 0.3.0 → 0.4.0

data/lib/shex/shex_context.rb

@@ -37,11 +37,10 @@ class JSON::LD::Context
       "expressions" => TermDefinition.new("expressions", id: "http://shex.io/ns/shex#expressions", type_mapping: "@id", container_mapping: "@list"),
       "extra" => TermDefinition.new("extra", id: "http://shex.io/ns/shex#extra", type_mapping: "@id"),
       "fractiondigits" => TermDefinition.new("fractiondigits", id: "http://shex.io/ns/shex#fractiondigits", type_mapping: "http://www.w3.org/2001/XMLSchema#integer"),
-      "id" => TermDefinition.new("id", id: "@id", simple: true),
       "include" => TermDefinition.new("include", id: "http://shex.io/ns/shex#include", type_mapping: "@id"),
       "inverse" => TermDefinition.new("inverse", id: "http://shex.io/ns/shex#inverse", type_mapping: "http://www.w3.org/2001/XMLSchema#boolean"),
       "iri" => TermDefinition.new("iri", id: "http://shex.io/ns/shex#iri", simple: true),
-      "label" => TermDefinition.new("label", id: "@id", simple: true),
+      "id" => TermDefinition.new("id", id: "@id", simple: true),
       "language" => TermDefinition.new("language", id: "@language", simple: true),
       "length" => TermDefinition.new("length", id: "http://shex.io/ns/shex#length", type_mapping: "http://www.w3.org/2001/XMLSchema#integer"),
       "literal" => TermDefinition.new("literal", id: "http://shex.io/ns/shex#literal", simple: true),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
@@ -196,17 +196,15 @@ files:
 - lib/shex/algebra/annotation.rb
 - lib/shex/algebra/each_of.rb
 - lib/shex/algebra/external.rb
-- lib/shex/algebra/inclusion.rb
 - lib/shex/algebra/node_constraint.rb
 - lib/shex/algebra/not.rb
 - lib/shex/algebra/one_of.rb
 - lib/shex/algebra/operator.rb
 - lib/shex/algebra/or.rb
-- lib/shex/algebra/satisfiable.rb
 - lib/shex/algebra/schema.rb
 - lib/shex/algebra/semact.rb
 - lib/shex/algebra/shape.rb
-- lib/shex/algebra/shape_ref.rb
+- lib/shex/algebra/shape_expression.rb
 - lib/shex/algebra/start.rb
 - lib/shex/algebra/stem.rb
 - lib/shex/algebra/stem_range.rb

data/lib/shex/algebra/inclusion.rb

@@ -1,67 +0,0 @@
-module ShEx::Algebra
-  ##
-  class Inclusion < Operator
-    include TripleExpression
-    NAME = :inclusion
-
-    ##
-    # Creates an operator instance from a parsed ShExJ representation
-    # @param (see Operator#from_shexj)
-    # @return [Operator]
-    def self.from_shexj(operator, options = {})
-      raise ArgumentError unless operator.is_a?(Hash) && operator['type'] == "Inclusion"
-      raise ArgumentError, "missing include in #{operator.inspect}" unless operator.has_key?('include')
-      super
-    end
-
-    def initialize(arg, **options)
-      raise ArgumentError, "Shape inclusion must be an IRI or BNode: #{arg}" unless arg.is_a?(RDF::Resource)
-      super
-    end
-
-    ##
-    # In this case, we accept an array of statements, and match based on cardinality.
-    #
-    # @param  (see TripleExpression#matches)
-    # @return (see TripleExpression#matches)
-    # @raise  (see TripleExpression#matches)
-    def matches(arcs_in, arcs_out, depth: 0)
-      status "referenced_shape: #{operands.first}"
-      expression = referenced_shape.expression
-      max = maximum
-      matched_expression = expression.matches(arcs_in, arcs_out, depth: depth + 1)
-      satisfy matched: matched_expression.matched, depth: depth
-    rescue ShEx::NotMatched => e
-      not_matched e.message, unsatisfied: e.expression, depth: depth
-    end
-
-    ##
-    # Returns the referenced shape
-    #
-    # @return [Operand]
-    def referenced_shape
-      @referenced_shape ||= schema.shapes.detect {|s| s.label == operands.first}
-    end
-
-    ##
-    # A Inclusion is valid if it's ancestor schema has any shape with a lable
-    # the same as it's reference.
-    #
-    # An Inclusion object's include property must appear in the schema's shapes map and the corresponding triple expression must be a Shape with a tripleExpr. The function dereference(include) returns the shape's tripleExpr.
-    def validate!
-      structure_error("Missing included shape: #{operands.first}") if referenced_shape.nil?
-      structure_error("Self included shape: #{operands.first}") if referenced_shape == first_ancestor(Shape)
-      structure_error("Referenced shape must be a Shape: #{operands.first}") unless referenced_shape.is_a?(Shape)
-      super
-    end
-
-    ##
-    # Returns the binary S-Expression (SXP) representation of this operator.
-    #
-    # @return [Array]
-    # @see    https://en.wikipedia.org/wiki/S-expression
-    def to_sxp_bin
-      ([:inclusion, ([:label, @label] if @label)].compact + operands).to_sxp_bin
-    end
-  end
-end

data/lib/shex/algebra/shape_ref.rb

@@ -1,71 +0,0 @@
-module ShEx::Algebra
-  ##
-  class ShapeRef < Operator::Unary
-    include Satisfiable
-    NAME = :shapeRef
-
-    def initialize(arg, **options)
-      structure_error("Shape reference must be an IRI or BNode: #{arg}", exception: ArgumentError) unless arg.is_a?(RDF::Resource)
-      super
-    end
-
-    ##
-    # Creates an operator instance from a parsed ShExJ representation
-    # @param (see Operator#from_shexj)
-    # @return [Operator]
-    def self.from_shexj(operator, options = {})
-      raise ArgumentError unless operator.is_a?(Hash) && operator['type'] == "ShapeRef"
-      raise ArgumentError, "missing reference in #{operator.inspect}" unless operator.has_key?('reference')
-      super
-    end
-
-    ##
-    # Satisfies referenced shape.
-    # @param  (see Satisfiable#satisfies?)
-    # @return (see Satisfiable#satisfies?)
-    # @raise  (see Satisfiable#satisfies?)
-    # @see [https://shexspec.github.io/spec/#shape-expression-semantics]
-    def satisfies?(focus, depth: 0)
-      status "ref #{operands.first.to_s}", depth: depth
-      schema.enter_shape(operands.first, focus) do |shape|
-        if shape
-          matched_shape = shape.satisfies?(focus, depth: depth + 1)
-          satisfy focus: focus, satisfied: matched_shape, depth: depth
-        else
-          status "Satisfy as #{operands.first} was re-entered for #{focus}", depth: depth
-          satisfy focus: focus, satisfied: referenced_shape, depth: depth
-        end
-      end
-    rescue ShEx::NotSatisfied => e
-      not_satisfied e.message, focus: focus, unsatisfied: e.expression, depth: depth
-    end
-
-    ##
-    # Returns the referenced shape
-    #
-    # @return [Shape]
-    def referenced_shape
-      @referenced_shape ||= schema.shapes.detect {|s| s.label == operands.first}
-    end
-
-    ##
-    # A ShapeRef is valid if it's ancestor schema has any shape with a label
-    # the same as it's reference.
-    # A ref cannot reference itself (via whatever path) without going through a TripleConstraint.
-    # Even when going through TripleConstraints, there can't be a negative reference.
-    def validate!
-      structure_error("Missing referenced shape: #{operands.first}") if referenced_shape.nil?
-      raise ShEx::StructureError, "Self referencing shape: #{operands.first}" if referenced_shape == first_ancestor(Satisfiable)
-      super
-    end
-
-    ##
-    # Returns the binary S-Expression (SXP) representation of this operator.
-    #
-    # @return [Array]
-    # @see    https://en.wikipedia.org/wiki/S-expression
-    def to_sxp_bin
-      ([:shapeRef, ([:label, @label] if @label)].compact + operands).to_sxp_bin
-    end
-  end
-end