dbd 0.0.11 → 0.0.12

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

@@ -16,22 +16,22 @@ module Dbd
     end
 
     describe '#from_CSV reads back a csv exported graph correctly' do
-      describe 'for a graph with only provenance_facts' do
+      describe 'for a graph with only context_facts' do
 
-        let(:graph) { TestFactories::Graph.only_provenance }
+        let(:graph) { TestFactories::Graph.only_context }
 
         it 'round_trip validates' do
           validate_round_trip(graph)
         end
 
-        it 'for a provenance_fact, the provenance_subject must be equal (nil)' do
+        it 'for a context_fact, the context_subject must be equal (nil)' do
           graph_from_CSV = round_tripped_graph(graph)
-          provenance_fact = graph_from_CSV.first
-          provenance_fact.provenance_subject.should be_nil
+          context_fact = graph_from_CSV.first
+          context_fact.context_subject.should be_nil
         end
       end
 
-      describe 'for a graph with facts and provenance_facts' do
+      describe 'for a graph with facts and context_facts' do
 
         let(:graph) { TestFactories::Graph.full }
 
@@ -47,15 +47,15 @@ module Dbd
     end
 
     describe '#from_CSV reads back _two_ csv exported graphs correctly' do
-      describe 'for a graph with facts and provenance_facts' do
+      describe 'for a graph with facts and context_facts' do
 
-        let(:graph_provenance) { TestFactories::Graph.only_provenance }
-        let(:graph_facts) { TestFactories::Graph.only_facts(graph_provenance.first.subject) }
-        let(:graph_provenance_csv) { graph_provenance.to_CSV }
+        let(:graph_context) { TestFactories::Graph.only_context }
+        let(:graph_facts) { TestFactories::Graph.only_facts(graph_context.first.subject) }
+        let(:graph_context_csv) { graph_context.to_CSV }
         let(:graph_facts_csv) { graph_facts.to_CSV }
 
         let(:graph_from_2_csv_s) do
-          stream_1 = StringIO.new(graph_provenance_csv)
+          stream_1 = StringIO.new(graph_context_csv)
           stream_2 = StringIO.new(graph_facts_csv)
           graph = described_class.new
           graph.from_CSV(stream_1)
@@ -64,21 +64,21 @@ module Dbd
 
         it 'round_trip validates' do
           # we do not have full graph equivalence yet
-          graph_from_2_csv_s.first.should be_equivalent(graph_provenance.first)
+          graph_from_2_csv_s.first.should be_equivalent(graph_context.first)
           graph_from_2_csv_s.last.should be_equivalent(graph_facts.last)
         end
 
         it 'a string concat of 2 CSV files works to logically concat them' do
-          graph_from_2_csv_s.to_CSV.should == (graph_provenance_csv + graph_facts_csv)
+          graph_from_2_csv_s.to_CSV.should == (graph_context_csv + graph_facts_csv)
         end
       end
     end
 
     describe '#from_CSV reads special cases correctly' do
 
-      let(:provenance_subject) { TestFactories::Fact::Subject.fixed_provenance_subject }
-      let(:resource) { TestFactories::Resource.empty(provenance_subject) }
-      let(:special_fact) { TestFactories::Fact.fact_with_special_chars(provenance_subject, resource.subject) }
+      let(:context_subject) { TestFactories::Fact::Subject.fixed_context_subject }
+      let(:resource) { TestFactories::Resource.empty(context_subject) }
+      let(:special_fact) { TestFactories::Fact.fact_with_special_chars(context_subject, resource.subject) }
 
       it 'as object' do
         resource << special_fact

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

@@ -2,42 +2,42 @@ require 'spec_helper'
 
 module TestFactories
   describe Graph do
-    describe 'with only provenance facts' do
+    describe 'with only context_facts' do
 
-      let(:only_provenance) { described_class.only_provenance }
+      let(:only_context) { described_class.only_context }
 
       it 'is a Graph' do
