shex 0.6.0 → 0.6.4

data/lib/shex/terminals.rb

@@ -43,7 +43,11 @@ module ShEx
     # 160s
     ECHAR                = /\\[tbnrf\\"']/
 
-    WS                   = /(?:\s|(?:#[^\n\r]*))+/m.freeze
+    WS                   = %r((
+                              \s
+                            | (?:\#[^\n\r]*)
+                            | (?:/\*(?:(?:\*[^/])|[^*])*\*/)
+                            )+)xmu.freeze
 
     # 69
     RDF_TYPE             = /a/.freeze
@@ -92,30 +96,6 @@ module ShEx
     CODE                 = /\{(?:[^%\\]|\\[%\\]|#{UCHAR})*%#{WS}*\}/m.freeze
     # 70
     REPEAT_RANGE         = /\{\s*#{INTEGER}(?:,#{WS}*(?:#{INTEGER}|\*)?)?#{WS}*\}/.freeze
-
-    # String terminals, mixed case sensitivity
-    STR_EXPR = %r(true|false
-                 |\^\^|\/\/
-                 |[\(\)\{\}\[\],\.;\=\-\~!\|\&\@\$\?\+\*\%\^a]|
-                 (?i:OR|AND|NOT
-                   |BASE|PREFIX
-                   |IRI|BNODE|NONLITERAL
-                   |MINLENGTH|MAXLENGTH|LENGTH
-                   |MAXINCLUSIVE|MAXEXCLUSIVE
-                   |MININCLUSIVE|MINEXCLUSIVE
-                   |TOTALDIGITS|FRACTIONDIGITS
-                   |START
-                   |EXTERNAL|CLOSED|EXTRA|LITERAL
-                 )
-              )x.freeze
-
-    # Map terminals to canonical form
-    STR_MAP = %w{OR AND NOT BASE PREFIX IRI BNODE NONLITERAL
-      MINLENGTH MAXLENGTH LENGTH MININCLUSIVE MAXINCLUSIVE MINEXCLUSIVE MAXEXCLUSIVE
-      TOTALDIGITS FRACTIONDIGITS START EXTERNAL CLOSED EXTRA LITERAL}.
-    inject({}) do |memo, t|
-      memo.merge(t.downcase => t)
-    end
   
   end
 end

data/lib/shex.rb

@@ -1,9 +1,12 @@
+require               'rdf'
+require               'sxp'
+require               'shex/format'
+
 ##
 # A ShEx runtime for RDF.rb.
 #
-# @see http://shex.io/shex-semantics/#shexc
+# @see https://shex.io/shex-semantics/#shexc
 module ShEx
-  require               'shex/format'
   autoload :Algebra,    'shex/algebra'
   autoload :Meta,       'shex/meta'
   autoload :Parser,     'shex/parser'
@@ -66,7 +69,7 @@ module ShEx
   #
   # @example executing a ShExC schema
   #   graph = RDF::Graph.load("etc/doap.ttl")
-  #   ShEx.execute('etc/doap.shex', graph, "http://rubygems.org/gems/shex", "")
+  #   ShEx.execute('etc/doap.shex', graph, "https://rubygems.org/gems/shex", "")
   #
   # @param [IO, StringIO, String, #to_s]  expression (ShExC or ShExJ)
   # @param (see ShEx::Algebra::Schema#execute)
@@ -84,7 +87,7 @@ module ShEx
   #
   # @example executing a ShExC schema
   #   graph = RDF::Graph.load("etc/doap.ttl")
-  #   ShEx.execute('etc/doap.shex', graph, "http://rubygems.org/gems/shex", "")
+  #   ShEx.execute('etc/doap.shex', graph, "https://rubygems.org/gems/shex", "")
   #
   # @param [IO, StringIO, String, #to_s]  expression (ShExC or ShExJ)
   # @param (see ShEx::Algebra::Schema#satisfies?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shex
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Gregg Kellogg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-15 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.20
+        version: '0.9'
 description: Implements ShExC and ShEx JSON.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -196,6 +230,7 @@ files:
 - lib/shex/algebra/annotation.rb
 - lib/shex/algebra/each_of.rb
 - lib/shex/algebra/external.rb
+- lib/shex/algebra/import.rb
 - lib/shex/algebra/language.rb
 - lib/shex/algebra/node_constraint.rb
 - lib/shex/algebra/not.rb
@@ -220,12 +255,12 @@ files:
 - lib/shex/shex_context.rb
 - lib/shex/terminals.rb
 - lib/shex/version.rb
-homepage: http://ruby-rdf.github.com/shex
+homepage: https://ruby-rdf.github.com/shex
 licenses:
 - Unlicense
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -240,8 +275,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Implementation of Shape Expressions (ShEx) for RDF.rb
 test_files: []