sparql 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774ff66fd7f181a0b4aa7eb36c5c3a11c10c7a8c2b02728c358825ab7690e3be
-  data.tar.gz: 7f71db0b80c137af45f57b54ed335ab8d0d327e9c427d0eadb1fc70ae2c4ba62
+  metadata.gz: f623228f6e6d10b6b8221219ba1b7b6fcfdf8410db716cb400ed50b5e59f7d25
+  data.tar.gz: 8678296e2d0744c5d8dbbc0ac424c7c8b0e2540fa730a03960e961b9c2f08b33
 SHA512:
-  metadata.gz: fa064eb95aa7106739015840d71ea30bf89c853225517aee1d89fefe0f523fda1d3ed62fbf0c5e1f03d7c8fe10ae41dd14d2585754ea51539c86cc918a468313
-  data.tar.gz: 67b69a2e66be71bc5a73d74da3243f10950e56165c971f65536bd800edfd8edc25eb9d198cd84c220ae6f0e58a7819adfc9e2dd45439931449224d57227e240b
+  metadata.gz: f2b53c1cbf504ac9818d2a6ee0b03b9703e447698c5d2edcef697d49a4a7eaca63f563511440ec8e15e2bf64b8a91290b15eaf5aac2261c5fdd59a88a779fa66
+  data.tar.gz: 19a3844b38131cbc1cfa63a8109602fe07c98b58af4c8eef77cbb3bc668a055872582aa529e8b06ab27e873aacbc2b882abb435ab61148294f28fe4391024cdc

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.1.3

data/lib/sinatra/sparql.rb

@@ -103,7 +103,7 @@ module Sinatra
       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

data/lib/sparql.rb

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

data/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
   # 

data/lib/sparql/algebra/expression.rb

@@ -20,13 +20,6 @@ module SPARQL; module Algebra
     # @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

data/lib/sparql/algebra/extensions.rb

@@ -427,6 +427,7 @@ class RDF::Query
     variables.values
   end
 
+  alias_method :optimize_without_expression!, :optimize!
   ##
   # Optimize the query, removing lexical shortcuts in URIs
   #
@@ -441,11 +442,9 @@ class RDF::Query
           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
 
   ##

data/lib/sparql/algebra/operator.rb

@@ -571,13 +571,6 @@ module SPARQL; module Algebra
     #
     # @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
 

data/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
   ##

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Gregg Kellogg
 - Arto Bendiken
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-16 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -414,7 +414,7 @@ homepage: https://github.com/ruby-rdf/sparql
 licenses:
 - Unlicense
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -429,8 +429,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: SPARQL Query and Update library for Ruby.
 test_files: []