-        only_provenance.should be_a(described_class.factory_for)
+        only_context.should be_a(described_class.factory_for)
       end
 
       it 'has some facts' do
-        only_provenance.size.should >= 2
+        only_context.size.should >= 2
       end
     end
 
     describe 'with only facts' do
 
       let(:subject) { described_class.new_subject }
-      let(:only_facts_without_provenance_subject) { described_class.only_facts }
-      let(:only_facts_with_provenance_subject) { described_class.only_facts(subject) }
+      let(:only_facts_without_context_subject) { described_class.only_facts }
+      let(:only_facts_with_context_subject) { described_class.only_facts(subject) }
 
-      describe 'only_facts_without_provenance_subject' do
+      describe 'only_facts_without_context_subject' do
         it 'is a Graph' do
-          only_facts_without_provenance_subject.should be_a(described_class.factory_for)
+          only_facts_without_context_subject.should be_a(described_class.factory_for)
         end
 
         it 'has some facts' do
-          only_facts_without_provenance_subject.size.should >= 2
+          only_facts_without_context_subject.size.should >= 2
         end
       end
 
       describe 'only_facts_with_subject' do
         it 'is a Graph' do
-          only_facts_with_provenance_subject.should be_a(described_class.factory_for)
+          only_facts_with_context_subject.should be_a(described_class.factory_for)
         end
 
         it 'has the set subject' do
-          only_facts_with_provenance_subject.first.provenance_subject.should == subject
+          only_facts_with_context_subject.first.context_subject.should == subject
         end
       end
     end

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

@@ -8,19 +8,19 @@ module Dbd
       Fact.factory.new_subject
     end
 
-    let(:provenance_facts) { TestFactories::Fact::Collection.provenance_facts(new_subject) }
-    let(:provenance_fact_1) { provenance_facts.first }
-    let(:fact_2_3) { TestFactories::Fact::Collection.fact_2_3(provenance_fact_1.subject) }
-    let(:fact_special_characters) { TestFactories::Fact::fact_with_special_chars(provenance_fact_1.subject, new_subject) }
+    let(:context_facts) { TestFactories::Fact::Collection.context_facts(new_subject) }
+    let(:context_fact_1) { context_facts.first }
+    let(:fact_2_3) { TestFactories::Fact::Collection.fact_2_3(context_fact_1.subject) }
+    let(:fact_special_characters) { TestFactories::Fact::fact_with_special_chars(context_fact_1.subject, new_subject) }
 
     let(:subject_valid_regexp) { Fact::Subject.valid_regexp }
     let(:id_valid_regexp) { Fact::ID.valid_regexp }
     let(:time_stamp_valid_regexp) { TimeStamp.valid_regexp }
 
-    describe '#to_CSV with only provenance_facts' do
+    describe '#to_CSV with only context_facts' do
       before do
-        provenance_facts.each_with_index do |provenance_fact, index|
-          subject << provenance_fact
+        context_facts.each do |context_fact|
+          subject << context_fact
         end
       end
 
@@ -36,7 +36,7 @@ module Dbd
         subject.to_CSV.should match(/\A"[^",]+","[^",]+","[^",]*","[^",]+"/)
       end
 
-      describe 'with a single provenance_fact collection' do
+      describe 'with a single context_fact collection' do
         it 'has three logical lines (but one with embedded newline)' do
           subject.to_CSV.lines.count.should == 4
         end
@@ -46,7 +46,7 @@ module Dbd
         end
       end
 
-      describe 'has all attributes of the provenance_fact_collection' do
+      describe 'has all attributes of the context_collection' do
 
         let(:first_line) do
           subject.to_CSV.lines.to_a.first.chomp
@@ -60,7 +60,7 @@ module Dbd
           first_line.split(',')[1][1..-2].should match(time_stamp_valid_regexp)
         end
 
