volt 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8411833ee4800b3e7d701875b963b718af2c8351
-  data.tar.gz: f68ff074f4a685036f18e9a0536d431cee35ad1a
+  metadata.gz: 8d7bacdfeed9b6502911eb0eeea86c91ff909e58
+  data.tar.gz: f7a9dbc54254ba479f159054500e0d7be94383d8
 SHA512:
-  metadata.gz: c20f7c8102cf7b8b5f7fb35996cc9bf15400bc2d027324ab263357f7b46b2e5ae8843445b503fc22e37521e6b8ec195eba226fa4bed9e81a4b3e55968bc7103e
-  data.tar.gz: 3795c0247a76819a5ba58b444cf922db34c9234ae0816ebdf7c6d7ff7cfd535b03b0c5235277e52b20c47a491932667ca6137523135fde6195cec330f3bfdcb7
+  metadata.gz: 5fc4b3f656d8b40a8160eb5f386d0e76e156eb282ea3eb0f4359a246b2147127fd632eefea78f78916238474ecc721f12e88c22d1e8abac95b632b45bb4947c8
+  data.tar.gz: 559444ac5f139576652669add6d7fe23b7532b4dd1a6b8fe849181e584fad67298597668f0d975bd25338791c398ac952b663f3b88208564ead76607d93ce02b

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/app/volt/assets/css/notices.css.scss

@@ -0,0 +1,8 @@
+.notices {
+  position: absolute;
+  width: 600px;
+  top: 0px;
+  margin-left: -300px;
+  left: 50%;
+  z-index: 1000;
+}

data/app/volt/tasks/channel_tasks.rb

@@ -0,0 +1,33 @@
+class ChannelTasks
+  @@listeners = {}
+  
+  def initialize(channel, dispatcher)
+    @channel = channel
+    @dispatcher = dispatcher
+  end
+  
+  def add_listener(channel_name)
+    @@listeners[channel_name] ||= []
+    @@listeners[channel_name] << @channel
+  end
+  
+  def remove_listener(channel_name)
+    if @@listeners[channel_name]
+      @@listeners[channel_name].delete(@channel)
+    end
+  end
+  
+  def self.send_message_to_channel(channel_name, message, skip_channel)
+    listeners = @@listeners[channel_name]
+    
+    if listeners
+      listeners.each do |listener|
+        # We might need to skip a channel if the update came in on this
+        # channel.
+        next if listener == skip_channel
+        
+        listener.send_message(*message)
+      end
+    end
+  end
+end

data/app/volt/tasks/store_tasks.rb

@@ -0,0 +1,45 @@
+require 'mongo'
+require_relative 'channel_tasks'
+
+class StoreTasks
+  def initialize(channel=nil, dispatcher=nil)
+    @@mongo_db ||= Mongo::MongoClient.new("localhost", 27017)
+    @@db ||= @@mongo_db.db("development")
+    
+    @channel = channel
+    @dispatcher = dispatcher
+  end
+  
+  def db
+    @@db
+  end
+  
+  def save(collection, data)
+    puts "Insert: #{data.inspect} on #{collection.inspect}"
+    # Try to create
+    # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
+    begin
+      @@db[collection].insert(data)
+      id = {'_id' => data.delete('_id')}
+    rescue Mongo::OperationFailure => error
+      # Really mongo client?
+      if error.message[/^11000[:]/]
+        # Update because the id already exists
+        id = {'_id' => data.delete('_id')}
+        @@db[collection].update(id, data)
+      else
+        raise
+      end
+    end
+    
+    id = id['_id']
+    # ChannelHandler.send_message_all(@channel, 'update', nil, id, data.merge('_id' => id))
+    
+    ChannelTasks.send_message_to_channel("#{collection}##{id}", ['update', nil, id, data.merge('_id' => id)], @channel)
+  end
+  
+  def find(collection, scope, query=nil)
+    puts "FIND: #{collection.inspect} - #{scope}"
+    return @@db[collection].find(scope).to_a
+  end
+end

data/app/volt/views/notices/index.html

@@ -0,0 +1,11 @@
+<:body>
+{#if page._reloading}
+  <div class="notices alert alert-info">Reloading...</div>
+{/}
+{#if channel.state == :closed}
+  <div class="notices alert alert-info">
+    Connection Lost... {channel.error}...
+    {#if channel.reconnect_interval}  Reconnecting in {(channel.reconnect_interval / 1000.0).round} sec{/}
+  </div>
+{/}
+</:body>

data/lib/volt/controllers/model_controller.rb

@@ -23,6 +23,10 @@ class ModelController
     $page.channel
   end
   
+  def tasks
+    $page.tasks
+  end
+  
   def controller
     @controller ||= ReactiveValue.new(Model.new)
   end

data/lib/volt/models/array_model.rb

@@ -2,10 +2,12 @@ require 'volt/models/model_wrapper'
 
 class ArrayModel < ReactiveArray
   include ModelWrapper
+  
+  attr_reader :parent, :path
 
   def initialize(array=[], parent=nil, path=nil)
     @parent = parent
-    @path = path
+    @path = path || []
     
     array = wrap_values(array)
     
@@ -34,4 +36,12 @@ class ArrayModel < ReactiveArray
     args = wrap_values(args)
     super(*args)
   end
+  
+  def new_model(*args)
+    Model.new(*args)
+  end
+  
+  def new_array_model(*args)
+    ArrayModel.new(*args)
+  end
 end

data/lib/volt/models/model.rb

@@ -33,9 +33,9 @@ class Model
   end
   
   def initialize(attributes={}, parent=nil, path=nil, class_paths=nil)
-    self.attributes = wrap_values(attributes)
     @parent = parent
-    @path = path
+    @path = path || []
+    self.attributes = wrap_values(attributes)
   end
   
   # Pass the comparison through
@@ -58,9 +58,6 @@ class Model
   end
   
   tag_all_methods do
-    destructive! do |method_name|
-      method_name[0] == '_' && method_name[-1] == '='
-    end
     pass_reactive! do |method_name|
       method_name[0] == '_' && method_name[-1] == '='
     end
@@ -89,7 +86,7 @@ class Model
     value = args[0]
     __assign_element(attribute_name, value)
     
-    attributes[attribute_name] = wrap_value(value)
+    attributes[attribute_name] = wrap_value(value, [attribute_name])
     trigger_by_attribute!('changed', attribute_name)
   end
   
@@ -101,7 +98,7 @@ class Model
     # Reading an attribute, we may get back a nil model.
     method_name = method_name.to_sym
     
-    if attributes == nil
+    if method_name[0] != '_' && attributes == nil
       # The method we are calling is on a nil model, return a wrapped 
       # exception.
       return return_undefined_method(method_name)
@@ -109,9 +106,14 @@ class Model
       # Method has the key, look it up directly
       return attributes[method_name]
     else
-      return new_model(nil, self, method_name)
+      return read_new_model(method_name)
     end
   end
+
+  # Get a new model, make it easy to override
+  def read_new_model(method_name)
+    return new_model(nil, self, path + [method_name])
+  end
   
   def return_undefined_method(method_name)
     # Methods called on nil capture an error so the user can know where
@@ -131,6 +133,10 @@ class Model
     Model.new(*args)
   end
   
+  def new_array_model(*args)
+    ArrayModel.new(*args)
+  end
+  
   def trigger_by_attribute!(event_name, attribute, *passed_args)
     trigger_by_scope!(event_name, *passed_args) do |scope|
       method_name, *args, block = scope
@@ -152,24 +158,26 @@ class Model
       if @parent
         @parent.expand!
       
-        @parent.attributes[@path] = self
+        @parent.attributes[@path.last] = self
       end
     end
   end
   
   tag_method(:<<) do
-    destructive!
     pass_reactive!
   end
   # Initialize an empty array and append to it
   def <<(value)
     @parent.expand!
-    result = @parent.send(@path)
+
+    # Grab the last section of the path, so we can do the assign on the parent
+    path = @path.last
+    result = @parent.send(path)
     
     if result.nil?
       # If this isn't a model yet, instantiate it
-      @parent.send(:"#{@path}=", ArrayModel.new([], @parent, @path))
-      result = @parent.send(@path)
+      @parent.send(:"#{path}=", new_array_model([], @parent, @path))
+      result = @parent.send(path)
       
       # Add the new item
       result << value
@@ -179,7 +187,7 @@ class Model
   end
   
   def inspect
-    "<#{self.class.to_s}:#{@path} #{attributes.inspect}>"
+    "<#{self.class.to_s} #{attributes.inspect}>"
   end
   
   

data/lib/volt/models/model_wrapper.rb

@@ -1,21 +1,28 @@
 module ModelWrapper
   # For cretain values, we wrap them to make the behave as a
   # model.
-  def wrap_value(value)
+  def wrap_value(value, lookup)
     if value.cur.is_a?(Array)
-      value = ArrayModel.new(value, self, nil)
+      value = new_array_model(value, self, path + lookup)
     elsif value.cur.is_a?(Hash)
-      value = Model.new(value)
+      value = new_model(value, self, path + lookup)
     end
     
     return value
   end
   
-  def wrap_values(values)
+  def wrap_values(values, lookup=[])
     if values.cur.is_a?(Array)
-      values = values.map {|v| wrap_value(v) }
+      # Coming from an array
+      values = values.map {|v| wrap_value(v,lookup + [:[]]) }
     elsif values.cur.is_a?(Hash)
-      values = Hash[values.map {|k,v| [k, wrap_value(v)] }]
+      pairs = values.map do |k,v|
+        path = lookup + [k]
+            
+        [k, wrap_value(v,path)]
+      end
+      
+      values = Hash[pairs]
     end
     
     return values

data/lib/volt/models/params.rb

@@ -1,3 +1,5 @@
+require 'volt/models/params_array'
+
 # All url related data is stored in params.  This includes the main uri
 # in addition to any query parameters.  The router is responsible for
 # converting any uri sections into params.  Sections in the uri will
@@ -6,7 +8,6 @@
 # The params value can be updated the same way a model would be, only
 # the updates will trigger an updated url via the browser history api.
 # TODO: Support # for browsers without the history api.
-
 class Params < Model    
   def initialize(*args)
     super(*args)
@@ -64,4 +65,8 @@ class Params < Model
   def new_model(*args)
     Params.new(*args)
   end
+  
+  def new_array_model(*args)
+    ParamsArray.new(*args)
+  end
 end

data/lib/volt/models/params_array.rb

@@ -0,0 +1,9 @@
+class ParamsArray < ArrayModel
+  def new_model(*args)
+    Params.new(*args)
+  end
+  
+  def new_array_model(*args)
+    ParamsArray.new(*args)
+  end
+end

data/lib/volt/models/store.rb

@@ -0,0 +1,164 @@
+require 'volt/models/store_array'
+
+class Store < Model
+  ID_CHARS = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map {|v| v.to_a }.flatten
+  
+  @@identity_map = {}
+  
+  def initialize(tasks=nil, *args)
+    @tasks = tasks
+
+    super(*args)
+    
+    track_in_identity_map if attributes && attributes['_id']
+    
+    value_updated
+  end
+  
+  # def _id
+  #   return attributes && attributes['_id']
+  # end
+
+  def event_added(event, scope_provider, first)
+    if first && event == :changed
+      # Start listening
+      ensure_id
+      if self.attributes && self.path.size > 1
+        channel_name = "#{self.path[-2]}##{self.attributes['_id']}"
+        puts "LISTENER ON: #{channel_name.inspect} -- #{self.path.inspect}"
+        $page.tasks.call('ChannelTasks', 'add_listener', channel_name)
+      end
+    end
+  end
+  
+  def event_removed(event, no_more_events)
+    if no_more_events && event == :changed
+      # Stop listening
+      if self.attributes && self.path.size > 1
+        channel_name = "#{self.path[-2]}##{self.attributes['_id']}"
+        puts "REMOVE LISTENER ON: #{channel_name}"
+        $page.tasks.call('ChannelTasks', 'remove_listener', channel_name)
+      end
+    end
+  end
+  
+  def self.update(model_id, data)
+    model = @@identity_map[model_id]
+    
+    if model
+      data.each_pair do |key, value|
+        if key != '_id'
+          puts "update #{key} with #{value.inspect}"
+          model.send(:"#{key}=", value)
+        end
+      end
+    end
+  end
+  
+  def generate_id
+    id = []
+    12.times { id << ID_CHARS.sample }
+    
+    return id.join
+  end
+  
+  def method_missing(method_name, *args, &block)
+    result = super
+    
+    if method_name[0] == '_' && method_name[-1] == '='
+      # Trigger value updated after an assignment
+      self.value_updated
+    end
+    
+    return result
+  end
+  
+  def track_in_identity_map
+    @@identity_map[attributes['_id']] = self
+  end
+  
+  # When called, will setup an id if there is not one
+  def ensure_id
+    # No id yet, lets create one
+    if attributes && !attributes['_id']
+      self.attributes['_id'] = generate_id
+      track_in_identity_map
+    end
+  end
+  
+  def value_updated
+    # puts "VU: #{@tasks.inspect} = #{path.inspect} - #{attributes.inspect}"
+    if (!defined?($loading_models) || !$loading_models) && @tasks && path.size > 0 && !self.nil?
+      
+      ensure_id
+      
+      if path.size > 2 && parent && source = parent.parent
+        self.attributes[path[-2].to_s.singularize+'_id'] = source._id
+      end
+      
+      # Don't store any sub-stores, those will do their own saving.
+      attrs = attributes.reject {|k,v| v.is_a?(Model) || v.is_a?(ArrayModel) }
+      
+      puts "Save: #{collection} - #{attrs.inspect}"
+      @tasks.call('StoreTasks', 'save', collection, attrs)
+    end
+  end
+  
+  def collection(path=nil)
+    path ||= self.path
+    
+    collection_name = path.last
+    collection_name = path[-2] if collection_name == :[]
+    
+    return collection_name
+  end
+  
+  # On stores, we store the model so we don't have to look it up
+  # every time we do a read.
+  def read_new_model(method_name)
+    model = new_model(nil, self, path + [method_name])
+    
+    self.attributes ||= {}
+    attributes[method_name] = model
+    
+    return model
+  end
+  
+  
+  
+  def new_model(attributes={}, parent=nil, path=nil, class_paths=nil)
+    model = Store.new(@tasks, attributes, parent, path, class_paths)
+
+    if @tasks && path.last[-1] == 's'
+      # puts "FIND NEW MODEL: #{path.inspect} - #{attributes.inspect}"
+      
+      # Check to see the parents scope so we can only lookup associated
+      # models.
+      scope = {}
+      
+      if parent.attributes && parent.attributes['_id'].true?
+        scope[path[-1].singularize + '_id'] = parent._id
+      end
+      
+      puts "FIND: #{collection(path).inspect} at #{scope.inspect}"
+      @tasks.call('StoreTasks', 'find', collection(path), scope) do |results|
+        # TODO: Globals evil, replace
+        $loading_models = true
+        results.each do |result|
+          # Get model again, we need to fetch it each time so it gets the
+          # updated model when it switches from nil.
+          # TODO: Strange that this is needed
+          model = self.send(path.last)
+          model << Store.new(@tasks, result, model, path + [:[]], class_paths)
+        end
+        $loading_models = false
+      end
+    end
+    
+    return model
+  end
+  
+  def new_array_model(*args)
+    StoreArray.new(@tasks, *args)
+  end
+end

data/lib/volt/models/store_array.rb

@@ -0,0 +1,15 @@
+class StoreArray < ArrayModel
+  def initialize(tasks=nil, array=[], parent=nil, path=nil)
+    @tasks = tasks
+
+    super(array, parent, path)
+  end
+  
+  def new_model(*args)
+    Store.new(@tasks, *args)
+  end
+  
+  def new_array_model(*args)
+    StoreArray.new(@tasks, *args)
+  end
+end

data/lib/volt/models/url.rb

@@ -60,10 +60,6 @@ class URL
   # Called when the state has changed and the url in the
   # browser should be updated
   # Called when an attribute changes to update the url
-  tag_method(:update!) do
-    destructive!
-    # TODO: ! methods should default to destructive
-  end
   def update!
     new_url = full_url()
     

data/lib/volt/models.rb

@@ -2,4 +2,5 @@ require 'volt/extra_core/extra_core'
 require 'volt/reactive/reactive_value'
 require 'volt/models/model'
 require 'volt/models/params'
+require 'volt/models/store'
 

data/lib/volt/{templates → page/bindings}/attribute_binding.rb

@@ -1,5 +1,5 @@
-require 'volt/templates/base_binding'
-require 'volt/templates/targets/attribute_target'
+require 'volt/page/bindings/base_binding'
+require 'volt/page/targets/attribute_target'
 
 class AttributeBinding < BaseBinding
   def initialize(target, context, binding_name, attribute_name, getter)
@@ -82,11 +82,7 @@ class AttributeBinding < BaseBinding
       value = false
     end
     
-    if value
-      element['checked'] = 'checked'
-    else
-      element.remove_attr('checked')
-    end
+    element.prop('checked', value)
     
   end
   
@@ -104,6 +100,11 @@ class AttributeBinding < BaseBinding
       @update_listener.remove
       @update_listener = nil
     end
+    
+    # Clear any references
+    @target = nil
+    @context = nil
+    @section = nil
   end
 
 

data/lib/volt/{templates → page/bindings}/base_binding.rb

@@ -13,8 +13,13 @@ class BaseBinding
     @section ||= target.section(@binding_name)
   end
   
-  def remove
+  def remove    
     section.remove
+    
+    # Clear any references
+    @target = nil
+    @context = nil
+    @section = nil
   end
   
   def remove_anchors

data/lib/volt/{templates → page/bindings}/content_binding.rb

@@ -1,4 +1,4 @@
-require 'volt/templates/base_binding'
+require 'volt/page/bindings/base_binding'
 
 class ContentBinding < BaseBinding
   def initialize(target, context, binding_name, getter)

data/lib/volt/{templates → page/bindings}/each_binding.rb

@@ -1,4 +1,4 @@
-require 'volt/templates/base_binding'
+require 'volt/page/bindings/base_binding'
 
 class EachBinding < BaseBinding
   def initialize(target, context, binding_name, getter, variable_name, template_name)
@@ -17,20 +17,23 @@ class EachBinding < BaseBinding
     # Run the initial render
     update
 
-    @added_listener = @value.on('added') { |position, item| puts "ADDED" ; item_added(position) }
+    @added_listener = @value.on('added') { |_, position, item| puts "ADDED" ; item_added(position) }
     @changed_listener = @value.on('changed') { puts "CHANGED" ; reload }
-    @removed_listener = @value.on('removed') { |position| puts "REMOVED at #{position.inspect}" ; item_removed(position) }
+    @removed_listener = @value.on('removed') { |_, position| item_removed(position) }
   end
   
   # When a change event comes through, its most likely upstream, so the whole
   # array might have changed.  In this case, just reload the whole thing
   # TODO: Track to make sure the changed event isn't being called too often (it is currently)
   def reload
+    # ObjectTracker.enable_cache
     # Remove all of the current templates
     if @templates
       @templates.each do |template|
-        template.remove
         template.remove_anchors
+        
+        # TODO: Make sure this is being removed since we already removed the anchors
+        template.remove
       end
     end
     
@@ -38,12 +41,14 @@ class EachBinding < BaseBinding
     
     # Run update again to rebuild
     update
+
+    # ObjectTracker.disable_cache
   end
 
   def item_removed(position)
     position = position.cur
-    @templates[position].remove
     @templates[position].remove_anchors
+    @templates[position].remove
     @templates.delete_at(position)
     
     value_obj = @value.cur
@@ -63,7 +68,8 @@ class EachBinding < BaseBinding
   end
 
   def item_added(position)
-    # puts "ADDED AT #{position}"
+    # ObjectTracker.enable_cache
+    # puts "ADDED 1"
     binding_name = @@binding_number
     @@binding_number += 1
 
@@ -75,7 +81,10 @@ class EachBinding < BaseBinding
     
     item_context = SubContext.new({@item_name => value, :index => index, :parent => @value}, @context)
 
+    # ObjectTracker.enable_cache
     @templates << TemplateRenderer.new(@target, item_context, binding_name, @template_name)
+    # puts "ADDED 2"
+    # ObjectTracker.disable_cache
   end
 
   def update(item=nil)

data/lib/volt/{templates → page/bindings}/event_binding.rb

@@ -1,4 +1,4 @@
-require 'volt/templates/base_binding'
+require 'volt/page/bindings/base_binding'
 
 # TODO: We need to figure out how we want to wrap JS events
 class JSEvent
@@ -39,10 +39,6 @@ class EventBinding < BaseBinding
     @listener = $page.events.add(event_name, self, handler)
   end
 
-  def element
-    Element.find('#' + binding_name)
-  end
-
   # Remove the event binding
   def remove
     # puts "REMOVE EL FOR #{@event}"

data/lib/volt/{templates → page/bindings}/if_binding.rb

@@ -1,4 +1,4 @@
-require 'volt/templates/base_binding'
+require 'volt/page/bindings/base_binding'
 
 class IfBinding < BaseBinding
   def initialize(target, context, binding_name, branches)