tripod 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5100a6b1c8c88df0960b3777553605ebb2d58e2
-  data.tar.gz: e5485011985f9d66114103f97e81c43a6b0c34b3
+  metadata.gz: 3f4b77f60b44c3d2471ca37daa9608abcd25502b
+  data.tar.gz: a76daf16003cd434e172c924db465845dd9b5009
 SHA512:
-  metadata.gz: 7571c8035d8b762f9e67f2aee4ad0f93912c9357dafd0a420531df75cc3e74893f0bbc9ef0bf7abc7b3e2e627e92cc39fb58a0c4fca6392c7b8e52985aea856e
-  data.tar.gz: 727177fc93f5a3925135b2c05ef3e3ed7263d13c24d223636a6bd3bed64e0ae2225af5c734aa933a68cf3c795660820a36be4220cb5a0a3dec118264742b1a2b
+  metadata.gz: bd2701dbd4e32689e700a80876a51fb0f93ff907bc73ebe7bcc663b068746b3255422a5fdde3aee845a845fac5e8c7360fe5b207b4f948bda2406d2e7307e850
+  data.tar.gz: 778f6876ea0cb79dcdab35d71c93c715786a4b9f95013678a2a5890aae32ca7c060798ec67a849423db30036a5230e074fe6cef8c0eec08cd82adc4701e3a810

data/Gemfile

@@ -6,4 +6,6 @@ gemspec
 group :test do
   gem "rspec", "~> 2.99.0"
   gem "webmock"
+  gem 'pry', '~> 0.9.12.6'
+  gem 'binding_of_caller', '~> 0.7.2'
 end

data/lib/tripod/eager_loading.rb

@@ -11,10 +11,13 @@ 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
   # options: labels_only (default false)
+  # options: predicates (default nil) array of predicaets (as URIs or strings representing URIs) for fieldnames to fetch
   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 }"
+    elsif (opts[:predicates] && opts[:predicates].length > 0)
+      construct_query = build_multifield_query(opts[:predicates],"?p")
     else
       construct_query = "CONSTRUCT { ?p ?pred_pred ?pred_label } WHERE { <#{self.uri.to_s}> ?p ?o . ?p ?pred_pred ?pred_label }"
     end
@@ -26,11 +29,14 @@ module Tripod::EagerLoading
   # get all the triples in the db where the object uri is their subject
   # stick the results in this resource's repo
   # options: labels_only (default false)
+  # options: predicates (default nil) array of predicaets (as URIs or strings representing URIs) for fieldnames to fetch
   def eager_load_object_triples!(opts={})
     object_uris = []
 
     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 }"
+    elsif (opts[:predicates] && opts[:predicates].length > 0)      
+      construct_query = build_multifield_query(opts[:predicates],"?o")
     else
       construct_query = "CONSTRUCT { ?o ?obj_pred ?obj_label } WHERE { <#{self.uri.to_s}> ?p ?o . ?o ?obj_pred ?obj_label }"
     end
@@ -39,6 +45,46 @@ module Tripod::EagerLoading
     self.class.add_data_to_repository(extra_triples, self.repository)
   end
 
+  # build a list of optional predicates  
+  # 
+  # for the input 
+  #  build_multifield_query(RDF::SKOS.prefLabel, RDF::RDFS.label, RDF::DC.title],"?p")
+  # 
+  # the follwing query is generated
+  # 
+  # CONSTRUCT {
+  #  ?p <http://www.w3.org/2004/02/skos/core#prefLabel> ?pref_label . 
+  #  ?p <http://www.w3.org/2000/01/rdf-schema#label> ?label . 
+  #  ?p <http://purl.org/dc/elements/1.1/title> ?title . }
+  #  WHERE {  
+  #    <http://data.hampshirehub.net/data/miscelleanous/2011-census-ks101ew-usual-resident-population-key-statistics-ks> ?p ?o .  
+  #    OPTIONAL { ?p <http://www.w3.org/2004/02/skos/core#prefLabel> ?pref_label .  } 
+  #    OPTIONAL { ?p <http://www.w3.org/2000/01/rdf-schema#label> ?label .  }
+  #    OPTIONAL { ?p <http://purl.org/dc/elements/1.1/title> ?title .  } 
+  #  }
+  # 
+  def build_multifield_query(predicates,subject_position_as)
+      clauses = []
+
+      iter = 0
+      predicates.each do |p|
+        variable_name = "var#{iter.to_s}"
+        clauses << "#{subject_position_as} <#{p.to_s}> ?#{variable_name} . "   
+        iter +=1   
+      end
+
+      construct_query = "CONSTRUCT { "
+      clauses.each do |c|
+        construct_query += c
+      end
+
+      construct_query += " } WHERE {  <#{self.uri.to_s}> ?p ?o . "
+      clauses.each do |c|
+        construct_query += " OPTIONAL { #{c} } "
+      end
+      construct_query += " }" # close WHERE
+  end
+
   # get the resource that represents a particular uri. If there's triples in our repo where that uri
   # is the subject, use that to hydrate a resource, otherwise justdo a find against the db.
   def get_related_resource(resource_uri, class_of_resource_to_create)

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/spec/app/models/resource.rb

