dbd 0.0.11 → 0.0.12

data/spec/lib/dbd/fact/collection/collection_spec.rb

@@ -4,19 +4,19 @@ module Dbd
   class Fact
     describe Collection do
 
-      let(:provenance_subject_1) { Fact.factory.new_subject }
-      let(:provenance_subject_2) { Fact.factory.new_subject }
+      let(:context_subject_1) { Fact.factory.new_subject }
+      let(:context_subject_2) { Fact.factory.new_subject }
 
-      let(:provenance_fact_context) { TestFactories::ProvenanceFact.context(provenance_subject_1) }
-      let(:provenance_fact_created_by) { TestFactories::ProvenanceFact.created_by(provenance_subject_1) }
-      let(:provenance_fact_original_source) { TestFactories::ProvenanceFact.original_source(provenance_subject_2) }
+      let(:context_fact_visibility) { TestFactories::ContextFact.visibility(context_subject_1) }
+      let(:context_fact_created_by) { TestFactories::ContextFact.created_by(context_subject_1) }
+      let(:context_fact_original_source) { TestFactories::ContextFact.original_source(context_subject_2) }
 
-      let(:fact_1) { TestFactories::Fact.fact_1(provenance_subject_1) }
-      let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject(provenance_subject_1) }
-      let(:fact_3_with_subject) { TestFactories::Fact.fact_3_with_subject(provenance_subject_1) }
+      let(:fact_1) { TestFactories::Fact.fact_1(context_subject_1) }
+      let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject(context_subject_1) }
+      let(:fact_3_with_subject) { TestFactories::Fact.fact_3_with_subject(context_subject_1) }
 
-      let(:fact_2_3) { TestFactories::Fact::Collection.fact_2_3(provenance_subject_1) }
-      let(:provenance_facts) { TestFactories::Fact::Collection.provenance_facts(provenance_subject_1) }
+      let(:fact_2_3) { TestFactories::Fact::Collection.fact_2_3(context_subject_1) }
+      let(:context_facts) { TestFactories::Fact::Collection.context_facts(context_subject_1) }
 
       let(:subject) do
         Object.new.tap do |object_with_Fact_Collection|
@@ -43,13 +43,13 @@ module Dbd
             subject.size.should == 1
           end
 
-          it 'adding a provenance_fact works' do
-            subject << provenance_fact_context
+          it 'adding a context_fact works' do
+            subject << context_fact_visibility
             subject.size.should == 1
           end
 
           it 'returns self to allow chaining' do
-            (subject << provenance_fact_context).should == subject
+            (subject << context_fact_visibility).should == subject
           end
         end
 
@@ -68,14 +68,14 @@ module Dbd
         end
       end
 
-      describe 'adding a fact with a ref to a provenance_fact' do
+      describe 'adding a fact with a ref to a context_fact' do
 
-        it 'fact_2_with_subject has a provenance_subject that refers to context and created_by' do
-          subject << provenance_fact_context
-          subject << provenance_fact_created_by
+        it 'fact_2_with_subject has a context_subject that refers to context_fact_visibility and context_fact_created_by' do
+          subject << context_fact_visibility
+          subject << context_fact_created_by
           subject << fact_2_with_subject
-          ps = fact_1.provenance_subject
-          subject.by_subject(ps).should == [provenance_fact_context, provenance_fact_created_by]
+          context_subject = fact_1.context_subject
+          subject.by_subject(context_subject).should == [context_fact_visibility, context_fact_created_by]
         end
       end
 
@@ -136,37 +136,37 @@ module Dbd
         end
       end
 
-      describe 'provenance_facts must all come before first use by a fact' do
-        it 'adding a provenance_fact, depending fact, another provenance_fact with same subject fail' do
-          subject << provenance_fact_context
+      describe 'context_facts must all come before first use by a fact' do
+        it 'adding a context_fact, depending fact, another context_fact with same subject fail' do
+          subject << context_fact_visibility
           subject << fact_2_with_subject
-          lambda { subject << provenance_fact_created_by } . should raise_error OutOfOrderError
+          lambda{ subject << context_fact_created_by }.should raise_error OutOfOrderError
         end
 
         # testing private functionality (kept temporarily as documentation)
-        # A hash with all the provenance_subjects that are used by at least one fact.
-        # Needed for the validation that no provenance_fact may be added that is
+        # A hash with all the context_subjects that are used by at least one fact.
+        # Needed for the validation that no context_fact may be added that is
         # referred from a fact that is already in the fact stream.
-        describe 'used_provenance_subjects' do
+        describe 'used_context_subjects' do
           # testing an internal variable ...
 
-          let(:used_provenance_subjects) do
-            subject.instance_variable_get(:@used_provenance_subjects)
+          let(:used_context_subjects) do
+            subject.instance_variable_get(:@used_context_subjects)
           end
 
           it 'is empty initially' do
-            used_provenance_subjects.should be_empty
+            used_context_subjects.should be_empty
           end
 
-          it 'adding a provenance_fact alone does not create an entry' do
-            subject << provenance_fact_context
-            used_provenance_subjects.should be_empty
+          it 'adding a context_fact alone does not create an entry' do
+            subject << context_fact_visibility
+            used_context_subjects.should be_empty
           end
 
-          it 'adding a provenance_fact and a depending fact create an entry' do
-            subject << provenance_fact_context
+          it 'adding a context_fact and a depending fact create an entry' do
+            subject << context_fact_visibility
             subject << fact_2_with_subject
-            used_provenance_subjects[provenance_subject_1].should == true
+            used_context_subjects[context_subject_1].should == true
           end
         end
       end
@@ -177,8 +177,8 @@ module Dbd
         end
 
         it 'raises FactError with message when fact.errors has errors' do
-           provenance_fact_context.stub(:errors).and_return(['Error 1', 'Error 2'])
-           lambda { subject << provenance_fact_context } . should raise_error(
+           context_fact_visibility.stub(:errors).and_return(['Error 1', 'Error 2'])
+           lambda { subject << context_fact_visibility } . should raise_error(
              FactError,
              'Error 1, Error 2.')
         end
@@ -186,49 +186,49 @@ module Dbd
 
       describe 'by_subject : ' do
         it 'finds entries for a given subject' do
-          subject << provenance_fact_context
-          subject << provenance_fact_created_by
-          subject << provenance_fact_original_source
-          provenance_fact_context.subject.should == provenance_subject_1 # assert test set-up
-          provenance_fact_created_by.subject.should == provenance_subject_1 # assert test set-up
-          provenance_fact_original_source.subject.should == provenance_subject_2 # assert test set-up
-          subject.by_subject(provenance_subject_1).first.should == provenance_fact_context
-          subject.by_subject(provenance_subject_1).last.should == provenance_fact_created_by
-          subject.by_subject(provenance_subject_2).single.should == provenance_fact_original_source
+          subject << context_fact_visibility
+          subject << context_fact_created_by
+          subject << context_fact_original_source
+          context_fact_visibility.subject.should == context_subject_1 # assert test set-up
+          context_fact_created_by.subject.should == context_subject_1 # assert test set-up
+          context_fact_original_source.subject.should == context_subject_2 # assert test set-up
+          subject.by_subject(context_subject_1).first.should == context_fact_visibility
+          subject.by_subject(context_subject_1).last.should == context_fact_created_by
+          subject.by_subject(context_subject_2).single.should == context_fact_original_source
         end
       end
 
       describe 'TestFactories::Fact::Collection' do
         describe '.fact_2_3' do
-          it 'has the given provenance_subject with explicit subject arg' do
+          it 'has the given context_subject with explicit subject arg' do
             fact_2_3.each do |fact|
-              fact.provenance_subject.should == provenance_subject_1
+              fact.context_subject.should == context_subject_1
             end
           end
         end
 
-        describe '.provenance_facts' do
-          it 'has a context' do
-            provenance_facts.select do |provenance_fact|
-              provenance_fact.predicate == 'https://data.vandenabeele.com/ontologies/provenance#context'
+        describe '.context_facts' do
+          it 'has a visibility' do
+            context_facts.select do |context_fact|
+              context_fact.predicate == 'context:visibility'
             end.size.should == 1
           end
 
           it 'has a created_by' do
-            provenance_facts.select do |provenance_fact|
-              provenance_fact.predicate == 'https://data.vandenabeele.com/ontologies/provenance#created_by'
+            context_facts.select do |context_fact|
+              context_fact.predicate == 'dcterms:creator'
             end.size.should == 1
           end
 
           it 'has an original_source' do
-            provenance_facts.select do |provenance_fact|
-              provenance_fact.predicate == 'https://data.vandenabeele.com/ontologies/provenance#original_source'
+            context_facts.select do |context_fact|
+              context_fact.predicate == 'prov:source'
             end.size.should == 1
           end
 
           it 'has the given subjects with explicit subject arg' do
-            provenance_facts.each do |provenance_fact|
-              provenance_fact.subject.should == provenance_subject_1
+            context_facts.each do |context_fact|
+              context_fact.subject.should == context_subject_1
             end
           end
         end

data/spec/lib/dbd/fact/factory/factory_spec.rb

@@ -61,12 +61,12 @@ module Dbd
             with_validation(string_values)
           end
 
-          it 'for a nil provenance_subject (for provenance_facts)' do
+          it 'for a nil context_subject (for context_facts)' do
             string_values[2] = nil
             with_validation(string_values)
           end
 
-          it 'for an empty provenance_subject (for provenance_facts)' do
+          it 'for an empty context_subject (for context_facts)' do
             string_values[2] = ''
             with_validation(string_values)
           end
@@ -83,7 +83,7 @@ module Dbd
             lambda{ with_validation(string_values) }.should raise_error(FactError)
           end
 
-          it 'for invalid provenance_subject' do
+          it 'for invalid context_subject' do
             string_values[2] = 'foo'
             lambda{ with_validation(string_values) }.should raise_error(FactError)
           end

data/spec/lib/dbd/fact/methods_spec.rb

@@ -4,12 +4,12 @@ module Dbd
   describe Fact do
 
     let(:factory) { described_class.factory }
-    let(:provenance_subject) { factory.new_subject }
+    let(:context_subject) { factory.new_subject }
     let(:subject) { factory.new_subject }
-    let(:fact_1) { TestFactories::Fact.fact_1(provenance_subject) }
-    let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject(provenance_subject) }
-    let(:fact_with_newline) { TestFactories::Fact.fact_with_newline(provenance_subject) }
-    let(:fact_with_special_chars) { TestFactories::Fact.fact_with_special_chars(provenance_subject) }
+    let(:fact_1) { TestFactories::Fact.fact_1(context_subject) }
+    let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject(context_subject) }
+    let(:fact_with_newline) { TestFactories::Fact.fact_with_newline(context_subject) }
+    let(:fact_with_special_chars) { TestFactories::Fact.fact_with_special_chars(context_subject) }
     let(:full_fact) { TestFactories::Fact.full_fact }
 
     describe '.factory' do
@@ -47,7 +47,7 @@ module Dbd
     end
 
     describe 'short' do
-      it 'for a base fact shows provenance, subject, predicate, object' do
+      it 'for a base fact shows context, subject, predicate, object' do
         fact_1.subject = subject
         fact_1.time_stamp = TimeStamp.new
         fact_1.short.should match(/^[0-9a-f]{8} : [0-9a-f]{8} : http:\/\/example\.org\/test\/ : Gandhi$/)
@@ -86,14 +86,14 @@ module Dbd
         fact_2_with_subject.errors.should be_empty
       end
 
-      describe 'without provenance_subject' do
+      describe 'without context_subject' do
 
         before(:each) do
-          fact_2_with_subject.stub(:provenance_subject).and_return(nil)
+          fact_2_with_subject.stub(:context_subject).and_return(nil)
         end
 
         it 'errors returns an array with 1 error message' do
-          fact_2_with_subject.errors.single.should match(/Provenance subject is missing/)
+          fact_2_with_subject.errors.single.should match(/ContextFact subject is missing/)
         end
       end
 
@@ -139,9 +139,9 @@ module Dbd
       end
     end
 
-    describe 'provenance_fact?' do
-      it 'is false for a base fact or derived from it that is not a ProvenanceFact ' do
-        fact_1.provenance_fact?.should be_false
+    describe 'context_fact?' do
+      it 'is false for a base fact or derived from it that is not a ContextFact ' do
+        fact_1.context_fact?.should be_false
       end
     end
 

data/spec/lib/dbd/fact/new_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 module Dbd
   describe Fact do
     let(:factory) { described_class.factory}
-    let(:provenance_subject) { factory.new_subject }
+    let(:context_subject) { factory.new_subject }
     let(:subject) { factory.new_subject }
-    let(:fact_1) { TestFactories::Fact.fact_1(provenance_subject) }
-    let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject(provenance_subject) }
+    let(:fact_1) { TestFactories::Fact.fact_1(context_subject) }
+    let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject(context_subject) }
     let(:data_predicate)  { 'http://example.org/test/name' }
     let(:string_object_1)  { 'Gandhi' }
     let(:id_valid_regexp) { described_class::ID.valid_regexp }
