dbd 0.0.9 → 0.0.10

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

@@ -3,52 +3,52 @@ require 'spec_helper'
 module Dbd
   describe Resource do
 
-    let(:provenance_subject) { Factories::ProvenanceResource.provenance_resource.subject }
+    let(:provenance_subject) { TestFactories::ProvenanceResource.provenance_resource.subject }
 
     let(:resource) { described_class.new(provenance_subject: provenance_subject) }
 
     let(:resource_subject) { resource.subject }
 
-    describe "the fact collection" do
+    describe 'the fact collection' do
 
-      let(:fact_2_with_subject) { Factories::Fact.fact_2_with_subject }
-      let(:fact_3_with_subject) { Factories::Fact.fact_3_with_subject }
-      let(:fact_without_subject) { Factories::Fact.data_fact }
-      let(:fact_with_provenance) { Factories::Fact.data_fact(provenance_subject, nil) }
-      let(:fact_with_resource_subject) { Factories::Fact.data_fact(nil, resource_subject) }
-      let(:fact_with_provenance_and_resource_subject) { Factories::Fact.data_fact(provenance_subject, resource_subject) }
-      let(:fact_with_incorrect_provenance) { Factories::Fact.data_fact(Factories::ProvenanceFact.new_subject, resource_subject) }
-      let(:provenance_fact_context) { Factories::ProvenanceFact.context }
+      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_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 }
 
-      it "enumerable functions work" do
+      it 'enumerable functions work' do
         resource.to_a.should == []
       end
 
-      describe "#<<" do
+      describe '#<<' do
 
-        it "can add a two facts (no subject set)" do
+        it 'can add a two facts (no subject set)' do
           resource << fact_without_subject
           resource << fact_with_provenance
           resource.size.should == 2
         end
 
-        it "complains if a provenance_subject is added" do
+        it 'complains if a provenance_subject is added' do
           lambda{ resource << provenance_fact_context }.should raise_error(
             ArgumentError,
-            "Trying to add a ProvenanceFact to a Resource.")
+            'Trying to add a ProvenanceFact 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
+        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)
               end
             end
 
-            describe "when the subject of the fact is not equal to the resource_subject" do
-              it "raises a SetOnceError" do
+            describe 'when the subject of the fact is not equal to the resource_subject' do
+              it 'raises a SetOnceError' do
                 lambda{ resource << fact_2_with_subject }.should raise_error(
                   RubyPeterV::SetOnceError,
                   "Value of subject was #{fact_2_with_subject.subject}, " \
@@ -57,7 +57,7 @@ module Dbd
             end
           end
 
-          describe "adding a fact without subject" do
+          describe 'adding a fact without subject' do
 
             before(:each) do
               resource << fact_with_provenance
@@ -67,33 +67,33 @@ module Dbd
               resource.single
             end
 
-            it "insert the same instance" do
+            it 'insert the same instance' do
               fact_in_resource.should be_equal(fact_with_provenance)
             end
 
-            it "has kept the other attributes" do
+            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)
               end
             end
 
-            it "has set the subject to the Resource subject" do
+            it 'has set the subject to the Resource subject' do
               fact_in_resource.subject.should == resource_subject
             end
           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
-              it "inserts the fact unaltered" do
+        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
+              it 'inserts the fact unaltered' do
                 resource << fact_with_provenance_and_resource_subject
                 resource.single.should be_equal(fact_with_provenance_and_resource_subject)
               end
             end
 
-            describe "when the provenance_subject of the fact is not equal to the resource" do
-              it "raises a SetOnceError" do
+            describe 'when the provenance_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(
                   RubyPeterV::SetOnceError,
                   "Value of provenance_subject was #{fact_with_incorrect_provenance.provenance_subject}, " \
@@ -102,7 +102,7 @@ module Dbd
             end
           end
 
-          describe "adding a fact without provenance_subject" do
+          describe 'adding a fact without provenance_subject' do
 
             before(:each) do
               resource << fact_with_resource_subject
@@ -110,11 +110,11 @@ module Dbd
 
             let(:fact_in_resource) { resource.single }
 
-            it "inserts the same instance" do
+            it 'inserts the same instance' do
               fact_in_resource.should be_equal(fact_with_resource_subject)
             end
 
-            it "has set the provenance_subject to the Resource provenance_subject" do
+            it 'has set the provenance_subject to the Resource provenance_subject' do
              fact_in_resource.provenance_subject.should == provenance_subject
             end
           end

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

@@ -3,29 +3,29 @@ require 'spec_helper'
 module Dbd
   describe Resource do
 
-    let(:provenance_subject) { Factories::ProvenanceResource.provenance_resource.subject }
+    let(:provenance_subject) { TestFactories::ProvenanceResource.provenance_resource.subject }
 
     let(:resource) { described_class.new(provenance_subject: provenance_subject) }
 
-    describe ".new_subject" do
-      it "returns a Fact#new_subject" do
-        described_class.new_subject.should be_a(Fact.new_subject.class)
+    describe '.new_subject' do
+      it 'returns a Fact#new_subject' do
+        described_class.new_subject.should be_a(Fact.factory.new_subject.class)
       end
     end
 
-    describe ".new" do
-      describe "with a provenance_subject argument" do
-        it "has created a subject" do
+    describe '.new' do
+      describe 'with a provenance_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
+        it 'has stored the provenance_subject' do
           resource.provenance_subject.should == provenance_subject
         end
       end
 
