flight-for-rails 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9f106b2d07829bdecb6ad4fd43f0162dcb8f8b
-  data.tar.gz: 98e6e0b82bec8458e79d452d5b32da47fdb3e2d8
+  metadata.gz: a93dc1c47c9e3ba0bd06e30468a72b3562a7536c
+  data.tar.gz: 57e09d4d2a18359ae41d446eef897cbd7971c7ae
 SHA512:
-  metadata.gz: a86ba4fad82252740774f69464016388356f4a47e57966cadcb198a519b6f756154cd2b73bb2592e5d568ebee86f7cbf365eaf090c6a7fde0aaa1cc0d6777a13
-  data.tar.gz: 7594e7fee7b1d11a9ff05ada1b52da8b3122269d8c1f9c9069739c08a370ecfbb7ae34950cb5729356529980a1e9fe95ba1d7c009e19a4e644e6c6a2e14431a7
+  metadata.gz: 9f37a790cd4636b80bf1a0a4e3c3b838f2f84633216e4c3ca0ff2429b6b6e44dac5683e6bf2344aa6085345018553e29818b7a405ee077f74e9d9bee4ffa7456
+  data.tar.gz: aac69228d7cabb3ad6e49551f0d2a6f0745633131f9b6b9fa9b7f1a9d34094b6d6d3fe57563b08a533ed12605a5e00979b3016c1477d4e97b17a0678eb2fb245

data/Rakefile

@@ -0,0 +1,33 @@
+require File.expand_path('../lib/flight-for-rails/version', __FILE__)
+require 'rubygems'
+require 'bundler/setup'
+
+Bundler::GemHelper.install_tasks
+
+namespace :flight do
+  desc 'Try to update standalone version of flight.js'
+  task :check_for_updates do
+    source_file = open('http://flightjs.github.io/release/latest/flight.js')
+    
+    if source_file && (fl = source_file.gets)
+      fl.match /\A\/\*! *Flight *v([0-9]*\.[0-9]*\.[0-9]*)/
+      if $1 && $1 != FlightForRails::VERSION
+        source_file.rewind
+        
+        # Updates vendor/assets/javascripts/flight/standalone.js
+        open(File.expand_path('../vendor/assets/javascripts/flight/standalone.js', __FILE__), 'w') do |file|
+          file.write source_file.read
+        end
+        
+        # Updates lib/flight-for-rails/version.rb
+        open(File.expand_path('../lib/flight-for-rails/version.rb', __FILE__), 'w') do |file|
+          file.write "# This file is generated automatically\nmodule FlightForRails; VERSION = '#{$1}'; end"
+        end
+
+        puts "Hooray! Flight.js has been updated to v#{$1}!"
+      else
+        puts 'Already up-to-date.'
+      end
+    end
+  end
+end

data/lib/flight-for-rails/version.rb

@@ -1,3 +1,2 @@
-module FlightForRails
-	VERSION = '1.1.2'
-end
+# This file is generated automatically
+module FlightForRails; VERSION = '1.1.3'; end

data/vendor/assets/javascripts/flight/standalone.js

