Add Batman.Property.withoutTracking for preventing gets from creating…

… sources on demand.
johnthethird · Dec 9, 2011 · a1cc5b5 · a1cc5b5
1 parent 47d3baa
commit a1cc5b5
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 28 deletions.
diff --git a/lib/batman.js b/lib/batman.js
diff --git a/src/batman.coffee b/src/batman.coffee
@@ -494,11 +494,20 @@ class Batman.Property
       base.property(key)
     else
       new Batman.Keypath(base, key)
-
+  @withoutTracking: (block) ->
+    @pushDummySourceTracker()
+    try
+      block()
+    finally
+      @popSourceTracker()
   @registerSource: (obj) ->
     return unless obj.isEventEmitter
     @sourceTracker()?.add(obj)
 
+  @pushSourceTracker: -> Batman.Property._sourceTrackerStack.push(new Batman.SimpleSet)
+  @pushDummySourceTracker: -> Batman.Property._sourceTrackerStack.push(null)
+  @popSourceTracker: -> Batman.Property._sourceTrackerStack.pop()
+
   constructor: (@base, @key) ->
     developer.do =>
       keyType = $typeOf(@key)
@@ -546,11 +555,8 @@ class Batman.Property
     results
   hasObservers: -> @observers().length > 0
 
-  pushSourceTracker: -> Batman.Property._sourceTrackerStack.push(new Batman.SimpleSet)
-  pushDummySourceTracker: -> Batman.Property._sourceTrackerStack.push(null)
-  popSourceTracker: -> Batman.Property._sourceTrackerStack.pop()
   updateSourcesFromTracker: ->
-    newSources = @popSourceTracker()
+    newSources = @constructor.popSourceTracker()
     handler = @sourceChangeHandler()
     @_eachSourceChangeEvent (e) -> e.removeHandler(handler)
     @sources = newSources
@@ -563,7 +569,7 @@ class Batman.Property
   getValue: ->
     @registerAsMutableSource()
     unless @isCached()
-      @pushSourceTracker()
+      @constructor.pushSourceTracker()
       try
         @value = @valueFromAccessor()
         @cached = yes
@@ -612,12 +618,12 @@ class Batman.Property
 
   _changeValue: (block) ->
     @cached = no
-    @pushDummySourceTracker()
+    @constructor.pushDummySourceTracker()
     try
       result = block.apply(this)
       @refresh()
     finally
-      @popSourceTracker()
+      @constructor.popSourceTracker()
     @die() unless @isCached() or @hasObservers()
     result
 
@@ -669,7 +675,6 @@ class Batman.Property
       @_isolationCount--
   isIsolated: -> @_isolationCount > 0
 
-
 # Keypaths
 # --------
 

diff --git a/tests/batman/observable/observable_test.coffee b/tests/batman/observable/observable_test.coffee
@@ -79,6 +79,24 @@ test "get(key) works with cacheable properties with more than one level of acces
   @obj.get('indirectProperty')
   equal @fooPropertyAccessor.get.callCount, 2
 
+test "get(key) works with Batman.Property.withoutTracking", ->
+  callCount = 0
+  @obj.accessor 'withoutTrackingProperty', ->
+    callCount++
+    @get('foo')
+    Batman.Property.withoutTracking =>
+      @get('foo.bar')
+    true
+
+  @obj.get('withoutTrackingProperty')
+  equal callCount, 1
+  @obj.set('foo.bar', true)
+  @obj.get('withoutTrackingProperty')
+  equal callCount, 1
+  @obj.set('foo')
+  @obj.get('withoutTrackingProperty')
+  equal callCount, 2
+
 ###
 # set(key)
 ###

diff --git a/tests/batman/property/keypath_test.coffee b/tests/batman/property/keypath_test.coffee
@@ -136,10 +136,10 @@ test "working with Hashes", ->
     hash: new Batman.Hash
       foo: new Batman.Object(bar: 'nested value'),
       "foo.bar": 'flat value'
-  
+
   equal obj.get('hash.foo.bar'), 'nested value'
   equal obj.hash.get('foo.bar'), 'flat value'
-  
+
   property = obj.property('hash.foo.bar')
   ok property instanceof Batman.Keypath
   equal property.getValue(), 'nested value'
@@ -163,10 +163,10 @@ test "working with SimpleHashes", ->
     hash: new Batman.SimpleHash
       foo: new Batman.Object(bar: 'nested value'),
       "foo.bar": 'flat value'
-  
+
   equal obj.get('hash.foo.bar'), 'nested value'
   equal obj.hash.get('foo.bar'), 'flat value'
-  
+
   property = obj.property('hash.foo.bar')
   ok property instanceof Batman.Keypath
   equal property.getValue(), 'nested value'
@@ -179,5 +179,3 @@ test "working with SimpleHashes", ->
   obj.set 'hash.foo.bar', 'new value'
   equal hashFooBarSpy.callCount, 1
   deepEqual hashFooBarSpy.lastCallArguments, ['new value', 'nested value']
-
-