dbd 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34e70c3c3d08093acee3610c0e3d93ac5bace6b6
-  data.tar.gz: 64f2171e686baaa681c3dccef02ef7feb543b71b
+  metadata.gz: 8ceec5332dfdb3174ee303dcd09cf401186990c8
+  data.tar.gz: a7e61a7b4acc1dcb9a966369ba1c4d8a853b5f9f
 SHA512:
-  metadata.gz: 202ce2b19b1c53a04aa84c0089935baf715f76ed0836d0aaf2259ea930f528592e71ad45f6580679dd1fb5d3174755cbe943092f6c2ac275016294b5908e1920
-  data.tar.gz: 64dd10c180cb960f408d3de9be9227c392a2dddc93a6db8c4e0e1baa11345b6591df0a3a227fe3ca79d57366c6cfd584378cddabb1b5a327e0c1baf22955b90a
+  metadata.gz: f1da941433fd3f5dc0f077992bec69d6dc2a3dc761d52549934dd707e713d6317495ae54659e764c21bab079789ed3e74e260ff639bf237715f14222bc267e9b
+  data.tar.gz: cfdd88e0c3ed9e012f354008ab32685c052fffef7897492d78663d2d243c76abd9ae0a3f3a0c2b8b4f5c54ab8371553a9f129436a36a25ea57e46b86d555d8ef

data/.travis.yml

@@ -6,5 +6,4 @@ rvm:
   - 1.9.3
   - 1.9.2
   - jruby-19mode
-  - ruby-head
   - jruby-head

data/HISTORY.txt

@@ -37,3 +37,9 @@
 =====
 
 * fix a bug in TimeStamp round trip in JRuby
+
+0.0.8 (23 June 2013)
+=====
+
+* bin/test_1.rb was used for first successful writing of 10M facts using
+  ruby-1.9.3-p429 (will report issues on ruby-2.0.0-p195 and jruby-1.7.4)

data/bin/test_1.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+
+# This is a very primitive implementation:
+# the CSV is first fully built and only then
+# written to disk. Needs to be modified to
+# stream to disk.
+
+count = ARGV[0].to_i
+unless count > 0
+  puts "Give a 'count' as first argument."
+  exit(1)
+end
+
+filename = ARGV[1]
+unless filename.size > 0
+  puts "Give a 'filename' as second argument."
+  exit(1)
+end
+
+require 'dbd'
+provenance_resource = Dbd::ProvenanceResource.new
+provenance_resource << Dbd::ProvenanceFact.new(predicate: "prov:test" , object: "A" * 10)
+
+resource = Dbd::Resource.new(provenance_subject: provenance_resource.subject)
+(0...count).each do |i|
+  resource << Dbd::Fact.new(predicate: "test", object: "#{'B' * 80} #{i}")
+end
+
+graph = Dbd::Graph.new
+graph << provenance_resource << resource
+
+File.open(filename, 'w') do |f|
+  f << graph.to_CSV
+end

data/dbd.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '> 1.2.4'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'guard-rspec'
-  spec.add_development_dependency 'rb-fsevent', '~> 0.9'
+  spec.add_development_dependency 'rb-fsevent'
   spec.add_development_dependency 'terminal-notifier-guard'
   spec.add_development_dependency 'yard'
   spec.add_runtime_dependency 'neography'
-  spec.add_runtime_dependency 'rdf', '~> 1.0.6'
-  spec.add_runtime_dependency 'ruby_peter_v', '>= 0.0.8'
+  spec.add_runtime_dependency 'rdf'
+  spec.add_runtime_dependency 'ruby_peter_v', '>= 0.0.9'
 end

data/lib/dbd/fact.rb

@@ -78,41 +78,43 @@ module Dbd
     # This implements a "form" of immutable behavior. The value can
     # be set once (possibly after creation the object), but can
     # never be changed after that.
+    #
+    # The input class is validated (easy confusion with String or Time).
     def time_stamp=(time_stamp)
-      raise ArgumentError unless time_stamp.is_a?(TimeStamp)
+      validate_time_stamp_class(time_stamp)
       set_once(:time_stamp, time_stamp)
     end
 
     ##
-    # A set_once setter for subject.
+    # A set_once setter for provenance_subject.
     #
     # This implements a "form" of immutable behavior. The value can
     # be set once (possibly after creation the object), but can
     # never be changed after that.
-    def subject=(subject)
-      set_once(:subject, subject)
+    def provenance_subject=(provenance_subject)
+      set_once(:provenance_subject, provenance_subject)
     end
 
     ##
-    # A set_once setter for provenance_subject.
+    # A set_once setter for subject.
     #
     # This implements a "form" of immutable behavior. The value can
     # be set once (possibly after creation the object), but can
     # never be changed after that.
-    def provenance_subject=(provenance_subject)
-      set_once(:provenance_subject, provenance_subject)
+    def subject=(subject)
+      set_once(:subject, subject)
     end
 
     ##
-    # @return [Subject] A new random subject.
+    # @return [String] A new subject string.
     def self.new_subject
-      Subject.new
+      Subject.new_subject
     end
 
     ##
-    # @return [ID] A new random id.
+    # @return [String] A new id string.
     def self.new_id
-      ID.new
+      ID.new_id
     end
 
     ##
@@ -121,13 +123,14 @@ module Dbd
     # @param [Hash{Symbol => Object}] options
     # @option options [#to_s] :predicate Required : the predicate for this Fact
     # @option options [#to_s] :object Required :  the object for this Fact (required)
-    # @option options [Subject] :provenance_subject (nil) Optional: the subject of the provenance(resource|fact)
-    # @option options [Subject] :subject (nil) Optional: the subject for this Fact
+    # @option options [String (uuid)] :provenance_subject (nil) Optional: the subject of the provenance(resource|fact)
+    # @option options [String (uuid)] :subject (nil) Optional: the subject for this Fact
     # @option options [TimeStamp] :time_stamp (nil) Optional: the time_stamp for this Fact
-    # @option options [ID] :id Optional : set the id
+    # @option options [String (uuid)] :id Optional : set the id
     def initialize(options)
       @id = options[:id] || self.class.new_id
       @time_stamp = options[:time_stamp]
+      validate_time_stamp_class(@time_stamp)
       @provenance_subject = options[:provenance_subject]
       @subject = options[:subject]
       @predicate = options[:predicate]
@@ -143,14 +146,38 @@ module Dbd
     end
 
     ##
-    # Constructs a Fact or ProvenanceFact from a values array
+    # @return [Array] The 6 values of a Fact converted to a string.
+    # This is similar to the 6 entries in the to_CSV mapping
+    def string_values
+      values.map(&:to_s)
+    end
+
+    ##
+    # Constructs a Fact or ProvenanceFact from a string values array
     # (e.g. pulled from a CSV row).
     #
     # @param [Array] values Required : the array with values, organized as in attributes
     # @return [Fact, ProvenanceFact] the constructed fact
-    def self.from_values(values)
-      hash = hash_from_values(values)
-      fact_from_hash(hash)
+    def self.from_string_values(string_values)
+      string_hash = hash_from_values(string_values)
+      fact_from_hash(values_hash(string_hash))
+    end
+
+    ##
+    # Equivalent facts (have all same values, except time_stamp).
+    #
+    # For "equality" only a test on the id is used. If the id
+    # (which is a uuid) is the same, we assume that is the "same"
+    # fact. This equivalent? method is used to test is equal
+    # methods are "really" equivalent.
+    #
+    # The time_stamp may be slightly different (because shifts
+    # of a few nanoseconds will be required to resolve collisions
+    # on merge).
+    def equivalent?(other)
+      (self.class.attributes - [:time_stamp]).
+        all?{ |attribute| self.send(attribute) == other.send(attribute) } &&
+        self.time_stamp.near?(other.time_stamp)
     end
 
     ##
@@ -219,19 +246,32 @@ module Dbd
       "#{provenance_subject.to_s[0...8]}"
     end
 
+    # FIXME This has to move to a Fact::Factory
     def self.hash_from_values(values)
       # Do not keep "empty" values (e.g. the provenance_subject for a ProvenanceFact).
-      attributes_values_array = [attributes, values].transpose.select{|a,v| v != ''}
+      attributes_values_array = [attributes, values].transpose.delete_if{|a,v| v.nil? || v == ''}
       Hash[attributes_values_array]
     end
 
+    def self.values_hash(string_hash)
+      string_hash.dup.tap do |h|
+        h[:time_stamp] = TimeStamp.new(time: h[:time_stamp])
+      end
+    end
+
     def self.fact_from_hash(hash)
       if hash[:provenance_subject]
-        new(hash)
+        Fact.new(hash)
       else
         ProvenanceFact.new(hash)
       end
     end
 
+    def validate_time_stamp_class(time_stamp)
+      unless time_stamp.nil? || time_stamp.is_a?(TimeStamp)
+        raise ArgumentError, "time_stamp is of class #{time_stamp.class}, should be TimeStamp"
+      end
+    end
+
   end
 end

data/lib/dbd/fact/id.rb

@@ -1,19 +1,15 @@
 module Dbd
   class Fact
-    class ID
-
-      def initialize(options = {})
-        @uuid = options[:uuid] || Helpers::UUID.new.to_s
-      end
-
-      def to_s
-        @uuid
-      end
+    module ID
 
       def self.regexp
         Helpers::UUID.regexp
       end
 
+      def self.new_id
+        Helpers::UUID.new.to_s
+      end
+
     end
   end
 end

data/lib/dbd/fact/subject.rb

@@ -2,20 +2,16 @@ require 'dbd/helpers/uuid'
 
 module Dbd
   class Fact
-    class Subject
-
-      def initialize(options = {})
-        @uuid = options[:uuid] || Helpers::UUID.new.to_s
-      end
-
-      def to_s
-        @uuid
-      end
+    module Subject
 
       def self.regexp
         Helpers::UUID.regexp
       end
 
+      def self.new_subject
+        Helpers::UUID.new.to_s
+      end
+
     end
   end
 end

data/lib/dbd/graph.rb

@@ -48,7 +48,7 @@ module Dbd
       new.tap do |graph|
         CSV.new(csv).each do |row|
           # TODO validate the input formats (e.g. invalid uuid codes)
-          graph << Fact.from_values(row)
+          graph << Fact.from_string_values(row)
         end
       end
     end

data/lib/dbd/time_stamp.rb

@@ -42,10 +42,11 @@ module Dbd
     # Builds a new TimeStamp.
     #
     # @param [Hash{Symbol => Object}] options
-    # @option options [Time] :time (Time.now) force the time to this value
+    # @option options [Time, String] :time (Time.now) force the time to this value
     # @option options [TimeStamp] :larger_than (void) time_stamp must be larger than this
     def initialize(options={})
       @time = options[:time] || new_time(options[:larger_than])
+      @time = time_from_s(@time) if @time.is_a?(String)
     end
 
     ##
@@ -66,34 +67,51 @@ module Dbd
       Rational("#{1+rand(999)}/1_000_000_000")
     end
 
-    def self.time_format
+    def time_format
       '%F %T.%N %Z'
     end
 
+    ##
+    # with a nanosecond granularity and in UTC
+    def time_from_s(time_string)
+      # For ns precision in JRuby this extended process is required
+      time_hash = DateTime._strptime(time_string, time_format)
+      validate_time_zone(time_hash)
+      Time.utc(time_hash[:year],
+               time_hash[:mon],
+               time_hash[:mday],
+               time_hash[:hour],
+               time_hash[:min],
+               time_hash[:sec],
+               time_hash[:sec_fraction] * 1_000_000)
+    end
+
+    def validate_time_zone(time_hash)
+      unless time_hash[:zone] == 'UTC'
+        raise(ArgumentError, "Time zone was #{time_hash[:zone]}, must be 'UTC'")
+      end
+    end
+
   public
 
     ##
     # with a nanosecond granularity and in UTC
     def to_s
-      @time.strftime(self.class.time_format)
+      @time.strftime(time_format)
     end
 
+    # Max drift in time_stamp
+    MAX_DRIFT = Rational("1/1_000_000")
+
     ##
-    # with a nanosecond granularity and in UTC
-    def self.from_s(time_string)
-      # For ns precision in JRuby this extended process is required
-      time_hash = DateTime._strptime(time_string, time_format)
-      raise(
-        ArgumentError,
-        "Time zone must be UTC, was #{time_hash[:zone]}") unless time_hash[:zone] == "UTC"
-      time = Time.utc(time_hash[:year],
-                      time_hash[:mon],
-                      time_hash[:mday],
-                      time_hash[:hour],
-                      time_hash[:min],
-                      time_hash[:sec],
-                      time_hash[:sec_fraction] * 1_000_000)
-      TimeStamp.new(time: time)
+    # determines if 2 time_stamps are "near".
+    #
+    # The time_stamp of an equivalent fact may be slightly different
+    # (because shifts of a few nanoseconds will be required to resolve
+    # collisions on a merge of fact streams with overlapping time_stamp
+    # ranges).
+    def near?(other)
+      (self - other).abs <= MAX_DRIFT
     end
 
     def >(other)

data/lib/dbd/version.rb

@@ -1,3 +1,3 @@
 module Dbd
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/factories/fact.rb

@@ -1,3 +1,4 @@
+# encoding=utf-8
 module Factories
   module Fact
 
@@ -23,6 +24,14 @@ module Factories
         object: "Gandhi")
     end
 
