tripod 0.7.4 → 0.7.5

data/lib/tripod/eager_loading.rb

@@ -10,23 +10,33 @@ module Tripod::EagerLoading
 
   # get all the triples in the db where the predicate uri is their subject
   # stick the results in this resource's repo
-  def eager_load_predicate_triples!
-    graph_of_triples = self.class.describe_uris(predicates)
-    self.class.add_data_to_repository(graph_of_triples, self.repository)
+  # options: labels_only (default false)
+  def eager_load_predicate_triples!(opts={})
+
+    if opts[:labels_only]
+      construct_query = "CONSTRUCT { ?p <#{RDF::RDFS.label}> ?pred_label } WHERE { <#{self.uri.to_s}> ?p ?o . ?p <#{RDF::RDFS.label}> ?pred_label }"
+    else
+      construct_query = "CONSTRUCT { ?p ?pred_pred ?pred_label } WHERE { <#{self.uri.to_s}> ?p ?o . ?p ?pred_pred ?pred_label }"
+    end
+
+    extra_triples = self.class._graph_of_triples_from_construct_or_describe construct_query
+    self.class.add_data_to_repository(extra_triples, self.repository)
   end
 
   # get all the triples in the db where the object uri is their subject
   # stick the results in this resource's repo
-  def eager_load_object_triples!
+  # options: labels_only (default false)
+  def eager_load_object_triples!(opts={})
     object_uris = []
 
-    self.get_triples_for_this_resource.each_statement do |statement|
-      object_uris << statement.object if statement.object.uri?
+    if opts[:labels_only]
+      construct_query = "CONSTRUCT { ?o <#{RDF::RDFS.label}> ?obj_label } WHERE { <#{self.uri.to_s}> ?p ?o . ?o <#{RDF::RDFS.label}> ?obj_label }"
+    else
+      construct_query = "CONSTRUCT { ?o ?obj_pred ?obj_label } WHERE { <#{self.uri.to_s}> ?p ?o . ?o ?obj_pred ?obj_label }"
     end
 
-    object_uris = object_uris.uniq # in case an object appears > once.
-    graph_of_triples = self.class.describe_uris(object_uris)
-    self.class.add_data_to_repository(graph_of_triples, self.repository)
+    extra_triples = self.class._graph_of_triples_from_construct_or_describe construct_query
+    self.class.add_data_to_repository(extra_triples, self.repository)
   end
 
   # get the resource that represents a particular uri. If there's triples in our repo where that uri
@@ -50,4 +60,5 @@ module Tripod::EagerLoading
     r
   end
 
+
 end

data/lib/tripod/finders.rb

@@ -132,6 +132,12 @@ module Tripod::Finders
       graph
     end
 
+    # given a construct or describe query, return a graph of triples.
+    def _graph_of_triples_from_construct_or_describe(construct_query)
+      ntriples_str = Tripod::SparqlClient::Query.query(construct_query, "application/n-triples")
+      _rdf_graph_from_ntriples_string(ntriples_str, graph=nil)
+    end
+
     # Given a select query, perform a DESCRIBE query to get a graph of data from which we
     # create and hydrate a collection of resources.
     #

data/lib/tripod/resource_collection.rb

@@ -41,6 +41,10 @@ module Tripod
       self.to_nt == other.to_nt
     end
 
+    def to_text
+      to_nt
+    end
+
     # for n-triples we can just concatenate them
     def to_nt
       time_serialization('nt') do

data/lib/tripod/serialization.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 
-# This module defines behaviour for finders.
 module Tripod::Serialization
   extend ActiveSupport::Concern
 
@@ -24,4 +23,8 @@ module Tripod::Serialization
     get_triples_for_this_resource.dump(:jsonld)
   end
 
+  def to_text
+    to_nt
+  end
+
 end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/tripod/eager_loading_spec.rb

@@ -6,10 +6,12 @@ describe Tripod::EagerLoading do
 
     @name = Resource.new('http://example.com/name', 'http://example.com/names')
     @name.label = "Name"
+    @name.write_predicate('http://example.com/name-other-pred', 'hello') # another predicate
     @name.save!
 
     @peter = Person.new('http://example.com/peter')
     @peter.name = "Peter"
+    @peter.age = 30
     @peter.save!
 
     @john = Person.new('http://example.com/john')
@@ -20,15 +22,35 @@ describe Tripod::EagerLoading do
 
   describe "#eager_load_predicate_triples!" do
 
