volt 0.9.7.pre3 → 0.9.7.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f0e852a5a80c23450553604545cc05f2046713
-  data.tar.gz: 8714d6c8452571f7b556238f749504ac85bd0a4b
+  metadata.gz: 3cdc140dec9dafbccfdc80fbe5f9e98695b46394
+  data.tar.gz: c4e30bbd6a618229e594cfdbff8b40f4dcedaae8
 SHA512:
-  metadata.gz: e359ae0d0fea64290af10f8f08f59f5fe21bd5ec623f0ed8dfde2e2612e8f6915b85f2098b499436dd25f9f73dd63b2f7061abbbb5f6946e6ea54b2b59cbb07b
-  data.tar.gz: bcbe9de16828193c20085cbf3d953e003e6ce3e4ddcd0f9a9fe98c5987a6e29d9efb0c81bd26d2b061f71b72e7cae94550fc51bb5d7ab03a761c57fcd652d909
+  metadata.gz: ba0802d6f9adcbf18ec68a28b95629ecfb59a9fa2cb2ea29f3c1c8e922c7e918af509647f95d28e8f23b840c7bda0bb91ff2451df02e9794eb9236b24ce574d6
+  data.tar.gz: e65b951533259dacf018849c1a0e0c2cf46f23205a1d11fdd9a8ab469aaa7d6d624fc6d075950b616cad916867a3a417e4844a9e3923fcc9480c1d27f227627e

data/app/volt/models/volt_app_property.rb

@@ -5,4 +5,6 @@
 class VoltAppProperty < Volt::Model
   field :name, String
   field :value, String
+
+  index :name, unique: true
 end

data/lib/volt/controllers/model_controller.rb

@@ -103,26 +103,12 @@ module Volt
 
     # Sets the current model on this controller
     def model=(val)
-      if val.is_a?(Promise)
-        # Resolve the promise before setting
-        self.last_promise = val
+      # Clear the proc watcher
+      stop_proc_watcher
 
-        val.then do |result|
-          # Only assign if nothing else has been assigned since we started the resolve
-          self.model = result if last_promise == val
-        end.fail do |err|
-          Volt.logger.error("Unable to resolve promise assigned to model on #{inspect}")
-        end
-
-        return
-      end
-
-      # Clear
+      # Clear last promise
       self.last_promise = nil
 
-      # Start with a nil reactive value.
-      self.current_model ||= Model.new
-
       if Symbol === val || String === val
         collections = [:page, :store, :params, :controller]
         if collections.include?(val.to_sym)
@@ -130,16 +116,61 @@ module Volt
         else
           fail "#{val} is not the name of a valid model, choose from: #{collections.join(', ')}"
         end
+
+        return
+      end
+      # If the val is a proc, then we need to call the proc in a watch, and
+      # run the rest of the assign after
+
+      if val.is_a?(Proc)
+        @model_proc_watcher = proc do
+          # unwrap in a proc
+          new_val = val.call
+
+          # The assignment part we don't want to watch on because it will be
+          # changing the current_model reactive_accessor.
+          u do
+            assign_current_model(new_val)
+          end
+        end.watch!
       else
-        self.current_model = val
+        assign_current_model(val)
       end
     end
 
+    def stop_proc_watcher
+      @model_proc_watcher.stop if @model_proc_watcher
+      @model_proc_watcher = nil
+    end
+
+    def controller_removed!
+      stop_proc_watcher
+    end
+
+    def assign_current_model(val)
+      if val.is_a?(Promise)
+        # Resolve the promise before setting
+        self.last_promise = val
+
+        val.then do |result|
+          # Only assign if nothing else has been assigned since we started the resolve
+          self.current_model = result if last_promise == val
+          self.last_promise = nil
+        end.fail do |err|
+          Volt.logger.error("Unable to resolve promise assigned to ModelController: #{inspect}")
+        end
+
+        return
+      end
+
+      self.current_model = val
+    end
+
     def model
       model = self.current_model
 
-      # If the model is a proc, call it now
-      model = model.call if model && model.is_a?(Proc)
+      # # If the model is a proc, call it now
+      # model = model.call if model && model.is_a?(Proc)
 
       model
     end

data/lib/volt/helpers/time/volt_time.rb

@@ -49,10 +49,10 @@ class VoltTime
     # Live now acts just like now, except it invalidates any computations the
     # VoltTime object is used in at every interval.  This makes it easy to
     # display live timer's.
-    def live_now(interval=1000)
+    def live_now(seconds=1)
       dep = Volt::Dependency.new
       dep.depend
-      Volt::Timers.client_set_timeout(interval) do
+      Volt::Timers.client_set_timeout(seconds * 1000) do
         dep.changed!
       end
       VoltTime.new

data/lib/volt/models/associations.rb

@@ -22,11 +22,9 @@ module Volt
 
         # setter
         define_method(:"#{method_name}=") do |obj|
-          # Associatie the obj's foreign key
-          obj.set(foreign_key, id)
-
-          # Associate on the method name
-          set(method_name, obj)
+          # Associate the local key
+          foreign_key_value = obj.get(foreign_key)
+          set(local_key, foreign_key_value)
         end
       end
 

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

@@ -151,7 +151,6 @@ module Volt
     end
 
     def changed(model_id, data)
-      puts "CH: #{model_id.inspect} - #{data.inspect}"
       $loading_models = true
       Persistors::ModelStore.changed(model_id, data)
       $loading_models = false

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

@@ -142,6 +142,7 @@ module Volt
       # Remove existing controller and template and call _removed
       if @current_controller_handler
         @current_controller_handler.call_action('before', 'remove')
+        @current_controller_handler.send_controller_removed!
       end
 
       if @current_template

data/lib/volt/page/bindings/view_binding/controller_handler.rb

@@ -59,6 +59,14 @@ module Volt
       false
     end
 
+    # If the controller wants to know, provide a general way the controller can
+    # know if its being removed.  This lets us cleanup any watches.
+    def send_controller_removed!
+      if @controller.respond_to?(:controller_removed!)
+        @controller.controller_removed!
+      end
+    end
+
     # Fetch the controller class
     def self.get_controller_and_action(controller_path)
       fail "Invalid controller path: #{controller_path.inspect}" unless controller_path && controller_path.size > 0

data/lib/volt/page/document_events.rb

@@ -32,6 +32,10 @@ module Volt
       element = `$(event.target || event.originalEvent.target)`
 
       loop do
+        if `event.isPropagationStopped()`
+          break
+        end
+
         # Lookup the handler, make sure to not assume the group
         # exists.
         # TODO: Sometimes the event doesn't exist, but we still get

data/lib/volt/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Version
-    STRING = '0.9.7.pre3'
+    STRING = '0.9.7.pre5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt
 version: !ruby/object:Gem::Version
-  version: 0.9.7.pre3
+  version: 0.9.7.pre5
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor