volt-watch 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aed001ff8fc736e54968e215a9bc2718a92cc50
-  data.tar.gz: e54c41cc2018522b7ee0104d38faec391de89019
+  metadata.gz: 3a601784ccab5ec7a97019dfa491e666d496ba88
+  data.tar.gz: 670d9cc1feeee240b0a0225a954806cbe7d19f7d
 SHA512:
-  metadata.gz: aef4afc1b7639112f73a587a0d87bf145cb8abeb04436c88021e42dd26f8479dca31a2febfb88667fea0ed8d2bf5111d2b791944652cde7dda6f909c493347fc
-  data.tar.gz: 3c8ea040ec249cfee51eb12ea7db17a8d861fe240b7888ee2558fe3c9e7ad2e5a661b423244e456cf60df8ae0f0ad7855165e1c4e8e8b7302707b1af3ef74141
+  metadata.gz: bec5cdf14cf2f3c60b2bd130be534cd6d6fcee0605a173790d401feb51e79a97fc6ca02798c9b3374a349f27e9d9066b5046de61df5c8b9fe5548f6384c20b3f
+  data.tar.gz: 7a78bf09343d9f393a3ed106ffbbd807995a82ba2a8926c4ef473e34b49e2d1cdaf65dad8d03310b3d8053477f8934e78884b9b3552d885e56b7cc11cee75c64

data/lib/volt/watch.rb

@@ -225,25 +225,52 @@ module Volt
 
     def ensure_reactive(model)
       unless reactive?(model)
-        raise ArgumentError, 'argument must be Volt Model, ArrayModel, ReactiveArray or ReactiveHash'
+        raise ArgumentError, 'argument must be Volt Model, ArrayModel, ReactiveArray or ReactiveHash...'
       end
     end
 
     def reactive?(model)
+      reactive_model?(model) ||
+      reactive_array?(model) ||
+      reactive_hash?(model)
+    end
+
+    # Must behave like a Volt::Model
+    # and respond to #get(attribute)
+    def reactive_model?(model)
       Volt::Model === model ||
+      # dirty way of letting anything be reactive if it wants
+      (model.respond_to?(:reactive_model?) && model.reactive_model?) ||
+      (model.class.respond_to?(:reactive_model?) && model.class.reactive_model?)
+    end
+
+    # Must behave like a Volt::ArrayModel or Volt::ReactiveArray
+    def reactive_array?(model)
       Volt::ArrayModel === model ||
-      Volt::ReactiveArray == model ||
-      Volt::ReactiveHash === model
+      Volt::ReactiveArray === model ||
+      # dirty way of letting anything be reactive if it wants
+      (model.respond_to?(:reactive_array?) && model.reactive_array?) ||
+      (model.class.respond_to?(:reactive_array?) && model.class.reactive_array?)
+    end
+
+    # Must behave like a Volt::ReactiveHash
+    def reactive_hash?(model)
+      Volt::ReactiveHash === model ||
+      # dirty way of letting anything be reactive if it wants
+      (model.respond_to?(:reactive_hash?) && model.reactive_hash?) ||
+      (model.class.respond_to?(:reactive_hash?) && model.class.reactive_hash?)
     end
 
     def traverse(node, mode, except, pass_model, block)
       # debug __method__, __LINE__, "node=#{node} mode=#{mode} except=#{except}"
-      if node.is_a?(Volt::Model)
+      if reactive_model?(node)
         traverse_model(node, mode, except, pass_model, block)
-      elsif node.is_a?(Volt::ReactiveArray)
+      elsif reactive_array?(node)
         traverse_array(node, mode, except, pass_model, block)
-      elsif node.is_a?(Volt::ReactiveHash)
+      elsif reactive_hash?(node)
         traverse_hash(node, mode, except, pass_model, block)
+      else
+        # go no further
       end
     end
 

data/lib/volt/watch/version.rb

@@ -1,5 +1,5 @@
 module Volt
   module Watch
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-watch
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Colin Gunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: