tripod 0.3.3 → 0.3.4

data/lib/tripod/criteria/execution.rb

@@ -39,10 +39,6 @@ module Tripod
 
       def build_select_query
 
-        # convert the order, limit and offset to extras in the right order
-        extras(order_clause)
-        extras(limit_clause)
-        extras(offset_clause)
 
         if graph_uri
           select_query = "SELECT ?uri (<#{graph_uri}> as ?graph) WHERE { GRAPH <#{graph_uri}> "
@@ -54,6 +50,9 @@ module Tripod
         select_query += self.where_clauses.join(" . ")
         select_query += " } } "
         select_query += self.extra_clauses.join(" ")
+
+        select_query += [order_clause, limit_clause, offset_clause].join(" ")
+
         select_query.strip
       end
 

data/lib/tripod/sparql_query.rb

@@ -47,7 +47,6 @@ module Tripod
     end
 
     def as_count_query_str
-
       check_subqueryable!
 
       count_query = "SELECT COUNT(*) { #{self.body} }"
@@ -58,8 +57,7 @@ module Tripod
     end
 
     def as_first_query_str
-      # only allow for selects
-      raise SparqlQueryError.new("Can't turn this into a subquery") unless self.query_type == :select
+      check_subqueryable!
 
       first_query = "SELECT * { #{self.body} } LIMIT 1"
       first_query = "#{self.prefixes} #{first_query}" if self.prefixes

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/tripod/criteria_execution_spec.rb

@@ -10,15 +10,17 @@ describe Tripod::Criteria do
     c = Tripod::Criteria.new(Resource)
   end
 
-  let(:john) do
+  let!(:john) do
     p = Person.new('http://john')
     p.name = "John"
+    p.save!
     p
   end
 
-  let(:barry) do
+  let!(:barry) do
     p = Person.new('http://barry')
     p.name = "Barry"
+    p.save!
     p
   end
 
@@ -80,10 +82,7 @@ describe Tripod::Criteria do
 
   describe "#resources" do
 
-    before do
-      john.save!
-      barry.save!
-    end
+
 
     context "with no extra restrictions" do
       it "should return a set of hydrated objects for the type" do
@@ -104,11 +103,6 @@ describe Tripod::Criteria do
 
   describe "#first" do
 
-    before do
-      john.save!
-      barry.save!
-    end
-
     it "should return the first resource for the criteria" do
       person_criteria.first.should == john
     end
@@ -122,10 +116,6 @@ describe Tripod::Criteria do
 
   describe "#count" do
 
-    before do
-      john.save!
-      barry.save!
-    end
 
     it "should return a set of hydrated objects for the criteria" do
       person_criteria.count.should == 2
@@ -138,15 +128,16 @@ describe Tripod::Criteria do
       person_criteria.count
     end
 
+    it "should execute the right Sparql" do
+      sparql = "SELECT COUNT(*) { SELECT ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> } }  LIMIT 10 OFFSET 20 }"
+      Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
+      Person.all.limit(10).offset(20).count
+    end
+
   end
 
   describe "exeuting a chained criteria" do
 
-    before do
-      john.save!
-      barry.save!
-    end
-
     let(:chained_criteria) { Person.where("?uri <http://name> ?name").limit(1).offset(0).order("DESC(?name)") }
 
     it "should run the right Sparql" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70137501007220 !ruby/object:Gem::Requirement
+  requirement: &70190726102800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501007220
+  version_requirements: *70190726102800
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70137501006540 !ruby/object:Gem::Requirement
+  requirement: &70190726101660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501006540
+  version_requirements: *70190726101660
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70137501006080 !ruby/object:Gem::Requirement
+  requirement: &70190726100840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501006080
+  version_requirements: *70190726100840
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70137501005120 !ruby/object:Gem::Requirement
+  requirement: &70190730540020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501005120
+  version_requirements: *70190730540020
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70137501004320 !ruby/object:Gem::Requirement
+  requirement: &70190730539320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501004320
+  version_requirements: *70190730539320
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70137501003540 !ruby/object:Gem::Requirement
+  requirement: &70190730538300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501003540
+  version_requirements: *70190730538300
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70137501002360 !ruby/object:Gem::Requirement
+  requirement: &70190730537520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501002360
+  version_requirements: *70190730537520
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70137501001680 !ruby/object:Gem::Requirement
+  requirement: &70190730536780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137501001680
+  version_requirements: *70190730536780
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70137500999880 !ruby/object:Gem::Requirement
+  requirement: &70190730536300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137500999880
+  version_requirements: *70190730536300
 description: RDF ruby ORM
 email:
 - ric@swirrl.com