tripod 0.0.10 → 0.2

data/spec/tripod/finders_spec.rb

@@ -18,8 +18,8 @@ describe Tripod::Finders do
     stmt.object = RDF::URI.new('http://bill')
     stmts << stmt
 
-    r = Person.new(@ric_uri, 'http://people')
-    r.hydrate!(stmts)
+    r = Person.new(@ric_uri)
+    r.hydrate!(:graph => stmts)
     r.save
     r
   end
@@ -32,8 +32,8 @@ describe Tripod::Finders do
     stmt.predicate = RDF::URI.new('http://name')
     stmt.object = "bill"
     stmts << stmt
-    b = Person.new(@bill_uri, 'http://people')
-    b.hydrate!(stmts)
+    b = Person.new(@bill_uri)
+    b.hydrate!(:graph => stmts)
     b.save
     b
   end
@@ -41,38 +41,33 @@ describe Tripod::Finders do
   describe '.find' do
 
     context 'when record exists' do
-
-      it 'does not error' do
-        r = Person.find(ric.uri)
-      end
+      let(:person) { Person.find(ric.uri) }
 
       it 'hydrates and return an object' do
-        r = Person.find(ric.uri)
-        r['http://name'].should == [RDF::Literal.new("ric")]
-        r['http://knows'].should == [RDF::URI.new('http://bill')]
+        person.name.should == "ric"
+        person.knows.should == [RDF::URI('http://bill')]
       end
 
       it 'sets the graph on the instantiated object' do
-        r = Person.find(ric.uri)
-        r.graph_uri.should_not be_nil
-        r.graph_uri.should == RDF::URI("http://people")
+        person.graph_uri.should_not be_nil
+        person.graph_uri.should == RDF::URI("http://graph")
       end
 
       it "returns a non-new record" do
-        r = Person.find(ric.uri)
-        r.new_record?.should be_false
+        person.new_record?.should be_false
       end
 
     end
 
     context 'when record does not exist' do
       it 'raises not found' do
-        lambda { Person.find('http://nonexistant') }.should raise_error(Tripod::Errors::ResourceNotFound)
+        lambda { Person.find('http://nonexistent') }.should raise_error(Tripod::Errors::ResourceNotFound)
       end
     end
 
+    context 'with a given graph URI' do
 
-
+    end
   end
 
   describe '.where' do
@@ -90,7 +85,7 @@ describe Tripod::Finders do
       res.last.should == bill
 
       res.first.name.should == "ric"
-      res.first['http://knows'].should == [RDF::URI.new("http://bill")]
+      res.first.knows.should == [RDF::URI.new("http://bill")]
     end
 
     it 'uses the uri and graph variables if supplied' do

data/spec/tripod/persistence_spec.rb

@@ -4,14 +4,15 @@ describe Tripod::Persistence do
 
   let(:unsaved_person) do
     @unsaved_uri = @uri = 'http://uri'
-    @graph1 = RDF::Graph.new
+    @graph_uri = 'http://graph'
+    @graph1 = RDF::Graph.new(@graph_uri)
     stmt = RDF::Statement.new
     stmt.subject = RDF::URI.new(@uri)
     stmt.predicate = RDF::URI.new('http://pred')
     stmt.object = RDF::URI.new('http://obj')
     @graph1 << stmt
     p = Person.new(@uri, 'http://graph')
-    p.hydrate!(@graph1)
+    p.hydrate!(:graph => @graph1)
     p
   end
 
@@ -24,65 +25,38 @@ describe Tripod::Persistence do
     stmt.object = RDF::URI.new('http://obj2')
     @graph2 << stmt
     p = Person.new(@uri2, 'http://graph')
-    p.hydrate!(@graph2)
+    p.hydrate!(:graph => @graph2)
     p.save
     p
   end
 
 
-  describe "#save" do
+  describe ".save" do
+    it 'saves the contents to the db' do
+      unsaved_person.save.should be_true
 