-        it 'has an empty third value (signature of a provenance_fact)' do
+        it 'has an empty third value (signature of a context_fact)' do
           first_line.split(',')[2].should == '""'
         end
 
@@ -69,7 +69,7 @@ module Dbd
         end
 
         it 'has data_predicate as 5th value' do
-          first_line.split(',')[4].should == '"https://data.vandenabeele.com/ontologies/provenance#context"'
+          first_line.split(',')[4].should == '"context:visibility"'
         end
 
         it 'has object as 6th value' do
@@ -127,8 +127,8 @@ module Dbd
           first_line.split(',')[1][1..-2].should match(time_stamp_valid_regexp)
         end
 
-        it 'has provenance_fact_1.subject as third value' do
-          first_line.split(',')[2].should == "\"#{provenance_fact_1.subject.to_s}\""
+        it 'has context_fact_1.subject as third value' do
+          first_line.split(',')[2].should == "\"#{context_fact_1.subject.to_s}\""
         end
 
         it 'has subject as 4th value' do
@@ -145,11 +145,11 @@ module Dbd
       end
     end
 
-    describe '#to_CSV with provenance_facts and facts' do
+    describe '#to_CSV with context_facts and facts' do
 
       before do
-        provenance_facts.each do |provenance_fact|
-          subject << provenance_fact
+        context_facts.each do |context_fact|
+          subject << context_fact
         end
         fact_2_3.each do |fact|
           subject << fact
@@ -164,8 +164,8 @@ module Dbd
     describe '#to_CSV_file' do
 
       before do
-        provenance_facts.each do |provenance_fact|
-          subject << provenance_fact
+        context_facts.each do |context_fact|
+          subject << context_fact
         end
         fact_2_3.each do |fact|
           subject << fact

data/spec/lib/dbd/performance_spec.rb

@@ -11,23 +11,23 @@ module Dbd
       Fact.factory.new_subject
     end
 
-    let(:provenance_fact_1) { TestFactories::ProvenanceFact.context(new_subject) }
+    let(:context_fact_1) { TestFactories::ContextFact.visibility(new_subject) }
 
     NUMBER_OF_FACTS = 10_000
 
     describe "#{NUMBER_OF_FACTS} facts" do
       it 'reports and checks the used time' do
         graph = Graph.new
-        graph << provenance_fact_1
+        graph << context_fact_1
         # Rehearsal
         NUMBER_OF_FACTS.times do |counter|
-          data_fact = TestFactories::Fact.data_fact(provenance_fact_1, new_subject)
+          data_fact = TestFactories::Fact.data_fact(context_fact_1, new_subject)
           graph << data_fact
         end
         # Actual
         start = Time.now
         NUMBER_OF_FACTS.times do |counter|
-          data_fact = TestFactories::Fact.data_fact(provenance_fact_1, new_subject)
+          data_fact = TestFactories::Fact.data_fact(context_fact_1, new_subject)
           graph << data_fact
         end
         duration = Time.now - start

data/spec/lib/dbd/resource/collection_spec.rb

@@ -3,10 +3,8 @@ require 'spec_helper'
 module Dbd
   describe Resource do
 
-    let(:provenance_subject) { TestFactories::ProvenanceResource.provenance_resource.subject }
-
-    let(:resource) { described_class.new(provenance_subject: provenance_subject) }
-
+    let(:context_subject) { TestFactories::ContextFact.new_subject }
+    let(:resource) { described_class.new(context_subject: context_subject) }
     let(:resource_subject) { resource.subject }
 
     describe 'the fact collection' do
@@ -14,11 +12,11 @@ module Dbd
       let(:fact_2_with_subject) { TestFactories::Fact.fact_2_with_subject }
       let(:fact_3_with_subject) { TestFactories::Fact.fact_3_with_subject }
       let(:fact_without_subject) { TestFactories::Fact.data_fact }