@@ -1,4 +1,4 @@
-/*! Flight v1.1.2 | (c) Twitter, Inc. | MIT License */
+/*! Flight v1.1.3 | (c) Twitter, Inc. | MIT License */
 (function(context) {
   var factories = {}, loaded = {};
   var isArray = Array.isArray || function(obj) {
@@ -611,6 +611,11 @@ define('lib/registry', [], function () {
         this.findInstanceInfo = function (instance) {
             return this.allInstances[instance.identity] || null;
         };
+        this.getBoundEventNames = function (instance) {
+            return this.findInstanceInfo(instance).events.map(function (ev) {
+                return ev.type;
+            });
+        };
         this.findInstanceInfoByNode = function (node) {
             var result = [];
             Object.keys(this.allInstances).forEach(function (k) {
@@ -707,6 +712,11 @@ define('lib/base', [
             ].join(' '));
         }
     }
+    function proxyEventTo(targetEvent) {
+        return function (e, data) {
+            $(e.target).trigger(targetEvent, data);
+        };
+    }
     function withBase() {
         // delegate trigger, bind and unbind to an element
         // if $element not supplied, use component's node
@@ -751,6 +761,8 @@ define('lib/base', [
             if (typeof origin == 'object') {
                 //delegate callback
                 originalCb = utils.delegate(this.resolveDelegateRules(origin));
+            } else if (typeof origin == 'string') {
+                originalCb = proxyEventTo(origin);
             } else {
                 originalCb = origin;
             }
@@ -788,8 +800,10 @@ define('lib/base', [
                 type = arguments[0];
             }
             if (callback) {
+                //this callback may be the original function or a bound version
+                var boundFunctions = callback.target ? callback.target.bound : callback.bound || [];
                 //set callback to version bound against this instance
-                callback.bound && callback.bound.some(function (fn, i, arr) {
+                boundFunctions && boundFunctions.some(function (fn, i, arr) {
                     if (fn.context && this.identity == fn.context.identity) {
                         arr.splice(i, 1);
                         callback = fn;
@@ -805,7 +819,7 @@ define('lib/base', [
                 if (!(r in this.attr)) {
                     throw new Error('Component "' + this.toString() + '" wants to listen on "' + r + '" but no such attribute was defined.');
                 }
-                rules[this.attr[r]] = ruleInfo[r];
+                rules[this.attr[r]] = typeof ruleInfo[r] == 'string' ? proxyEventTo(ruleInfo[r]) : ruleInfo[r];
             }, this);
             return rules;
         };
@@ -875,7 +889,7 @@ define('lib/logger', ['./utils'], function (utils) {
     function log(action, component, eventArgs) {
         if (!window.DEBUG || !window.DEBUG.enabled)
             return;
-        var name, eventType, elem, fn, logFilter, toRegExp, actionLoggable, nameLoggable;
+        var name, eventType, elem, fn, payload, logFilter, toRegExp, actionLoggable, nameLoggable, info;
         if (typeof eventArgs[eventArgs.length - 1] == 'function') {
             fn = eventArgs.pop();
             fn = fn.unbound || fn;    // use unbound version if any (better info)
@@ -883,17 +897,20 @@ define('lib/logger', ['./utils'], function (utils) {
         if (eventArgs.length == 1) {
             elem = component.$node[0];
             eventType = eventArgs[0];
-        } else if (eventArgs.length == 2) {
-            if (typeof eventArgs[1] == 'object' && !eventArgs[1].type) {
-                elem = component.$node[0];
-                eventType = eventArgs[0];
-            } else {
-                elem = eventArgs[0];
-                eventType = eventArgs[1];
+        } else if (eventArgs.length == 2 && typeof eventArgs[1] == 'object' && !eventArgs[1].type) {
+            //2 args, first arg is not elem
+            elem = component.$node[0];
+            eventType = eventArgs[0];
+            if (action == 'trigger') {
+                payload = eventArgs[1];
             }
         } else {
+            //2+ args, first arg is elem
             elem = eventArgs[0];
             eventType = eventArgs[1];
+            if (action == 'trigger') {
+                payload = eventArgs[2];
+            }
         }
         name = typeof eventType == 'object' ? eventType.type : eventType;
         logFilter = DEBUG.events.logFilter;
@@ -907,7 +924,15 @@ define('lib/logger', ['./utils'], function (utils) {
             return toRegExp(e).test(name);
         });
         if (actionLoggable && nameLoggable) {
-            console.info(actionSymbols[action], action, '[' + name + ']', elemToString(elem), component.constructor.describe.split(' ').slice(0, 3).join(' '));
+            info = [
+                actionSymbols[action],
+                action,
+                '[' + name + ']'
+            ];
+            payload && info.push(payload);
+            info.push(elemToString(elem));
+            info.push(component.constructor.describe.split(' ').slice(0, 3).join(' '));
+            console.info.apply(console, info);
         }
     }
     function withLogging() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flight-for-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Sergey Rezvanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,6 +48,7 @@ files:
 - .gitignore
 - LICENSE
 - README.md
+- Rakefile
 - flight-for-rails.gemspec
 - lib/flight-for-rails.rb
 - lib/flight-for-rails/engine.rb