twine-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4386189c38efbea2da170dd03b7d30d11c69d0e7
-  data.tar.gz: 90f46d3522191a2e65f21f9bc0accef50accc453
+  metadata.gz: 538a0c1b2f074d00d9402091cd8903e88a8c89f8
+  data.tar.gz: b966ba3ac32c35b34ab8cde4a05677e7d3b2ccfc
 SHA512:
-  metadata.gz: a841a7bc1f7a30ddd0dd06dbb317f4aef580ae384865bf6a7f3df2c1789c36ef22df1bc4a4ece8501f4b6349100994bc0d6bb48f1cb5d79bf5172f58ed41c09c
-  data.tar.gz: f66a43f275158666c7012acd90ca5a634c379ef8545c6255a6efb920f9cb82109c42ef7c7a98b492880949ea92af60eaab5f736acf5edffa490f247a44ea6194
+  metadata.gz: e272cf342cddbff047c8f3cff87f81a50631ab71559d3b17d7d12255689aa7fe72f1ed1b885060f04f1cb88f355a31efddf77ef5ae148a31977ce9c25438f099
+  data.tar.gz: 6d792404c98c19676b3d1f16b38d1e48874d4c691f8fe9c1a78e1b0a489c1475193ea1cf3181d994f018a3b6de1e90b83e4cd53d9ff75b31dfc40c98babe46f0

data/lib/assets/javascripts/twine.coffee

@@ -56,6 +56,7 @@
 
   bind = (context, node, indexes, forceSaveContext) ->
     currentBindingCallbacks = []
+    element = null
     if node.bindingId
       Twine.unbind(node)
 
@@ -69,13 +70,29 @@
       element = findOrCreateElementForNode(node)
       element.indexes = indexes
 
-    for type, binding of Twine.bindingTypes when definition = Twine.getAttribute(node, type)
-      element = findOrCreateElementForNode(node)
+    bindingConstructors = null
+    for attribute in node.attributes
+      type = attribute.name
+      type = type.slice(5) if isDataAttribute(type)
+
+      constructor = Twine.bindingTypes[type]
+      continue unless constructor
+
+      bindingConstructors ?= []
+      definition = attribute.value
+      if type == 'bind'
+        bindingConstructors.unshift([constructor, definition])
+      else
+        bindingConstructors.push([constructor, definition])
+
+    if bindingConstructors
+      element ?= findOrCreateElementForNode(node)
       element.bindings ?= []
       element.indexes ?= indexes
 
-      fn = binding(node, context, definition, element)
-      element.bindings.push(fn) if fn
+      for [constructor, definition] in bindingConstructors
+        binding = constructor(node, context, definition, element)
+        element.bindings.push(binding) if binding
 
     if newContextKey = Twine.getAttribute(node, 'context')
       keypath = keypathForKey(node, newContextKey)
@@ -85,7 +102,7 @@
       context = getValue(context, keypath) || setValue(context, keypath, {})
 
     if element || newContextKey || forceSaveContext
-      element = findOrCreateElementForNode(node)
+      element ?= findOrCreateElementForNode(node)
       element.childContext = context
       element.indexes ?= indexes if indexes?
 
@@ -108,7 +125,6 @@
   findOrCreateElementForNode = (node) ->
     node.bindingId ?= ++nodeCount
     elements[node.bindingId] ?= {}
-    elements[node.bindingId]
 
   # Queues a refresh of the DOM, batching up calls for the current synchronous block.
   Twine.refresh = ->
@@ -187,7 +203,7 @@
     addKey(rootContext) if node == rootNode
     keys.join('.')
 
-  valueAttributeForNode = (node) ->
+  valuePropertyForNode = (node) ->
     name = node.nodeName.toLowerCase()
     if name in ['input', 'textarea', 'select']
       if node.getAttribute('type') in ['checkbox', 'radio'] then 'checked' else 'value'
@@ -232,14 +248,7 @@
     object[lastKey] = value
 
   stringifyNodeAttributes = (node) ->
-    nAttributes = node.attributes.length
-    i = 0
-    result = ""
-    while i < nAttributes
-      attr = node.attributes.item(i)
-      result += "#{attr.nodeName}='#{attr.textContent}'"
-      i+=1
-    result
+    [].map.call(node.attributes, (attr) -> "#{attr.name}=#{JSON.stringify(attr.value)}").join(' ')
 
   wrapFunctionString = (code, args, node) ->
     if isKeypath(code) && keypath = keypathForKey(node, code)
@@ -249,7 +258,7 @@
         ($context, $root) -> getValue($context, keypath)
     else
       code = "return #{code}"
-      code = "with($arrayPointers) { #{code} }" if nodeHasArrayIndexes(node)
+      code = "with($arrayPointers) { #{code} }" if nodeArrayIndexes(node)
       code = "with($registry) { #{code} }" if requiresRegistry(args)
       try
         new Function(args, "with($context) { #{code} }")
@@ -258,14 +267,12 @@
 
   requiresRegistry = (args) -> /\$registry/.test(args)
 
-  nodeHasArrayIndexes = (node) ->
-    return unless node.bindingId?
-    !!elements[node.bindingId]?.indexes?
+  nodeArrayIndexes = (node) ->
+    node.bindingId? && elements[node.bindingId]?.indexes
 
   arrayPointersForNode = (node, context) ->
-    return {} unless node.bindingId?
-    indexes = elements[node.bindingId]?.indexes
-    return {} unless indexes?
+    indexes = nodeArrayIndexes(node)
+    return {} unless indexes
 
     result = {}
     for key, index of indexes
@@ -273,7 +280,14 @@
     result
 
   isKeypath = (value) ->
-    value not in ['true', 'false', 'null', 'undefined'] and keypathRegex.test(value)
+    value not in ['true', 'false', 'null', 'undefined'] && keypathRegex.test(value)
+
+  isDataAttribute = (value) ->
+    value[0] == 'd' &&
+    value[1] == 'a' &&
+    value[2] == 't' &&
+    value[3] == 'a' &&
+    value[4] == '-'
 
   fireCustomChangeEvent = (node) ->
     event = document.createEvent('CustomEvent')
@@ -282,8 +296,8 @@
 
   Twine.bindingTypes =
     bind: (node, context, definition) ->
-      valueAttribute = valueAttributeForNode(node)
-      value = node[valueAttribute]
+      valueProp = valuePropertyForNode(node)
+      value = node[valueProp]
       lastValue = undefined
       teardown = undefined
 
@@ -296,9 +310,9 @@
         return if newValue == lastValue # return if we can and avoid a DOM operation
 
         lastValue = newValue
-        return if newValue == node[valueAttribute]
+        return if newValue == node[valueProp]
 
-        node[valueAttribute] = if checkedValueType then newValue == node.value else newValue
+        node[valueProp] = if checkedValueType then newValue == node.value else newValue
         fireCustomChangeEvent(node)
 
       return {refresh} unless isKeypath(definition)
@@ -308,10 +322,10 @@
           return unless node.checked
           setValue(context, keypath, node.value)
         else
-          setValue(context, keypath, node[valueAttribute])
+          setValue(context, keypath, node[valueProp])
 
       keypath = keypathForKey(node, definition)
-      twoWayBinding = valueAttribute != 'textContent' && node.type != 'hidden'
+      twoWayBinding = valueProp != 'textContent' && node.type != 'hidden'
 
       if keypath[0] == '$root'
         context = rootContext
@@ -322,7 +336,7 @@
 
       if twoWayBinding
         changeHandler = ->
-          return if getValue(context, keypath) == this[valueAttribute]
+          return if getValue(context, keypath) == this[valueProp]
           refreshContext()
           Twine.refreshImmediately()
         $(node).on 'input keyup change', changeHandler
@@ -383,24 +397,24 @@
 
     indexes
 
-  setupAttributeBinding = (attributeName, bindingName) ->
-    booleanAttribute = attributeName in ['checked', 'indeterminate', 'disabled', 'readOnly']
+  setupPropertyBinding = (attributeName, bindingName) ->
+    booleanProp = attributeName in ['checked', 'indeterminate', 'disabled', 'readOnly']
 
-    Twine.bindingTypes["bind-#{bindingName}"] = (node, context, definition) ->
+    Twine.bindingTypes["bind-#{bindingName.toLowerCase()}"] = (node, context, definition) ->
       fn = wrapFunctionString(definition, '$context,$root,$arrayPointers', node)
       lastValue = undefined
       return refresh: ->
         newValue = fn.call(node, context, rootContext, arrayPointersForNode(node, context))
-        newValue = !!newValue if booleanAttribute
+        newValue = !!newValue if booleanProp
         return if newValue == lastValue
         node[attributeName] = lastValue = newValue
 
         fireCustomChangeEvent(node) if attributeName == 'checked'
 
   for attribute in ['placeholder', 'checked', 'indeterminate', 'disabled', 'href', 'title', 'readOnly', 'src']
-    setupAttributeBinding(attribute, attribute)
+    setupPropertyBinding(attribute, attribute)
 
-  setupAttributeBinding('innerHTML', 'unsafe-html')
+  setupPropertyBinding('innerHTML', 'unsafe-html')
 
   preventDefaultForEvent = (event) ->
     (event.type == 'submit' || event.currentTarget.nodeName.toLowerCase() == 'a') &&

data/lib/twine-rails.rb

@@ -1,5 +1,4 @@
 require "rails"
-require "active_support"
 
 require "twine-rails/version"
 

data/lib/twine-rails/version.rb

@@ -1,3 +1,3 @@
 module TwineRails
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twine-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Justin Li
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -26,6 +26,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Minimalistic two-way bindings