dbd 0.0.11 → 0.0.12

data/spec/lib/dbd/version/version_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+module Dbd
+  describe "VERSION" do
+    it "should exist" do
+      VERSION.should_not be_nil
+    end
+  end
+end

data/spec/test_factories/context.rb

@@ -0,0 +1,16 @@
+module TestFactories
+  module Context
+
+    def self.factory_for
+      ::Dbd::Context
+    end
+
+    def self.context
+      factory_for.new.tap do |context|
+        context << TestFactories::ContextFact.visibility
+        context << TestFactories::ContextFact.created_by
+      end
+    end
+
+  end
+end

data/spec/test_factories/{provenance_fact.rb → context_fact.rb}

@@ -1,32 +1,32 @@
 # encoding=utf-8
 module TestFactories
-  module ProvenanceFact
+  module ContextFact
     def self.factory_for
-      ::Dbd::ProvenanceFact
+      ::Dbd::ContextFact
     end
 
     def self.new_subject
       factory_for.factory.new_subject
     end
 
-    def self.context(subject = nil)
+    def self.visibility(subject = nil)
       factory_for.new(
         subject: subject,
-        predicate: 'https://data.vandenabeele.com/ontologies/provenance#context',
+        predicate: 'context:visibility',
         object: 'public')
     end
 
     def self.created_by(subject = nil)
       factory_for.new(
         subject: subject,
-        predicate: 'https://data.vandenabeele.com/ontologies/provenance#created_by',
+        predicate: 'dcterms:creator',
         object: 'peter_v')
     end
 
     def self.original_source(subject = nil)
       factory_for.new(
         subject: subject,
-        predicate: 'https://data.vandenabeele.com/ontologies/provenance#original_source',
+        predicate: 'prov:source',
         object: "this has a comma , a newline \n and a double quote \"")
     end
 

data/spec/test_factories/fact.rb

@@ -18,9 +18,9 @@ module TestFactories
        'Gandhi']
     end
 
-    def self.fact_1(provenance_subject = nil)
+    def self.fact_1(context_subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         predicate: 'http://example.org/test/name',
         object: 'Gandhi')
     end
@@ -32,9 +32,9 @@ module TestFactories
         object: 'Gandhi')
     end
 
-    def self.fact_with_special_chars(provenance_subject = nil, subject = nil)
+    def self.fact_with_special_chars(context_subject = nil, subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         subject: subject,
         predicate: 'http://example.org/test/comment',
         object: "A long story with a newline\nreally with a comma, a double quote \" and a non-ASCII char éà Über.")
@@ -47,41 +47,41 @@ module TestFactories
         object: 'Gandhi')
     end
 
-    def self.fact_2_with_subject(provenance_subject = nil)
+    def self.fact_2_with_subject(context_subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         subject: new_subject,
         predicate: 'http://example.org/test/name',
         object: 'Mandela')
     end
 
-    def self.fact_3_with_subject(provenance_subject = nil)
+    def self.fact_3_with_subject(context_subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         subject: new_subject,
         predicate: 'http://example.org/test/name',
         object: 'King')
     end
 
-    def self.data_fact(provenance_subject = nil, subject = nil)
+    def self.data_fact(context_subject = nil, subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         subject: subject,
         predicate: 'http://example.org/test/name',
         object: 'Aung San Suu Kyi')
     end
 
-    def self.data_fact_EU(provenance_subject = nil, subject = nil)
+    def self.data_fact_EU(context_subject = nil, subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         subject: subject,
         predicate: 'http://example.org/test/name',
         object: 'European Union')
     end
 
-    def self.fact_with_newline(provenance_subject = nil, subject = nil)
+    def self.fact_with_newline(context_subject = nil, subject = nil)
       factory_for.new(
-        provenance_subject: provenance_subject,
+        context_subject: context_subject,
         subject: subject,
         predicate: 'http://example.org/test/comment',
         object: "A long story\nreally.")
@@ -92,7 +92,7 @@ module TestFactories
       fact_with_forced_id(fixed_id).tap do |fact|
         fact.time_stamp = TestFactories::TimeStamp.fixed_time_stamp
         fact.subject = TestFactories::Fact::Subject.fixed_subject
-        fact.provenance_subject = TestFactories::Fact::Subject.fixed_provenance_subject
+        fact.context_subject = TestFactories::Fact::Subject.fixed_context_subject
       end
     end
 
@@ -104,18 +104,18 @@ module TestFactories
         o
       end
 
-      def self.fact_2_3(provenance_subject)
+      def self.fact_2_3(context_subject)
         factory_for_instance.tap do |fact_collection|
