support prefix hashes

update tests leave docs alone since hash format is now supported
ruby-rdf · Nov 13, 2018 · 8957d3a · 8957d3a
1 parent 6e9bb94
commit 8957d3a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/lib/sparql/client/query.rb b/lib/sparql/client/query.rb
@@ -387,14 +387,16 @@ def slice(start, length)
     #   @param [string] string
     #   @return [Query]
     # @see    http://www.w3.org/TR/sparql11-query/#prefNames
-    def prefix(*args)
-      case args.length
-      when 1
-        (options[:prefixes] ||= []) << args[0]
-      when 2
-        (options[:prefixes] ||= []) << "#{args[0]}: <#{args[1]}>"
+    def prefix(val)
+      options[:prefixes] ||= []
+      if val.kind_of? String
+        options[:prefixes] << val
+      elsif val.kind_of? Hash
+        val.each do |k, v|
+          options[:prefixes] << "#{k}: <#{v}>"
+        end
       else
-        raise ArgumentError, "wrong number of arguments (#{args.length} for 1 or 2)"
+        raise ArgumentError, "prefix must be a kind of String or a Hash"
       end
       self
     end

diff --git a/spec/query_spec.rb b/spec/query_spec.rb
@@ -187,9 +187,20 @@
       expect(subject.select.prefix(prefixes[0]).prefix(prefixes[1]).where([:s, :p, :o]).to_s).to eq "PREFIX dc: <http://purl.org/dc/elements/1.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT * WHERE { ?s ?p ?o . }"
     end
 
-    it "should support RDF::URI PREFIX" do
-      prefixes = [[:dc, RDF::URI("http://purl.org/dc/elements/1.1/")], [:foaf, RDF::URI("http://xmlns.com/foaf/0.1/")]]
-      expect(subject.select.prefix(*prefixes[0]).prefix(*prefixes[1]).where([:s, :p, :o]).to_s).to eq "PREFIX dc: <http://purl.org/dc/elements/1.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT * WHERE { ?s ?p ?o . }"
+    it "should support hash PREFIX" do
+      prefixes = [{dc: RDF::URI("http://purl.org/dc/elements/1.1/")}, {foaf: RDF::URI("http://xmlns.com/foaf/0.1/")}]
+      expect(subject.select.prefix(prefixes[0]).prefix(prefixes[1]).where([:s, :p, :o]).to_s).to eq "PREFIX dc: <http://purl.org/dc/elements/1.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT * WHERE { ?s ?p ?o . }"
+    end
+
+    it "should support multiple values in PREFIX hash" do
+      expect(subject.select.prefix(dc: RDF::URI("http://purl.org/dc/elements/1.1/"), foaf: RDF::URI("http://xmlns.com/foaf/0.1/")).where([:s, :p, :o]).to_s).to eq "PREFIX dc: <http://purl.org/dc/elements/1.1/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> SELECT * WHERE { ?s ?p ?o . }"
+    end
+
+    it "should raise an ArgumentError for invalid PREFIX type" do
+      inavlid_prefix_types = [RDF::URI('missing prefix hash'), 0, []]
+      inavlid_prefix_types.each do |invalid_arg|
+        expect { subject.select.prefix(invalid_arg) }.to raise_error ArgumentError, "prefix must be a kind of String or a Hash"
+      end
     end
 
     it "should support OPTIONAL" do