git-ds 0.9.6.1 → 0.9.7.2

data/ChangeLog

@@ -1,3 +1,13 @@
+2011-06-15 :	mkfs <mkfs@thoughtgang.org>
+	*	Added clear_cache method to ModelItem
+
+2011-06-14 :	mkfs <mkfs@thoughtgang.org>
+	*	Fixed ModelItem#array_property and ts_property methods
+
+2011-06-13 :	mkfs <mkfs@thoughtgang.org>
+	*	Added publish/subscribe support to Database object
+	*	Bumped gem version to 0.9.7
+
 2011-06-06 :	mkfs <mkfs@thoughtgang.org>
 	*	Added runtime checks (and exceptions) for NULL bytes in path
 

data/lib/git-ds/database.rb

@@ -43,6 +43,13 @@ Default is nil (i.e. let Git read actor from .git/config or ENV).
 =end
     attr_accessor :actor
 
+=begin rdoc
+Subcribers that are notified when the model is changed. This is a Hash of
+an ident (e.g. a classname, UUID, or symbol) to a 2-element array:
+a callback method  and an (optional) object to pass with that method.
+=end
+    attr_reader :subscribers
+
 =begin rdoc
 Return a connection to the Git DB.
 Creates the DB if it does not already exist.
@@ -67,6 +74,7 @@ Creates the DB if it does not already exist.
       end
 
       @actor = Grit::Actor.new(username, email) if username
+      @subscribers = {}
 
     end
 
@@ -145,6 +153,45 @@ actor=.
       self.actor = name ? Grit::Actor.new(name, (email ? email : '')) : nil
     end
 
+    # ----------------------------------------------------------------------
+=begin rdoc
+Subscribe to change notifications from the model. The provided callback will
+be invoked whenever the model is modified (specifically, when an outer
+Transaction or ExecCmd is completed).
+
+A subscriber can use either block or argument syntax:
+
+  def func_cb(arg)
+    ...
+  end
+  model.subscribe( self.ident, arg, func_cb )
+
+  # block callback
+  model.subscribe( self.ident ) { ... }
+
+  # block callback where arg is specified in advance
+  model.subscribe( self.ident, arg ) { |arg| ... }
+=end
+    def subscribe(ident, obj=nil, func=nil, &block)
+      cb = (block_given?) ? block : func
+      @subscribers[ident] = [cb, obj]
+    end
+
+=begin rdoc
+Notify all subscribers that a change has occurred.
+=end
+    def notify
+      @subscribers.each { |ident, (block,obj)| block.call(obj) }
+    end
+
+=begin rdoc
+Unsubscribe from change notification.
+=end
+    def unsubscribe(ident)
+      @subscribers.delete(ident)
+    end
+
+    # ----------------------------------------------------------------------
 =begin rdoc
 Execute a block in the context of the staging index.
 
@@ -183,6 +230,7 @@ See Transaction.
       end
     end
 
+    # ----------------------------------------------------------------------
 =begin rdoc
 Add files to the database. Calls exec to ensure that a write is not performed
 if a staging index already exists.
@@ -278,6 +326,7 @@ See Database#transaction .
       rv
     end
 
+    # ----------------------------------------------------------------------
     private
 
 =begin rdoc

data/lib/git-ds/exec_cmd.rb

@@ -98,6 +98,7 @@ Perform command.
       if not self.nested
         self.index.build
         commit
+        @database.notify
       end
 
       rv

data/lib/git-ds/model/item.rb

@@ -349,6 +349,14 @@ Return Hash of cached property values.
       @property_cache ||= {}
     end
 
+=begin rdoc
+Clear all caches in ModelItem instance. In the base class, this just clears
+the property cache.
+=end
+    def clear_cache
+      property_cache.clear
+    end
+
 =begin rdoc
 Return the value of a specific property. If the proprty has not been set,
 nil is returned.
@@ -389,7 +397,11 @@ Convenience method for reading Time (aka timestamp) properties.
 =end
     def timestamp_property(name)
       val = property(name)
-      val && (! val.empty?) ? property_cache[name] = Time.parse(val) : nil
+      if val && (not val.kind_of? Time)
+        val = (not val.empty?) ? Time.parse(val) : nil
+        property_cache[name] = val
+      end
+      val
     end
 
     alias :ts_property :timestamp_property
@@ -414,7 +426,11 @@ Classes which perform their own encoding can choose a different delimiter.
 =end
     def array_property(name, delim="\n")
       val = property(name)
-      val ? (property_cache[name] = val.split(delim)) : nil
+      if val && (not val.kind_of? Array)
+        val = (val.empty?) ? [] : val.split(delim)
+        property_cache[name] = val
+      end
+      val
     end
 
     alias :a_property :array_property

data/lib/git-ds/t.rb

@@ -0,0 +1,44 @@
+=begin rdoc
+Subcribers that are notified when the model is changed. This is a Hash of
+an ident (e.g. a classname, UUID, or symbol) to a 2-element array:
+a callback method  and an (optional) object to pass with that method.
+=end
+    attr_reader :subscribers
+
+      @subscribers = {}
+=begin rdoc
+Subscribe to change notifications from the model. The provided callback will
+be invoked whenever the model is modified (specifically, when an outer
+Transaction or ExecCmd is completed).
+
+A subscriber can use either block or argument syntax:
+
+  def func_cb(arg)
+    ...
+  end
+  model.subscribe( self.ident, arg, func_cb )
+
+  # block callback
+  model.subscribe( self.ident ) { ... }
+
+  # block callback where arg is specified in advance
+  model.subscribe( self.ident, arg ) { |arg| ... }
+=end
+    def subscribe(ident, obj=nil, func=nil, &block)
+      cb = (block_given?) ? block : func
+      @subscribers[ident] = [cb, obj]
+    end
+
+=begin rdoc
+Notify all subscribers that a change has occurred.
+=end
+    def notify
+      @subscribers.each { |ident, (block,obj)} block.call(obj) }
+    end
+
+=begin rdoc
+Unsubscribe from change notification.
+=end
+    def unsubscribe(ident)
+      @subscribers.delete(ident)
+    end

data/lib/git-ds/transaction.rb

@@ -51,6 +51,7 @@ rollback() is called.
       if rv
         self.index.build  # required during nesting to support merge_and_branch
         commit if not @nested
+        @database.notify if not @nested
       end
 
       rv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-ds
 version: !ruby/object:Gem::Version
-  version: 0.9.6.1
+  version: 0.9.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-06 00:00:00.000000000 -04:00
+date: 2011-06-15 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &14078760 !ruby/object:Gem::Requirement
+  requirement: &19273020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *14078760
+  version_requirements: *19273020
 description: A hierarchical datastore based on Git.
 email: community@thoughtgang.org
 executables: []
@@ -58,6 +58,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - lib/git-ds.rb
+- lib/git-ds/t.rb
 - lib/git-ds/model.rb
 - lib/git-ds/exec_cmd.rb
 - lib/git-ds/config.rb