tripod 0.10.10 → 0.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e09d56a300cfbce5e1e35feb3be1821a129eee
-  data.tar.gz: 8b149e9c78c869ec7f307e84d2e609840b0271fe
+  metadata.gz: ba073a508bbb8401fee9818d86cab1d1d97dd506
+  data.tar.gz: 89d5cab48aa1e06f603bddd46ccc2d98b8fc592e
 SHA512:
-  metadata.gz: 8c32107cb6bb6d0065f5584e08be54f54ac08222a63ebf8a9e4dbf88ccbcc01425bfb9e61d0c4f4aa938d76cf9439b22f44ee6387f80cb03f537f44b4f8e549e
-  data.tar.gz: 42054adedd9b7975e3ddef60678b7118f596e75982ff6d7cfd731c9ed745767bb382cc9f9326e552cdf98935efc7ab8afc1236ec8bc4aee9b2a492244b71ea13
+  metadata.gz: 7ff8a8d538b37f697433d2c1edebec5d80cfd092976b395812de0277bc8abb526d65df706dd8dcc1f68bf0d6c481c57327b290acd2e09b162bbde40ab53a0644
+  data.tar.gz: 5decb3639f621abcfecd3e82380ba710b9941937748b2ce39290f22795f941a3958fa9a53facf91c0635be2363bc1bb77bd7aa64fb711bd38de02553ae2e4693

data/lib/tripod/finders.rb

@@ -161,8 +161,8 @@ module Tripod::Finders
     def _create_and_hydrate_resources_from_sparql(select_sparql, opts={})
       # TODO: Optimization?: if return_graph option is false, then don't do this next line?
       uris_and_graphs = _select_uris_and_graphs(select_sparql, :uri_variable => opts[:uri_variable], :graph_variable => opts[:graph_variable])
-      ntriples_string = _raw_describe_select_results(select_sparql, :uri_variable => opts[:uri_variable]) # this defaults to ntriples
-      graph = _rdf_graph_from_ntriples_string(ntriples_string, graph=nil)
+      construct_query = _construct_query_for_uris_and_graphs(uris_and_graphs)
+      graph = _graph_of_triples_from_construct_or_describe(construct_query)
       _resources_from_graph(graph, uris_and_graphs)
     end
 
@@ -186,6 +186,16 @@ module Tripod::Finders
       "
     end
 
+    # Generate a CONSTRUCT query for the given uri and graph pairs.
+    def _construct_query_for_uris_and_graphs(uris_and_graphs)
+      value_pairs = uris_and_graphs.map do |(uri, graph)|
+        u = RDF::URI.new(uri).to_base
+        g = graph ? RDF::URI.new(graph).to_base : 'UNDEF'
+        "(#{u} #{g})"
+      end
+      query = "CONSTRUCT { ?uri ?p ?o . #{ self.all_triples_construct("?uri") }} WHERE { GRAPH ?g { ?uri ?p ?o . #{ self.all_triples_where("?uri") } VALUES (?uri ?g) { #{ value_pairs.join(' ') } } } }"
+    end
+
     # For a select query, get a raw serialisation of the DESCRIPTION of the resources from the database.
     #
     # @option options [ String ] uri_variable The name of the uri variable in the query, if not 'uri'
@@ -207,7 +217,7 @@ module Tripod::Finders
       # uris from the graph, and just not create the resoruces with a graph
       # (but they won't be persistable).
 
-      uris_and_graphs.each_pair do |u,g|
+      uris_and_graphs.each do |(u,g)|
 
         # instantiate a new resource
         g ||= {}
@@ -232,7 +242,7 @@ module Tripod::Finders
       resources
     end
 
-    # based on the query passed in, build a hash of uris->graphs
+    # based on the query passed in, build an array of [uri, graph] pairs
     # @param [ String] sparql. The sparql query
     # @param [ Hash ] opts. A hash of options.
     #
@@ -241,16 +251,15 @@ module Tripod::Finders
     def _select_uris_and_graphs(sparql, opts={})
       select_results = Tripod::SparqlClient::Query.select(sparql)
 
-      uris_and_graphs = {}
+      uri_variable = opts[:uri_variable] || 'uri'
+      graph_variable = opts[:graph_variable] || 'graph'
 
-      select_results.each do |r|
-        uri_variable = opts[:uri_variable] || 'uri'
-        graph_variable = opts[:graph_variable] || 'graph'
-        graph_value = r[graph_variable]["value"] if r[graph_variable]
-        uris_and_graphs[ r[uri_variable]["value"] ] = graph_value || nil
+      select_results.reduce([]) do |memo, result|
+        u = result[uri_variable]['value']
+        g = result[graph_variable]['value'] if result[graph_variable]
+        memo << [u, g]
+        memo
       end
-
-      uris_and_graphs
     end
 
   end

data/lib/tripod/sparql_client.rb

@@ -46,7 +46,7 @@ module Tripod::SparqlClient
     end
 
     # Tripod helper to turn a hash to a query string, allowing multiple params in arrays
-    # e.g. :query=>'foo', :graph=>['bar', 'baz'] 
+    # e.g. :query=>'foo', :graph=>['bar', 'baz']
     #  -> query=foo&graph=bar&graph=baz
     # based on the ActiveSupport implementation, but with different behaviour for arrays
     def self.to_query hash
@@ -93,13 +93,12 @@ module Tripod::SparqlClient
     #
     # @return [ true ]
     def self.update(sparql)
