dbd 0.0.9 → 0.0.10

data/spec/lib/dbd/fact/id/id_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 module Dbd
   class Fact
     describe ID do
-      it ".regexp has a regexp for the to_s" do
-        described_class.regexp.should == Helpers::UUID.regexp
+      it '.valid_regexp has a regexp for the to_s' do
+        described_class.valid_regexp.should == Helpers::UUID.valid_regexp
       end
 
-      it ".new_id" do
-        described_class.new_id.should match(described_class.regexp)
+      it '.new_id' do
+        described_class.new_id.should match(described_class.valid_regexp)
       end
     end
   end

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

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+module TestFactories
+  module Fact
+    describe ID do
+
+      let(:fixed_id) { described_class.fixed_id }
+
+      it 'fixed_id is exactly this fixed id' do
+        fixed_id.should == '825e44d5-af33-4858-8047-549bd813daa8'
+      end
+    end
+  end
+end

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

@@ -3,34 +3,41 @@ require 'spec_helper'
 module Dbd
   describe Fact do
 
-    let(:provenance_subject) { ProvenanceFact.new_subject }
-    let(:subject) { described_class.new_subject }
-    let(:fact_1) { Factories::Fact.fact_1(provenance_subject) }
-    let(:fact_2_with_subject) { Factories::Fact.fact_2_with_subject(provenance_subject) }
-    let(:fact_with_newline) { Factories::Fact.fact_with_newline(provenance_subject) }
-    let(:full_fact) { Factories::Fact.full_fact }
-
-    describe "time_stamp=" do
-      it "checks the type (too easy to try to give a Time arg)" do
+    let(:factory) { described_class.factory }
+    let(:provenance_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(:full_fact) { TestFactories::Fact.full_fact }
+
+    describe '.factory' do
+      it 'should return the factory for a Fact' do
+        factory.should == described_class::Factory
+      end
+    end
+
+    describe 'time_stamp=' do
+      it 'checks the type (too easy to try to give a Time arg)' do
         lambda{ fact_1.time_stamp = Time.now }.should raise_error(ArgumentError)
       end
 
-      describe "set_once" do
+      describe 'set_once' do
 
         let(:time_stamp_now) { TimeStamp.new }
 
-        it "can be set when nil" do
+        it 'can be set when nil' do
           fact_1.time_stamp = time_stamp_now
           fact_1.time_stamp.should == time_stamp_now
         end
 
-        describe "setting it two times" do
-          it "with the value succeeds" do
+        describe 'setting it two times' do
+          it 'with the value succeeds' do
             fact_1.time_stamp = time_stamp_now
             fact_1.time_stamp = time_stamp_now
           end
 
-          it "with a different value raises a SetOnceError" do
+          it 'with a different value raises a SetOnceError' do
             fact_1.time_stamp = time_stamp_now
             lambda{ fact_1.time_stamp = (time_stamp_now+1) }.should raise_error(RubyPeterV::SetOnceError)
           end
@@ -38,123 +45,112 @@ module Dbd
       end
     end
 
-    describe "short" do
-      it "for a base fact shows provenance, subject, predicate, object" do
+    describe 'short' do
+      it 'for a base fact shows provenance, 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$/)
       end
 
-      it "for a fact with a newline replaces it with a underscore" do
+      it 'for a fact with a newline replaces it with a underscore' do
         fact_with_newline.subject = subject
         fact_with_newline.short.should match(/^[0-9a-f]{8} : [0-9a-f]{8} : http:\/\/example\.org\/test\/ : A long story_really.$/)
       end
     end
 
-    describe "errors" do
-      it "the factory has no errors" do
+    describe 'errors' do
+      it 'the factory has no errors' do
         fact_2_with_subject.errors.should be_empty
       end
 
-      describe "without provenance_subject" do
+      describe 'without provenance_subject' do
 
         before(:each) do
           fact_2_with_subject.stub(:provenance_subject).and_return(nil)
         end
 
-        it "errors returns an array with 1 error message" do
+        it 'errors returns an array with 1 error message' do
           fact_2_with_subject.errors.single.should match(/Provenance subject is missing/)
         end
       end
 
-      describe "without subject" do
+      describe 'without subject' do
 
         before(:each) do
           fact_2_with_subject.stub(:subject).and_return(nil)
         end
 
-        it "errors returns an array with an errorm message" do
+        it 'errors returns an array with an errorm message' do
           fact_2_with_subject.errors.single.should match(/Subject is missing/)
         end
       end
     end
 
-    describe "attributes" do
-      it "there are 6 attributes" do
+    describe 'attributes' do
+      it 'there are 6 attributes' do
         described_class.attributes.size.should == 6
       end
 
-      it "first attribute is :id" do
+      it 'first attribute is :id' do
         described_class.attributes.first.should == :id
       end
     end
 
-    describe "values" do
-      it "there are 6 values" do
+    describe 'values' do
+      it 'there are 6 values' do
         full_fact.values.size.should == 6
       end
 
-      it "the second element (time_stamp) is a TimeStamp" do
+      it 'the second element (time_stamp) is a TimeStamp' do
         full_fact.values[1].should be_a(TimeStamp)
       end
     end
 
-    describe "string_values" do
-      it "there are 6 string_values" do
+    describe 'string_values' do
+      it 'there are 6 string_values' do
         full_fact.string_values.size.should == 6
       end
 
-      it "the second element (time_stamp) is a String" do
+      it 'the second element (time_stamp) is a String' do
         full_fact.string_values[1].should be_a(String)
       end
     end
 
-    describe "provenance_fact?" do
-      it "is false for a base fact or derived from it that is not a ProvenanceFact " do
+    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
       end
     end
 
-    def string_values
-      ["825e44d5-af33-4858-8047-549bd813daa8",
-       "2013-06-17 21:55:09.967653013 UTC",
-       "40fab407-9b04-4a51-9a52-d978abfcbb1f",
-       "2e9fbc87-2e94-47e9-a8fd-121cc4bc3e8f",
-       "http://example.org/test/name",
-       "Gandhi"]
-    end
+    describe 'equivalent?' do
 
-    describe "from_string_values" do
-      it "reads the values correctly (round trip test)" do
-        fact = described_class.from_string_values(string_values)
-        fact.string_values.should == string_values
+      # no let, since we want a fresh copy on each invocation
+      def string_values
+        TestFactories::Fact.string_values
       end
-    end
-
-    describe "equivalent?" do
 
-      let(:ref) { described_class.from_string_values(string_values) }
+      let(:ref) { factory.from_string_values(string_values) }
 
-      it "is true for facts with same values" do
-        other = described_class.from_string_values(string_values)
+      it 'is true for facts with same values' do
+        other = factory.from_string_values(string_values)
         other.should be_equivalent(ref)
       end
 
-      it "is false for each of the entries largely different" do
+      it 'is false for each of the entries largely different' do
         (0...string_values.size).each do |index|
           string_values_1_modified = string_values.dup.tap { |_string_values|
             _string_values[index][3] = '4' # different and valid for all cases
           }
-          other = described_class.from_string_values(string_values_1_modified)
+          other = factory.from_string_values(string_values_1_modified)
           other.should_not be_equivalent(ref)
         end
       end
 
-      it "is true when the time_stamp is 500 ns larger" do
+      it 'is true when the time_stamp is 500 ns larger' do
         string_values_time_modified = string_values.dup.tap { |_string_values|
-          _string_values[1] = "2013-06-17 21:55:09.967653513 UTC"
+          _string_values[1] = '2013-06-17 21:55:09.967653513 UTC'
         }
-        other = described_class.from_string_values(string_values_time_modified)
+        other = factory.from_string_values(string_values_time_modified)
         other.should be_equivalent(ref)
       end
     end

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

@@ -2,74 +2,51 @@ require 'spec_helper'
 
 module Dbd
   describe Fact do
-    let(:provenance_subject) { ProvenanceFact.new_subject }
-    let(:fact_1) { Factories::Fact.fact_1(provenance_subject) }
-    let(:fact_2_with_subject) { Factories::Fact.fact_2_with_subject(provenance_subject) }
-    let(:data_predicate)  { "http://example.org/test/name" }
-    let(:string_object_1)  { "Gandhi" }
-    let(:id_regexp) { Fact::ID.regexp }
-    let(:subject_regexp) { Fact::Subject.regexp }
-    let(:forced_id) { described_class.new_id }
-    let(:subject) { described_class.new_subject }
-    let(:fact_with_forced_id) { Factories::Fact.fact_with_forced_id(forced_id) }
+    let(:factory) { described_class.factory}
+    let(:provenance_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(:data_predicate)  { 'http://example.org/test/name' }
+    let(:string_object_1)  { 'Gandhi' }
+    let(:id_valid_regexp) { described_class::ID.valid_regexp }
+    let(:subject_valid_regexp) { described_class::Subject.valid_regexp }
+    let(:forced_id) { described_class.factory.new_id }
+    let(:fact_with_forced_id) { TestFactories::Fact.fact_with_forced_id(forced_id) }
     let(:time_stamp) { TimeStamp.new }
-    let(:fact_with_time_stamp) { Factories::Fact.fact_with_time_stamp(time_stamp) }
-    let(:fact_with_incorrect_time_stamp) { Factories::Fact.fact_with_time_stamp(time_stamp.time) }
+    let(:fact_with_time_stamp) { TestFactories::Fact.fact_with_time_stamp(time_stamp) }
+    let(:fact_with_incorrect_time_stamp) { TestFactories::Fact.fact_with_time_stamp(time_stamp.time) }
 
-    describe ".new_subject" do
-      it "creates a new (random) subject" do
-        described_class.new_subject.should match(subject_regexp)
+    describe 'create a fact' do
+      it 'has a unique id (matches id_valid_regexp)' do
+        fact_1.id.should match(id_valid_regexp)
       end
 
-      it "creating a second one is different" do
-        subject_1 = described_class.new_subject
-        subject_2 = described_class.new_subject
-        subject_1.should_not == subject_2
-      end
-    end
-
-    describe ".new_id" do
-      it "creates a new (random) id" do
-        described_class.new_id.should match(id_regexp)
-      end
-
-      it "creating a second one is different" do
-        id_1 = described_class.new_id
-        id_2 = described_class.new_id
-        id_1.should_not == id_2
-      end
-    end
-
-    describe "create a fact" do
-      it "has a unique id (matches id_regexp)" do
-        fact_1.id.should match(id_regexp)
-      end
-
-      it "two facts have different id" do
+      it 'two facts have different id' do
         fact_1.id.should_not == fact_2_with_subject.id
       end
 
-      it "optionally sets the id" do
+      it 'optionally sets the id' do
         fact_with_forced_id.id.should == forced_id
       end
 
-      it "optionally sets the time_stamp" do
+      it 'optionally sets the time_stamp' do
         fact_with_time_stamp.time_stamp.should == time_stamp
       end
 
-      it "setting the time_stamp to a non TimeStamp raises ArgumentError" do
-        lambda{ fact_with_incorrect_time_stamp }.should raise_error ArgumentError
+      it 'setting the time_stamp to a non TimeStamp raises ArgumentError' do
+        lambda{ fact_with_incorrect_time_stamp }.should raise_error(ArgumentError)
       end
 
-      it "new sets the provenance_subject" do
+      it 'new sets the provenance_subject' do
         fact_1.provenance_subject.should == provenance_subject
       end
 
-      it "new sets the subject" do
-        fact_2_with_subject.subject.should match(subject_regexp)
+      it 'new sets the subject' do
+        fact_2_with_subject.subject.should match(subject_valid_regexp)
       end
 
-      it "a nil predicate raises PredicateError" do
+      it 'a nil predicate raises PredicateError' do
         lambda do
           described_class.new(
             predicate: nil,
@@ -77,7 +54,7 @@ module Dbd
         end.should raise_error(PredicateError)
       end
 
-      it "a nil object raises ObjectError" do
+      it 'a nil object raises ObjectError' do
         lambda do
           described_class.new(
             predicate: data_predicate,
@@ -86,20 +63,20 @@ module Dbd
       end
     end
 
-    describe "create fact_1" do
-      describe "with a string object type" do
-        it "new sets the predicate" do
+    describe 'create fact_1' do
+      describe 'with a string object type' do
+        it 'new sets the predicate' do
           fact_1.predicate.should == data_predicate
         end
 
-        it "new sets the object" do
+        it 'new sets the object' do
           fact_1.object.should == string_object_1
         end
       end
     end
 
-    describe "update_used_provenance_subjects" do
-      it "sets the value for provenance_subject to true for a fact" do
+    describe 'update_used_provenance_subjects' do
+      it 'sets the value for provenance_subject to true for a fact' do
         h = {}
         fact_1.update_used_provenance_subjects(h)
         h[fact_1.provenance_subject].should == true

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

@@ -3,12 +3,12 @@ require 'spec_helper'
 module Dbd
   class Fact
     describe Subject do
-      it ".regexp has a regexp for the to_s" do
-        described_class.regexp.should == Helpers::UUID.regexp
+      it ".valid_regexp has a regexp for the to_s" do
+        described_class.valid_regexp.should == Helpers::UUID.valid_regexp
       end
 
       it ".new_subject" do
-        described_class.new_subject.should match(described_class.regexp)
+        described_class.new_subject.should match(described_class.valid_regexp)
       end
     end
   end

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

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module TestFactories
+  module Fact
+    describe Subject do
+
+      let(:fixed_subject) { described_class.fixed_subject }
+      let(:fixed_provenance_subject) { described_class.fixed_provenance_subject }
+
+      describe 'fixed_subject' do
+        it 'fixed_subject is exactly this fixed subject' do
+          fixed_subject.should == '2e9fbc87-2e94-47e9-a8fd-121cc4bc3e8f'
+        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'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+module TestFactories
+  describe Fact do
+    let(:provenance_subject) { ProvenanceFact.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(: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)
+        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
+      end
+
+      it 'fact_2_with_subject should not raise_error' do
+        described_class.fact_2_with_subject
+      end
+
+      it 'fact_3_with_subject should not raise_error' do
+        described_class.fact_3_with_subject
+      end
+
+      describe 'data_fact' do
+        describe 'without arguments' do
+          it 'has empty provenance_subject' do
+            described_class.data_fact.provenance_subject.should be_nil
+          end
+
+          it 'has empty subject' do
+            described_class.data_fact.subject.should be_nil
+          end
+        end
+
+        describe 'with provenance_subject' do
+          it 'has provenance_subject' do
+            described_class.data_fact(provenance_subject).
+              provenance_subject.should == provenance_subject
+          end
+
+          it 'has empty subject' do
+            described_class.data_fact(provenance_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
+          end
+
+          it 'has subject' do
+            described_class.data_fact(provenance_subject, subject).
+              subject.should == subject
+          end
+        end
+      end
+
+      describe 'full_fact' do
+        it 'does not fail' do
+          full_fact
+        end
+
+        it 'has values for all attributes' do
+          full_fact.values.all?.should be_true
+        end
+
+        it 'is valid (no errors)' do
+          full_fact.errors.should be_empty
+        end
+      end
+    end
+  end
+end