-    before do
-      @peter.eager_load_predicate_triples!
+    context "with no options passed" do
+      before do
+        @peter.eager_load_predicate_triples!
+      end
+
+      it "should add triples to the repository all for the predicates' predicates" do
+        triples = @peter.repository.query([ RDF::URI.new('http://example.com/name'), :predicate, :object] )
+        triples.to_a.length.should == 2
+
+        triples.to_a.sort{|a,b| a.to_s <=> b.to_s }.first.predicate.should == RDF::URI('http://example.com/name-other-pred')
+        triples.to_a.sort{|a,b| a.to_s <=> b.to_s }.first.object.to_s.should == "hello"
+
+        triples.to_a.sort{|a,b| a.to_s <=> b.to_s }.last.predicate.should == RDF::RDFS.label
+        triples.to_a.sort{|a,b| a.to_s <=> b.to_s }.last.object.to_s.should == "Name"
+      end
     end
 
-    it "should add triples to the repository for the predicates" do
-      triples = @peter.repository.query([ RDF::URI.new('http://example.com/name'), :predicate, :object] )
-      triples.to_a.length.should_not == 0
-      triples.first.predicate.should == RDF::RDFS.label
-      triples.first.object.to_s.should == "Name"
+    context "with labels_only option" do
+      before do
+        @peter.eager_load_predicate_triples!(:labels_only => true)
+      end
+
+      it "should add triples to the repository all for the predicates labels only" do
+        triples = @peter.repository.query([ RDF::URI.new('http://example.com/name'), :predicate, :object] )
+        triples.to_a.length.should == 1
+        triples.first.predicate.should == RDF::RDFS.label
+        triples.first.object.to_s.should == "Name"
+      end
+
     end
 
   end
@@ -39,15 +61,19 @@ describe Tripod::EagerLoading do
       @john.eager_load_object_triples!
     end
 
-    it "should add triples to the repository for the objects" do
+    it "should add triples to the repository for the all the objects' predicates" do
       triples = @john.repository.query([ @peter.uri, :predicate, :object] )
-      triples.to_a.length.should_not == 0
+      triples.to_a.length.should == 3
 
-      triples.to_a[1].predicate.should == RDF.type
-      triples.to_a[1].object.to_s.should == RDF::URI('http://example.com/person')
+      triples.to_a.sort{|a,b| a.to_s <=> b.to_s }[0].predicate.should ==  RDF::URI('http://example.com/age')
+      triples.to_a.sort{|a,b| a.to_s <=> b.to_s }[0].object.to_s.should == "30"
+
+      triples.to_a.sort{|a,b| a.to_s <=> b.to_s }[1].predicate.should ==  RDF::URI('http://example.com/name')
+      triples.to_a.sort{|a,b| a.to_s <=> b.to_s }[1].object.to_s.should == "Peter"
+
+      triples.to_a.sort{|a,b| a.to_s <=> b.to_s }[2].predicate.should == RDF.type
+      triples.to_a.sort{|a,b| a.to_s <=> b.to_s }[2].object.to_s.should == RDF::URI('http://example.com/person')
 
-      triples.to_a[0].predicate.should == RDF::URI('http://example.com/name')
-      triples.to_a[0].object.to_s.should == "Peter"
     end
 
   end
@@ -86,6 +112,7 @@ describe Tripod::EagerLoading do
         res = @john.get_related_resource(@peter.uri, Person)
         res.should == @peter
       end
+
     end
 
     context "when eager_load_predicate_triples has been called" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70112683423380 !ruby/object:Gem::Requirement
+  requirement: &70124439331920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683423380
+  version_requirements: *70124439331920
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70112683421720 !ruby/object:Gem::Requirement
+  requirement: &70124439346220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683421720
+  version_requirements: *70124439346220
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70112683435900 !ruby/object:Gem::Requirement
+  requirement: &70124439344500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683435900
+  version_requirements: *70124439344500
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70112683432360 !ruby/object:Gem::Requirement
+  requirement: &70124439343180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683432360
+  version_requirements: *70124439343180
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70112683445060 !ruby/object:Gem::Requirement
+  requirement: &70124439341020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683445060
+  version_requirements: *70124439341020
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70112683443980 !ruby/object:Gem::Requirement
+  requirement: &70124439339640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683443980
+  version_requirements: *70124439339640
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70112683442360 !ruby/object:Gem::Requirement
+  requirement: &70124439354600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683442360
+  version_requirements: *70124439354600
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70112683440480 !ruby/object:Gem::Requirement
+  requirement: &70124439352980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683440480
+  version_requirements: *70124439352980
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70112683438740 !ruby/object:Gem::Requirement
+  requirement: &70124439352500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683438740
+  version_requirements: *70124439352500
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70112683449840 !ruby/object:Gem::Requirement
+  requirement: &70124439351820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70112683449840
+  version_requirements: *70124439351820
 description: RDF ruby ORM
 email:
 - ric@swirrl.com