-      let(:fact_with_provenance) { TestFactories::Fact.data_fact(provenance_subject, nil) }
+      let(:fact_with_context) { TestFactories::Fact.data_fact(context_subject, nil) }
       let(:fact_with_resource_subject) { TestFactories::Fact.data_fact(nil, resource_subject) }
-      let(:fact_with_provenance_and_resource_subject) { TestFactories::Fact.data_fact(provenance_subject, resource_subject) }
-      let(:fact_with_incorrect_provenance) { TestFactories::Fact.data_fact(TestFactories::ProvenanceFact.new_subject, resource_subject) }
-      let(:provenance_fact_context) { TestFactories::ProvenanceFact.context }
+      let(:fact_with_context_and_resource_subject) { TestFactories::Fact.data_fact(context_subject, resource_subject) }
+      let(:fact_with_incorrect_context) { TestFactories::Fact.data_fact(TestFactories::ContextFact.new_subject, resource_subject) }
+      let(:context_fact_visibility) { TestFactories::ContextFact.visibility }
 
       it 'enumerable functions work' do
         resource.to_a.should == []
@@ -28,22 +26,22 @@ module Dbd
 
         it 'can add a two facts (no subject set)' do
           resource << fact_without_subject
-          resource << fact_with_provenance
+          resource << fact_with_context
           resource.size.should == 2
         end
 
-        it 'complains if a provenance_subject is added' do
-          lambda{ resource << provenance_fact_context }.should raise_error(
+        it 'complains if a context_subject is added' do
+          lambda{ resource << context_fact_visibility }.should raise_error(
             ArgumentError,
-            'Trying to add a ProvenanceFact to a Resource.')
+            'Trying to add a ContextFact to a Resource.')
          end
 
         describe 'checks and sets subject :' do
           describe 'adding a fact with subject :' do
             describe 'when the subject of the fact is equal to the resource_subject' do
               it 'inserts the fact unaltered' do
-                resource << fact_with_provenance_and_resource_subject
-                resource.first.should be_equal(fact_with_provenance_and_resource_subject)
+                resource << fact_with_context_and_resource_subject
+                resource.first.should be_equal(fact_with_context_and_resource_subject)
               end
             end
 
@@ -60,7 +58,7 @@ module Dbd
           describe 'adding a fact without subject' do
 
             before(:each) do
-              resource << fact_with_provenance
+              resource << fact_with_context
             end
 
             let(:fact_in_resource) do
@@ -68,12 +66,12 @@ module Dbd
             end
 
             it 'insert the same instance' do
-              fact_in_resource.should be_equal(fact_with_provenance)
+              fact_in_resource.should be_equal(fact_with_context)
             end
 
             it 'has kept the other attributes' do
-              (fact_with_provenance.class.attributes - [:subject]).each do |attr|
-                fact_in_resource.send(attr).should == fact_with_provenance.send(attr)
+              (fact_with_context.class.attributes - [:subject]).each do |attr|
+                fact_in_resource.send(attr).should == fact_with_context.send(attr)
               end
             end
 
@@ -83,26 +81,26 @@ module Dbd
           end
         end
 
-        describe 'checks and sets provenance_subject :' do
-          describe 'adding a fact with a provenance subject :' do
-            describe 'when the provenance_subject of the fact is equal to the provenance_subject of the resource' do
+        describe 'checks and sets context_subject :' do
+          describe 'adding a fact with a context_fact subject :' do
+            describe 'when the context_subject of the fact is equal to the context_subject of the resource' do
               it 'inserts the fact unaltered' do
-                resource << fact_with_provenance_and_resource_subject
-                resource.single.should be_equal(fact_with_provenance_and_resource_subject)
+                resource << fact_with_context_and_resource_subject
+                resource.single.should be_equal(fact_with_context_and_resource_subject)
               end
             end
 
-            describe 'when the provenance_subject of the fact is not equal to the resource' do
+            describe 'when the context_subject of the fact is not equal to the resource' do
               it 'raises a SetOnceError' do
