tripod 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8b2231c1e29b1c0505ed07246fed4759caec36
-  data.tar.gz: 7f11adc9aeb2eb8da2cc0bdc9cdc7e5c6aed0375
+  metadata.gz: 860ab59bda222badcfcec33c7581cb38c9689438
+  data.tar.gz: f3b261284e25ca436da10d9645069566ee5502ef
 SHA512:
-  metadata.gz: 631ba8493a054ed194a00582d6da8bb834d5e30493a82f3097ff5f0c6219637d7dec3049ec6fad916c280e2b9cd2327caed7500ee4d87c2c987c2f223207f4ae
-  data.tar.gz: 8504919b265ce0582f2d0d1a60795214bd119867a02ec32892d7be22d40a48ebe6228d5ab2e38c1f582a1dcd561658757236b3192e8ba3791a2d1f7c91c8cdcf
+  metadata.gz: 76536a9ac3b635dcc105d200b46ed62ff18e62aef98448ff2f025dd032348d4a5775fba2106a5b612777f1671de4bc804e658fde6a7ab48c17d894fa4c7dc582
+  data.tar.gz: bc4b45d80af1433da52118bf8c0fc9ebbcf62f2f194c36073983b83ef34a775b4d96806c304bc805f81dc80721b85dfc6400778d1a4af9157a3cec2420de1e42

data/lib/tripod/criteria.rb

@@ -18,11 +18,13 @@ module Tripod
     attr_accessor :order_clause
     attr_accessor :offset_clause
     attr_accessor :graph_uri
+    attr_accessor :graph_lambdas
 
     def initialize(resource_class)
       self.resource_class = resource_class
       self.where_clauses = []
       self.extra_clauses = []
+      self.graph_lambdas = []
 
       if resource_class._RDF_TYPE
         self.where("?uri a <#{resource_class._RDF_TYPE.to_s}>")
@@ -84,17 +86,28 @@ module Tripod
       self
     end
 
-    # Restrict htis query to the graph uri passed in
+    # Restrict this query to the graph uri passed in
+    # You may also pass a block to an unbound graph, ?g
+    # then chain a where clause to the criteria returned to bind ?g
     #
     # @example .graph(RDF::URI.new('http://graphoid')
     # @example .graph('http://graphoid')
+    # @example .graph(nil) { "?s ?p ?o" }.where("?uri ?p ?g")
     #
-    # @param [ Stirng, RDF::URI ] The graph uri
+    # @param [ String, RDF::URI ] The graph uri
+    # @param [ Block ] A string to be executed within an unbound graph, ?g
     #
     # @return [ Tripod::Criteria ] A criteria object
-    def graph(graph_uri)
-      self.graph_uri = graph_uri.to_s
-      self
+    def graph(graph_uri, &block)
+
+      if block_given?
+        self.graph_lambdas ||= []
+        self.graph_lambdas << block
+        self
+      else
+        self.graph_uri = graph_uri.to_s
+        self
+      end
     end
   end
 end

data/lib/tripod/criteria/execution.rb

@@ -62,22 +62,40 @@ module Tripod
 
       select_query = "SELECT DISTINCT ?uri "
 
-      if return_graph
-        # if we are returing the graph, select it as a variable, and include either the <graph> or ?graph in the where clause
-        if graph_uri
-          select_query += "(<#{graph_uri}> as ?graph) WHERE { GRAPH <#{graph_uri}> { "
+      if graph_lambdas.empty?
+
+        if return_graph
+          # if we are returning the graph, select it as a variable, and include either the <graph> or ?graph in the where clause
+          if graph_uri
+            select_query += "(<#{graph_uri}> as ?graph) WHERE { GRAPH <#{graph_uri}> { "
+          else
+            select_query += "?graph WHERE { GRAPH ?graph { "
+          end
         else
-          select_query += "?graph WHERE { GRAPH ?graph { "
+          select_query += "WHERE { "
+          # if we're not returning the graph, only restrict by the <graph> if there's one set at class level
+          select_query += "GRAPH <#{graph_uri}> { " if graph_uri
         end
+
+        select_query += self.query_where_clauses.join(" . ")
+        select_query += " } "
+        select_query += "} " if return_graph || graph_uri # close the graph clause
+
       else
+        # whip through the graph lambdas and add into the query
+        # we have multiple graphs so the above does not apply
         select_query += "WHERE { "
-        # if we're not returning the graph, only restrict by the <graph> if there's one set at class level
-        select_query += "GRAPH <#{graph_uri}> { " if graph_uri
+
+        graph_lambdas.each do |lambda_item|
+          select_query += "GRAPH ?g { "
+          select_query += lambda_item.call
+          select_query += " } "
+        end
+
+        select_query += self.query_where_clauses.join(" . ")
+        select_query += " } "
       end
 
-      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(" ")
 
       select_query += [order_clause, limit_clause, offset_clause].join(" ")

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.11.2"
+  VERSION = "0.12.0"
 end

data/spec/tripod/criteria_execution_spec.rb

@@ -26,6 +26,22 @@ describe Tripod::Criteria do
 
   describe "#as_query" do
 
+    context "when graph_lambdas exist" do
+      it "should return the contents of the block inside a graph statement with unbound ?g parameter" do
+        resource_criteria.graph(nil) do
+          "?uri ?p ?o"
+        end
+        resource_criteria.as_query.should == "SELECT DISTINCT ?uri WHERE { GRAPH ?g { ?uri ?p ?o } ?uri ?p ?o }"
+      end
+
+      it "should be possible to bind to the ?g paramter on the criteria after supplying a block" do
+        resource_criteria.graph(nil) do
+          "?s ?p ?o"
+        end.where("?uri ?p ?g")
+        resource_criteria.as_query.should == "SELECT DISTINCT ?uri WHERE { GRAPH ?g { ?s ?p ?o } ?uri ?p ?g }"
+      end
+    end
+
     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> } }"

data/spec/tripod/criteria_spec.rb

@@ -16,6 +16,10 @@ describe Tripod::Criteria do
       person_criteria.extra_clauses.should == []
     end
 
+    it "should initialize the graph lambdas to a blank array" do
+      person_criteria.graph_lambdas.should == []
+    end
+
     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>"]
@@ -133,6 +137,18 @@ describe Tripod::Criteria do
       resource_criteria.graph(RDF::URI("http://example.com/foobar"))
       resource_criteria.graph_uri.should == "http://example.com/foobar"
     end
+
+    context "with a block" do
+
+      it "will convert each criteria in the block to a query" do
+        resource_criteria.graph(nil) do
+          "?uri ?p ?o"
+        end.where("?uri ?p ?g")
+
+        resource_criteria.graph_lambdas.should_not be_empty
+      end
+
+    end
   end
 
 end

metadata

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