dbd 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52008013920900a7e6910513c2dd0cde838b386b
-  data.tar.gz: 0eae581b08f64c6dc3a7f459d6c39d58dff670c5
+  metadata.gz: 9ad1bee3c2518a24358318cfda3b6931321911a2
+  data.tar.gz: 2b7ffc84e350ce65c526e8cfc2246713e02cd7a6
 SHA512:
-  metadata.gz: c61721ceb5d4161f317d8e2fa1f2a15cfef35ffac18d0a9c5e536a2929bdb1e744be061619f599bb26045067ccb2bd93bd1e1d0023f394005e628b6261497d71
-  data.tar.gz: 16ce5f0c1be7867338e9c0e37a808d260ed9beef25a7d299f6ea575bcf542fb87b79352987e9c90166102167cd1fce353c9ac8057f6f82b5637613697a288a04
+  metadata.gz: a2b09154cd4c1482f08d7233964343c9b02ac70293358e9928b6b46fe30f04650b1a118506ab0fe98d6ce8a46143563ac5f09a0e3233f5c3196ab95b26e97b81
+  data.tar.gz: a25149c6e0288ce1cd9ae0f7f769fbcd067b5db6dfc52b8128cd4f6d53cfd31c1e607e62e2ef020735cef027447de56711f754bcfcf8cef55005d241ae7e2ca6

data/Gemfile

@@ -6,3 +6,6 @@ gemspec
 #gem 'rdf', '1.1.0',
 #    :git => 'https://github.com/ruby-rdf/rdf',
 #    :branch => '1.1'
+
+#gem 'ruby_peter_v',
+#    :path => '/Users/peter_v/p/ruby_peter_v'

data/HISTORY.txt

@@ -22,3 +22,8 @@
 =====
 
 * Graph#<< takes recursive collections of Facts
+
+0.0.5 (03 June 2013)
+=====
+
+* use ruby_peter_v 0.0.8 which does not have max_with_nil

data/README.md

@@ -3,7 +3,9 @@
 This is facts based data store, inspired by [RDF] concepts, but adding a log based structure and fine-grained provenance.
 
 * [Why?][Rationale]
-* <http://github.com/petervandenabeele/dbd>
+* <https://github.com/petervandenabeele/dbd>
+* <http://rubydoc.info/github/petervandenabeele/dbd/frames/>
+* <https://rubygems.org/gems/dbd>
 
 [![Gem Version](https://badge.fury.io/rb/dbd.png)](http://badge.fury.io/rb/dbd)
 [![Build Status](https://travis-ci.org/petervandenabeele/dbd.png?branch=master)](http://travis-ci.org/petervandenabeele/dbd)

data/dbd.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   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.4'
+  spec.add_runtime_dependency 'ruby_peter_v', '>= 0.0.8'
 end

data/docs/stories/012_provenance_fact_properties_from_provenance_ontology.txt

@@ -4,6 +4,7 @@ As a client
 I can read the predicates for a provenance_fact from provenance ontology
 
 * make an ontology in a separate gem (dbd_onto)
+* clean up using common methods
 * import that gem
 * use this ontology to build a validated Provenance Resource
 * use this validate Provenance Resource instance to better build

data/lib/dbd/graph.rb

@@ -14,7 +14,7 @@ module Dbd
     #
     # This will add a time_stamp to the Facts.
     def <<(recursive_fact_collection)
-      loop_recursively(recursive_fact_collection) do |fact|
+      recursive_fact_collection.each_recursively do |fact|
         enforce_strictly_monotonic_time(fact)
         super(fact)
       end
@@ -42,19 +42,5 @@ module Dbd
       fact.time_stamp = TimeStamp.new(larger_than: newest_time_stamp) unless fact.time_stamp
     end
 
-    def loop_recursively(recursive_collection, &block)
-      Array(recursive_collection).each do |fact_or_collection|
-        further_recursion_or_stop(fact_or_collection, &block)
-      end
-    end
-
-    def further_recursion_or_stop(fact_or_collection, &block)
-      if fact_or_collection.respond_to?(:each)
-        loop_recursively(fact_or_collection, &block)
-      else
-        yield(fact_or_collection)
-      end
-    end
-
   end
 end

data/lib/dbd/time_stamp.rb

@@ -35,6 +35,7 @@ module Dbd
   # in a fact stream.
   class TimeStamp
 
+    include DefineEquality(:time)
     attr_reader :time
 
     ##
@@ -58,7 +59,7 @@ module Dbd
   private
 
     def new_time(larger_than)
-      max_with_nil(Time.now.utc, (larger_than && larger_than.time)) + random_offset
+      [Time.now.utc, (larger_than && larger_than.time)].compact.max + random_offset
     end
 
     def random_offset
@@ -73,14 +74,6 @@ module Dbd
       @time.strftime('%F %T.%N %Z')
     end
 
-    def ==(other)
-      @time == other.time
-    end
-
-    def hash
-      @time.hash
-    end
-
     def >(other)
       @time > other.time
     end
@@ -89,12 +82,16 @@ module Dbd
       @time < other.time
     end
 
+    def >=(other)
+      @time >= other.time
+    end
+
     def <=(other)
       @time <= other.time
     end
 
     def +(seconds)
-      TimeStamp.new(time: (@time + seconds))
+      self.class.new(time: (@time + seconds))
     end
 
     def -(other)

data/lib/dbd/version.rb

@@ -1,3 +1,3 @@
 module Dbd
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/dbd/fact_spec.rb

@@ -47,7 +47,7 @@ module Dbd
           described_class.new(
             predicate: nil,
             object: string_object_1)
-        end . should raise_error PredicateError
+        end.should raise_error(PredicateError)
       end
 
       it "a nil object raises ObjectError" do
@@ -55,13 +55,13 @@ module Dbd
           described_class.new(
             predicate: data_predicate,
             object: nil)
-        end . should raise_error ObjectError
+        end.should raise_error(ObjectError)
       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)
+        lambda{ fact_1.time_stamp = Time.now }.should raise_error(ArgumentError)
       end
 
       describe "set_once" do
@@ -76,7 +76,7 @@ module Dbd
         describe "setting it two times" 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 SetOnceError
+            lambda{ fact_1.time_stamp = (time_stamp_now+1) }.should raise_error(RubyPeterV::SetOnceError)
           end
         end
       end

data/spec/lib/dbd/provenance_resource_spec.rb

@@ -21,15 +21,15 @@ module Dbd
 
       describe "with a provenance_subject argument" do
         it "raises an ProvenanceError" do
-          lambda { described_class.new(provenance_subject: provenance_resource_subject) } .
-            should raise_error ProvenanceError
+          lambda{ described_class.new(provenance_subject: provenance_resource_subject) }.
+            should raise_error(ProvenanceError)
         end
       end
     end
 
     describe "provenance_subject" do
       it "raises NoMethodError when called" do
-        lambda { provenance_resource.provenance_subject } . should raise_error NoMethodError
+        lambda{ provenance_resource.provenance_subject }.should raise_error(NoMethodError)
       end
     end
 
@@ -53,8 +53,8 @@ module Dbd
         end
 
         it "with incorrect subject it raises SubjectError" do
-          lambda { provenance_resource << provenance_fact_context_with_incorrect_subject } .
-            should raise_error SetOnceError,
+          lambda{ provenance_resource << provenance_fact_context_with_incorrect_subject }.
+            should raise_error(RubyPeterV::SetOnceError),
               "Value of subject was #{provenance_fact_context_with_incorrect_subject.subject}, " \
               "trying to set it to #{provenance_resource.subject}"
         end
@@ -70,7 +70,7 @@ module Dbd
         end
 
         it "with incorrect provenance_subject it raises ProvenanceError" do
-          lambda { provenance_resource << fact_1 } .
+          lambda{ provenance_resource << fact_1 }.
             should raise_error ProvenanceError
         end
       end

data/spec/lib/dbd/resource_spec.rb

@@ -79,8 +79,8 @@ module Dbd
 
             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(
-                  SetOnceError,
+                lambda{ resource << fact_2_with_subject }.should raise_error(
+                  RubyPeterV::SetOnceError,
                   "Value of subject was #{fact_2_with_subject.subject}, " \
                   "trying to set it to #{resource.subject}")
               end
@@ -123,9 +123,9 @@ module Dbd
             end
 
             describe "when the provenance_subject of the fact is not equal to the resource" do
-              it "raises a ProvenanceError" do
-                lambda { resource << fact_with_incorrect_provenance } . should raise_error(
-                  SetOnceError,
+              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}, " \
                   "trying to set it to #{resource.provenance_subject}")
               end

data/spec/lib/dbd/time_stamp_spec.rb

@@ -80,8 +80,13 @@ module Dbd
       end
     end
 
-    describe "<=" 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
         time_stamp_1.should <= time_stamp_2
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.8
 description: A data store that (almost) never forgets
 email:
 - peter@vandenabeele.com