twine-rails 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 538a0c1b2f074d00d9402091cd8903e88a8c89f8
-  data.tar.gz: b966ba3ac32c35b34ab8cde4a05677e7d3b2ccfc
+  metadata.gz: 75172b52a36ebd2de8b177f65b1733c0433eb5e2
+  data.tar.gz: 41c83aac3cb17eed504cb352eab82db8f4babbb5
 SHA512:
-  metadata.gz: e272cf342cddbff047c8f3cff87f81a50631ab71559d3b17d7d12255689aa7fe72f1ed1b885060f04f1cb88f355a31efddf77ef5ae148a31977ce9c25438f099
-  data.tar.gz: 6d792404c98c19676b3d1f16b38d1e48874d4c691f8fe9c1a78e1b0a489c1475193ea1cf3181d994f018a3b6de1e90b83e4cd53d9ff75b31dfc40c98babe46f0
+  metadata.gz: 65b2216340071a68ea54fa4bb2e5d5c7e716de7c56655c19428aa2e21e822b0ed56d73558bfb89aa28777c071a453aabe8cd948caba16e8948f2e4a0b7676e2f
+  data.tar.gz: da8b5083d1f4120862638df28199853f2ee4a92b8c8713766c001d98abbb894a3c89ff004921919f41ec767b1548296ab938b9669eeb2e3223770fe1f7cc2540

data/README.md

@@ -171,6 +171,7 @@ Where context expects a node and `$0` is shorthand for the current node in the d
 ## Releasing
 
 1. Update version number in `package.json`, `bower.json`, and `lib/twine-rails/version.rb`
-2. Run `bundle install` to update `Gemfile.lock`
-3. Run make .all && make .uglify to update JS
+2. Run `dev up` to update `Gemfile.lock`
+3. Run `make .all && make .uglify` to update JS
 4. Push the new tag to GitHub and the new version to rubygems with `bundle exec rake release`
+5. Publish the new version to NPM with `npm publish`.

data/lib/assets/javascripts/twine.coffee

@@ -24,6 +24,7 @@
 
   keypathRegex = /^[a-z]\w*(\.[a-z]\w*|\[\d+\])*$/i # Tests if a string is a pure keypath.
   refreshQueued = false
+  refreshCallbacks = []
   rootNode = null
 
   currentBindingCallbacks = null
@@ -80,17 +81,14 @@
 
       bindingConstructors ?= []
       definition = attribute.value
-      if type == 'bind'
-        bindingConstructors.unshift([constructor, definition])
-      else
-        bindingConstructors.push([constructor, definition])
+      bindingConstructors.push([type, constructor, definition])
 
     if bindingConstructors
       element ?= findOrCreateElementForNode(node)
       element.bindings ?= []
       element.indexes ?= indexes
 
-      for [constructor, definition] in bindingConstructors
+      for [_, constructor, definition] in bindingConstructors.sort(bindingOrder)
         binding = constructor(node, context, definition, element)
         element.bindings.push(binding) if binding
 
@@ -127,7 +125,9 @@
     elements[node.bindingId] ?= {}
 
   # Queues a refresh of the DOM, batching up calls for the current synchronous block.
-  Twine.refresh = ->
+  # The callback will be called once when the refresh has completed.
+  Twine.refresh = (callback) ->
+    refreshCallbacks.push(callback) if callback
     return if refreshQueued
     refreshQueued = true
     setTimeout(Twine.refreshImmediately, 0)
@@ -139,6 +139,10 @@
   Twine.refreshImmediately = ->
     refreshQueued = false
     refreshElement(element) for key, element of elements
+
+    callbacks = refreshCallbacks
+    refreshCallbacks = []
+    cb() for cb in callbacks
     return
 
   Twine.register = (name, component) ->
@@ -294,6 +298,17 @@
     event.initCustomEvent('bindings:change', true, false, {})
     node.dispatchEvent(event)
 
+  bindingOrder = ([firstType], [secondType]) ->
+    ORDERED_BINDINGS = {
+      define: 1,
+      bind: 2,
+      eval: 3
+    }
+    return 1 unless ORDERED_BINDINGS[firstType]
+    return -1 unless ORDERED_BINDINGS[secondType]
+
+    ORDERED_BINDINGS[firstType] - ORDERED_BINDINGS[secondType]
+
   Twine.bindingTypes =
     bind: (node, context, definition) ->
       valueProp = valuePropertyForNode(node)
