volt 0.7.23 → 0.8.0

data/lib/volt/models/persistors/base.rb

@@ -15,7 +15,7 @@ module Persistors
       changed(attribute_name)
     end
 
-    def event_added(event, scope_provider, first, first_for_event)
+    def event_added(event, first, first_for_event)
     end
 
     def event_removed(event, last, last_for_event)

data/lib/volt/models/persistors/model_store.rb

@@ -82,7 +82,7 @@ module Persistors
       return promise
     end
 
-    def event_added(event, scope_provider, first, first_for_event)
+    def event_added(event, first, first_for_event)
       if first_for_event && event == :changed
         ensure_setup
       end

data/lib/volt/models/persistors/params.rb

@@ -20,7 +20,11 @@ module Persistors
     end
 
     def run_update
-      $page.params.trigger!('child_changed') if Volt.client?
+      # TODORW:
+      # $page.params.trigger!('child_changed') if Volt.client?
+      if Volt.client?
+        $page.url.update!
+      end
     end
   end
 end

data/lib/volt/models/persistors/query/query_listener.rb

@@ -16,12 +16,14 @@ class QueryListener
   def add_listener
     @listening = true
     @tasks.call('QueryTasks', 'add_listener', @collection, @query) do |results, errors|
+      # puts "Query Tasks: #{results.inspect} - #{@stores.inspect} - #{self.inspect}"
       # When the initial data comes back, add it into the stores.
       @stores.each do |store|
         # Clear if there are existing items
         store.model.clear if store.model.size > 0
 
         results.each do |index, data|
+          # puts "ADD: #{index} - #{data.inspect}"
           store.add(index, data)
         end
 

data/lib/volt/models/persistors/store.rb

@@ -27,10 +27,11 @@ module Persistors
         model = @model.new_array_model([], options)
       else
         model = @model.new_model(nil, options)
+
+        @model.attributes ||= {}
+        @model.attributes[method_name] = model
       end
 
-      @model.attributes ||= {}
-      @model.attributes[method_name] = model
 
       return model
     end

data/lib/volt/models/persistors/store_state.rb

@@ -7,7 +7,10 @@ module StoreState
   end
 
   def state
-    @state
+    @state_dep ||= Dependency.new
+    @state_dep.depend
+
+    return @state
   end
 
   # Called from the QueryListener when the data is loaded
@@ -18,7 +21,7 @@ module StoreState
     # Trigger changed on the 'state' method
     unless skip_trigger
       if old_state != @state
-        @model.trigger_for_methods!('changed', :state, :loaded?)
+        @state_dep.changed! if @state_dep
       end
     end
 
@@ -26,6 +29,8 @@ module StoreState
       # Trigger each waiting fetch
       @fetch_promises.compact.each {|fp| fp.resolve(@model) }
       @fetch_promises = nil
+
+      stop_listening
     end
   end
 

data/lib/volt/models/url.rb

@@ -1,9 +1,11 @@
 # The url class handles parsing and updating the url
+require 'volt/reactive/reactive_accessors'
+
 class URL
-  include ReactiveTags
+  include ReactiveAccessors
 
   # TODO: we need to make it so change events only trigger on changes
-  attr_reader :scheme, :host, :port, :path, :query, :params
+  reactive_accessor :scheme, :host, :port, :path, :query, :params, :fragment
   attr_accessor :router
 
   def initialize(router=nil)
@@ -13,13 +15,10 @@ class URL
 
   # Parse takes in a url and extracts each sections.
   # It also assigns and changes to the params.
-  tag_method(:parse) do
-    destructive!
-  end
   def parse(url)
     if url[0] == '#'
       # url only updates fragment
-      @fragment = url[1..-1]
+      self.fragment = url[1..-1]
       update!
     else
       host = `document.location.host`
@@ -37,41 +36,45 @@ class URL
       end
 
       matcher = url.match(/^(#{protocol[0..-2]})[:]\/\/([^\/]+)(.*)$/)
-      @scheme = matcher[1]
-      @host, @port = matcher[2].split(':')
-      @port ||= 80
+      self.scheme = matcher[1]
+      host, port = matcher[2].split(':')
+      port ||= 80
+
+      self.host = host
+      self.port = port
 
-      @path = matcher[3]
-      @path, @fragment = @path.split('#', 2)
-      @path, @query = @path.split('?', 2)
+      path = matcher[3]
+      path, fragment = path.split('#', 2)
+      path, query = path.split('?', 2)
+
+      self.path = path
+      self.fragment = fragment
+      self.query = query
 
       assign_query_hash_to_params
     end
 
     scroll
 
-    trigger_for_methods!('changed', :path)
-
     return true
   end
 
   # Full url rebuilds the url from it's constituent parts
   def full_url
-    if @port
-      host_with_port = "#{@host}:#{@port}"
+    if port
+      host_with_port = "#{host}:#{port}"
     else
-      host_with_port = @host
+      host_with_port = host
     end
 
-    path, params = @router.params_to_url(@params.deep_cur.to_h)
+    path, params = @router.params_to_url(@params.to_h)
 
-    new_url = "#{@scheme}://#{host_with_port}#{(path || @path).chomp('/')}"
+    new_url = "#{scheme}://#{host_with_port}#{(path || self.path).chomp('/')}"
 
     unless params.empty?
       new_url += '?'
       query_parts = []
       nested_params_hash(params).each_pair do |key,value|
-        value = value.cur
         # remove the _ from the front
         value = `encodeURI(value)`
         query_parts << "#{key}=#{value}"
@@ -80,7 +83,8 @@ class URL
       new_url += query_parts.join('&')
     end
 
-    new_url += '#' + @fragment if @fragment
+    frag = self.fragment
+    new_url += '#' + frag if frag.present?
 
     return new_url
   end
@@ -104,12 +108,13 @@ class URL
 
   def scroll
     if Volt.client?
-      if @fragment
+      frag = self.fragment
+      if frag
         # Scroll to anchor via http://www.w3.org/html/wg/drafts/html/master/browsers.html#scroll-to-fragid
         %x{
-          var anchor = $('#' + this.fragment);
+          var anchor = $('#' + frag);
           if (anchor.length == 0) {
-            anchor = $('*[name="' + this.fragment + '"]:first');
+            anchor = $('*[name="' + frag + '"]:first');
           }
           if (anchor && anchor.length > 0) {
             console.log('scroll to: ', anchor.offset().top);
@@ -134,10 +139,10 @@ class URL
       query_hash = self.query_hash
 
       # Get the params that are in the route
-      new_params = @router.url_to_params(@path)
+      new_params = @router.url_to_params(path)
 
       if new_params == false
-        raise "no routes match path: #{@path}"
+        raise "no routes match path: #{path}"
       end
 
       query_hash.merge!(new_params)
@@ -153,7 +158,7 @@ class URL
     def assign_from_old(params, new_params)
       queued_deletes = []
 
-      params.cur.attributes.each_pair do |name,old_val|
+      params.attributes.each_pair do |name,old_val|
         # If there is a new value, see if it has [name]
         new_val = new_params ? new_params[name] : nil
 
@@ -188,8 +193,9 @@ class URL
 
     def query_hash
       query_hash = {}
-      if @query
-        @query.split('&').reject {|v| v == '' }.each do |part|
+      qury = self.query
+      if qury
+        qury.split('&').reject {|v| v == '' }.each do |part|
           parts = part.split('=').reject {|v| v == '' }
 
           # Decode string

data/lib/volt/models/validations.rb

@@ -19,32 +19,22 @@ module Validations
     base.send :extend, ClassMethods
   end
 
-  # Sometimes we want to skip checking a field until some event
-  # has happened (usually a field has been typed in or blurred)
-  def exclude_from_errors!(field_name)
-    @exclude_from_errors ||= {}
-    @exclude_from_errors[field_name] = true
-
-    @include_in_errors.delete(field_name) if @include_in_errors
-
-    trigger_for_methods!('changed', :errors, :marked_errors)
-  end
-
   # Once a field is ready, we can use include_in_errors! to start
   # showing its errors.
   def mark_field!(field_name, trigger_changed=true)
-    @marked_fields ||= {}
-    @marked_fields[field_name] = true
+    marked_fields[field_name] = true
+  end
 
-    if trigger_changed
-      trigger_for_methods!('changed', :errors, :marked_errors)
-    end
+  def marked_fields
+    @marked_fields ||= ReactiveHash.new
   end
 
   def marked_errors
     errors(true)
   end
 
+  # TODO: Errors is being called for any validation change.  We should have errors return a
+  # hash like object that only calls the validation for each one.
   def errors(marked_only=false)
     errors = {}
 
@@ -62,7 +52,7 @@ module Validations
       validations.each_pair do |field_name, options|
         if marked_only
           # When marked only, skip any validations on non-marked fields
-          next unless @marked_fields && @marked_fields[field_name]
+          next unless marked_fields[field_name]
         end
 
         options.each_pair do |validation, args|

data/lib/volt/page/bindings/attribute_binding.rb

@@ -2,33 +2,39 @@ require 'volt/page/bindings/base_binding'
 require 'volt/page/targets/attribute_target'
 
 class AttributeBinding < BaseBinding
-  def initialize(page, target, context, binding_name, attribute_name, getter)
+  def initialize(page, target, context, binding_name, attribute_name, getter, setter)
     super(page, target, context, binding_name)
 
     @attribute_name = attribute_name
     @getter = getter
+    @setter = setter
 
     setup
   end
 
   def setup
 
-    # Find the source for the content binding
-    @value = value_from_getter(@getter)
-
-    # Run the initial update (render)
-    update
+    # Listen for changes
+    @computation = -> do
+      begin
+        update(@context.instance_eval(&@getter))
+      rescue => e
+        Volt.logger.error("AttributeBinding Error: #{e.inspect}")
+        update('')
+      end
+    end.watch!
 
-    if @value.reactive?
-      @update_listener = @value.on('changed') { update }
+    @is_radio = element.is('[type=radio]')
+    if @is_radio
+      @selected_value = element.attr('value')
+    end
 
-      # Bind so when this value updates, we update
-      case @attribute_name
-      when 'value'
-        element.on('input.attrbind') { changed }
-      when 'checked'
-        element.on('change.attrbind') {|event| changed(event) }
-      end
+    # Bind so when this value updates, we update
+    case @attribute_name
+    when 'value'
+      element.on('input.attrbind') { changed }
+    when 'checked'
+      element.on('change.attrbind') {|event| changed(event) }
     end
   end
 
@@ -40,26 +46,45 @@ class AttributeBinding < BaseBinding
       current_value = element.is(':checked')
     end
 
-    @value.cur = current_value
+    if @is_radio
+      if current_value
+        # if it is a radio button and its checked
+        @context.instance_exec(@selected_value, &@setter)
+      end
+    else
+      @context.instance_exec(current_value, &@setter)
+    end
   end
 
   def element
     Element.find('#' + binding_name)
   end
 
-  def update
-    value = @value.cur
-
+  def update(new_value)
     if @attribute_name == 'checked'
-      update_checked
+      update_checked(new_value)
       return
     end
 
-    if value.is_a?(NilMethodCall) || value.nil?
-      value = ''
-    end
+    # Stop any previous reactive template computations
+    @string_template_renderer_computation.stop if @string_template_renderer_computation
+    @string_template_renderer.remove if @string_template_renderer
 
-    self.value = value
+    if new_value.is_a?(StringTemplateRender)
+      # We don't need to refetch the whole reactive template to
+      # update, we can just depend on it and update directly.
+      @string_template_renderer = new_value
+
+      @string_template_renderer_computation = -> do
+        self.value = @string_template_renderer.html
+      end.watch!
+    else
+      if new_value.is_a?(NilMethodCall) || new_value.nil?
+        new_value = ''
+      end
+
+      self.value = new_value
+    end
   end
 
   def value=(val)
@@ -75,15 +100,16 @@ class AttributeBinding < BaseBinding
     end
   end
 
-  def update_checked
-    value = @value.cur
-
+  def update_checked(value)
     if value.is_a?(NilMethodCall) || value.nil?
       value = false
     end
 
-    element.prop('checked', value)
+    if @is_radio
+      value = (@selected_value == value)
+    end
 
+    element.prop('checked', value)
   end
 
   def remove
@@ -96,22 +122,14 @@ class AttributeBinding < BaseBinding
       element.off('change.attrbind', nil)
     end
 
-    # Value is a reactive template, remove it
-    if @value && @value.reactive?
-      @value.remove
-    end
-
-
-    if @update_listener
-      @update_listener.remove
-      @update_listener = nil
-    end
+    @string_template_renderer.remove if @string_template_renderer
+    @string_template_renderer_computation.stop if @string_template_renderer_computation
+    @computation.stop if @computation
 
     # Clear any references
     @target = nil
     @context = nil
     @getter = nil
-    @value = nil
   end
 
   def remove_anchors

data/lib/volt/page/bindings/base_binding.rb

@@ -36,18 +36,4 @@ class BaseBinding
   def remove_anchors
     @dom_section.remove_anchors if @dom_section
   end
-
-  def queue_update
-    if Volt.server?
-      # Run right away
-      update
-    else
-      @page.draw_cycle.queue(self)
-    end
-  end
-
-  def value_from_getter(getter)
-    # Evaluate the getter proc in the context
-    return @context.instance_eval(&getter)
-  end
 end