dbd 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d54382f08bbd348679cb10c1c8b91f3be990cf
-  data.tar.gz: b566258aea1a3a5fd2086094cce17d7459989cc0
+  metadata.gz: dee663a858909394b98fac3db46fc8555a2abdcf
+  data.tar.gz: 0dda169214ad947ac23e4d04f62b60cc0c9dc723
 SHA512:
-  metadata.gz: 3d7eb71352a57bce730c5f2198d26bd30e1c5a5ab67bbe9cca9d85351cd0051d91522e42bdd4233049a20e3930a956508efe15f9161b534381ced3f23362eb5b
-  data.tar.gz: 1c73a36ccfda7a251914d65d84e8c427f72eaf02a007e69b1f52a3f5d324e8fb8bf603a06aaf16cf1b3db632f6385b90d86430df576c33d0644409711f242c9a
+  metadata.gz: 79597df1ed60147831542ffaa689123a9706bab7047d07622b772b988fb59e16893dc5c0d2b97b32cfa1ab3656fcb9d13ecb80f2992b2db76e9f0bc5f5cbb8c3
+  data.tar.gz: 534fe8b6fa1157cd8bcce028a2636518ee4c02f8a5dccc02c213e0b6a653584e0e050f8e137ec23956b503d01d3d1f350d52268ab4f8447f45d0bbb76ed593e6

data/HISTORY.txt

@@ -117,3 +117,8 @@
 ======
 
 * Resource|Context << also accepts an array of Facts|ContextFacts
+
+0.0.20 (6 Oct 2013)
+======
+
+* Resource can have facts with different context_subjects

data/lib/dbd/context.rb

@@ -1,7 +1,7 @@
 module Dbd
   ##
   # A Context is derived from a Resource, and is the
-  # set of all Contexts that share the same subject.
+  # set of all ContextFacts that share the same subject.
   #
   # It is pointed to by a context_subject of a Fact and has
   # no context_subject itself (the context_subject

data/lib/dbd/graph.rb

@@ -85,8 +85,28 @@ module Dbd
       on_sorted_file(filename) { |sorted_file| from_CSV(sorted_file) }
     end
 
+    ##
+    # Return an array of resources for graph
+    #
+    # @return [Array] array with all resources
+    def resources
+      subjects.map do |subject|
+        facts = by_subject(subject)
+        resource_from_facts(subject, facts)
+      end.compact
+    end
+
   private
 
+    # FIXME : the context_subject argument must not be given here
+    def resource_from_facts(subject, facts)
+      unless facts.first.is_a?(ContextFact)
+        context_subject = facts.first.context_subject
+        resource = Resource.new(subject: subject, context_subject: context_subject)
+        resource << facts
+      end
+    end
+
     ##
     # Setting a strictly monotonically increasing time_stamp (if not yet set).
     # The time_stamp also has some randomness (1 .. 999 ns) to reduce the

data/lib/dbd/resource.rb

@@ -13,10 +13,9 @@ module Dbd
   # a subject is a random uuid (like a oid), not a meaningful URI
   # as it is in RDF.
   #
-  # A context_subject is a required field in the options hash.
-  # Practically, first a Context will be created and the
-  # subject of that will be used as context_subject for the
-  # Resources that are associated with it.
+  # A context_subject can optionally be given in the options hash.
+  # The context_subject of the Resource will be used as a default
+  # for Facts that are added to the Resource.
   #
   # During build-up of a Fact, the subject and the context_subject
   # can be nil. These will then be set when the Fact is added
@@ -41,13 +40,13 @@ module Dbd
     # (this is best created with the new_subject class method for forward
     # compatibility).
     #
-    # The context_subject argument is required. This will typically be
-    # taken from an earlier created Context.
+    # The context_subject argument is optional (if all facts in the resource
+    # have the same context).
     #
-    # @param [Hash{Symbol => Object}] options
-    # @option options [Fact::Subject] :context_subject (required) the subject of the context for this resource
+    # @param [Hash{Symbol => Object}] options (optional)
+    # @option options [Fact::Subject] :context_subject (nil) Optional: the subject of the context for this resource
     # @option options [Fact::Subject] :subject (new_subject) Optional: the subject for the resource
-    def initialize(options)
+    def initialize(options = {})
       set_subject(options)
       set_context_subject(options)
       super()
