reactive count

Author: ryanstout

lib/volt/page/bindings/content_binding.rb

@@ -17,6 +17,9 @@ def initialize(page, target, context, binding_name, getter)
 
   def update
     value = @value.cur.or('')
+    if value.reactive?
+      puts "GOT CUR: #{value.inspect}"
+    end
 
     # Exception values display the exception as a string
     value = value.to_s

lib/volt/page/bindings/template_binding.rb

@@ -174,7 +174,7 @@ def call_ready
       # Set the current section on the controller if it wants so it can manipulate
       # the dom if needed
       if @controller.respond_to?(:section=)
-        @controller.dom_section = @current_template.dom_ection
+        @controller.section = @current_template.dom_section
       end
 
       if @controller.respond_to?(:dom_ready)

lib/volt/reactive/reactive_count.rb

@@ -17,14 +17,16 @@ def cur
   # After events are bound, we keep a cache of each cell's count
   # value, and base the results
   def cached_count
+    @cached_results = []
+
 
   end
 
   # Before events are bound, when .cur is called, we simply
   # run the count on the source object.
   def direct_count
     count = 0
-    @source.size.cur.times do |index|
+    @source.cur.size.times do |index|
       val = @source[index]
       result = @block.call(val).cur
       if result == true
@@ -37,23 +39,25 @@ def direct_count
 
   def setup_listeners
     @cell_trackers = []
+    @setup = false
     @added_tracker = @source.on('added') do |_, index|
       change_cell_count(@source.size.cur)
-      trigger!('changed')
     end
 
     @removed_tracker = @source.on('removed') do |_, index|
       change_cell_count(@source.size.cur)
-      trigger!('changed')
     end
 
+    @setup = true
+
     # Initial cell tracking
     change_cell_count(@source.size.cur)
   end
 
   # We need to make sure we're listening on the result from each cell,
   # that way we can trigger when the value changes.
   def change_cell_count(size)
+    # puts "CHANGE SIZE: #{size}"
     current_size = @cell_trackers.size
 
     if current_size < size
@@ -66,6 +70,7 @@ def change_cell_count(size)
         result = @block.call(val)
 
         @cell_trackers << result.on('changed') do
+          # puts "RESULT CHANGED: #{index}"
           trigger!('changed')
         end
       end

lib/volt/reactive/reactive_value.rb

@@ -239,21 +239,23 @@ def event_removed(event, last, last_for_event)
 
   # Fetch the current value
   def cur(shallow=false, ignore_cache=false)
-    # Return from cache if it is cached
+    # Use cache if it is cached
     if @cur_cache && !shallow && !ignore_cache
-      return @cur_cache
-    end
-
-    if @getter.class == ::Proc
-      # Get the current value, capture any errors
-      begin
-        result = @getter.call
-      rescue => e
-        result = e
-      end
+      # We might be caching another reactive value, so we just set
+      # it as the result and let it get unwrapped.
+      result = @cur_cache
     else
-      # getter is just an object, return it
-      result = @getter
+      if @getter.class == ::Proc
+        # Get the current value, capture any errors
+        begin
+          result = @getter.call
+        rescue => e
+          result = e
+        end
+      else
+        # getter is just an object, return it
+        result = @getter
+      end
     end
 
     if !shallow && result.reactive?
@@ -268,7 +270,7 @@ def cur(shallow=false, ignore_cache=false)
   def update_followers
     return if @setting_up
     if has_listeners?
-      current_obj = cur(false, true)
+      current_obj = cur(true, true)
       should_attach = current_obj.respond_to?(:on)
 
       if should_attach

spec/models/reactive_count_spec.rb

@@ -0,0 +1,13 @@
+require 'volt/models'
+
+describe ReactiveCount do
+  it "should call cur through the reactive count to the number" do
+    model = ReactiveValue.new(Model.new)
+
+    model._items << {_name: 'ok'}
+
+    count = model._items.count {|m| m._name == 'ok' }
+
+    expect(count.cur).to eq(1)
+  end
+end