generalize to reactive block

Author: ryanstout

lib/volt/page/bindings/event_binding.rb

@@ -11,8 +11,11 @@ def key_code
     `this.js_event.keyCode`
   end
 
-  def stop
-    # `this.js_event.stopPropagation();`
+  def stop!
+    `this.js_event.stopPropagation();`
+  end
+
+  def prevent_default!
     `this.js_event.preventDefault();`
   end
 
@@ -30,7 +33,7 @@ def initialize(page, target, context, binding_name, event_name, call_proc)
 
     handler = Proc.new do |js_event|
       event = JSEvent.new(js_event)
-      event.stop if event_name == 'submit'
+      event.prevent_default! if event_name == 'submit'
 
       # Call the proc the user setup for the event in context,
       # pass in the wrapper for the JS event

lib/volt/reactive/reactive_array.rb

@@ -1,5 +1,5 @@
 require 'volt/reactive/object_tracking'
-require 'volt/reactive/reactive_count'
+require 'volt/reactive/reactive_block'
 
 class ReactiveArray# < Array
   include ReactiveTags
@@ -244,7 +244,7 @@ def inspect
   # end
   def count(&block)
     if block
-      return ReactiveCount.new(self, block)
+      return ReactiveBlock.new(self, block)
     else
       @array.count
     end

lib/volt/reactive/reactive_count.rb renamed to lib/volt/reactive/reactive_block.rb

@@ -1,4 +1,4 @@
-class ReactiveCount
+class ReactiveBlock
   include ReactiveTags
 
   def reactive?
@@ -14,27 +14,10 @@ def cur
     direct_count
   end
 
-  # 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.cur.size.times do |index|
-      val = @source[index]
-      result = @block.call(val).cur
-      if result == true
-        count += 1
-      end
-    end
-
-    count
+    @source.cur.array.count(&@block)
   end
 
   def setup_listeners

lib/volt/server/html_parser/sandlebars_parser.rb

@@ -13,7 +13,7 @@ class SandlebarsParser
   def self.truth_hash(array)
     hash = {}
     array.each {|v| hash[v] = true }
-    
+
     return hash
   end
 
@@ -23,64 +23,64 @@ def self.truth_hash(array)
   ATTRIBUTES = /([-\:A-Za-z0-9_]+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/
 
   # Types of elements
-  BLOCK = truth_hash(%w{address applet blockquote button center dd del dir div dl dt fieldset form frameset hr iframe ins isindex li map menu noframes noscript object ol p pre script table tbody td tfoot th thead tr ul})
+  BLOCK = truth_hash(%w{a address applet blockquote button center dd del dir div dl dt fieldset form frameset hr iframe ins isindex li map menu noframes noscript object ol p pre script table tbody td tfoot th thead tr ul})
   EMPTY = truth_hash(%w{area base basefont br col frame hr img input isindex link meta param embed})
-  INLINE = truth_hash(%w{a abbr acronym applet b basefont bdo big br button cite code del dfn em font i iframe img input ins kbd label map object q s samp script select small span strike strong sub sup textarea tt u var})
+  INLINE = truth_hash(%w{abbr acronym applet b basefont bdo big br button cite code del dfn em font i iframe img input ins kbd label map object q s samp script select small span strike strong sub sup textarea tt u var})
   CLOSE_SELF = truth_hash(%w{colgroup dd dt li options p td tfoot th thead tr})
   SPECIAL = truth_hash(%w{script style})
-  
+
   FILL_IN_ATTRIBUTES = truth_hash(%w{checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected})
-  
+
   def initialize(html, handler, file_path=nil)
     @html = StringScanner.new(html)
     @handler = handler
     @file_path = file_path
-    
+
     @stack = []
-    
+
     parse
   end
-  
+
   def last
     @stack.last
   end
-  
+
   def parse
     loop do
       if last && SPECIAL[last]
         # In a script or style tag, just look for the first end
         close_tag = "</#{last}>"
         body = @html.scan_until(/#{close_tag}/)
         body = body[0..((-1 * close_tag.size)-1)]
-        
+
         body = body.gsub(/\<\!--(.*?)--\>/, "\\1").gsub(/\<\!\[CDATA\[(.*?)\]\]\>/, "\\1")
-        
+
         text(body)
-        
+
         end_tag(last, last)
       elsif @html.scan(/\<\!--/)
         # start comment
         comment = @html.scan_until(/--\>/)
         comment = comment[0..-4]
-        
+
         @handler.comment(comment) if @handler.respond_to?(:comment)
       elsif (tag = @html.scan(START_TAG))
         tag_name = @html[1]
         rest = @html[2]
         unary = @html[3]
-      
+
         start_tag(tag, tag_name, rest, unary)
       elsif @html.scan(END_TAG)
         tag_name = @html[1]
-        
+
         end_tag(tag_name, tag_name)
       elsif (escaped = @html.scan(/\{\{\{(.*?)\}\}\}([^\}]|$)/))
         # Anything between {{{ and }}} is escaped and not processed (treaded as text)
         if escaped[-1] != '}'
           # Move back if we matched a new non } for close, skip if we hit the end
           @html.pos = @html.pos - 1
         end
-        
+
         text(@html[1])
       elsif (binding = @html.scan(/\{/))
         # We are in text mode and matched the start of a binding
@@ -93,14 +93,14 @@ def parse
         break
       end
     end
-    
+
     end_tag(nil, nil)
   end
-  
+
   def text(text)
     @handler.text(text) if @handler.respond_to?(:text)
   end
-  
+
   # Findings the end of a binding
   def start_binding
     binding = ''
@@ -109,7 +109,7 @@ def start_binding
     # scan until we reach a { or }
     loop do
       binding << @html.scan_until(/([\{\}\n]|\Z)/)
-      
+
       match = @html[1]
       if match == '}'
         # close
@@ -126,23 +126,23 @@ def start_binding
         raise "should not reach here"
       end
     end
-    
+
     binding = binding[0..-2]
-    @handler.binding(binding) if @handler.respond_to?(:binding)    
+    @handler.binding(binding) if @handler.respond_to?(:binding)
   end
-  
+
   def raise_parse_error(error)
     line_number = @html.pre_match.count("\n") + 1
-    
+
     error_str = error + " on line: #{line_number}"
     error_str += " of #{@file_path}" if @file_path
 
     raise HTMLParseError, error_str
   end
-  
+
   def start_tag(tag, tag_name, rest, unary)
     section_tag = tag_name[0] == ':' && tag_name[1] =~ /[A-Z]/
-    
+
     tag_name = tag_name.downcase
 
     # handle doctype so we get it output exactly the same way
@@ -157,45 +157,45 @@ def start_tag(tag, tag_name, rest, unary)
         end_tag(nil, last)
       end
     end
-    
+
     # Some tags close themselves when a new one of themselves is reached.
     # ex, a tr will close the previous tr
     if CLOSE_SELF[tag_name] && last == tag_name
       end_tag(nil, tag_name)
     end
-    
+
     unary = EMPTY[tag_name] || !unary.blank?
-    
+
     # Section tag's are also unary
     unless unary || section_tag
       @stack.push(tag_name)
     end
-    
+
     if @handler.respond_to?(:start_tag)
       attributes = {}
-      
+
       # Take the rest string and extract the attributes, filling in any
       # "fill in" attribute values if not provided.
       rest.scan(ATTRIBUTES).each do |match|
         name = match[0]
-        
+
         value = match[1] || match[2] || match[3] || FILL_IN_ATTRIBUTES[name] || ''
-        
+
         attributes[name] = value
       end
-      
+
       if section_tag
         @handler.start_section(tag_name, attributes, unary)
       else
         @handler.start_tag(tag_name, attributes, unary)
       end
     end
   end
-  
+
   def end_tag(tag, tag_name)
     # If no tag name is provided, close all the way up
     new_size = 0
-    
+
     if tag
       # Find the closest tag that closes.
       (@stack.size-1).downto(0) do |index|
@@ -205,7 +205,7 @@ def end_tag(tag, tag_name)
         end
       end
     end
-        
+
     if new_size >= 0
       if @handler.respond_to?(:end_tag)
         (@stack.size-1).downto(new_size) do |index|

spec/models/reactive_array_spec.rb

@@ -327,4 +327,38 @@
       expect(count).to eq(0)
     end
   end
+
+  # describe "concat, diff" do
+  #   it "should concat two arrays and trigger added/removed through" do
+  #     a = ReactiveValue.new(ReactiveArray.new([1,2,3]))
+  #     b = ReactiveValue.new(ReactiveArray.new([1,2,3]))
+  #
+  #     c = a + b
+  #
+  #     count = 0
+  #     # c.on('added') { count += 1 }
+  #     c.on('changed') { count += 1 }
+  #     expect(count).to eq(0)
+  #
+  #     b << 4
+  #
+  #     expect(count).to eq(1)
+  #   end
+  # end
+
+  describe "array methods" do
+    it "should handle compact with events" do
+      a = ReactiveValue.new(ReactiveArray.new([1,2,nil,3]))
+
+      count = 0
+      last_position = nil
+      compact = a.compact
+      compact.on('changed') { count += 1 }
+      expect(count).to eq(0)
+
+      a << 4
+
+      expect(count).to eq(1)
+    end
+  end
 end

spec/models/reactive_count_spec.rb renamed to spec/models/reactive_block_spec.rb

@@ -1,6 +1,6 @@
 require 'volt/models'
 
-describe ReactiveCount do
+describe ReactiveBlock do
   it "should call cur through the reactive count to the number" do
     model = ReactiveValue.new(Model.new)