volt 0.4.9 → 0.4.10

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

@@ -0,0 +1,26 @@
+require 'volt/models/persistors/base'
+
+module Persistors
+  class Params < Base
+    def initialize(model)
+      @model = model
+    end
+    
+    def changed(attribute_name)
+      if RUBY_PLATFORM == 'opal'
+        %x{
+          if (window.setTimeout && this.$run_update.bind) {
+            if (window.paramsUpdateTimer) {
+              clearTimeout(window.paramsUpdateTimer);
+            }
+            window.paramsUpdateTimer = setTimeout(this.$run_update.bind(this), 0);
+          }
+        }
+      end
+    end
+    
+    def run_update
+      $page.params.trigger!('child_changed') if Volt.client?
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'volt/models/persistors/base'
+
+module Persistors
+  class Store < Base
+    def initialize(model, tasks=nil)
+      @model = model
+      @is_tracking = false
+      @tasks = tasks
+    end
+  
+    def change_channel_connection(add_or_remove, event=nil, scope=nil)
+      if (@model.attributes && @model.path.size > 1) || @model.is_a?(ArrayModel)
+        channel_name = self.channel_name.to_s
+        channel_name += "-#{event}" if event
+
+        puts "Event #{add_or_remove}: #{channel_name} -- #{@model.attributes.inspect}"
+        @tasks.call('ChannelTasks', "#{add_or_remove}_listener", channel_name, scope)
+      end
+    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)
+      # On stores, plural associations are automatically assumed to be
+      # collections.
+      options = @model.options.merge(parent: @model, path: @model.path + [method_name])
+      if method_name.plural?
+        model = @model.new_array_model([], options)
+      else
+        model = @model.new_model(nil, options)
+      end
+      
+      @model.attributes ||= {}
+      @model.attributes[method_name] = model
+
+      # if model.is_a?(StoreArray)# && model.state == :not_loaded
+      #   model.load!
+      # end
+    
+      return model
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Persistors
+  class StoreFactory
+    def initialize(tasks)
+      @tasks = tasks
+    end
+    
+    def new(model)
+      if model.is_a?(ArrayModel)
+        ArrayStore.new(model, @tasks)
+      else
+        ModelStore.new(model, @tasks)
+      end
+    end
+  end
+end

data/lib/volt/models/url.rb

@@ -8,7 +8,8 @@ class URL
   
   def initialize(router=nil)
     @router = router
-    @params = Params.new({}, 'params')
+    @params = Model.new({}, persistor: Persistors::Params)
+    #Params.new({}, 'params')
   end
   
   # Parse takes in a url and extracts each sections.

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

@@ -17,8 +17,8 @@ class EachBinding < BaseBinding
     # Run the initial render
     update
 
-    @added_listener = @value.on('added') { |_, position, item| puts "ADDED" ; item_added(position) }
-    @changed_listener = @value.on('changed') { puts "CHANGED" ; reload }
+    @added_listener = @value.on('added') { |_, position, item| item_added(position) }
+    @changed_listener = @value.on('changed') { reload }
     @removed_listener = @value.on('removed') { |_, position| item_removed(position) }
   end
   

data/lib/volt/page/channel.rb

@@ -82,10 +82,8 @@ class Channel
     destructive!
   end
   def send_message(message)
-    puts "Send #{message.inspect}"
     if @state != :open
       @queue << message
-      puts "Queue"
     else
       # TODO: Temp: wrap message in an array, so we're sure its valid JSON
       message = JSON.dump([message])

data/lib/volt/page/page.rb

@@ -4,7 +4,6 @@ if RUBY_PLATFORM == 'opal'
   require 'opal-jquery'
 end
 require 'volt/models'
-require 'volt/models/params'
 require 'volt/controllers/model_controller'
 require 'volt/page/bindings/attribute_binding'
 require 'volt/page/bindings/content_binding'
@@ -42,8 +41,8 @@ class Page
     @model_classes = {}
     
     # Run the code to setup the page
-    @page = ReactiveValue.new(Model.new)#({}, nil, 'page', @model_classes))
-    @store = ReactiveValue.new(Store.new(tasks))#({}, nil, 'store', @model_classes))
+    @page = ReactiveValue.new(Model.new)
+    @store = ReactiveValue.new(Model.new({}, persistor: Persistors::StoreFactory.new(tasks)))
     
     @url = ReactiveValue.new(URL.new)
     @params = @url.params

data/lib/volt/page/tasks.rb

@@ -42,31 +42,52 @@ class Tasks
     end
   end
   
-  def response(callback_id, *args)
+  def response(callback_id, result, error)
     callback = @callbacks.delete(callback_id)
     
     if callback