-                lambda{ resource << fact_with_incorrect_provenance }.should raise_error(
+                lambda{ resource << fact_with_incorrect_context }.should raise_error(
                   RubyPeterV::SetOnceError,
-                  "Value of provenance_subject was #{fact_with_incorrect_provenance.provenance_subject}, " \
-                  "trying to set it to #{resource.provenance_subject}")
+                  "Value of context_subject was #{fact_with_incorrect_context.context_subject}, " \
+                  "trying to set it to #{resource.context_subject}")
               end
             end
           end
 
-          describe 'adding a fact without provenance_subject' do
+          describe 'adding a fact without context_subject' do
 
             before(:each) do
               resource << fact_with_resource_subject
@@ -114,8 +112,8 @@ module Dbd
               fact_in_resource.should be_equal(fact_with_resource_subject)
             end
 
-            it 'has set the provenance_subject to the Resource provenance_subject' do
-             fact_in_resource.provenance_subject.should == provenance_subject
+            it 'has set the context_subject to the Resource context_subject' do
+             fact_in_resource.context_subject.should == context_subject
             end
           end
         end

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

@@ -3,9 +3,8 @@ require 'spec_helper'
 module Dbd
   describe Resource do
 
-    let(:provenance_subject) { TestFactories::ProvenanceResource.provenance_resource.subject }
-
-    let(:resource) { described_class.new(provenance_subject: provenance_subject) }
+    let(:context_subject) { TestFactories::ContextFact.new_subject }
+    let(:resource) { described_class.new(context_subject: context_subject) }
 
     describe '.new_subject' do
       it 'returns a Fact#new_subject' do
@@ -14,13 +13,13 @@ module Dbd
     end
 
     describe '.new' do
-      describe 'with a provenance_subject argument' do
+      describe 'with a context_subject argument' do
         it 'has created a subject' do
           resource.subject.should be_a(described_class.new_subject.class)
         end
 
-        it 'has stored the provenance_subject' do
-          resource.provenance_subject.should == provenance_subject
+        it 'has stored the context_subject' do
+          resource.context_subject.should == context_subject
         end
       end
 
@@ -29,14 +28,14 @@ module Dbd
           explicit_subject = described_class.new_subject
           described_class.new(
             subject: explicit_subject,
-            provenance_subject: provenance_subject).subject.should == explicit_subject
+            context_subject: context_subject).subject.should == explicit_subject
         end
       end
 
-      describe 'with a nil provenance_subject argument' do
-        it 'raises a ProvenanceError' do
-          lambda { described_class.new(provenance_subject: nil) } .
-            should raise_error ProvenanceError
+      describe 'with a nil context_subject argument' do
+        it 'raises a ContextError' do
+          lambda { described_class.new(context_subject: nil) } .
+            should raise_error ContextError
         end
       end
     end

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

@@ -3,21 +3,22 @@ require 'spec_helper'
 module TestFactories
   describe Resource do
 
-    let(:provenance_subject) { TestFactories::ProvenanceResource.provenance_resource.subject }
+    let(:context_subject) { TestFactories::ContextFact.new_subject }
 
     describe "TestFactories::Resource" do
       it ".empty works" do
-        described_class.facts_resource(provenance_subject)
+        resource = described_class.empty(context_subject)
+        resource.context_subject.should == context_subject
       end
 
-      context ".facts_resource" do
-        it "works with explicit provenance_subject" do
-          described_class.facts_resource(provenance_subject)
+      describe ".facts_resource" do
+        it "works with explicit context_subject" do
+          described_class.facts_resource(context_subject)
         end
 
-        it "works without explicit provenance_subject" do
+        it "works without explicit context_subject" do
           resource = described_class.facts_resource()
-          resource.provenance_subject.should_not be_nil
+          resource.context_subject.should_not be_nil
         end
       end
     end