@@ -60,18 +59,17 @@ module Dbd
     # * if it has no subject, the subject is set (this modifies the fact !)
     # * if is has the same subject as the resource, added unchanged.
     # * if it has a different subject, a SubjectError is raised.
+    # * inside one resource, all facts must have same subject
     #
     # * if it has no context_subject, the context_subject is set (this modifies the fact !)
-    # * if is has the same context_subject as the resource, added unchanged.
-    # * if it has a different context_subject, a ContextError is raised.
+    # * if is has a context_subject this remains unchanged
+    # * inside one resource, different facts can have different context_subjects
     #
     # @param [Fact, #each] fact_collection a recursive collection of Facts
     # @return [Resource] self
     def <<(fact_collection)
       fact_collection.each_recursively do |fact|
-        assert_fact_or_context_fact(fact)
-        set_fact_subject!(fact)
-        set_fact_context_subject!(fact)
+        prepare_fact!(fact)
         super(fact)
       end
       self
@@ -84,16 +82,23 @@ module Dbd
     end
 
     def set_context_subject(options)
-      @context_subject = options[:context_subject]
-      raise ContextError, "context_subject cannot be nil" if @context_subject.nil?
+      @context_subject = options[:context_subject] # nil default
     end
 
     def set_fact_subject!(fact)
+      # this is protected by a SetOnce immutable behavior
       fact.subject = subject
     end
 
     def set_fact_context_subject!(fact)
-      fact.context_subject = context_subject
+      #context_subject from fact has priority
+      fact.context_subject ||= context_subject
+    end
+
+    def prepare_fact!(fact)
+      assert_fact_or_context_fact(fact)
+      set_fact_subject!(fact)
+      set_fact_context_subject!(fact)
     end
 
     # Assert _no_ Contexts here

data/lib/dbd/version.rb

@@ -1,3 +1,3 @@
 module Dbd
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Dbd
+  describe Graph do
+    let(:full_graph) { TestFactories::Graph.full }
+
+    context 'resources' do
+      it 'is an array' do
+        full_graph.resources.should be_a(Array)
+      end
+
+      it 'is an array of resources' do
+        full_graph.resources.each do |resource|
+          resource.should be_a(Resource)
+        end
+      end
+
+      it 'the resource has the facts' do
+        facts = full_graph.reject(&:context_fact?)
+        full_graph.resources.single.should include(*facts)
+      end
+
+      it 'the resource does not have has the context_facts' do
+        context_facts = full_graph.select(&:context_fact?)
+        full_graph.resources.single.should_not include(*context_facts)
+      end
+
+      it 'has at least one entry' do
+        full_graph.resources.should_not be_empty
+      end
+    end
+  end
+end

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

@@ -4,8 +4,11 @@ module Dbd
   describe Resource do
 
     let(:context_subject) { TestFactories::ContextFact.new_subject }
-    let(:resource) { described_class.new(context_subject: context_subject) }
-    let(:resource_subject) { resource.subject }
+    let(:other_context_subject) { TestFactories::ContextFact.new_subject }
+    let(:resource_subject) { TestFactories::Fact.new_subject }
+    let(:resource) { described_class.new(subject: resource_subject) }
+    let(:resource_with_context_subject) { described_class.new(context_subject: context_subject,
+                                                              subject: resource_subject) }
 
     describe 'the fact collection' do
 
@@ -15,7 +18,7 @@ module Dbd
       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_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(:fact_with_other_context_and_resource_subject) { TestFactories::Fact.data_fact(other_context_subject, resource_subject) }
       let(:context_fact_visibility) { TestFactories::ContextFact.visibility }
 
       it 'enumerable functions work' do
@@ -96,17 +99,22 @@ module Dbd
           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_context_and_resource_subject
-                resource.single.should be_equal(fact_with_context_and_resource_subject)
+                resource_with_context_subject << fact_with_context
+                resource_with_context_subject.single.should be_equal(fact_with_context)
               end
             end
 
             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_context }.should raise_error(
-                  RubyPeterV::SetOnceError,
-                  "Value of context_subject was #{fact_with_incorrect_context.context_subject}, " \
-                  "trying to set it to #{resource.context_subject}")
+              it 'the context_fact of the fact wins' do
+                resource_with_context_subject << fact_with_other_context_and_resource_subject
+                resource_with_context_subject.single.should be_equal(fact_with_other_context_and_resource_subject)
+              end
+            end
+
+            describe 'when the context_subject of the fact is set and the resource has no context_subject' do
+              it 'the context_fact of the fact wins' do
+                resource << fact_with_context_and_resource_subject
+                resource.single.should be_equal(fact_with_context_and_resource_subject)
               end
             end
           end