@@ -38,8 +38,8 @@ module Dbd
         lambda{ fact_with_incorrect_time_stamp }.should raise_error(ArgumentError)
       end
 
-      it 'new sets the provenance_subject' do
-        fact_1.provenance_subject.should == provenance_subject
+      it 'new sets the context_subject' do
+        fact_1.context_subject.should == context_subject
       end
 
       it 'new sets the subject' do
@@ -75,11 +75,11 @@ module Dbd
       end
     end
 
-    describe 'update_used_provenance_subjects' do
-      it 'sets the value for provenance_subject to true for a fact' do
+    describe 'update_used_context_subjects' do
+      it 'sets the value for context_subject to true for a fact' do
         h = {}
-        fact_1.update_used_provenance_subjects(h)
-        h[fact_1.provenance_subject].should == true
+        fact_1.update_used_context_subjects(h)
+        h[fact_1.context_subject].should == true
       end
     end
   end

data/spec/lib/dbd/fact/subject/test_factories_spec.rb

@@ -5,7 +5,7 @@ module TestFactories
     describe Subject do
 
       let(:fixed_subject) { described_class.fixed_subject }
-      let(:fixed_provenance_subject) { described_class.fixed_provenance_subject }
+      let(:fixed_context_subject) { described_class.fixed_context_subject }
 
       describe 'fixed_subject' do
         it 'fixed_subject is exactly this fixed subject' do
@@ -13,9 +13,9 @@ module TestFactories
         end
       end
 
-      describe 'fixed_provenance_subject' do
-        it 'fixed_provenance_subject is exactly this fixed subject' do
-          fixed_provenance_subject.should == '40fab407-9b04-4a51-9a52-d978abfcbb1f'
+      describe 'fixed_context_subject' do
+        it 'fixed_context_subject is exactly this fixed subject' do
+          fixed_context_subject.should == '40fab407-9b04-4a51-9a52-d978abfcbb1f'
         end
       end
     end

data/spec/lib/dbd/fact/test_factories_spec.rb

@@ -2,23 +2,23 @@ require 'spec_helper'
 
 module TestFactories
   describe Fact do
-    let(:provenance_subject) { ProvenanceFact.new_subject }
+    let(:context_subject) { ContextFact.new_subject }
     let(:subject) { described_class.new_subject }
     let(:data_predicate)  { 'http://example.org/test/name' }
     let(:string_object_1)  { 'Gandhi' }
-    let(:fact_2_with_subject) { described_class.fact_2_with_subject(provenance_subject) }
+    let(:fact_2_with_subject) { described_class.fact_2_with_subject(context_subject) }
     let(:full_fact) { described_class.full_fact }
 
     describe 'factory works' do
-      it 'with explicit provenance_subject' do
-        fact_2_with_subject.provenance_subject.should be_a(provenance_subject.class)
+      it 'with explicit context_subject' do
+        fact_2_with_subject.context_subject.should be_a(context_subject.class)
         fact_2_with_subject.subject.should be_a(subject.class)
         fact_2_with_subject.predicate.should be_a(data_predicate.class)
         fact_2_with_subject.object.should be_a(string_object_1.class)
       end
 
-      it 'without explicit provenance_subject' do
-        described_class.fact_1.provenance_subject.should be_nil
+      it 'without explicit context_subject' do
+        described_class.fact_1.context_subject.should be_nil
       end
 
       it 'fact_2_with_subject should not raise_error' do
@@ -31,8 +31,8 @@ module TestFactories
 
       describe 'data_fact' do
         describe 'without arguments' do
-          it 'has empty provenance_subject' do
-            described_class.data_fact.provenance_subject.should be_nil
+          it 'has empty context_subject' do
+            described_class.data_fact.context_subject.should be_nil
           end
 
           it 'has empty subject' do
@@ -40,25 +40,25 @@ module TestFactories
           end
         end
 
-        describe 'with provenance_subject' do
-          it 'has provenance_subject' do
-            described_class.data_fact(provenance_subject).
-              provenance_subject.should == provenance_subject
+        describe 'with context_subject' do
+          it 'has context_subject' do
+            described_class.data_fact(context_subject).
+              context_subject.should == context_subject
           end
 
           it 'has empty subject' do
-            described_class.data_fact(provenance_subject).subject.should be_nil
+            described_class.data_fact(context_subject).subject.should be_nil
           end
         end
 
-        describe 'with provenance_subject and subject' do
-          it 'has provenance_subject' do
-            described_class.data_fact(provenance_subject, subject).
-              provenance_subject.should == provenance_subject
+        describe 'with context_subject and subject' do
+          it 'has context_subject' do
+            described_class.data_fact(context_subject, subject).
+              context_subject.should == context_subject
           end
 
           it 'has subject' do
-            described_class.data_fact(provenance_subject, subject).
+            described_class.data_fact(context_subject, subject).
               subject.should == subject
           end
         end

data/spec/lib/dbd/graph/add_to_graph_spec.rb

@@ -9,16 +9,16 @@ module Dbd
 
     let(:data_fact) { TestFactories::Fact.data_fact(new_subject, new_subject) }
     let(:fact_no_subject) { TestFactories::Fact.data_fact(new_subject, nil) }
-    let(:fact_no_provenance) { TestFactories::Fact.data_fact(nil, new_subject) }
+    let(:fact_no_context) { TestFactories::Fact.data_fact(nil, new_subject) }
 
-    let(:provenance_facts) { TestFactories::Fact::Collection.provenance_facts(new_subject) }
-    let(:provenance_fact_1) { provenance_facts.first }
+    let(:context_facts) { TestFactories::Fact::Collection.context_facts(new_subject) }
+    let(:context_fact_1) { context_facts.first }
 
     let(:subject_regexp) { Fact::Subject.regexp }
 
-    let(:provenance_resource) { TestFactories::ProvenanceResource.provenance_resource }
-    let(:resource) { TestFactories::Resource.facts_resource(provenance_resource.subject) }
-    let(:resource_array) { [provenance_resource, resource]}
+    let(:context) { TestFactories::Context.context }
+    let(:resource) { TestFactories::Resource.facts_resource(context.subject) }
+    let(:resource_array) { [context, resource]}
 
     describe 'create a graph' do
       it 'does not fail' do
@@ -32,12 +32,12 @@ module Dbd
           subject << data_fact
         end
 
-        it 'a provenance_fact does not fail' do
-          subject << provenance_fact_1
+        it 'a context_fact does not fail' do
+          subject << context_fact_1
         end
 
         it 'two facts does not fail' do
-          subject << provenance_fact_1
+          subject << context_fact_1
           subject << data_fact
         end
 
@@ -45,8 +45,8 @@ module Dbd
           lambda { subject << fact_no_subject } . should raise_error FactError
         end
 
-        it 'fact with missing provenance raises FactError' do
-          lambda { subject << fact_no_provenance } . should raise_error FactError
+        it 'fact with missing context raises FactError' do
+          lambda { subject << fact_no_context } . should raise_error FactError
         end
       end
 
@@ -88,22 +88,22 @@ module Dbd
         end
       end
 
-      describe 'a ProvenanceResource and a Resource' do
+      describe 'a Context and a Resource' do
 
         it 'does not fail' do
-          subject << provenance_resource
+          subject << context
         end
 
-        it 'Adds the facts from the provenance_resource to the graph' do
-          subject << provenance_resource
+        it 'Adds the facts from the context to the graph' do
+          subject << context
           subject.size.should == 2
         end
 
-        it 'Adds the facts from the provenance_resource and the resource to the graph' do
-          subject << provenance_resource
+        it 'Adds the facts from the context and the resource to the graph' do
+          subject << context
           subject << resource
           subject.size.should == 4
-          subject.first.should be_a(ProvenanceFact)
+          subject.first.should be_a(ContextFact)
           subject.last.class.should == Fact
         end
       end
@@ -113,9 +113,9 @@ module Dbd
           subject << resource_array
         end
 
-        it 'Adds the facts from the provenance_resource and the resource to the graph' do
+        it 'Adds the facts from the context and the resource to the graph' do
           subject << resource_array
-          subject.first.class.should == ProvenanceFact
+          subject.first.class.should == ContextFact
           subject.last.class.should == Fact
           subject.size.should == 4
         end
@@ -126,13 +126,13 @@ module Dbd
         end
 
         it 'works with different levels deep in 1 collection' do
-          subject << [provenance_resource, [[resource]]]
+          subject << [context, [[resource]]]
           subject.size.should == 4
         end
       end
 
       it 'returns self' do
-        (subject << TestFactories::Fact::Collection.provenance_facts(new_subject)).should be_a(described_class)
+        (subject << TestFactories::Fact::Collection.context_facts(new_subject)).should be_a(described_class)
       end
     end
   end