-      callback.call(*args)
+      if error
+        # TODO: full error handling
+        puts "Error: #{error.inspect}"
+      else
+        callback.call(result)
+      end
     end
   end
   
   def changed(model_id, data)
     $loading_models = true
-    puts "UPDATE: #{model_id} with #{data.inspect}"
-    Store.update(model_id, data)
+    puts "From Backend: UPDATE: #{model_id} with #{data.inspect}"
+    Persistors::ModelStore.update(model_id, data)
     $loading_models = false
   end
   
   def added(path, data)
     $loading_models = true
-    puts "Add: #{path.inspect} - #{data.inspect}"
-    $page.store.send(path) << data
+    
+    # Don't add if already in there
+    # TODO: shouldn't send twice
+    unless Persistors::ModelStore.from_id(data[:_id])
+    
+      _, parent_id = data.find {|k,v| k != :_id && k[-3..-1] == '_id'}
+      if parent_id
+        parent_collection = Persistors::ModelStore.from_id(parent_id).model
+      else
+        # On the root
+        parent_collection = $page.store
+      end
+    
+      puts "From Backend: Add: #{path.inspect} - #{data.inspect}"
+      parent_collection.send(path) << data
+    end
     $loading_models = false
   end
   
   def removed(id)
+    puts "From Backend: Remove: #{id}"
     $loading_models = true
-    Store.from_id(id).delete!
+    model = Persistors::ModelStore.from_id(id)
+    model.delete!
     $loading_models = false
   end
   

data/lib/volt/reactive/reactive_array.rb

@@ -53,7 +53,7 @@ class ReactiveArray# < Array
     
     __clear_element(index)
     
-    @array.delete_at(index_val)
+    model = @array.delete_at(index_val)
     
     trigger_on_direct_listeners!('removed', index_val)
     
@@ -64,6 +64,19 @@ class ReactiveArray# < Array
     end
     
     trigger_size_change!
+    
+    @persistor.removed(model) if @persistor
+    
+    return model
+  end
+  
+  
+  # Delete is implemented as part of delete_at
+  tag_method(:delete) do
+    destructive!
+  end
+  def delete(val)
+    self.delete_at(@array.index(val))
   end
   
 

data/lib/volt/tasks/dispatcher.rb

@@ -14,11 +14,17 @@ class Dispatcher
       klass = Object.send(:const_get, class_name)
       
       # Init and send the method
-      result = klass.new(channel, self).send(method_name, *args)
+      begin
+        result = klass.new(channel, self).send(method_name, *args)
+        error = nil
+      rescue => e
+        result = nil
+        error = e
+      end
       
       if callback_id
         # Callback with result
-        channel.send_message('response', callback_id, result)
+        channel.send_message('response', callback_id, result, error)
       end
     end
   end

data/spec/models/model_spec.rb

@@ -293,7 +293,7 @@ describe Model do
   
   it "should handle a basic todo list with no setup" do
     store = ReactiveValue.new(Model.new)
-    params = ReactiveValue.new(Params.new)
+    params = ReactiveValue.new(Model.new({}, persistor: Persistors::Params))
     
     a = store._todo_lists
     store._current_todo = store._todo_lists[params._index.or(0).to_i]
@@ -412,8 +412,30 @@ describe Model do
     
   end
   
-  it "should set its self to be " do
+  it "should delete from an ArrayModel" do
+    array = ArrayModel.new([])
     
+    array << {_name: 'One'}
+    array << {_name: 'Two'}
+    array << {_name: 'Three'}
+    
+    expect(array.size).to eq(3)
+
+    expect(array.index(array[0])).to eq(0)
+    
+    array.delete(array[0])
+    expect(array.size).to eq(2)
+    expect(array[0]._name).to eq('Two')
+  end
+  
+  it "should compare true" do
+    a = Model.new({_name: 'Cool'})
+    expect(a == a).to eq(true)
+  end
+  
+  it "should do index" do
+    a = [{name: 'One'}, {name: 'Two'}, {name: 'Three'}]
+    expect(a.index(a[1])).to eq(1)
   end
   
   
@@ -438,4 +460,12 @@ describe Model do
       expect(@model._lists[0]._items.path.cur).to eq([:_lists, :[], :_items])
     end
   end
+  
+  describe "persistors" do
+    it "should setup a new instance of the persistor with self" do
+      persistor = double('persistor')
+      expect(persistor).to receive(:new)
+      @model = Model.new(nil, persistor: persistor)
+    end
+  end
 end

data/spec/models/persistors/params_spec.rb

@@ -0,0 +1,16 @@
+require 'volt/models'
+
+describe Persistors::Params do
+  it "should stay as params classes when used" do
+    a = Model.new({}, persistor: Persistors::Params)
+    expect(a._test.class).to eq(Model)
+    
+    expect(a._test._cool.persistor.class).to eq(Persistors::Params)
+    
+    a._items << {_name: 'Test'}
+    
+    expect(a._items.persistor.class).to eq(Persistors::Params)
+    expect(a._items[0].persistor.class).to eq(Persistors::Params)
+    expect(a._items[0]._name.class).to eq(String)
+  end
+end

data/spec/models/persistors/store_spec.rb

@@ -0,0 +1,29 @@
+require 'volt/models'
+
+describe Persistors::Store do
+  it "should tell the persistor when the model has changed" do
+    persistor = double('persistor')
+    persistor_instance = double('persistor instance')
+    expect(persistor_instance).to receive(:loaded)
+    expect(persistor).to receive(:new).and_return(persistor_instance)
+    
+    @model = Model.new(nil, persistor: persistor)
+    
+    expect(persistor_instance).to receive(:changed)
+    
+    @model._attr = 'yes'
+  end
+  
+  it "should tell the persistor when something is added to an array model" do
+    persistor = double('persistor')
+    persistor_instance = double('persistor instance')
+    expect(persistor_instance).to receive(:loaded)
+    expect(persistor).to receive(:new).and_return(persistor_instance)
+    
+    @model = ArrayModel.new([1,2,3], persistor: persistor)
+    
+    expect(persistor_instance).to receive(:added).with(4)
+    
+    @model << 4
+  end
+end

data/spec/models/store_spec.rb

@@ -1,16 +1,16 @@
-require 'volt/models'
-
-describe Store do
-  it "should stay as store classes when used" do
-    a = Store.new
-    expect(a._test.class).to eq(Store)
-    
-    expect(a._test._cool.class).to eq(Store)
-    
-    a._items << {_name: 'Test'}
-    
-    expect(a._items.class).to eq(StoreArray)
-    expect(a._items[0].class).to eq(Store)
-    expect(a._items[0]._name.class).to eq(String)
-  end
-end
+# require 'volt/models'
+# 
+# describe Store do
+#   # it "should stay as store classes when used" do
+#   #   a = Store.new
+#   #   expect(a._test.class).to eq(Store)
+#   #   
+#   #   expect(a._test._cool.class).to eq(Store)
+#   #   
+#   #   a._items << {_name: 'Test'}
+#   #   
+#   #   expect(a._items.class).to eq(StoreArray)
+#   #   expect(a._items[0].class).to eq(Store)
+#   #   expect(a._items[0]._name.class).to eq(String)
+#   # end
+# end

data/spec/router/routes_spec.rb

@@ -8,7 +8,7 @@ end
 
 describe Routes do
   it "should match routes" do
-    params = Params.new
+    params = Model.new({}, persistor: Persistors::Params)
     params._controller = 'blog'
     params._index = '5'
     

data/templates/project/app/home/controllers/index_controller.rb

@@ -1,5 +1,6 @@
 class IndexController < ModelController
+  model :page
+
   def initialize
-    @model = page
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -354,10 +354,12 @@ files:
 - lib/volt/models/array_model.rb
 - lib/volt/models/model.rb
 - lib/volt/models/model_wrapper.rb
-- lib/volt/models/params.rb
-- lib/volt/models/params_array.rb
-- lib/volt/models/store.rb
-- lib/volt/models/store_array.rb
+- lib/volt/models/persistors/array_store.rb
+- lib/volt/models/persistors/base.rb
+- lib/volt/models/persistors/model_store.rb
+- lib/volt/models/persistors/params.rb
+- lib/volt/models/persistors/store.rb
+- lib/volt/models/persistors/store_factory.rb
 - lib/volt/models/url.rb
 - lib/volt/page/bindings/attribute_binding.rb
 - lib/volt/page/bindings/base_binding.rb
@@ -424,7 +426,8 @@ files:
 - spec/models/event_chain_spec.rb
 - spec/models/model_spec.rb
 - spec/models/old_model_spec.rb
-- spec/models/params_spec.rb
+- spec/models/persistors/params_spec.rb
+- spec/models/persistors/store_spec.rb
 - spec/models/reactive_array_spec.rb
 - spec/models/reactive_tags_spec.rb
 - spec/models/reactive_value_spec.rb
@@ -510,7 +513,8 @@ test_files:
 - spec/models/event_chain_spec.rb
 - spec/models/model_spec.rb
 - spec/models/old_model_spec.rb
-- spec/models/params_spec.rb
+- spec/models/persistors/params_spec.rb
+- spec/models/persistors/store_spec.rb
 - spec/models/reactive_array_spec.rb
 - spec/models/reactive_tags_spec.rb
 - spec/models/reactive_value_spec.rb