Finish 3.1.3

ruby-rdf · Oct 17, 2020 · c5e7b57 · c5e7b57
2 parents 43544a3 + 2ea665b
commit c5e7b57
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 25 deletions.
diff --git a/.github/workflows/gitstamp.yaml b/.github/workflows/gitstamp.yaml
@@ -0,0 +1,19 @@
+# See: https://github.com/artob/gitstamp-action
+---
+name: Gitstamp
+on:
+  push:
+    branches:
+      - develop
+jobs:
+  gitstamp:
+    runs-on: ubuntu-latest
+    name: Timestamp commit with Gitstamp
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+      - name: Submit Gitstamp transaction
+        uses: artob/gitstamp-action@v1
+        with:
+          wallet-key: ${{ secrets.GITSTAMP_KEYFILE }}
+          commit-link: true
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.2
+3.1.3
diff --git a/lib/sinatra/sparql.rb b/lib/sinatra/sparql.rb
@@ -103,7 +103,7 @@ def self.registered(app)
       app.helpers(Sinatra::SPARQL::Helpers)
       app.send(:include, ::SPARQL)
       app.send(:include, ::RDF)
-      app.send(:include, ::LinkedData)
+      app.send(:include, ::LinkedData) if defined?(::LinkedData)
     end
   end
 end

diff --git a/lib/sparql.rb b/lib/sparql.rb
@@ -1,4 +1,6 @@
+require 'sxp'
 require 'sparql/extensions'
+require 'sparql/algebra/sxp_extensions'
 
 ##
 # A SPARQL for RDF.rb.

diff --git a/lib/sparql/algebra.rb b/lib/sparql/algebra.rb
@@ -142,15 +142,15 @@ module SPARQL
   # 
   #     Operator(:isBlank).new(RDF::Node(:foobar)).to_sxp                        #=> "(isBlank _:foobar)"
   #     Operator(:isIRI).new(RDF::URI('https://rubygems.org/gems/rdf/')).to_sxp       #=> "(isIRI <https://rubygems.org/gems/rdf/>)"
-  #     Operator(:isLiteral).new(RDF::Literal(3.1415)).to_sxp                    #=> "(isLiteral 3.1415)"
-  #     Operator(:str).new(Operator(:datatype).new(RDF::Literal(3.1415))).to_sxp #=> "(str (datatype 3.1415))"
+  #     Operator(:isLiteral).new(RDF::Literal(3.1415)).to_sxp                    #=> "(isLiteral 3.1415e0)"
+  #     Operator(:str).new(Operator(:datatype).new(RDF::Literal(3.1415))).to_sxp #=> "(str (datatype 3.1415e0))"
   # 
   # ## Constructing operator expressions using SSE forms
   # 
   #     SPARQL::Algebra::Expression[:isBlank, RDF::Node(:foobar)].to_sxp                          #=> "(isBlank _:foobar)"
   #     SPARQL::Algebra::Expression[:isIRI, RDF::URI('https://rubygems.org/gems/rdf/')].to_sxp         #=> "(isIRI <https://rubygems.org/gems/rdf/>)"
-  #     SPARQL::Algebra::Expression[:isLiteral, RDF::Literal(3.1415)].to_sxp                      #=> "(isLiteral 3.1415)"
-  #     SPARQL::Algebra::Expression[:str, [:datatype, RDF::Literal(3.1415)]].to_sxp               #=> "(str (datatype 3.1415))"
+  #     SPARQL::Algebra::Expression[:isLiteral, RDF::Literal(3.1415)].to_sxp                      #=> "(isLiteral 3.1415e0)"
+  #     SPARQL::Algebra::Expression[:str, [:datatype, RDF::Literal(3.1415)]].to_sxp               #=> "(str (datatype 3.1415e0))"
   # 
   # ## Constructing operator expressions using SSE strings
   # 

diff --git a/lib/sparql/algebra/expression.rb b/lib/sparql/algebra/expression.rb
@@ -20,13 +20,6 @@ module Expression
     # @yieldreturn [void] ignored
     # @return [Expression]
     def self.parse(sse, **options, &block)
-      begin
-        require 'sxp' # @see https://rubygems.org/gems/sxp
-      rescue LoadError
-        abort "SPARQL::Algebra::Expression.parse requires the SXP gem (hint: `gem install sxp')."
-      end
-      require 'sparql/algebra/sxp_extensions'
-
       sse = sse.encode(Encoding::UTF_8)
       sxp = SXP::Reader::SPARQL.new(sse) do |reader|
         # Set base_uri if we have one

diff --git a/lib/sparql/algebra/extensions.rb b/lib/sparql/algebra/extensions.rb
@@ -427,6 +427,7 @@ def vars
     variables.values
   end
 
+  alias_method :optimize_without_expression!, :optimize!
   ##
   # Optimize the query, removing lexical shortcuts in URIs
   #
@@ -441,11 +442,9 @@ def optimize!(**options)
           term
         end
       end
-      RDF::Query::Pattern.from(components)
-    end.sort! do |a, b|
-      (a.cost || 0) <=> (b.cost || 0)
+      RDF::Query::Pattern.from(components, **pattern.options)
     end
-    self
+    self.optimize_without_expression!(**options)
   end
 
   ##

diff --git a/lib/sparql/algebra/operator.rb b/lib/sparql/algebra/operator.rb
@@ -571,13 +571,6 @@ def to_sxp_bin
     #
     # @return [String]
     def to_sxp
-      begin
-        require 'sxp' # @see https://rubygems.org/gems/sxp
-      rescue LoadError
-        abort "SPARQL::Algebra::Operator#to_sxp requires the SXP gem (hint: `gem install sxp')."
-      end
-      require 'sparql/algebra/sxp_extensions'
-
       to_sxp_bin.to_sxp
     end
 

diff --git a/lib/sparql/grammar.rb b/lib/sparql/grammar.rb
@@ -1,7 +1,6 @@
 require 'rdf' # @see https://rubygems.org/gems/rdf
 require 'sparql/algebra'
 require 'json'
-require 'sxp'
 
 module SPARQL
   ##