+    def self.fact_with_special_chars(provenance_subject = nil, subject = nil)
+      factory_for.new(
+        provenance_subject: provenance_subject,
+        subject: subject,
+        predicate: "http://example.org/test/comment",
+        object: "A long story\nreally with a comma, a double quote \" and a non-ASCII char éà Über.")
+    end
+
     def self.fact_with_time_stamp(time_stamp)
       factory_for.new(
         time_stamp: time_stamp,

data/spec/factories/fact/id.rb

@@ -1,13 +1,8 @@
 module Factories
   module Fact
     module ID
-
-      def self.factory_for
-        ::Dbd::Fact::ID
-      end
-
       def self.fixed_id
-        factory_for.new(uuid: "825e44d5-af33-4858-8047-549bd813daa8")
+        "825e44d5-af33-4858-8047-549bd813daa8"
       end
     end
   end

data/spec/factories/fact/subject.rb

@@ -1,17 +1,12 @@
 module Factories
   module Fact
     module Subject
-
-      def self.factory_for
-        ::Dbd::Fact::Subject
-      end
-
       def self.fixed_subject
-        factory_for.new(uuid: "2e9fbc87-2e94-47e9-a8fd-121cc4bc3e8f")
+        "2e9fbc87-2e94-47e9-a8fd-121cc4bc3e8f"
       end
 
       def self.fixed_provenance_subject
-        factory_for.new(uuid: "40fab407-9b04-4a51-9a52-d978abfcbb1f")
+        "40fab407-9b04-4a51-9a52-d978abfcbb1f"
       end
     end
   end

data/spec/factories/resource.rb

@@ -5,6 +5,11 @@ module Factories
       ::Dbd::Resource
     end
 
+    def self.empty(provenance_subject)
+      subject = Fact.new_subject
+      factory_for.new(subject: subject, provenance_subject: provenance_subject)
+    end
+
     def self.facts_resource(provenance_subject)
       subject = Fact.new_subject
       factory_for.new(subject: subject, provenance_subject: provenance_subject).tap do |resource|

data/spec/factories/time_stamp.rb

@@ -5,8 +5,12 @@ module Factories
       ::Dbd::TimeStamp
     end
 
+    def self.fixed_time_string
+      "2013-06-17 21:55:09.967653013 UTC"
+    end
+
     def self.fixed_time_stamp
-      factory_for.from_s("2013-06-17 21:55:09.967653012 UTC")
+      factory_for.new(time: fixed_time_string)
     end
   end
 end

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

@@ -98,8 +98,8 @@ module Dbd
 
       describe "validate that only 'newer' elements are added" do
         before(:each) do
-          fact_2_with_subject.stub(:time_stamp).and_return(TimeStamp.new(time: Time.new(2013,05,9,12,0,0)))
-          fact_3_with_subject.stub(:time_stamp).and_return(TimeStamp.new(time: Time.new(2013,05,9,12,0,1)))
+          fact_2_with_subject.stub(:time_stamp).and_return(TimeStamp.new(time: Time.utc(2013,05,9,12,0,0)))
+          fact_3_with_subject.stub(:time_stamp).and_return(TimeStamp.new(time: Time.utc(2013,05,9,12,0,1)))
         end
 
         it "adding an element with a newer time_stamp succeeds" do

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

@@ -7,12 +7,8 @@ module Dbd
 
         let(:fixed_id) { Factories::Fact::ID.fixed_id }
 
-        it "fixed_id is an Fact::ID" do
-          fixed_id.should be_a(described_class)
-        end
-
         it "fixed_id is exactly this fixed id" do
-          fixed_id.to_s.should == "825e44d5-af33-4858-8047-549bd813daa8"
+          fixed_id.should == "825e44d5-af33-4858-8047-549bd813daa8"
         end
       end
     end

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

@@ -3,25 +3,13 @@ require 'spec_helper'
 module Dbd
   class Fact
     describe ID do
-      describe ".new" do
-        it "creates an ID with a random uuid" do
-          subject.should be_a(described_class)
-        end
-
-        it "optionally takes an options hash with :uuid key" do
-          uuid = "825e44d5-af33-4858-8047-549bd813daa8"
-          id = described_class.new(uuid: uuid)
-          id.to_s.should == uuid
-        end
-      end
-
-      it "#to_s is a UUID string" do
-        subject.to_s.should match(Helpers::UUID.regexp)
-      end
-
       it ".regexp has a regexp for the to_s" do
         described_class.regexp.should == Helpers::UUID.regexp
       end
+
+      it ".new_id" do
+        described_class.new_id.should match(described_class.regexp)
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ module Dbd
     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
@@ -78,7 +79,7 @@ module Dbd
       end
     end
 
-    describe "attributes and values" do
+    describe "attributes" do
       it "there are 6 attributes" do
         described_class.attributes.size.should == 6
       end
@@ -86,31 +87,75 @@ module Dbd
       it "first attribute is :id" do
         described_class.attributes.first.should == :id
       end
+    end
 
+    describe "values" do
       it "there are 6 values" do
-        fact_1.values.size.should == 6
+        full_fact.values.size.should == 6
+      end
+
+      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
+        full_fact.string_values.size.should == 6
+      end
+
+      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
+        fact_1.provenance_fact?.should be_false
       end
     end
 
-    def values
+    def string_values
       ["825e44d5-af33-4858-8047-549bd813daa8",
-       "2013-06-17 21:55:09.967653012 UTC",
+       "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 "from_values" do
-      it "reads the values correctly" do
-        fact = described_class.from_values(values)
-        fact.values.should == values
+    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
       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 "equivalent?" do
+
+      let(:ref) { described_class.from_string_values(string_values) }
+
+      it "is true for facts with same values" do
+        other = described_class.from_string_values(string_values)
+        other.should be_equivalent(ref)
+      end
+
+      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.should_not be_equivalent(ref)
+        end
+      end
+
+      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"
+        }
+        other = described_class.from_string_values(string_values_time_modified)
+        other.should be_equivalent(ref)
       end
     end
   end

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

@@ -2,21 +2,23 @@ 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(:provenance_subject) { ProvenanceFact.new_subject }
     let(:data_predicate)  { "http://example.org/test/name" }
     let(:string_object_1)  { "Gandhi" }
-    let(:id_class) { Fact::ID }
-    let(:subject_class) { Fact::Subject }
+    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(: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) }
 
     describe ".new_subject" do
       it "creates a new (random) subject" do