@@ -339,9 +354,9 @@
           return if getValue(context, keypath) == this[valueProp]
           refreshContext()
           Twine.refreshImmediately()
-        $(node).on 'input keyup change', changeHandler
+        jQuery(node).on 'input keyup change', changeHandler
         teardown = ->
-          $(node).off 'input keyup change', changeHandler
+          jQuery(node).off 'input keyup change', changeHandler
 
       {refresh, teardown}
 
@@ -351,16 +366,29 @@
       return refresh: ->
         newValue = !fn.call(node, context, rootContext, arrayPointersForNode(node, context))
         return if newValue == lastValue
-        $(node).toggleClass('hide', lastValue = newValue)
+        jQuery(node).toggleClass('hide', lastValue = newValue)
 
     'bind-class': (node, context, definition) ->
       fn = wrapFunctionString(definition, '$context,$root,$arrayPointers', node)
-      lastValue = {}
+      lastValues = {}
+      $node = jQuery(node)
       return refresh: ->
-        newValue = fn.call(node, context, rootContext, arrayPointersForNode(node, context))
-        for key, value of newValue when !lastValue[key] != !value
-          $(node).toggleClass(key, !!value)
-        lastValue = newValue
+        newValues = fn.call(node, context, rootContext, arrayPointersForNode(node, context))
+        additions = []
+        removals = []
+
+        for key, value of newValues
+          newValue = newValues[key] = !!newValues[key]
+          currValue = lastValues[key] ? $node.hasClass(key)
+          if currValue != newValue
+            if newValue
+              additions.push(key)
+            else
+              removals.push(key)
+
+        $node.removeClass(removals.join(' ')) if removals.length
+        $node.addClass(additions.join(' ')) if additions.length
+        lastValues = newValues
 
     'bind-attribute': (node, context, definition) ->
       fn = wrapFunctionString(definition, '$context,$root,$arrayPointers', node)
@@ -368,7 +396,7 @@
       return refresh: ->
         newValue = fn.call(node, context, rootContext, arrayPointersForNode(node, context))
         for key, value of newValue when lastValue[key] != value
-          $(node).attr(key, value || null)
+          jQuery(node).attr(key, value || null)
         lastValue = newValue
 
     define: (node, context, definition) ->
@@ -398,7 +426,7 @@
     indexes
 
   setupPropertyBinding = (attributeName, bindingName) ->
-    booleanProp = attributeName in ['checked', 'indeterminate', 'disabled', 'readOnly']
+    booleanProp = attributeName in ['checked', 'indeterminate', 'disabled', 'readOnly', 'draggable']
 
     Twine.bindingTypes["bind-#{bindingName.toLowerCase()}"] = (node, context, definition) ->
       fn = wrapFunctionString(definition, '$context,$root,$arrayPointers', node)
@@ -411,7 +439,7 @@
 
         fireCustomChangeEvent(node) if attributeName == 'checked'
 
-  for attribute in ['placeholder', 'checked', 'indeterminate', 'disabled', 'href', 'title', 'readOnly', 'src']
+  for attribute in ['placeholder', 'checked', 'indeterminate', 'disabled', 'href', 'title', 'readOnly', 'src', 'draggable']
     setupPropertyBinding(attribute, attribute)
 
   setupPropertyBinding('innerHTML', 'unsafe-html')
@@ -431,10 +459,10 @@
 
         wrapFunctionString(definition, '$context,$root,$arrayPointers,event,data', node).call(node, context, rootContext, arrayPointersForNode(node, context), event, data)
         Twine.refreshImmediately()
-      $(node).on eventName, onEventHandler
+      jQuery(node).on eventName, onEventHandler
 
       return teardown: ->
-        $(node).off eventName, onEventHandler
+        jQuery(node).off eventName, onEventHandler
 
   for eventName in ['click', 'dblclick', 'mouseenter', 'mouseleave', 'mouseover', 'mouseout', 'mousedown', 'mouseup',
     'submit', 'dragenter', 'dragleave', 'dragover', 'drop', 'drag', 'change', 'keypress', 'keydown', 'keyup', 'input',

data/lib/twine-rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twine-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Justin Li
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-rails
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Minimalistic two-way bindings