tripod 0.10.12 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9566499135930792bfe25a0ff05af6a4cf8f2dc2
-  data.tar.gz: 3f8f7e3ab314f6d0dcc3ea2fdd914e2f0f05de2d
+  metadata.gz: 531f10bb018c574b829130163c072bf92da17bb5
+  data.tar.gz: 8d975d11b7b3a4e0d860910871e760b5bc6266ec
 SHA512:
-  metadata.gz: 25efd029784318c71f547eecfcce2217a1223a74fa42e8ae2f2d45aa17c817e58314d78df7a6de9221bf1dc138b132e300f1372137a2f8d49f91def0278b8ca8
-  data.tar.gz: 160760d6ac66d06f41de25de2836fb47ace3405881ca0e32a9b70bc01295f235aa6d7dbb0f1ac060b67b02c55fbbcacc396ceb54cc13183374e43b38cd87172a
+  metadata.gz: f25fe33e76090c1002bacf050eab8e47cd3b223d3547e21f8d60b1204464987623926e32a8b890a083aabcae5418844a83f057fe72640573df94f6cb5fb98a78
+  data.tar.gz: 5ef2a69e11203c68ce7f0a3b0b9406377614eed24f9e20b3c6a4320c5d009d511bfd33b3891f755b8f47ef1e53192d10fb5f79cd26eac8b12c40516569c0b3cb

data/lib/tripod/criteria.rb

@@ -42,7 +42,7 @@ module Tripod
     # e.g. my_criteria.where("?uri a <http://my-type>")
     #
     def where(filter)
-      if filter.is_a?(String) # we gotta Sparql snippet
+      if filter.is_a?(String) # we got a Sparql snippet
         where_clauses << filter
       elsif filter.is_a?(Hash)
         filter.each_pair do |key, value|
@@ -54,6 +54,9 @@ module Tripod
       self
     end
 
+    def query_where_clauses
+      where_clauses.empty? ? ['?uri ?p ?o'] : where_clauses
+    end
     # takes a string and adds an extra clause to this criteria.
     # e.g. my_criteria.extras("LIMIT 10 OFFSET 20").extrass
     #

data/lib/tripod/criteria/execution.rb

@@ -44,7 +44,12 @@ module Tripod
       sq = Tripod::SparqlQuery.new(self.as_query(opts))
       count_sparql = sq.as_count_query_str
       result = Tripod::SparqlClient::Query.select(count_sparql)
-      result[0]["tripod_count_var"]["value"].to_i
+
+      if result.length > 0
+        result[0]["tripod_count_var"]["value"].to_i
+      else
+        return 0
+      end
     end
 
     # turn this criteria into a query
@@ -70,7 +75,7 @@ module Tripod
         select_query += "GRAPH <#{graph_uri}> { " if graph_uri
       end
 
-      select_query += self.where_clauses.join(" . ")
+      select_query += self.query_where_clauses.join(" . ")
       select_query += " } "
       select_query += "} " if return_graph || graph_uri # close the graph clause
       select_query += self.extra_clauses.join(" ")

data/lib/tripod/finders.rb

@@ -41,7 +41,7 @@ module Tripod::Finders
         graph_uri ||= self.get_graph_uri
         unless graph_uri
           # do a quick select to see what graph to use.
-          select_query = "SELECT ?g WHERE { GRAPH ?g {<#{uri.to_s}> ?p ?o } } LIMIT 1"
+          select_query = "SELECT * WHERE { GRAPH ?g {<#{uri.to_s}> ?p ?o } } LIMIT 1"
           result = Tripod::SparqlClient::Query.select(select_query)
           if result.length > 0
             graph_uri = result[0]["g"]["value"]
@@ -90,7 +90,7 @@ module Tripod::Finders
     # execute a query to return all objects (restricted by this class's rdf_type if specified)
     # returns a criteria object
     def all
-      where('?uri ?p ?o')
+      Tripod::Criteria.new(self)
     end
 
     def count
@@ -161,9 +161,15 @@ 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])
-      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)
+
+      #there are no resources if there are no uris and graphs
+      if uris_and_graphs.empty?
+        []
+      else
+        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
     end
 
     # For a select query, generate a query which DESCRIBES all the results
@@ -250,10 +256,12 @@ module Tripod::Finders
     # @option options [ String ] graph_variable The name of the uri variable in thh query, if not 'graph'
     def _select_uris_and_graphs(sparql, opts={})
       select_results = Tripod::SparqlClient::Query.select(sparql)
-
+  
       uri_variable = opts[:uri_variable] || 'uri'
       graph_variable = opts[:graph_variable] || 'graph'
 
+      return [] unless select_results.select{|r| r.keys.length > 0 }.any?
+    
       select_results.reduce([]) do |memo, result|
         u = result[uri_variable]['value']
         g = result[graph_variable]['value'] if result[graph_variable]

data/lib/tripod/graphs.rb

@@ -7,6 +7,11 @@ module Tripod::Graphs
   def graphs
     select_query = "SELECT DISTINCT ?g WHERE { GRAPH ?g {<#{uri.to_s}> ?p ?o } }"
     result = Tripod::SparqlClient::Query.select(select_query)
-    result.map{|r| r["g"]["value"]}
+
+    if result.length > 0
+       result.select{|r| r.keys.length > 0 }.map{|r| r["g"]["value"] }
+    else
+       []
+    end
   end
 end

data/lib/tripod/sparql_client.rb

@@ -69,7 +69,11 @@ module Tripod::SparqlClient
     # @return [ Hash, String ]
     def self.select(query)
       query_response = self.query(query, "application/sparql-results+json")
-      JSON.parse(query_response)["results"]["bindings"]
+      if query_response.length >0 
+        JSON.parse(query_response)["results"]["bindings"]
+      else
+        []
+      end
     end
 
     def self._response_limit_options(response_limit_bytes)

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.10.12"
+  VERSION = "0.11.0"
 end

data/spec/spec_helper.rb

@@ -16,12 +16,15 @@ RSpec.configure do |config|
   config.before(:each) do
     WebMock.disable!
     # delete from all graphs.
-    Tripod::SparqlClient::Update.update('
-      # delete from default graph:
-      DELETE {?s ?p ?o} WHERE {?s ?p ?o};
-      # delete from named graphs:
-      DELETE {graph ?g {?s ?p ?o}} WHERE {graph ?g {?s ?p ?o}};
-    ')
+    # delete from default graph:
+    # Tripod::SparqlClient::Update.update('
+    #   DELETE {?s ?p ?o} WHERE {?s ?p ?o}')
+    #   # delete from named graphs:
+    # Tripod::SparqlClient::Update.update('
+    #   DELETE {graph ?g {?s ?p ?o}} WHERE {graph ?g {?s ?p ?o}};
+    # ')
+    Tripod::SparqlClient::Update.update('drop default')
+    Tripod::SparqlClient::Update.update('drop all')
   end
 
 end

data/spec/tripod/criteria_execution_spec.rb

@@ -28,12 +28,12 @@ describe Tripod::Criteria do
 
     context "for a class with an rdf_type and graph" do
       it "should return a SELECT query based with an rdf type restriction" do
-        person_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } }"
+        person_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> } }"
       end
 
       context "with include_graph option set to false" do
         it "should not select graphs, but restrict to graph" do
-          person_criteria.as_query(:return_graph => false).should == "SELECT DISTINCT ?uri WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } }"
+          person_criteria.as_query(:return_graph => false).should == "SELECT DISTINCT ?uri WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> } }"
         end
       end
 
@@ -41,7 +41,7 @@ describe Tripod::Criteria do
         before { person_criteria.where("[pattern]") }
 
         it "should return a SELECT query with the extra restriction" do
-          person_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o . [pattern] } }"
+          person_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . [pattern] } }"
         end
       end
 
@@ -49,7 +49,7 @@ describe Tripod::Criteria do
         before { person_criteria.graph("http://example.com/anothergraph") }
 
          it "should override the graph in the query" do
-          person_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/anothergraph> as ?graph) WHERE { GRAPH <http://example.com/anothergraph> { ?uri a <http://example.com/person> . ?uri ?p ?o } }"
+          person_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/anothergraph> as ?graph) WHERE { GRAPH <http://example.com/anothergraph> { ?uri a <http://example.com/person> } }"
         end
       end
     end
@@ -66,10 +66,10 @@ describe Tripod::Criteria do
       end
 
       context "and extra restrictions" do
-        before { resource_criteria.where("[pattern]") }
+        before { resource_criteria.where("?uri a <http://type>") }
 
         it "should return a SELECT query with the extra restrictions" do
-          resource_criteria.as_query.should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o . [pattern] } }"
+          resource_criteria.as_query.should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri a <http://type> } }"
         end
       end
 