-        described_class.new_subject.should be_a(subject_class)
+        described_class.new_subject.should match(subject_regexp)
       end
 
       it "creating a second one is different" do
@@ -26,9 +28,21 @@ module Dbd
       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 (id_class)" do
-        fact_1.id.should be_a(id_class)
+      it "has a unique id (matches id_regexp)" do
+        fact_1.id.should match(id_regexp)
       end
 
       it "two facts have different id" do
@@ -43,12 +57,16 @@ module Dbd
         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
+      end
+
       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 be_a(subject_class)
+        fact_2_with_subject.subject.should match(subject_regexp)
       end
 
       it "a nil predicate raises PredicateError" do

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

@@ -9,22 +9,14 @@ module Dbd
         let(:fixed_provenance_subject) { Factories::Fact::Subject.fixed_provenance_subject }
 
         describe "fixed_subject" do
-          it "is an Fact::Subject" do
-            fixed_subject.should be_a(described_class)
-          end
-
-          it "fixed_subject is exactly this fixed id" do
-            fixed_subject.to_s.should == "2e9fbc87-2e94-47e9-a8fd-121cc4bc3e8f"
+          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 "is an Fact::Subject" do
-            fixed_provenance_subject.should be_a(described_class)
-          end
-
-          it "fixed_provenance_subject is exactly this fixed id" do
-            fixed_provenance_subject.to_s.should == "40fab407-9b04-4a51-9a52-d978abfcbb1f"
+          it "fixed_provenance_subject is exactly this fixed subject" do
+            fixed_provenance_subject.should == "40fab407-9b04-4a51-9a52-d978abfcbb1f"
           end
         end
       end

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

@@ -3,25 +3,13 @@ require 'spec_helper'
 module Dbd
   class Fact
     describe Subject do
-      describe ".new" do
-        it "creates a Subject" do
-          subject.should be_a(described_class)
-        end
-
-        it "takes an optional :uuid option argument" do
-          uuid = "fe75eae3-cb14-4495-b726-7ecba8798b6d"
-          subject = described_class.new(uuid: uuid)
-          subject.to_s.should == uuid
-        end
-      end
-
-      it "#to_s is a UUID string" do
-        subject.to_s.should match(Helpers::UUID.regexp)
-      end
-
       it ".regexp has a regexp for the to_s" do
         described_class.regexp.should == Helpers::UUID.regexp
       end
+
+      it ".new_subject" do
+        described_class.new_subject.should match(described_class.regexp)
+      end
     end
   end
 end

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

@@ -54,7 +54,7 @@ module Dbd
 
         # NOTE: reduced the far_future from 2500 to 2250 as work around for
         #       http://jira.codehaus.org/browse/JRUBY-7095
-        let(:far_future) { TimeStamp.new(time: Time.new(2250,1,1,12,0,0).utc) }
+        let(:far_future) { TimeStamp.new(time: Time.utc(2250,1,1,12,0,0)) }
 
         it "don't touch the time_stamp if already set" do
           data_fact.time_stamp = far_future

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

@@ -1,3 +1,4 @@
+# encoding=utf-8
 require 'spec_helper'
 
 module Dbd
@@ -14,7 +15,7 @@ module Dbd
       graph_from_CSV.to_CSV.should == graph.to_CSV
     end
 
-    describe "#from_CSV reads back a csv exported graph correctly" do
+    describe ".from_CSV reads back a csv exported graph correctly" do
 
       describe "for a graph with only provenance_facts" do
 
@@ -45,5 +46,21 @@ module Dbd
         end
       end
     end
+
+    describe ".from_CSV reads special cases correctly" do
+
+      let(:provenance_subject) { Factories::Fact::Subject.fixed_provenance_subject }
+      let(:resource) { Factories::Resource.empty(provenance_subject) }
+      let(:special_fact) { Factories::Fact.fact_with_special_chars(provenance_subject, resource.subject) }
+
+      it "as object" do
+        resource << special_fact
+        graph = described_class.new << resource
+        csv = graph.to_CSV
+        csv.should match(%r{A long story\nreally with a comma, a double quote "" and a non-ASCII char éà Über.})
+        graph_from_CSV = described_class.from_CSV(csv)
+        graph_from_CSV.first.should be_equivalent(graph.first)
+      end
+    end
   end
 end

data/spec/lib/dbd/performance_spec.rb

@@ -36,6 +36,7 @@ module Dbd
         duration.should < 0.000_15 * NUMBER_OF_FACTS
         # typ. 37 us on Mac Ruby 2.0.0 (on 2013-05-15 over 15K iterations)
         # typ. 45 us on Mac Ruby 2.0.0 (on 2013-06-05 over 10K iterations)
+        # typ. 47 us on Mac Ruby 2.0.0 (on 2013-06-21 over 10K iterations)
         # typ. 60 us on Mac jruby 1.7.3
       end
     end

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

@@ -6,6 +6,10 @@ module Dbd
     let(:provenance_subject) { Factories::ProvenanceResource.provenance_resource.subject }
 
     describe "Factories::Resource" do
+      it ".empty works" do
+        Factories::Resource.facts_resource(provenance_subject)
+      end
+
       it ".facts_resource works" do
         Factories::Resource.facts_resource(provenance_subject)
       end

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

@@ -3,9 +3,13 @@ require 'spec_helper'
 module Dbd
   describe TimeStamp do
 
-    let(:time_stamp_0) { described_class.new(time: Time.new(2013,5,18,12,0,0)) }
-    let(:time_stamp_1) { described_class.new(time: Time.new(2013,5,18,12,0,0)) }
-    let(:time_stamp_2) { described_class.new(time: Time.new(2013,5,18,12,0,1)) }
+    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
@@ -17,6 +21,24 @@ module Dbd
       end
     end
 
+    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
+        time_stamp_2.near?(time_stamp_4).should be_true
+      end
+
+      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
+        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
         time_stamp_2.should > time_stamp_1

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

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 module Dbd
   describe TimeStamp do
+
     let(:fixed_time_stamp) { Factories::TimeStamp.fixed_time_stamp }
 
     describe "factory works" do
@@ -10,7 +11,7 @@ module Dbd
       end
 
       it "has an exact time" do
-        fixed_time_stamp.to_s.should == "2013-06-17 21:55:09.967653012 UTC"
+        fixed_time_stamp.to_s.should == "2013-06-17 21:55:09.967653013 UTC"
       end
     end
   end

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

@@ -25,18 +25,18 @@ module Dbd
 
     describe ".from_s" do
       it "returns a TimeStamp" do
-        described_class.from_s(a_time_stamp).should be_a(described_class)
+        described_class.new(time: a_time_stamp).should be_a(described_class)
       end
 
       it "round trips with to_s" do
-        time_stamp = described_class.from_s(a_time_stamp)
+        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
         time_CET = a_time_stamp.sub(/UTC/, 'CET')
-        lambda{ described_class.from_s(time_CET) }.should raise_error ArgumentError
+        lambda{ described_class.new(time: time_CET) }.should raise_error ArgumentError
       end
     end
- end
+  end
 end

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

@@ -6,6 +6,8 @@ module Dbd
 
       let(:time) { Time.now.utc }
 
+      let(:time_string) { Factories::TimeStamp.fixed_time_string }
+
       before(:each) do
         time
         Time.stub(:now).and_return(time)
@@ -15,12 +17,17 @@ module Dbd
         subject # should_not raise_error
       end
 
-      it "with :time option, sets that to time" do
+      it "with :time option given a Time object, sets that to time" do
         near_future = 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
+        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
         time_stamp = described_class.new(larger_than: larger_than)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dbd
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
@@ -112,34 +112,35 @@ dependencies:
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_peter_v
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
 description: A data store that (almost) never forgets
 email:
 - peter@vandenabeele.com
-executables: []
+executables:
+- test_1.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,6 +154,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/test_1.rb
 - dbd.gemspec
 - docs/rationale.md
 - docs/stories/001_create_a_fact.txt