-    context 'graph not set' do
-      it 'should not succeed' do
-        unsaved_person.graph_uri = nil
-        unsaved_person.save.should be_false
-        unsaved_person.should_not be_valid
-        unsaved_person.errors.should_not be_empty
-        unsaved_person.errors[:graph_uri].length.should ==1
-        unsaved_person.errors[:graph_uri].should == ["can't be blank"]
-      end
-    end
-
-    context 'uri not set' do
-      it 'should not succeed' do
-        unsaved_person.uri = nil
-        unsaved_person.save.should be_false
-        unsaved_person.should_not be_valid
-        unsaved_person.errors.should_not be_empty
-        unsaved_person.errors[:uri].length.should ==1
-        unsaved_person.errors[:uri].should == ["can't be blank"]
-      end
+      # try reading the data back out.
+      p2 = Person.new(@uri)
+      p2.hydrate!
+      repo_statements = p2.repository.statements
+      repo_statements.count.should == 1
+      repo_statements.first.subject.should == RDF::URI.new(@uri)
+      repo_statements.first.predicate.should == RDF::URI.new('http://pred')
+      repo_statements.first.object.should == RDF::URI.new('http://obj')
     end
 
-    context 'graph and uri set' do
-
-      it 'saves the contents to the db' do
-        unsaved_person.save.should be_true
-
-        # try reading the data back out.
-        p2 = Person.new(@uri)
-        p2.hydrate!
-        repo_statements = p2.repository.statements
-        repo_statements.count.should == 1
-        repo_statements.first.subject.should == RDF::URI.new(@uri)
-        repo_statements.first.predicate.should == RDF::URI.new('http://pred')
-        repo_statements.first.object.should == RDF::URI.new('http://obj')
-      end
-
-      it 'should leave other people untouched' do
-        # save the unsaved person
-        unsaved_person.save.should be_true
-
-        # read the saved person back out the db, and check he's untouched.
-        p2 = Person.new(saved_person.uri)
-        p2.hydrate!
-        p2.repository.dump(:ntriples).should == saved_person.repository.dump(:ntriples)
-      end
+    it 'should leave other people untouched' do
+      # save the unsaved person
+      unsaved_person.save.should be_true
 
+      # read the saved person back out the db, and check he's untouched.
+      p2 = Person.new(saved_person.uri)
+      p2.hydrate!
+      p2.repository.dump(:ntriples).should == saved_person.repository.dump(:ntriples)
     end
   end
 
-  describe "#destroy" do
+  describe ".destroy" do
 
     it 'removes all triples from the db' do
       saved_person.destroy.should be_true
@@ -95,42 +69,72 @@ describe Tripod::Persistence do
 
   end
 
-  describe "#save!" do
+  describe ".save!" do
     it 'throws an exception if save fails' do
-      unsaved_person.uri = nil
+      unsaved_person.stub(:graph_uri).and_return(nil) # force a failure
       lambda {unsaved_person.save!}.should raise_error(Tripod::Errors::Validations)
     end
   end
 
+  describe '.update_attribute' do
+    let (:person) { Person.new('http://newperson') }
+    before { person.stub(:save) }
+
+    it 'should write the attribute' do
+      person.update_attribute(:name, 'Bob')
+      person.name.should == 'Bob'
+    end
+
+    it 'should save the record' do
+      person.should_receive(:save)
+      person.update_attribute(:name, 'Bob')
+    end
+  end
+
+  describe '.update_attributes' do
+    let (:person) { Person.new('http://newperson') }
+    before { person.stub(:save) }
+
+    it 'should assign the attributes' do
+      person.update_attributes(:name => 'Bob')
+      person.name.should == 'Bob'
+    end
+
+    it 'should save the record' do
+      person.should_receive(:save)
+      person.update_attributes(:name => 'Bob')
+    end
+  end
+
   describe "transactions" do
 
-    it "only save on commit" do
+    it "only saves on commit" do
 
       transaction = Tripod::Persistence::Transaction.new
 
       unsaved_person.save(transaction: transaction)
-      saved_person['http://pred2'] = 'blah'
+      saved_person.write_predicate('http://pred2', 'blah')
       saved_person.save(transaction: transaction)
 
       # nothing should have changed yet.
       lambda {Person.find(unsaved_person.uri)}.should raise_error(Tripod::Errors::ResourceNotFound)
-      Person.find(saved_person.uri)['http://pred2'].first.to_s.should == RDF::URI.new('http://obj2').to_s
+      Person.find(saved_person.uri).read_predicate('http://pred2').first.to_s.should == RDF::URI.new('http://obj2').to_s
 
       transaction.commit
 
       # things should have changed now.
       lambda {Person.find(unsaved_person.uri)}.should_not raise_error()
-      Person.find(saved_person.uri)['http://pred2'].first.should == 'blah'
+      Person.find(saved_person.uri).read_predicate('http://pred2').first.should == 'blah'
 
     end
 
     it "silently ignore invalid saves" do
       transaction = Tripod::Persistence::Transaction.new
 
-      unsaved_person.uri = nil
+      unsaved_person.stub(:graph_uri).and_return(nil) # force a failure
       unsaved_person.save(transaction: transaction).should be_false
 
-      saved_person['http://pred2'] = 'blah'
+      saved_person.write_predicate('http://pred2', 'blah')
       saved_person.save(transaction: transaction).should be_true
 
       transaction.commit
@@ -142,7 +146,7 @@ describe Tripod::Persistence do
       lambda {Person.find(unsaved_person.uri)}.should raise_error(Tripod::Errors::ResourceNotFound)
 
       # saved person SHOULD be updated
-      Person.find(saved_person.uri)['http://pred2'].first.should == 'blah'
+      Person.find(saved_person.uri).read_predicate('http://pred2').first.should == 'blah'
     end
 
     it "can be aborted" do

data/spec/tripod/predicates_spec.rb

@@ -0,0 +1,82 @@
+require "spec_helper"
+
+describe Tripod::Predicates do
+
+  before do
+    @uri = 'http://ric'
+    @graph = RDF::Graph.new('http://graph')
+
+    stmt = RDF::Statement.new
+    stmt.subject = RDF::URI.new(@uri)
+    stmt.predicate = RDF::URI.new('http://blog')
+    stmt.object = RDF::URI.new('http://blog1')
+    @graph << stmt
+
+    stmt2 = RDF::Statement.new
+    stmt2.subject = RDF::URI.new(@uri)
+    stmt2.predicate = RDF::URI.new('http://blog')
+    stmt2.object = RDF::URI.new('http://blog2')
+    @graph << stmt2
+
+    stmt3 = RDF::Statement.new
+    stmt3.subject = RDF::URI.new(@uri)
+    stmt3.predicate = RDF::URI.new('http://name')
+    stmt3.object = "ric"
+    @graph << stmt3
+  end
+
+  let(:person) do
+    p = Person.new(@uri)
+    p.hydrate!(:graph => @graph)
+    p
+  end
+
+  describe "#read_predicate" do
+    it 'returns the values where the predicate matches' do
+      values = person.read_predicate('http://blog')
+      values.length.should == 2
+      values.first.should == RDF::URI('http://blog1')
+      values[1].should == RDF::URI('http://blog2')
+    end
+  end
+
+  describe '#write_predicate' do
+
+    context 'single term passed' do
+      it 'replaces the values where the predicate matches' do
+        person.write_predicate('http://name', 'richard')
+        person.read_predicate('http://name').should == [RDF::Literal.new('richard')]
+      end
+    end
+
+    context 'multiple terms passed' do
+      it 'replaces the values where the predicate matches' do
+        person.write_predicate('http://name', ['richard', 'ric', 'ricardo'])
+        person.read_predicate('http://name').should == [RDF::Literal.new('richard'), RDF::Literal.new('ric'), RDF::Literal.new('ricardo')]
+      end
+    end
+
+  end
+
+  describe '#remove_predicate' do
+    it 'remnoves the values where the predicate matches' do
+      person.remove_predicate('http://blog')
+      person.read_predicate('http://blog').should be_empty
+    end
+  end
+
+  describe "#append_to_predicate" do
+    it 'appends values to the existing values for the predicate' do
+      person.append_to_predicate('http://name', 'rico')
+      person.read_predicate('http://name').should == [RDF::Literal.new('ric'), RDF::Literal.new('rico')]
+    end
+  end
+
+  describe "#predicates" do
+    it "returns a list of unique RDF::URIs for the predicates set on this resource" do
+      person.predicates.length.should == 2
+      person.predicates.should == [RDF::URI('http://blog'), RDF::URI('http://name')]
+    end
+  end
+
+end

data/spec/tripod/repository_spec.rb

@@ -4,51 +4,78 @@ describe Tripod::Repository do
 
   describe "#hydrate" do
 
-    context 'no uri set' do
-      let(:person) do
-        Person.new
-      end
-
-      it 'rasies a UriNotSet error' do
-        lambda { person.hydrate! }.should raise_error(Tripod::Errors::UriNotSet)
-      end
-    end
-
     context 'uri set' do
 
       before do
         @uri = 'http://foobar'
-        @graph = RDF::Graph.new
-        @stmt = RDF::Statement.new
-        @stmt.subject = RDF::URI.new(@uri)
-        @stmt.predicate = RDF::URI.new('http://pred')
-        @stmt.object = RDF::URI.new('http://obj')
-        @graph << @stmt
-        @graph_nt = @graph.dump(:ntriples)
+        @uri2 = 'http://bazbar'
+        @graph_uri = 'http://graph'
+
+        p1 = Person.new(@uri, @graph_uri)
+        p1.write_predicate('http://pred', RDF::URI.new('http://obj'))
+        p1.write_predicate('http://pred2', RDF::URI.new('http://obj2'))
+        p1.write_predicate('http://pred3', 'literal')
+        p1.save!
       end
 
       let(:person) do
-        Person.new(@uri)
+        Person.new(@uri, @graph_uri)
       end
 
       context 'no graph passed' do
-        it 'populates the repository with a graph of triples from the db' do
-          Tripod::SparqlClient::Query.should_receive(:describe).with("DESCRIBE <#{@uri}>").and_return(@graph_nt)
-          person.hydrate!
-          person.repository.should_not be_empty
+
+        context 'no predicate restrictions passed' do
+
+          it 'populates the repository with a graph of triples from the db' do
+            Tripod::SparqlClient::Query.should_receive(:describe).with("DESCRIBE <#{@uri}>").and_call_original
+            person.hydrate!
+            person.repository.should_not be_empty
+          end
+
+        end
+
+        context 'single predicate restriction passed' do
+          it 'calls the right CONSTRUCT query' do
+            Tripod::SparqlClient::Query.should_receive(:construct).with("CONSTRUCT { <http://foobar> ?p ?o } WHERE { <http://foobar> ?p ?o . FILTER (?p = <http://pred>)}").and_call_original
+            person.hydrate!(:only => 'http://pred')
+          end
+
+          it 'only populates the right predicates' do
+            person.hydrate!(:only => 'http://pred')
+            person.predicates.length.should ==1
+            person.predicates.should == [RDF::URI('http://pred')]
+          end
+        end
+
+        context 'multiple predicate restrictions passed' do
+          it 'calls the right CONSTRUCT query' do
+            Tripod::SparqlClient::Query.should_receive(:construct).with("CONSTRUCT { <http://foobar> ?p ?o } WHERE { <http://foobar> ?p ?o . FILTER (?p = <http://pred> || ?p = <http://anotherpred>)}").and_call_original
+            person.hydrate!(:only => ['http://pred', 'http://anotherpred'])
+          end
+
+          it 'only populates the right predicates' do
+            person.hydrate!(:only => ['http://pred2', 'http://pred'])
+            person.predicates.length.should == 2
+            person.predicates.should == [RDF::URI('http://pred'), RDF::URI('http://pred2')]
+          end
         end
       end
 
       context 'graph passed' do
         it 'populates the repository with the graph of triples passed in, ingoring triples not about this resource' do
+          @graph = RDF::Graph.new
+
+          person.repository.statements.each do |s|
+            @graph << s
+          end
 
           @graph << RDF::Statement.new( 'http://anotherresource', 'http://pred', 'http://obj')
-          @graph.statements.count.should ==2
+          @graph.statements.count.should ==2 # there'll already be a statement about type in the person.
 
-          person.hydrate!(@graph)
+          person.hydrate!(:graph => @graph)
           person.repository.should_not be_empty
-          person.repository.statements.count.should == 1 # not the extra one.
-          person.repository.statements.first.should == @stmt
+          person.repository.statements.count.should == 1 # not the extra ones
+          person.repository.statements.first.should == @graph.statements.first
         end
       end