Make query validation optional. (Notation-3 patterns will appear to be invalid).

Author: gkellogg

Gemfile

@@ -22,7 +22,6 @@ group :debug do
   gem 'psych', platforms: [:mri, :rbx]
   gem "redcarpet", platforms: :ruby
   gem "byebug", platforms: :mri
-  gem 'ruby-debug', platform: :jruby
   gem 'guard-rspec'
 end
 

lib/rdf/query.rb

@@ -171,10 +171,12 @@ def self.Solutions(*args)
     #     Alias for `:graph_name`.
     #   @param  [Hash{Symbol => Object}] options
     #     any additional keyword options
+    # @option options [Boolean] validate (false)
+    #   validate patterns
     #   @yield  [query]
     #   @yieldparam  [RDF::Query] query
     #   @yieldreturn [void] ignored
-    def initialize(*patterns, solutions: nil, graph_name: nil, name: nil, **options, &block)
+    def initialize(*patterns, solutions: nil, graph_name: nil, name: nil, validate: false, **options, &block)
       @options = options.dup
       @solutions = Query::Solutions(solutions)
       graph_name = name if graph_name.nil?
@@ -195,6 +197,8 @@ def initialize(*patterns, solutions: nil, graph_name: nil, name: nil, **options,
           else instance_eval(&block)
         end
       end
+
+      validate! if validate
     end
 
     ##
@@ -291,7 +295,6 @@ def optimize!(**options)
     # @see    http://www.holygoat.co.uk/blog/entry/2005-10-25-1
     # @see    http://www.w3.org/TR/sparql11-query/#emptyGroupPattern
     def execute(queryable, solutions: Solution.new, graph_name: nil, name: nil, **options, &block)
-      validate!
       options = {bindings: {}}.merge(options)
 
       # Use provided solutions to allow for query chaining
@@ -516,12 +519,12 @@ def dup
     end
 
     ##
-    # Determine if the URI is a valid according to RFC3987
+    # Determine if the query containts valid patterns
     #
     # @return [Boolean] `true` or `false`
     # @since 0.3.9
     def valid?
-      !!validate!
+      !!validate! rescue raise false
     rescue
       false
     end

spec/query_spec.rb

@@ -178,7 +178,7 @@
          end
        end
     end
-    
+
     context "triple pattern combinations" do
       let(:graph) {
         # Normally we would not want all of this crap in the graph for each
@@ -295,7 +295,7 @@
         sol3 = q3.execute(graph, solutions: sol2)
         expect(sol3).to have_result_set [ { s: EX.x6, o: EX.target, o2: EX.target2, o3: EX.target3 } ]
       end
-      
+
       it "has bindings" do
         query = RDF::Query.new do |query|
           query << [:s, EX.p, :o]
@@ -478,7 +478,7 @@
           graph << [EX.xu, EX.p, EX.z]
         end
       }
-      
+
       describe "graph-1" do
         subject {
           query = RDF::Query.new {pattern [:x, EX.p, RDF::Literal::Integer.new(1)]}
@@ -488,17 +488,17 @@
         it "has two solutions" do
           expect(subject.count).to eq 2
         end
-        
+
         it "has xi1 as a solution" do
           expect(subject.filter(x: EX.xi1)).not_to be_empty
         end
-        
+
         it "has xi2 as a solution" do
           expect(subject.filter(x: EX.xi2)).not_to be_empty
         end
       end
 
-      
+
       describe "graph-2" do
         subject {
           query = RDF::Query.new {pattern [:x, EX.p, RDF::Literal::Double.new("1.0e0")]}
@@ -508,7 +508,7 @@
         it "has one solution" do
           expect(subject.count).to eq 1
         end
-        
+
         it "has xd1 as a solution" do
           expect(subject.filter(x: EX.xd1)).not_to be_empty
         end
@@ -629,15 +629,15 @@
         # restrictions, because the semantics of leading optional patterns
         # are hard to get right.
         expect do
-          query = RDF::Query.new do |query|
+          query = RDF::Query.new(validate: true) do |query|
             query.pattern [:s, EX.p2, :o], optional: true
             query.pattern [:s, EX.p, EX.o]
           end
           query.execute(@graph)
         end.to raise_error(ArgumentError)
 
         expect do
-          query = RDF::Query.new do |query|
+          query = RDF::Query.new(validate: true) do |query|
             query.pattern [:s, EX.p, EX.o]
             query.pattern [:s, EX.p2, :o], optional: true
             query.pattern [:s, EX.x, EX.x]
@@ -716,7 +716,7 @@
               count
           ).to eq 1
         end
-        
+
         it "accepts a block" do
           expect(
             subject.
@@ -725,7 +725,7 @@
           ).to eq 1
         end
       end
-      
+
       context "order" do
         it "returns ordered solutions using a symbol" do
           orig = subject.dup
@@ -750,7 +750,7 @@
           subject.order {|a, b| a[:p] <=> b[:p]}
         end
       end
-      
+
       it "should support duplicate elimination" do
         [:distinct, :reduced].each do |op|
           solutions = RDF::Query::Solutions(subject.to_a * 2)
@@ -776,7 +776,7 @@
     it "returns nil by default" do
       expect(subject.graph_name).to be_nil
     end
-    
+
     it "sets and returns a graph_name" do
       subject.graph_name = RDF.first
       expect(subject.graph_name).to eq RDF.first
@@ -794,32 +794,32 @@
     it "returns false with no graph_name" do
       expect(subject.named?).to be_falsey
     end
-    
+
     it "returns true with a graph_name" do
       subject.graph_name = RDF.first
       expect(subject.named?).to be_truthy
     end
   end
-  
+
   describe "#unnamed?" do
     it "returns true with no graph_name" do
       expect(subject.unnamed?).to be_truthy
     end
-    
+
     it "returns false with a graph_name" do
       subject.graph_name = RDF.first
       expect(subject.unnamed?).to be_falsey
     end
   end
-  
+
   describe "#+" do
     it "returns a new RDF::Query" do
       rhs = RDF::Query.new
       q = subject + rhs
       expect(q).not_to be_equal(subject)
       expect(q).not_to be_equal(rhs)
     end
-    
+
     it "contains patterns from each query in order" do
       subject.pattern [EX.first, EX.second, EX.third]
       rhs = RDF::Query.new