tripod 0.3.4 → 0.3.5

data/lib/tripod.rb

@@ -68,6 +68,7 @@ end
 require "tripod/extensions"
 require "tripod/sparql_client"
 require "tripod/sparql_query"
+require "tripod/resource_collection"
 
 require "tripod/predicates"
 require "tripod/attributes"

data/lib/tripod/criteria/execution.rb

@@ -6,9 +6,10 @@ module Tripod
 
     extend ActiveSupport::Concern
 
-    # Execute the query and return an array of all hydrated resources
+    # Execute the query and return a +ResourceCollection+ of all hydrated resources
+    # +ResourceCollection+ is an +Enumerable+, Array-like object.
     def resources
-      resources_from_sparql(build_select_query)
+      Tripod::ResourceCollection.new(resources_from_sparql(build_select_query))
     end
 
     # Execute the query and return the first result as a hydrated resource
@@ -39,11 +40,10 @@ module Tripod
 
       def build_select_query
 
-
         if graph_uri
-          select_query = "SELECT ?uri (<#{graph_uri}> as ?graph) WHERE { GRAPH <#{graph_uri}> "
+          select_query = "SELECT DISTINCT ?uri (<#{graph_uri}> as ?graph) WHERE { GRAPH <#{graph_uri}> "
         else
-          select_query = "SELECT ?uri ?graph WHERE { GRAPH ?graph "
+          select_query = "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph "
         end
 
         select_query += "{ "

data/lib/tripod/resource_collection.rb

@@ -0,0 +1,68 @@
+# encoding: utf-8
+
+module Tripod
+
+  # class that wraps a collection of resources, and allows them to be serialized
+  class ResourceCollection
+
+    include Enumerable
+
+    attr_reader :resources
+
+    def initialize(resources)
+      @resources = resources
+    end
+
+    def length
+      self.resources.length
+    end
+
+    def each
+      self.resources.each { |e| yield(e) }
+    end
+
+    # return the underlying array
+    def to_a
+      resources
+    end
+
+    # allow index operator to act on underlying array of resources.
+    def [](*args)
+      resources[*args]
+    end
+
+    # for n-triples we can just concatenate them
+    def to_nt
+      nt = ""
+      resources.each do |resource|
+        nt += resource.to_nt
+      end
+      nt
+    end
+
+    def to_json(opts={})
+      get_graph.dump(:jsonld)
+    end
+
+    def to_rdf
+      get_graph.dump(:rdf)
+    end
+
+    def to_ttl
+      get_graph.dump(:n3)
+    end
+
+    private
+
+    def get_graph
+      graph = RDF::Graph.new
+      RDF::Reader.for(:ntriples).new(self.to_nt) do |reader|
+        reader.each_statement do |statement|
+          graph << statement
+        end
+      end
+    end
+
+  end
+
+end

data/lib/tripod/version.rb

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

data/spec/tripod/criteria_execution_spec.rb

@@ -28,14 +28,14 @@ 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.send(:build_select_query).should == "SELECT ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> } }"
+        person_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> } }"
       end
 
       context "and extra restrictions" 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 ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> . [pattern] } }"
+          person_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> . [pattern] } }"
         end
       end
 
@@ -43,21 +43,21 @@ describe Tripod::Criteria do
         before { person_criteria.graph("http://anothergraph") }
 
          it "should override the graph in the query" do
-          person_criteria.send(:build_select_query).should == "SELECT ?uri (<http://anothergraph> as ?graph) WHERE { GRAPH <http://anothergraph> { ?uri a <http://person> } }"
+          person_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri (<http://anothergraph> as ?graph) WHERE { GRAPH <http://anothergraph> { ?uri a <http://person> } }"
         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 ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }"
+        resource_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }"
       end
 
       context "and extra restrictions" 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 ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o . [pattern] } }"
+          resource_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o . [pattern] } }"
         end
       end
 
@@ -65,7 +65,7 @@ describe Tripod::Criteria do
         before { resource_criteria.graph("http://graphy") }
 
          it "should override the graph in the query" do