@@ -2,6 +2,11 @@ class Resource
 
   include Tripod::Resource
 
-  field :label, RDF::RDFS.label
+    field :pref_label, RDF::SKOS.prefLabel
+    field :label, RDF::RDFS.label
+    field :title, RDF::DC.title
+
+end
+
+
 
-end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ $LOAD_PATH.unshift(MODELS)
 require 'tripod'
 require 'rspec'
 require 'webmock/rspec'
+require 'binding_of_caller'
+require 'pry'
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/tripod/eager_loading_spec.rb

@@ -5,7 +5,9 @@ describe Tripod::EagerLoading do
    before do
 
     @name = Resource.new('http://example.com/name', 'http://example.com/names')
+    @name.pref_label = "Nom"
     @name.label = "Name"
+    @name.title = "Soubriquet"
     @name.write_predicate('http://example.com/name-other-pred', 'hello') # another predicate
     @name.save!
 
@@ -18,6 +20,7 @@ describe Tripod::EagerLoading do
     @john.name = "john"
     @john.knows = @peter.uri
     @john.save!
+
   end
 
   describe "#eager_load_predicate_triples!" do
@@ -28,14 +31,16 @@ describe Tripod::EagerLoading do
       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"
+        triples = @peter.repository.query([ RDF::URI.new('http://example.com/name'), :predicate, :object] ).to_a.sort{|a,b| a.to_s <=> b.to_s }
+        triples.length.should == 4
+        triples[0].predicate.should == RDF::URI('http://example.com/name-other-pred')
+        triples[0].object.to_s.should == "hello"
+        triples[1].predicate.should == RDF::DC.title
+        triples[1].object.to_s.should == "Soubriquet"
+        triples[2].predicate.should == RDF::RDFS.label
+        triples[2].object.to_s.should == "Name"
+        triples[3].predicate.should == RDF::SKOS.prefLabel
+        triples[3].object.to_s.should == "Nom"
       end
     end
 
@@ -45,35 +50,84 @@ describe Tripod::EagerLoading do
       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 = @peter.repository.query([ RDF::URI.new('http://example.com/name'), :predicate, :object] ).to_a
+        triples.length.should == 1
         triples.first.predicate.should == RDF::RDFS.label
         triples.first.object.to_s.should == "Name"
       end
 
     end
 
+    context "with array of fields" do
+      before do
+        @peter.eager_load_predicate_triples!(:predicates => [RDF::SKOS.prefLabel, RDF::DC.title])
+      end
+
+      it "should add triples to the repository all for the given fields of the predicate" do
+        triples = @peter.repository.query([ RDF::URI.new('http://example.com/name'), :predicate, :object] ).to_a.sort{|a,b| a.to_s <=> b.to_s }
+        triples.length.should == 2
+        
+        triples.first.predicate.should == RDF::DC.title
+        triples.first.object.to_s.should == "Soubriquet"
+
+        triples.last.predicate.should == RDF::SKOS.prefLabel
+        triples.last.object.to_s.should == "Nom"
+        
+      end
+
+    end
+
   end
 
   describe "#eager_load_object_triples!" do
 
-    before do
-      @john.eager_load_object_triples!
+    context "with no options passed" do
+      before do
+        @john.eager_load_object_triples!
+      end
+
+      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 == 3
+
+        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')
+
+      end
     end
 
-    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 == 3
+    context "with labels_only option" do
+      before do
+        @john.eager_load_object_triples!(:labels_only => true)
+      end
 
-      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"
+      it "should add triples to the repository all for the object labels only" do
+        triples = @john.repository.query([ @peter.uri, :predicate, :object] ).to_a      
+        triples.length.should == 0 # people don't have labels    
+      end
 
-      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"
+    end
 
-      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')
+    context "with array of fields" do
+      before do
+        @john.eager_load_object_triples!(:predicates => ['http://example.com/name'])
+      end
 
+      it "should add triples to the repository all for the given fields of the object" do
+        triples = @john.repository.query([ @peter.uri, :predicate, :object] ).to_a.sort{|a,b| a.to_s <=> b.to_s }
+       
+        triples.length.should == 1
+        
+        triples.first.predicate.should == 'http://example.com/name'
+        triples.first.object.to_s.should == "Peter"
+                
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client