-          fact_collection << Fact.fact_2_with_subject(provenance_subject)
-          fact_collection << Fact.fact_3_with_subject(provenance_subject)
+          fact_collection << Fact.fact_2_with_subject(context_subject)
+          fact_collection << Fact.fact_3_with_subject(context_subject)
         end
       end
 
-      def self.provenance_facts(subject)
-        factory_for_instance.tap do |provenance_facts|
-          provenance_facts << ProvenanceFact.context(subject)
-          provenance_facts << ProvenanceFact.created_by(subject)
-          provenance_facts << ProvenanceFact.original_source(subject)
+      def self.context_facts(subject)
+        factory_for_instance.tap do |context_facts|
+          context_facts << ContextFact.visibility(subject)
+          context_facts << ContextFact.created_by(subject)
+          context_facts << ContextFact.original_source(subject)
         end
       end
     end

data/spec/test_factories/fact/subject.rb

@@ -5,7 +5,7 @@ module TestFactories
         '2e9fbc87-2e94-47e9-a8fd-121cc4bc3e8f'
       end
 
-      def self.fixed_provenance_subject
+      def self.fixed_context_subject
         '40fab407-9b04-4a51-9a52-d978abfcbb1f'
       end
     end

data/spec/test_factories/graph.rb

@@ -8,18 +8,18 @@ module TestFactories
       ::Dbd::Fact.factory.new_subject
     end
 
-    def self.only_provenance
-      factory_for.new << TestFactories::ProvenanceResource.provenance_resource
+    def self.only_context
+      factory_for.new << TestFactories::Context.context
     end
 
-    def self.only_facts(provenance_subject = new_subject)
-      factory_for.new << TestFactories::Resource.facts_resource(provenance_subject)
+    def self.only_facts(context_subject = new_subject)
+      factory_for.new << TestFactories::Resource.facts_resource(context_subject)
     end
 
     def self.full
-      provenance_resource = TestFactories::ProvenanceResource.provenance_resource
-      resource = TestFactories::Resource.facts_resource(provenance_resource.subject)
-      factory_for.new << provenance_resource << resource
+      context = TestFactories::Context.context
+      resource = TestFactories::Resource.facts_resource(context.subject)
+      factory_for.new << context << resource
     end
   end
 end

data/spec/test_factories/resource.rb

@@ -5,23 +5,28 @@ module TestFactories
       ::Dbd::Resource
     end
 
-    def self.empty(provenance_subject)
-      subject = Fact.new_subject
-      factory_for.new(subject: subject, provenance_subject: provenance_subject)
+    # TODO get this from the Resource class
+    def self.element_class
+      ::Dbd::Fact
     end
 
-    def self.facts_resource(provenance_subject = provenance_subject())
-      subject = Fact.new_subject
-      factory_for.new(subject: subject, provenance_subject: provenance_subject).tap do |resource|
-        resource << TestFactories::Fact.data_fact(provenance_subject, subject)
-        resource << TestFactories::Fact.data_fact_EU(provenance_subject, subject)
+    def self.empty(context_subject)
+      subject = element_class.factory.new_subject
+      factory_for.new(subject: subject, context_subject: context_subject)
+    end
+
+    def self.facts_resource(context_subject = context_subject())
+      subject = element_class.factory.new_subject
+      factory_for.new(subject: subject, context_subject: context_subject).tap do |resource|
+        resource << TestFactories::Fact.data_fact(context_subject, subject)
+        resource << TestFactories::Fact.data_fact_EU(context_subject, subject)
       end
     end
 
   private
 
-    def self.provenance_subject
-      TestFactories::ProvenanceResource.provenance_resource.subject
+    def self.context_subject
+      TestFactories::ContextFact.new_subject
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,6 +181,8 @@ files:
 - docs/stories/013_read_graph_from_CSV.txt
 - docs/test.rb
 - lib/dbd.rb
+- lib/dbd/context.rb
+- lib/dbd/context_fact.rb
 - lib/dbd/errors.rb
 - lib/dbd/fact.rb
 - lib/dbd/fact/collection.rb
@@ -190,8 +192,6 @@ files:
 - lib/dbd/graph.rb
 - lib/dbd/helpers/ordered_set_collection.rb
 - lib/dbd/helpers/uuid.rb
-- lib/dbd/provenance_fact.rb
-- lib/dbd/provenance_resource.rb
 - lib/dbd/rdf_base.rb
 - lib/dbd/repo.rb
 - lib/dbd/repo/neo4j_repo.rb
@@ -199,6 +199,11 @@ files:
 - lib/dbd/resource.rb
 - lib/dbd/time_stamp.rb
 - lib/dbd/version.rb