-          resource_criteria.send(:build_select_query).should == "SELECT ?uri (<http://graphy> as ?graph) WHERE { GRAPH <http://graphy> { ?uri ?p ?o } }"
+          resource_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri (<http://graphy> as ?graph) WHERE { GRAPH <http://graphy> { ?uri ?p ?o } }"
         end
       end
     end
@@ -75,7 +75,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 ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o . [pattern] } } LIMIT 10 OFFSET 20"
+        resource_criteria.send(:build_select_query).should == "SELECT DISTINCT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o . [pattern] } } LIMIT 10 OFFSET 20"
       end
     end
   end
@@ -86,7 +86,7 @@ describe Tripod::Criteria do
 
     context "with no extra restrictions" do
       it "should return a set of hydrated objects for the type" do
-        person_criteria.resources.should == [john, barry]
+        person_criteria.resources.to_a.should == [john, barry]
       end
     end
 
@@ -95,7 +95,7 @@ describe Tripod::Criteria do
       before { person_criteria.where("?uri <http://name> 'John'") }
 
       it "should return a set of hydrated objects for the type and restrictions" do
-         person_criteria.resources.should == [john]
+         person_criteria.resources.to_a.should == [john]
       end
     end
 
@@ -129,7 +129,7 @@ describe Tripod::Criteria do
     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 }"
+      sparql = "SELECT COUNT(*) { SELECT DISTINCT ?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
@@ -141,13 +141,13 @@ describe Tripod::Criteria do
     let(:chained_criteria) { Person.where("?uri <http://name> ?name").limit(1).offset(0).order("DESC(?name)") }
 
     it "should run the right Sparql" do
-      sparql = "SELECT ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> . ?uri <http://name> ?name } } ORDER BY DESC(?name) LIMIT 1 OFFSET 0"
+      sparql = "SELECT DISTINCT ?uri (<http://graph> as ?graph) WHERE { GRAPH <http://graph> { ?uri a <http://person> . ?uri <http://name> ?name } } ORDER BY DESC(?name) LIMIT 1 OFFSET 0"
       Tripod::SparqlClient::Query.should_receive(:select).with(sparql).and_call_original
       chained_criteria.resources
     end
 
     it "should return the right resources" do
-      chained_criteria.resources.should == [john]
+      chained_criteria.resources.to_a.should == [john]
     end
 
     it "should return the right number of resources" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70190726102800 !ruby/object:Gem::Requirement
+  requirement: &70333194336060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190726102800
+  version_requirements: *70333194336060
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70190726101660 !ruby/object:Gem::Requirement
+  requirement: &70333194335020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70190726101660
+  version_requirements: *70333194335020
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70190726100840 !ruby/object:Gem::Requirement
+  requirement: &70333194334540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190726100840
+  version_requirements: *70333194334540
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70190730540020 !ruby/object:Gem::Requirement
+  requirement: &70333194333460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190730540020
+  version_requirements: *70333194333460
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70190730539320 !ruby/object:Gem::Requirement
+  requirement: &70333194332500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190730539320
+  version_requirements: *70333194332500
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70190730538300 !ruby/object:Gem::Requirement
+  requirement: &70333194331640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190730538300
+  version_requirements: *70333194331640
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70190730537520 !ruby/object:Gem::Requirement
+  requirement: &70333194331040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190730537520
+  version_requirements: *70333194331040
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70190730536780 !ruby/object:Gem::Requirement
+  requirement: &70333194330380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190730536780
+  version_requirements: *70333194330380
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70190730536300 !ruby/object:Gem::Requirement
+  requirement: &70333194329820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70190730536300
+  version_requirements: *70333194329820
 description: RDF ruby ORM
 email:
 - ric@swirrl.com
@@ -151,6 +151,7 @@ files:
 - lib/tripod/predicates.rb
 - lib/tripod/repository.rb
 - lib/tripod/resource.rb
+- lib/tripod/resource_collection.rb
 - lib/tripod/serialization.rb
 - lib/tripod/sparql_client.rb
 - lib/tripod/sparql_query.rb