-
       begin
         RestClient::Request.execute(
           :method => :post,
           :url => Tripod.update_endpoint,
           :timeout => Tripod.timeout_seconds,
-          :payload => sparql,
+          :payload => { update: sparql }.merge(Tripod.extra_endpoint_params),
           :headers => {
             :content_type => 'application/sparql-update'
           }
@@ -113,4 +112,4 @@ module Tripod::SparqlClient
 
   end
 
-end
+end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.10.10"
+  VERSION = "0.10.11"
 end

data/spec/tripod/finders_spec.rb

@@ -15,6 +15,13 @@ describe Tripod::Finders do
     b
   end
 
+  let!(:john) do
+    j = Person.new('http://example.com/id/john', 'http://example.com/another_graph')
+    j.name = "john"
+    j
+  end
+
+
   describe '.find' do
 
     before do
@@ -196,34 +203,65 @@ describe Tripod::Finders do
 
   describe '.find_by_sparql' do
 
-    before do
-      # save these into the db
-      bill.save!
-      ric.save!
+    before { [bill, ric, john].each(&:save!) }
+
+    context 'given a simple SELECT query, returning uri and graph' do
+      let(:query) { 'SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }' }
+
+      it 'returns an array of matching resources' do
+        res = Person.find_by_sparql(query)
+        res.should =~ [bill, ric, john]
+      end
     end
 
-    it 'returns an array of resources which match those in the db' do
-      res = Person.find_by_sparql('SELECT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } } ORDER BY ?uri')
-      res.length.should == 2
-      res.should include bill
-      res.should include ric
+    context 'given a simple SELECT query, returning uri only' do
+      let(:query) { 'SELECT DISTINCT ?uri WHERE { ?uri ?p ?o }' }
 
-      r = res.last
-      r.name.should == "ric"
-      r.knows.should == [RDF::URI.new("http://example.com/id/bill")]
+      it 'returns an array of matching resources' do
+        res = Person.find_by_sparql(query)
+        res.should =~ [bill, ric, john]
+      end
     end
 
-    it 'uses the uri and graph variables if supplied' do
-      res = Person.find_by_sparql('SELECT ?bob ?geoff WHERE { GRAPH ?geoff { ?bob ?p ?o } }', :uri_variable => 'bob', :graph_variable => 'geoff')
-      res.length.should == 2
+    context 'given a SELECT query and named uri and graph variables' do
+      let(:query) { 'SELECT DISTINCT ?x ?y WHERE { GRAPH ?y { ?x ?p ?o } }' }
+      let(:opts) { {:uri_variable => 'x', :graph_variable => 'y'} }
+
+      it 'returns an array of matching resources' do
+        res = Person.find_by_sparql(query, opts)
+        res.should =~ [bill, ric, john]
+      end
     end
 
-    it "returns non-new records" do
-      res = Person.find_by_sparql('SELECT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }')
-      res.first.new_record?.should be false
+    context 'given a SELECT query containing a graph restriction' do
+      let(:query) { 'SELECT DISTINCT ?uri ?graph WHERE { GRAPH <http://example.com/graph> { ?uri ?p ?o  } }' }
+
+      it 'only returns matching resources' do
+        res = Person.find_by_sparql(query)
+        res.should =~ [bill, ric]
+      end
     end
 
-  end
+    context 'given a SELECT query containing multiple graph restrictions' do
+      let(:query) { 'SELECT DISTINCT ?uri ?graph WHERE {
+                     { GRAPH <http://example.com/graph> { ?uri ?p ?o } }
+                       UNION
+                     { GRAPH <http://example.com/another_graph> { ?uri ?p ?o } }
+                     }' }
+
+      it "should return matching resources" do
+        res = Person.find_by_sparql(query)
+        res.should =~ [bill, ric, john]
+      end
+    end
 
+    context 'given a SELECT query which returns no resources' do
+      let(:query) { 'SELECT ?uri WHERE { ?uri ?p ?o . <http://example.com/minotaur> ?p ?o . }' }
 
+      it 'returns an empty array' do
+        res = Person.find_by_sparql(query)
+        res.empty?.should == true
+      end
+    end
+  end
 end

data/spec/tripod/sparql_client_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module Tripod::SparqlClient
+  describe Update do
+    describe '.update' do
+      context 'given a valid SPARQL query' do
+        let(:uri) { RDF::URI.new("http://example.com/me") }
+        let(:query) { "INSERT DATA { GRAPH <http://example.com/graph/foo> { #{uri.to_base} <http://example.com/hello> \"world\" . } }" }
+
+        it 'should return true' do
+          Update.update(query).should == true
+        end
+
+        it 'should execute the update' do
+          Update.update(query)
+          Resource.find(uri).should_not be_nil
+        end
+
+        context 'and some additional endpoint params' do
+          it 'should include the additional params in the query payload'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.10.10
+  version: 0.10.11
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -276,6 +276,7 @@ files:
 - spec/tripod/repository_spec.rb
 - spec/tripod/resource_spec.rb
 - spec/tripod/serialization_spec.rb
+- spec/tripod/sparql_client_spec.rb
 - spec/tripod/sparql_query_spec.rb
 - spec/tripod/state_spec.rb
 - spec/tripod/streaming_spec.rb
@@ -327,6 +328,7 @@ test_files:
 - spec/tripod/repository_spec.rb
 - spec/tripod/resource_spec.rb
 - spec/tripod/serialization_spec.rb
+- spec/tripod/sparql_client_spec.rb
 - spec/tripod/sparql_query_spec.rb
 - spec/tripod/state_spec.rb
 - spec/tripod/streaming_spec.rb