@@ -84,10 +84,10 @@ describe Tripod::Criteria do
 
     context "with extras" do
 
-      before { resource_criteria.where("[pattern]").extras("LIMIT 10").extras("OFFSET 20") }
+      before { resource_criteria.where("?uri a <http://type>").extras("LIMIT 10").extras("OFFSET 20") }
 
       it "should add the extras on the end" do
-        resource_criteria.as_query.should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o . [pattern] } } LIMIT 10 OFFSET 20"
+        resource_criteria.as_query.should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri a <http://type> } } LIMIT 10 OFFSET 20"
       end
     end
   end
@@ -191,7 +191,7 @@ describe Tripod::Criteria do
 
     it "should execute the right Sparql" do
       sparql = "SELECT (COUNT(*) as ?tripod_count_var) {
-  SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> . ?uri ?p ?o } }  LIMIT 10 OFFSET 20
+  SELECT DISTINCT ?uri (<http://example.com/graph> as ?graph) WHERE { GRAPH <http://example.com/graph> { ?uri a <http://example.com/person> } }  LIMIT 10 OFFSET 20
 }"
       Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
       Person.all.limit(10).offset(20).count

data/spec/tripod/criteria_spec.rb

@@ -18,13 +18,13 @@ describe Tripod::Criteria do
 
     context "with rdf_type set on the class" do
       it "should initialize the where clauses to include a type restriction" do
-        person_criteria.where_clauses.should == ["?uri a <http://example.com/person>", "?uri ?p ?o"]
+        person_criteria.where_clauses.should == ["?uri a <http://example.com/person>"]
       end
     end
 
     context "with no rdf_type set on the class" do
       it "should initialize the where clauses to ?uri ?p ?o" do
-        resource_criteria.where_clauses.should == ["?uri ?p ?o"]
+        resource_criteria.where_clauses.should == []
       end
     end
   end
@@ -34,7 +34,7 @@ describe Tripod::Criteria do
     context 'given a string' do
       it "should add the sparql snippet to the where clauses" do
         resource_criteria.where("blah")
-        resource_criteria.where_clauses.should == ["?uri ?p ?o", "blah"]
+        resource_criteria.where_clauses.should == ["blah"]
       end
 
       it "should return an instance of Criteria" do
@@ -42,7 +42,7 @@ describe Tripod::Criteria do
       end
 
       it "should return an instance of Criteria with the where clauses added" do
-        resource_criteria.where("blah").where_clauses.should == ["?uri ?p ?o", "blah"]
+        resource_criteria.where("blah").where_clauses.should == ["blah"]
       end
     end
 
@@ -52,7 +52,7 @@ describe Tripod::Criteria do
 
         it 'should construct a sparql snippet with the appropriate predicate, treating the value as a literal' do
           criteria = resource_criteria.where(label: value)
-          criteria.where_clauses[1].should == "?uri <#{ RDF::RDFS.label }> \"#{ value }\""
+          criteria.where_clauses[0].should == "?uri <#{ RDF::RDFS.label }> \"#{ value }\""
         end
       end
 
@@ -61,7 +61,7 @@ describe Tripod::Criteria do
 
         it 'should construct a sparql snippet with the appropriate predicate' do
           criteria = resource_criteria.where(label: value)
-          criteria.where_clauses[1].should == "?uri <#{ RDF::RDFS.label }> <#{ value.to_s }>"
+          criteria.where_clauses[0].should == "?uri <#{ RDF::RDFS.label }> <#{ value.to_s }>"
         end
       end
     end

data/spec/tripod/finders_spec.rb

@@ -146,8 +146,8 @@ describe Tripod::Finders do
   end
 
   describe ".all" do
-    it "should make and return a new criteria for the current class, with a where clause of ?uri ?p ?o already started" do
-      Person.all.should == Tripod::Criteria.new(Person).where("?uri ?p ?o")
+    it "should make and return a new criteria for the current class" do
+      Person.all.should == Tripod::Criteria.new(Person)
     end
   end
 

data/spec/tripod/links_spec.rb

@@ -106,8 +106,7 @@ describe Tripod::Links do
 
         rover.friends.length.should == 2
 
-        rover.friends.to_a.first.uri.should == fido.uri
-        rover.friends.to_a.last.uri.should == spot.uri
+        rover.friends.map {|f| f.uri}.should =~ [fido.uri, spot.uri]
       end
 
       it "creates field getters and setters with the _uris suffix" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.10.12
+  version: 0.11.0
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client