+- spec/lib/dbd/context/context_spec.rb
+- spec/lib/dbd/context_fact/methods_spec.rb
+- spec/lib/dbd/context_fact/new_spec.rb
+- spec/lib/dbd/context_fact/test_factories_spec.rb
+- spec/lib/dbd/errors/errors_spec.rb
 - spec/lib/dbd/fact/collection/collection_spec.rb
 - spec/lib/dbd/fact/factory/factory_spec.rb
 - spec/lib/dbd/fact/id/id_spec.rb
@@ -215,10 +220,6 @@ files:
 - spec/lib/dbd/helpers/ordered_set_collection/ordered_set_collection_spec.rb
 - spec/lib/dbd/helpers/uuid/uuid_spec.rb
 - spec/lib/dbd/performance_spec.rb
-- spec/lib/dbd/provenance_fact/methods_spec.rb
-- spec/lib/dbd/provenance_fact/new_spec.rb
-- spec/lib/dbd/provenance_fact/test_factories_spec.rb
-- spec/lib/dbd/provenance_resource/provenance_resource_spec.rb
 - spec/lib/dbd/rdf_base/rdf_base_spec.rb
 - spec/lib/dbd/repo/neo4j_repo/base_spec.rb
 - spec/lib/dbd/repo/neo4j_repo/performance_spec.rb
@@ -229,13 +230,14 @@ files:
 - spec/lib/dbd/time_stamp/methods_spec.rb
 - spec/lib/dbd/time_stamp/new_spec.rb
 - spec/lib/dbd/time_stamp/test_factories_spec.rb
+- spec/lib/dbd/version/version_spec.rb
 - spec/spec_helper.rb
+- spec/test_factories/context.rb
+- spec/test_factories/context_fact.rb
 - spec/test_factories/fact.rb
 - spec/test_factories/fact/id.rb
 - spec/test_factories/fact/subject.rb
 - spec/test_factories/graph.rb
-- spec/test_factories/provenance_fact.rb
-- spec/test_factories/provenance_resource.rb
 - spec/test_factories/resource.rb
 - spec/test_factories/time_stamp.rb
 homepage: ''
@@ -263,6 +265,11 @@ signing_key:
 specification_version: 4
 summary: A data store that (almost) never forgets
 test_files:
+- spec/lib/dbd/context/context_spec.rb
+- spec/lib/dbd/context_fact/methods_spec.rb
+- spec/lib/dbd/context_fact/new_spec.rb
+- spec/lib/dbd/context_fact/test_factories_spec.rb
+- spec/lib/dbd/errors/errors_spec.rb
 - spec/lib/dbd/fact/collection/collection_spec.rb
 - spec/lib/dbd/fact/factory/factory_spec.rb
 - spec/lib/dbd/fact/id/id_spec.rb
@@ -279,10 +286,6 @@ test_files:
 - spec/lib/dbd/helpers/ordered_set_collection/ordered_set_collection_spec.rb
 - spec/lib/dbd/helpers/uuid/uuid_spec.rb
 - spec/lib/dbd/performance_spec.rb
-- spec/lib/dbd/provenance_fact/methods_spec.rb
-- spec/lib/dbd/provenance_fact/new_spec.rb
-- spec/lib/dbd/provenance_fact/test_factories_spec.rb
-- spec/lib/dbd/provenance_resource/provenance_resource_spec.rb
 - spec/lib/dbd/rdf_base/rdf_base_spec.rb
 - spec/lib/dbd/repo/neo4j_repo/base_spec.rb
 - spec/lib/dbd/repo/neo4j_repo/performance_spec.rb
@@ -293,13 +296,14 @@ test_files:
 - spec/lib/dbd/time_stamp/methods_spec.rb
 - spec/lib/dbd/time_stamp/new_spec.rb
 - spec/lib/dbd/time_stamp/test_factories_spec.rb
+- spec/lib/dbd/version/version_spec.rb
 - spec/spec_helper.rb
+- spec/test_factories/context.rb
+- spec/test_factories/context_fact.rb
 - spec/test_factories/fact.rb
 - spec/test_factories/fact/id.rb
 - spec/test_factories/fact/subject.rb
 - spec/test_factories/graph.rb
-- spec/test_factories/provenance_fact.rb
-- spec/test_factories/provenance_resource.rb
 - spec/test_factories/resource.rb
 - spec/test_factories/time_stamp.rb
 has_rdoc: 

data/lib/dbd/provenance_fact.rb

@@ -1,77 +0,0 @@
-module Dbd
-
-  ##
-  # ProvenanceFact
-  #
-  # ProvenanceFact is derived from Fact and behaves very similar.
-  #
-  # The ProvenanceFacts with same subject form a ProvenanceResource and
-  # this is used as the target for the provenance_subject of a Fact.
-  #
-  # The provenance_subject of a ProvenanceFact itself is empty, so the
-  # usage of provenance_subject is not recursive on this level (this
-  # allows efficient single pass loading in an underlying database).
-  #
-  # In the serialisation of a fact stream, the presence or absence of a
-  # provenance_subject marks the difference between a (base) Fact and a
-  # ProvenanceFact.
-  #
-  # The predicates in a ProvenanceFact would typically come from a defined
-  # "provenance ontology". An experimental example of a provenance ontology
-  # is built-up on https://data.vandenabeele.com/ontologies/provenance.
-  class ProvenanceFact < Fact
-
-    ##
-    # Builds a new ProvenanceFact.
-    #
-    # @param [Hash{Symbol => Object}] options
-    # @option options [Fact::Subject] :subject (new_subject) Optional: the subject for the ProvenanceFact
-    # @option options [String] :predicate Required: the subject for the ProvenanceFact
-    # @option options [String] :object Required: the object for the ProvenanceFact
-    def initialize(options)
-      validate_provenance_subject(options)
-      super
-    end
-
-    ##
-    # Executes the required update in used_provenance_subjects.
-    #
-    # For a ProvenanceFact, there is no provenance_subject, so
-    # pointless to mark it in used_provenance_subjects hash.
-    def update_used_provenance_subjects(h)
-      # Do nothing (override the behaviour from super).
-    end
-
-    ##
-    # Validates the presence or absence of provenance_subject.
-    #
-    # Here, in the derived ProvenanceFact, it must not be present.
-    # @param [#nil?] provenance_subject
-    # Return [nil, String] nil if valid, an error message if not
-    def provenance_subject_error(provenance_subject)
-      "Provenance subject should not be present in Provenance Fact" if provenance_subject
-    end
-
-    ##
-    # Confirms this is a ProvenanceFact
-    #
-    # Needed for validations that depend on different behavior for
-    # a provenance_fact (mainly, no provenance_subject).
-    def provenance_fact?
-      true
-    end
-
-  private
-
-    ##
-    # Validate that provenance_subject is not set here.
-    def validate_provenance_subject(options)
-      raise ProvenanceError if options[:provenance_subject]
-    end
-
-    def provenance_subject_short
-      "[ prov ]"
-    end
-
-  end
-end

data/lib/dbd/provenance_resource.rb

@@ -1,63 +0,0 @@
-module Dbd
-  ##
-  # A ProvenanceResource is derived from a Resource, specifically
-  # for a Provenance.
-  #
-  # The main difference is that it does not have a provenance_subject.
-  class ProvenanceResource < Resource
-
-    ##
-    # Build a new ProvenanceResource.
-    #
-    # The subject can be either given as an argument or a new (random)
-    # subject is automatically set (see Resource for details).
-    #
-    # A provenance_subject may not be given here.
-    # @option options [Fact::Subject] :subject (new_subject) Optional: the subject for the resource
-    def initialize(options = {})
-      super
-    end
-
-    ##
-    # Add a ProvenanceFact (strictly only a ProvenanceFact).
-    #
-    # Side effect on subject:
-    # * if it has no subject, the subject is set in a duplicate provenance_fact
-    # * if is has the same subject as the resource, added unchanged.
-    # * if it has a different subject, a SubjectError is raised.
-    def <<(provenance_fact)
-      super
-    end
-
-  private
-
-    # Should not be called in ProvenanceResource subclass.
-    def provenance_subject
-      raise NoMethodError, "provenance_subject should not be called in ProvenanceResource."
-    end
-
-    def set_provenance_subject(options)
-      raise ArgumentError, "provenance_subject must not be in the options" if options[:provenance_subject]
-    end
-
-    # Validate that provenance_subject is not present here.
-    # This should never raise as the setter was blocked above.
-    def validate_provenance_subject
-      raise ProvenanceError if @provenance_subject
-    end
-
-    ##
-    # Assert _only_ ProvenanceFacts here
-    def assert_fact_provenance_fact(fact)
-      raise ArgumentError, "Trying to add a non-ProvenanceFact to a ProvenanceResource." unless fact.provenance_fact?
-    end
-
-    ##
-    # A noop for ProvenanceResource.
-    # @param [ProvenanceFact] provenance_fact
-    def set_fact_provenance!(provenance_fact)
-      # Do nothing
-    end
-
-  end
-end