@@ -114,10 +122,11 @@ module Dbd
           describe 'adding a fact without context_subject' do
 
             before(:each) do
-              resource << fact_with_resource_subject
+              fact_with_resource_subject.context_subject.should be_nil # assert pre-condition
+              resource_with_context_subject << fact_with_resource_subject
             end
 
-            let(:fact_in_resource) { resource.single }
+            let(:fact_in_resource) { resource_with_context_subject.single }
 
             it 'inserts the same instance' do
               fact_in_resource.should be_equal(fact_with_resource_subject)

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

@@ -4,7 +4,8 @@ module Dbd
   describe Resource do
 
     let(:context_subject) { TestFactories::ContextFact.new_subject }
-    let(:resource) { described_class.new(context_subject: context_subject) }
+    let(:resource) { described_class.new }
+    let(:resource_with_context_subject) { described_class.new(context_subject: context_subject) }
 
     describe '.new_subject' do
       it 'returns a Fact#new_subject' do
@@ -13,29 +14,31 @@ module Dbd
     end
 
     describe '.new' do
-      describe 'with a context_subject argument' do
+
+      describe 'without 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 context_subject' do
-          resource.context_subject.should == context_subject
+        it 'has a nil context_subject' do
+          resource.context_subject.should be_nil
         end
       end
 
-      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,
-            context_subject: context_subject).subject.should == explicit_subject
+      describe 'with a context_subject argument' do
+        it 'has created a subject' do
+          resource_with_context_subject.subject.should be_a(described_class.new_subject.class)
+        end
+
+        it 'has stored the explicit context_subject' do
+          resource_with_context_subject.context_subject.should == context_subject
         end
       end
 
-      describe 'with a nil context_subject argument' do
-        it 'raises a ContextError' do
-          lambda { described_class.new(context_subject: nil) } .
-            should raise_error ContextError
+      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).subject.should == explicit_subject
         end
       end
     end

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

@@ -7,18 +7,19 @@ module TestFactories
 
     describe "TestFactories::Resource" do
       it ".empty works" do
-        resource = described_class.empty(context_subject)
-        resource.context_subject.should == context_subject
+        resource = described_class.empty
+        resource.context_subject.should == nil
       end
 
       describe ".facts_resource" do
         it "works with explicit context_subject" do
-          described_class.facts_resource(context_subject)
+          resource = described_class.facts_resource(context_subject)
+          resource.context_subject.should == context_subject
         end
 
         it "works without explicit context_subject" do
           resource = described_class.facts_resource()
-          resource.context_subject.should_not be_nil
+          resource.context_subject.should be_nil
         end
       end
     end

data/spec/test_factories/resource.rb

@@ -10,24 +10,17 @@ module TestFactories
       ::Dbd::Fact
     end
 
-    def self.empty(context_subject)
+    def self.empty(context_subject = nil)
       subject = element_class.factory.new_subject
       factory_for.new(subject: subject, context_subject: context_subject)
     end
 
-    def self.facts_resource(context_subject = context_subject())
+    def self.facts_resource(context_subject = nil)
       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.context_subject
-      TestFactories::ContextFact.new_subject
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,6 +221,7 @@ files:
 - spec/lib/dbd/fact/test_factories_spec.rb
 - spec/lib/dbd/graph/add_to_graph_spec.rb
 - spec/lib/dbd/graph/from_csv_spec.rb
+- spec/lib/dbd/graph/methods_spec.rb
 - spec/lib/dbd/graph/test_factories_spec.rb
 - spec/lib/dbd/graph/to_csv_spec.rb
 - spec/lib/dbd/helpers/ordered_set_collection/ordered_set_collection_spec.rb
@@ -289,6 +290,7 @@ test_files:
 - spec/lib/dbd/fact/test_factories_spec.rb
 - spec/lib/dbd/graph/add_to_graph_spec.rb
 - spec/lib/dbd/graph/from_csv_spec.rb
+- spec/lib/dbd/graph/methods_spec.rb
 - spec/lib/dbd/graph/test_factories_spec.rb
 - spec/lib/dbd/graph/to_csv_spec.rb
 - spec/lib/dbd/helpers/ordered_set_collection/ordered_set_collection_spec.rb