-      describe "with an explicit subject argument" do
-        it "has stored the given subject" do
+      describe 'with an explicit subject argument' do
+        it 'has stored the given subject' do
           explicit_subject = described_class.new_subject
           described_class.new(
             subject: explicit_subject,
@@ -33,8 +33,8 @@ module Dbd
         end
       end
 
-      describe "with a nil provenance_subject argument" do
-        it "raises a ProvenanceError" do
+      describe 'with a nil provenance_subject argument' do
+        it 'raises a ProvenanceError' do
           lambda { described_class.new(provenance_subject: nil) } .
             should raise_error ProvenanceError
         end

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

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module TestFactories
+  describe Resource do
+
+    let(:provenance_subject) { TestFactories::ProvenanceResource.provenance_resource.subject }
+
+    describe "TestFactories::Resource" do
+      it ".empty works" do
+        described_class.facts_resource(provenance_subject)
+      end
+
+      context ".facts_resource" do
+        it "works with explicit provenance_subject" do
+          described_class.facts_resource(provenance_subject)
+        end
+
+        it "works without explicit provenance_subject" do
+          resource = described_class.facts_resource()
+          resource.provenance_subject.should_not be_nil
+        end
+      end
+    end
+  end
+end

data/spec/lib/dbd/time_stamp/comparisons_spec.rb

@@ -3,82 +3,83 @@ require 'spec_helper'
 module Dbd
   describe TimeStamp do
 
-    let(:time_stamp_0) { described_class.new(time: Time.utc(2013,5,18,12,0,0)) }
-    let(:time_stamp_1) { described_class.new(time: Time.utc(2013,5,18,12,0,0)) }
-    let(:time_stamp_2) { described_class.new(time: Time.utc(2013,5,18,12,0,1,5_000)) }
-    let(:time_stamp_3) { described_class.new(time: Time.utc(2013,5,18,12,0,1,5_001)) }
-    let(:time_stamp_4) { described_class.new(time: Time.utc(2013,5,18,12,0,1,4_999)) }
-    let(:time_stamp_5) { described_class.new(time: Time.utc(2013,5,18,12,0,1,5_002)) }
-    let(:time_stamp_6) { described_class.new(time: Time.utc(2013,5,18,12,0,1,4_998)) }
-
-    describe "==" do
-      it "should be ==" do
+    let(:base_time) { Time.utc(2013,5,18,12,0,0)}
+    let(:time_stamp_0) { described_class.new(time: base_time) }
+    let(:time_stamp_1) { described_class.new(time: base_time) }
+    let(:time_stamp_2) { described_class.new(time: base_time + Rational('5_000/1_000_000')) }
+    let(:time_stamp_3) { described_class.new(time: base_time + Rational('5_001/1_000_000')) }
+    let(:time_stamp_4) { described_class.new(time: base_time + Rational('4_999/1_000_000')) }
+    let(:time_stamp_5) { described_class.new(time: base_time + Rational('5_002/1_000_000')) }
+    let(:time_stamp_6) { described_class.new(time: base_time + Rational('4_998/1_000_000')) }
+
+    describe '==' do
+      it 'should be ==' do
         time_stamp_0.should == time_stamp_1
       end
 
-      it "hash should also be equal" do
+      it 'hash should also be equal' do
         time_stamp_0.hash.should == time_stamp_1.hash
       end
     end
 
-    describe "near?(other)" do
-      it "is true when the time_stamp is 1000 ns larger" do
+    describe 'near?(other)' do
+      it 'is true when the time_stamp is 1000 ns larger' do
         time_stamp_2.near?(time_stamp_3).should be_true
       end
 
-      it "is true when the time_stamp is 1000 ns smaller" do
+      it 'is true when the time_stamp is 1000 ns smaller' do
         time_stamp_2.near?(time_stamp_4).should be_true
       end
 
-      it "is false when the time_stamp is 2000 ns larger" do
+      it 'is false when the time_stamp is 2000 ns larger' do
         time_stamp_2.near?(time_stamp_5).should_not be_true
       end
 
-      it "is false when the time_stamp is 2000 ns smaller" do
+      it 'is false when the time_stamp is 2000 ns smaller' do
         time_stamp_2.near?(time_stamp_6).should_not be_true
       end
     end
 
-    describe ">" do
-      it "is true if time_stamp is really larger" do
+    describe '>' do
+      it 'is true if time_stamp is really larger' do
         time_stamp_2.should > time_stamp_1
       end
     end
 
-    describe "<" do
-      it "is true if time_stamp is really smaller" do
+    describe '<' do
+      it 'is true if time_stamp is really smaller' do
         time_stamp_1.should < time_stamp_2
       end
     end
 
-    describe ">=" do
-      it "is true if time_stamp_2 is really larger" do
+    describe '>=' do
+      it 'is true if time_stamp_2 is really larger' do
         time_stamp_2.should >= time_stamp_1
       end
     end
 
-    describe "<=" do
-      it "is true if time_stamp_1 is really smaller" do
+    describe '<=' do
+      it 'is true if time_stamp_1 is really smaller' do
         time_stamp_1.should <= time_stamp_2
       end
     end
 
-    describe "+" do
-      it "returns a larger time_stamp" do
+    describe '+' do
+      it 'returns a larger time_stamp' do
         (subject + 1).should > subject
       end
 
-      it "sees a difference of 1 nanosecond" do
+      it 'sees a difference of 1 nanosecond' do
         (subject + Rational('1/1000_000_000')).should > subject
       end
     end
 
-    describe "-" do
-      it "returns the time difference" do
+    describe '-' do
+      it 'returns the time difference' do
         ((subject + 1) - subject).should == 1
       end
 
-      it "sees a difference of 1 nanosecond" do
+      it 'sees a difference of 1 nanosecond' do
         ((subject + Rational('1/1000_000_000')) - subject).should == Rational('1/1_000_000_000')
       end
     end

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

@@ -3,37 +3,41 @@ require 'spec_helper'
 module Dbd
   describe TimeStamp do
 
-    let(:a_time_stamp) { "2013-05-16 23:52:38.123456789 UTC" }
+    let(:a_time_stamp) { '2013-05-16 23:52:38.123456789 UTC' }
 
-    describe ".time_format_regexp" do
-      it "matches an example string" do
-        a_time_stamp.should match(described_class.to_s_regexp)
+    describe '.valid_regexp' do
+      it 'matches an example string' do
+        a_time_stamp.should match(described_class.valid_regexp)
+      end
+
+      it 'does not match an incorrect string' do
+        ('0' + a_time_stamp).should_not match(described_class.valid_regexp)
       end
     end
 
-    describe "#time to allow comparison" do
-      it "responds with a time" do
+    describe '#time to allow comparison' do
+      it 'responds with a time' do
         described_class.new.time.should be_a(Time)
       end
     end
 
-    describe "#to_s" do
-      it "returns a Time format string" do
-        subject.to_s.should match(described_class.to_s_regexp)
+    describe '#to_s' do
+      it 'returns a Time format string' do
+        subject.to_s.should match(described_class.valid_regexp)
       end
     end
 
-    describe ".from_s" do
-      it "returns a TimeStamp" do
+    describe '.from_s' do
+      it 'returns a TimeStamp' do
         described_class.new(time: a_time_stamp).should be_a(described_class)
       end
 
-      it "round trips with to_s" do
+      it 'round trips with to_s' do
         time_stamp = described_class.new(time: a_time_stamp)
         time_stamp.to_s.should == a_time_stamp
       end
 
-      it "raises ArgumentError is time_zone is not UTC" do
+      it 'raises ArgumentError is time_zone is not UTC' do
         time_CET = a_time_stamp.sub(/UTC/, 'CET')
         lambda{ described_class.new(time: time_CET) }.should raise_error ArgumentError
       end

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

@@ -2,43 +2,69 @@ require 'spec_helper'
 
 module Dbd
   describe TimeStamp do
-    describe ".new" do
+    describe '.new' do
 
-      let(:time) { Time.now.utc }
+      let(:base_time) { Time.utc(2013,5,18,12,0,0)}
 
-      let(:time_string) { Factories::TimeStamp.fixed_time_string }
+      let(:time_string) { TestFactories::TimeStamp.fixed_time_string }
 
       before(:each) do
-        time
-        Time.stub(:now).and_return(time)
+        Time.stub(:now).and_return(base_time)
       end
 
-      it "creates a new (random) time_stamp" do
+      it 'creates a new (random) time_stamp' do
         subject # should_not raise_error
       end
 
-      it "with :time option given a Time object, sets that to time" do
-        near_future = time + 100
+      it 'with :time option given a Time object, sets that to time' do
+        near_future = base_time + 100
         time_stamp = described_class.new(time: near_future)
         time_stamp.time.should == near_future
       end
 
-      it "with :time option given a String object, sets that to time" do
+      it 'with :time option given a String object, sets that to time' do
         time_stamp = described_class.new(time: time_string)
         time_stamp.to_s.should == time_string
       end
 
-      it "with :larger_than, sets a time that is strictly and slightly larger than this" do
-        larger_than = described_class.new(time: time + Rational('500/1000_000')) # 0.5 ms
+      it 'with :larger_than, sets a time that is strictly and slightly larger than this' do
+        larger_than = described_class.new(time: base_time + Rational('500/1000_000')) # 0.5 ms
         time_stamp = described_class.new(larger_than: larger_than)
         time_stamp.time.should > larger_than.time
         (time_stamp.time - larger_than.time).should < Rational('1/1000_000') # 1 us
       end
 
-      it "without :larger_than adds some random time to the generated time" do
+      it 'without :larger_than adds some random time to the generated time' do
         time_stamp = described_class.new
-        time_stamp.time.should > time
-        (time_stamp.time - time).should < Rational('1/1000_000') # 1 us
+        time_stamp.time.should > base_time
+        (time_stamp.time - base_time).should < Rational('1/1000_000') # 1 us
+      end
+
+      it 'using "minimum_time_offset" as a diff for new is always causing strictly larger time_stamp' do
+        time_stamp = described_class.new(time: base_time)
+        minimum_time_offset = nil
+        time_stamp.instance_eval do
+          # read the private variable.
+          # The public API methods "could" be used
+          # (and did expose the problem eventually), but
+          # only with a very low probability due to the
+          # random offset (using a minimum offset,
+          # triggers the issue with much less iterations).
+          minimum_time_offset = minimum_time_offset()
+        end
+        (1..100).each do |i|
+          higher = described_class.new(time: base_time + i * minimum_time_offset)
+          higher.should > time_stamp
+          time_stamp = higher
+        end
+      end
+
+      it 'with :time option given a String object, sets that to time for many values' do
+        (0...100).each do |i|
+          time_string = "2013-07-04 18:48:07.26300#{i.to_s.rjust(4,'0')} UTC"
+          time_stamp = described_class.new(time: time_string)
+          time_stamp.to_s.should == time_string
+        end
       end
     end
   end