tao_on_rails 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5cd10cf94e1abe75c759862792a084a403dd9fe
-  data.tar.gz: 2987b6c9ec002b7fad6a568c0a47029a079e78be
+  metadata.gz: 1aec7845926da7ba72c3a2adc0375801cc91465b
+  data.tar.gz: dc8dffdd444cf419667b54731aab0c59bfbe3144
 SHA512:
-  metadata.gz: b7e6023f2c0336c9adadfb79349ffe1ff6b2275a163a08a5c7820d9792cb64ad1577aa7b5fbaa44c29fe6a1a4b01c2cf91dc6cc19ab89b8958d4c835839d9101
-  data.tar.gz: cdc4059cf58af554318ccd4a0b101ff731c9b1bc96402fa1abded551f90b8721d1bc61ef7dec665e72e1520fb215a7f5fc32b54eb8abd3395cd558a4ad89de87
+  metadata.gz: d6e2dc63d51c677dee8eacc042b725b45f91a286ee350115c6e8cd9dab83c293b113341f682b4715c7e7a4a36b78b1dbd7d38a507c031e0c8bc74c05e850e3c2
+  data.tar.gz: f1b51e8276c9b98dd1df1ac5f95f1f98419bfac31e888da57515b00b7b453451364b54ddadea364d202b9aa1f6927f03a94310ee6ceb6f37d1429e827baaef19

data/lib/assets/javascripts/tao/component.coffee

@@ -102,16 +102,16 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
           @taoId = ++count
           @_init()
           @initialized = true
-          @trigger 'initialized'
+          @namespacedTrigger 'initialized'
 
         @_connected()
-        @trigger 'connected'
+        @namespacedTrigger 'connected'
 
     disconnectedCallback: ->
       $ =>
         @connected = false
         @_disconnected()
-        @trigger 'disconnected'
+        @namespacedTrigger 'disconnected'
 
     attributeChangedCallback: (name) ->
       return unless @connected
@@ -142,15 +142,26 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
     beforeCache: ->
       # called before turbolinks cache pages
 
-    findComponent: (selector, readyCallback) ->
-      component = @jq.find(selector).get(0)
-      if component.connected
-        # make sure element is returned before callback
-        setTimeout -> readyCallback? component
-      else
-        @one 'connected', selector, ->
-          readyCallback? component
-      component
+    findComponent: (selectors...) ->
+      readyCallback = selectors.pop() if _.isFunction(_.last(selectors))
+      components = selectors.map (s) =>
+        deferred = $.Deferred()
+        element = @jq.find(s).get(0)
+        if element.connected
+          # make sure element is returned before callback
+          setTimeout -> deferred.resolve()
+        else
+          @on 'tao:connected', s, (e) ->
+            return unless e.target == e.currentTarget
+            deferred.resolve()
+            @off 'tao:connected', s
+        [element, deferred.promise()]
+
+      elements = components.map (c) -> c[0]
+      promises = components.map (c) -> c[1]
+      $.when(promises...).then -> readyCallback?(elements...)
+
+      if elements.length > 1 then elements else elements[0]
 
     on: (name, args...) ->
       if name && name.indexOf('.') < 0
@@ -168,6 +179,10 @@ TaoComponentBasedOn = (superClassName = 'HTMLElement') ->
     triggerHandler: (args...) ->
       @jq.triggerHandler(args...)
 
+    namespacedTrigger: (name, params) ->
+      @trigger "tao:#{name}", params
+      @trigger "#{@constructor._tag}:#{name}", params
+
     one: (args...) ->
       @jq.one args...
 

data/lib/tao_on_rails/version.rb

@@ -1,3 +1,3 @@
 module TaoOnRails
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tao_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Siyuan Liu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turbolinks
@@ -115,6 +115,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement