tripod 0.7.18 → 0.7.19

data/lib/tripod/criteria/execution.rb

@@ -12,7 +12,7 @@ module Tripod
     # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
     def resources(opts={})
       Tripod::ResourceCollection.new(
-        self.resource_class._resources_from_sparql(build_select_query(opts)),
+        self.resource_class._resources_from_sparql(self.as_query(opts)),
          # pass in the criteria that was used to generate this collection, as well as whether the user specified return graph
         :return_graph => (opts.has_key?(:return_graph) ? opts[:return_graph] : true),
         :criteria => self
@@ -24,7 +24,7 @@ module Tripod
     # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
     # @option options [ String ] accept_header The accept header to use for serializing (defaults to application/n-triples)
     def serialize(opts={})
-      select_sparql = build_select_query(:return_graph => opts[:return_graph])
+      select_sparql = self.as_query(:return_graph => opts[:return_graph])
       self.resource_class._raw_describe_select_results(select_sparql, :accept_header => opts[:accept_header]) # note that this method defaults to using application/n-triples.
     end
 
@@ -32,7 +32,7 @@ module Tripod
     #
     # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
     def first(opts={})
-      sq = Tripod::SparqlQuery.new(build_select_query(opts))
+      sq = Tripod::SparqlQuery.new(self.as_query(opts))
       first_sparql = sq.as_first_query_str
       self.resource_class._resources_from_sparql(first_sparql).first
     end
@@ -41,52 +41,43 @@ module Tripod
     #
     # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
     def count(opts={})
-      sq = Tripod::SparqlQuery.new(build_select_query(opts))
+      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
     end
 
-    # PRIVATE:
+    # turn this criteria into a query
+    def as_query(opts={})
+      Tripod.logger.debug("TRIPOD: building select query for criteria...")
 
-    included do
+      return_graph = opts.has_key?(:return_graph) ? opts[:return_graph] : true
 
-      private
+      Tripod.logger.debug("TRIPOD: with return_graph: #{return_graph.inspect}")
 
-      # @option options [ String ] return_graph Indicates whether to return the graph as one of the variables.
-      def build_select_query(opts={})
+      select_query = "SELECT DISTINCT ?uri "
 
-        Tripod.logger.debug("TRIPOD: building select query for criteria...")
-
-        return_graph = opts.has_key?(:return_graph) ? opts[:return_graph] : true
-
-        Tripod.logger.debug("TRIPOD: with return_graph: #{return_graph.inspect}")
-
-        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}> { "
-          else
-            select_query += "?graph WHERE { GRAPH ?graph { "
-          end
+      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}> { "
         else
-          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
+          select_query += "?graph WHERE { GRAPH ?graph { "
         end
+      else
+        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.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(" ")
+      select_query += self.where_clauses.join(" . ")
+      select_query += " } "
+      select_query += "} " if return_graph || graph_uri # close the graph clause
+      select_query += self.extra_clauses.join(" ")
 
-        select_query.strip
-      end
+      select_query += [order_clause, limit_clause, offset_clause].join(" ")
 
+      select_query.strip
     end
 
   end

data/lib/tripod/criteria.rb

@@ -33,7 +33,7 @@ module Tripod
 
     # they're equal if they return the same query
     def ==(other)
-      build_select_query == other.send(:build_select_query)
+      as_query == other.send(:as_query)
     end
 
     # Takes a string and adds a where clause to this criteria.

data/lib/tripod/resource_collection.rb

@@ -9,13 +9,17 @@ module Tripod
 
     attr_reader :resources
     attr_reader :criteria # the criteria used to generate this collection
+    attr_reader :sparql_query_str # the sparql query used to generate this collection
 
     # options:
     #  :criteria - the criteria used to create this collection
+    #  :sparql_query_str - the sparql used to create this collection
     #  :return_graph - whether the original query returned the graphs or not.
     def initialize(resources, opts={})
       @resources = resources
       @criteria = opts[:criteria]
+      @sparql_query_str = opts[:sparql_query_str]
+      @resource_class = opts[:resource_class]
       @return_graph = opts[:return_graph]
     end
 
@@ -50,6 +54,9 @@ module Tripod
       time_serialization('nt') do
         if @criteria
           @criteria.serialize(:return_graph => @return_graph, :accept_header => "application/n-triples")
+        elsif @sparql_query_str && @resource_class
+          # run the query as a describe.
+          @resource_class._raw_describe_select_results(@sparql_query_str, :accept_header => "application/n-triples")
         else
           # for n-triples we can just concatenate them
           nt = ""
@@ -72,6 +79,9 @@ module Tripod
       time_serialization('rdf') do
         if @criteria
           @criteria.serialize(:return_graph => @return_graph, :accept_header => "application/rdf+xml")
+        elsif @sparql_query_str && @resource_class
+          # run the query as a describe.
+          @resource_class._raw_describe_select_results(@sparql_query_str, :accept_header => "application/rdf+xml")
         else
           get_graph.dump(:rdf)
         end
@@ -82,6 +92,9 @@ module Tripod
       time_serialization('ttl') do
         if @criteria
           @criteria.serialize(:return_graph => @return_graph, :accept_header => "text/turtle")
+        elsif @sparql_query_str && @resource_class
+          # run the query as a describe.
+          @resource_class._raw_describe_select_results(@sparql_query_str, :accept_header =>"text/turtle")
         else
           get_graph.dump(:turtle)
         end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.18"
+  VERSION = "0.7.19"
 end

data/spec/tripod/criteria_execution_spec.rb

@@ -24,16 +24,16 @@ describe Tripod::Criteria do
     p
   end
 
-  describe "#build_select_query" do
+  describe "#as_query" 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.send(:build_select_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> . ?uri ?p ?o } }"
       end
 
       context "with include_graph option set to false" do
         it "should not select graphs, but restrict to graph" do
-          person_criteria.send(:build_select_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> . ?uri ?p ?o } }"
         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.send(:build_select_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> . ?uri ?p ?o . [pattern] } }"
         end
       end
 
@@ -49,19 +49,19 @@ describe Tripod::Criteria do
         before { person_criteria.graph("http://example.com/anothergraph") }
 
          it "should override the graph in the query" do
-          person_criteria.send(:build_select_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> . ?uri ?p ?o } }"
         end
       end
     end
 
     context "for a class without an rdf_type and graph" do
       it "should return a SELECT query without an rdf_type restriction" do
-        resource_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }"
+        resource_criteria.as_query.should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }"
       end
 
       context "with include_graph option set to false" do
         it "should not select graphs or restrict to graph" do
-          resource_criteria.send(:build_select_query, :return_graph => false).should ==  "SELECT DISTINCT ?uri WHERE { ?uri ?p ?o }"
+          resource_criteria.as_query(:return_graph => false).should ==  "SELECT DISTINCT ?uri WHERE { ?uri ?p ?o }"
         end
       end
 
@@ -69,7 +69,7 @@ describe Tripod::Criteria do
         before { resource_criteria.where("[pattern]") }
 
         it "should return a SELECT query with the extra restrictions" do
-          resource_criteria.send(:build_select_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 ?p ?o . [pattern] } }"
         end
       end
 
@@ -77,7 +77,7 @@ describe Tripod::Criteria do
         before { resource_criteria.graph("http://example.com/graphy") }
 
          it "should override the graph in the query" do
-          resource_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri (<http://example.com/graphy> as ?graph) WHERE { GRAPH <http://example.com/graphy> { ?uri ?p ?o } }"
+          resource_criteria.as_query.should == "SELECT DISTINCT ?uri (<http://example.com/graphy> as ?graph) WHERE { GRAPH <http://example.com/graphy> { ?uri ?p ?o } }"
         end
       end
     end
@@ -87,7 +87,7 @@ describe Tripod::Criteria do
       before { resource_criteria.where("[pattern]").extras("LIMIT 10").extras("OFFSET 20") }
 
       it "should add the extras on the end" do
-        resource_criteria.send(:build_select_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 ?p ?o . [pattern] } } LIMIT 10 OFFSET 20"
       end
     end
   end
@@ -95,8 +95,8 @@ describe Tripod::Criteria do
   describe "#resources" do
 
     context "with options passed" do
-      it "should pass the options to build_select_query" do
-        person_criteria.should_receive(:build_select_query).with(:return_graph => false).and_call_original
+      it "should pass the options to as_query" do
+        person_criteria.should_receive(:as_query).with(:return_graph => false).and_call_original
         person_criteria.resources(:return_graph => false)
       end
     end
@@ -136,8 +136,8 @@ describe Tripod::Criteria do
   describe "#first" do
 
     context "with options passed" do
-      it "should pass the options to build_select_query" do
-        person_criteria.should_receive(:build_select_query).with(:return_graph => false).and_call_original
+      it "should pass the options to as_query" do
+        person_criteria.should_receive(:as_query).with(:return_graph => false).and_call_original
         person_criteria.first(:return_graph => false)
       end
     end
@@ -147,7 +147,7 @@ describe Tripod::Criteria do
     end
 
     it "should call Query.select with the 'first sparql'" do
-      sparql = Tripod::SparqlQuery.new(person_criteria.send(:build_select_query)).as_first_query_str
+      sparql = Tripod::SparqlQuery.new(person_criteria.as_query).as_first_query_str
       Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
       person_criteria.first
     end
@@ -172,8 +172,8 @@ describe Tripod::Criteria do
   describe "#count" do
 
     context "with options passed" do
-      it "should pass the options to build_select_query" do
-        person_criteria.should_receive(:build_select_query).with(:return_graph => false).and_call_original
+      it "should pass the options to as_querys" do
+        person_criteria.should_receive(:as_query).with(:return_graph => false).and_call_original
         person_criteria.count(:return_graph => false)
       end
     end
@@ -184,7 +184,7 @@ describe Tripod::Criteria do
     end
 
     it "should call Query.select with the 'count sparql'" do
-      sparql = Tripod::SparqlQuery.new(person_criteria.send(:build_select_query)).as_count_query_str
+      sparql = Tripod::SparqlQuery.new(person_criteria.as_query).as_count_query_str
       Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
       person_criteria.count
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70290660007320 !ruby/object:Gem::Requirement
+  requirement: &70230396905700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660007320
+  version_requirements: *70230396905700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70290660006220 !ruby/object:Gem::Requirement
+  requirement: &70230396905160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660006220
+  version_requirements: *70230396905160
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70290660020540 !ruby/object:Gem::Requirement
+  requirement: &70230396904740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660020540
+  version_requirements: *70230396904740
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70290660019200 !ruby/object:Gem::Requirement
+  requirement: &70230396904200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660019200
+  version_requirements: *70230396904200
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70290660017680 !ruby/object:Gem::Requirement
+  requirement: &70230396903780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660017680
+  version_requirements: *70230396903780
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70290660015240 !ruby/object:Gem::Requirement
+  requirement: &70230396903320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660015240
+  version_requirements: *70230396903320
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70290660013600 !ruby/object:Gem::Requirement
+  requirement: &70230396902900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660013600
+  version_requirements: *70230396902900
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70290660026920 !ruby/object:Gem::Requirement
+  requirement: &70230396902400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290660026920
+  version_requirements: *70230396902400
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70290660023980 !ruby/object:Gem::Requirement
+  requirement: &70230396901980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660023980
+  version_requirements: *70230396901980
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70290660022280 !ruby/object:Gem::Requirement
+  requirement: &70230396901440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70290660022280
+  version_requirements: *70230396901440
 description: RDF ruby ORM
 email:
 - ric@swirrl.com