Merge pull request #10 from coshx/fix/issues_in_event_firing_in_js

acadet · acadet · commit f0bf1d3e7f43 · 2015-11-05T19:06:03.000-08:00
Fixes multiple issues when firing events
diff --git a/Caravel.podspec b/Caravel.podspec
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   #  summary should be tweet-length, and the description more in depth.
   #
 
-  version = "0.4.1"
+  version = "0.4.2"
 
   s.name         = "Caravel"
   s.version      = version
diff --git a/caravel-test.xcodeproj/project.pbxproj b/caravel-test.xcodeproj/project.pbxproj
@@ -29,13 +29,14 @@
 		A7C869061B18CEF30070AF5A /* basic_triggering.html in Resources */ = {isa = PBXBuildFile; fileRef = A7C869051B18CEF30070AF5A /* basic_triggering.html */; };
 		A7C869081B18CF450070AF5A /* basic_triggering.js in Resources */ = {isa = PBXBuildFile; fileRef = A7C869071B18CF450070AF5A /* basic_triggering.js */; };
 		A7DC081B1B18C73500D98DA5 /* BasicTriggeringController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7DC081A1B18C73500D98DA5 /* BasicTriggeringController.swift */; };
+		A7EE0BA71BEC423E00D0925C /* Caravel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7EE0BA61BEC423E00D0925C /* Caravel.framework */; };
+		A7EE0BA81BEC423E00D0925C /* Caravel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A7EE0BA61BEC423E00D0925C /* Caravel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A7F1DE291B18045C001E9B94 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F1DE281B18045C001E9B94 /* AppDelegate.swift */; };
 		A7F1DE2B1B18045C001E9B94 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F1DE2A1B18045C001E9B94 /* ViewController.swift */; };
 		A7F1DE2E1B18045C001E9B94 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A7F1DE2C1B18045C001E9B94 /* Main.storyboard */; };
 		A7F1DE301B18045C001E9B94 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7F1DE2F1B18045C001E9B94 /* Images.xcassets */; };
 		A7F1DE331B18045C001E9B94 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = A7F1DE311B18045C001E9B94 /* LaunchScreen.xib */; };
 		A7F1DE3F1B18045C001E9B94 /* caravel_testTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F1DE3E1B18045C001E9B94 /* caravel_testTests.swift */; };
-		A7F1DE4B1B18067F001E9B94 /* Caravel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F1DE4A1B18067F001E9B94 /* Caravel.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -48,6 +49,20 @@
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		A7EE0BA91BEC423E00D0925C /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				A7EE0BA81BEC423E00D0925C /* Caravel.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		A75AD3F41B1913B600404C06 /* InitializationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InitializationController.swift; sourceTree = "<group>"; };
 		A75AD3F61B1914FA00404C06 /* initialization.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = initialization.js; path = js/initialization.js; sourceTree = "<group>"; };
@@ -71,6 +86,7 @@
 		A7C869051B18CEF30070AF5A /* basic_triggering.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = basic_triggering.html; path = html/basic_triggering.html; sourceTree = "<group>"; };
 		A7C869071B18CF450070AF5A /* basic_triggering.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = basic_triggering.js; path = js/basic_triggering.js; sourceTree = "<group>"; };
 		A7DC081A1B18C73500D98DA5 /* BasicTriggeringController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTriggeringController.swift; sourceTree = "<group>"; };
+		A7EE0BA61BEC423E00D0925C /* Caravel.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Caravel.framework; path = "/Users/acadet/Library/Developer/Xcode/DerivedData/caravel-gxizvdjjntycpgaiopgmjthvbutx/Build/Products/Debug-iphoneos/Caravel.framework"; sourceTree = "<absolute>"; };
 		A7F1DE231B18045C001E9B94 /* caravel-test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "caravel-test.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A7F1DE271B18045C001E9B94 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A7F1DE281B18045C001E9B94 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -81,15 +97,14 @@
 		A7F1DE381B18045C001E9B94 /* caravel-testTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "caravel-testTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		A7F1DE3D1B18045C001E9B94 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A7F1DE3E1B18045C001E9B94 /* caravel_testTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = caravel_testTests.swift; sourceTree = "<group>"; };
-		A7F1DE4A1B18067F001E9B94 /* Caravel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Caravel.framework; path = "../build/Debug-iphoneos/Caravel.framework"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		A7F1DE201B18045C001E9B94 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A7F1DE4B1B18067F001E9B94 /* Caravel.framework in Frameworks */,
+				A7EE0BA71BEC423E00D0925C /* Caravel.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -135,7 +150,7 @@
 		A7F1DE1A1B18045C001E9B94 = {
 			isa = PBXGroup;
 			children = (
-				A7F1DE4A1B18067F001E9B94 /* Caravel.framework */,
+				A7EE0BA61BEC423E00D0925C /* Caravel.framework */,
 				A7F1DE251B18045C001E9B94 /* caravel-test */,
 				A7F1DE3B1B18045C001E9B94 /* caravel-testTests */,
 				A7F1DE241B18045C001E9B94 /* Products */,
@@ -208,6 +223,7 @@
 				A7F1DE1F1B18045C001E9B94 /* Sources */,
 				A7F1DE201B18045C001E9B94 /* Frameworks */,
 				A7F1DE211B18045C001E9B94 /* Resources */,
+				A7EE0BA91BEC423E00D0925C /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
diff --git a/caravel-test/js/basic_triggering.js b/caravel-test/js/basic_triggering.js
@@ -1,5 +1,5 @@
 Caravel.getDefault().register("From iOS", function(name, data) {
-    $('body').append('<p>Received From iOS!</p>');
+    $('body').append('<p class="js">Received From iOS!</p>');
 });
 
 Caravel.getDefault().post("From JS");
diff --git a/caravel-test/js/event_data.js b/caravel-test/js/event_data.js
@@ -1,12 +1,12 @@
 function ok(name) {
-    $('body').append('<p>' + name + ' ok</p>');
+    $('body').append('<p class="js">' + name + ' ok</p>');
 }
 
 function fail(name, data) {
     if ((data instanceof Array) || (data instanceof Object)) {
         data = JSON.stringify(data);
     }
-    $('body').append('<p>Failed for ' + name + ': received ' + data + '</p>');
+    $('body').append('<p class="js">Failed for ' + name + ': received ' + data + '</p>');
 }
 
 Caravel.getDefault().register("Bool", function(name, data) {
diff --git a/caravel-test/js/event_name.js b/caravel-test/js/event_name.js
@@ -1,13 +1,13 @@
 Caravel.getDefault().register("Foo", function(name, data) {
     if (name == "Foo") {
-        $('body').append('<p>You should see me</p>');
+        $('body').append('<p class="js">You should see me</p>');
     } else {
-        $('body').append('<p>You should not see me</p>');
+        $('body').append('<p class="js">You should not see me</p>');
     }
 });
 
 Caravel.getDefault().register("Foobar", function(name, data) {
-    $('body').append('<p>You should not see me</p>');
+    $('body').append('<p class="js">You should not see me</p>');
 });
 
 Caravel.getDefault().post('Bar');
diff --git a/caravel-test/js/initialization.js b/caravel-test/js/initialization.js
@@ -1,7 +1,7 @@
 Caravel.getDefault().register("Before", function(name, data) {
-    $('body').append('<p>Before</p>');
+    $('body').append('<p class="js">Before</p>');
 });
 
 Caravel.getDefault().register("After", function(name, data) {
-    $('body').append('<p>After</p>');
+    $('body').append('<p class="js">After</p>');
 });
diff --git a/caravel-test/js/multiple_subscribers.js b/caravel-test/js/multiple_subscribers.js
@@ -1,7 +1,7 @@
 Caravel.getDefault().register("AnEvent", function(name, data) {
-    $('body').append('<p>First!</p>');
+    $('body').append('<p class="js">First!</p>');
 });
 
 Caravel.getDefault().register("AnEvent", function(name, data) {
-    $('body').append('<p>Second!</p>');
+    $('body').append('<p class="js">Second!</p>');
 });
diff --git a/caravel-test/js/two_buses.js b/caravel-test/js/two_buses.js
@@ -1,7 +1,7 @@
 Caravel.get("BarBus").register("AnEvent", function(name, data) {
-    $('body').append('<p>You should see me first and only once</p>');
+    $('body').append('<p class="js">You should see me first and only once</p>');
 });
 
 Caravel.get("FooBus").register("AnEvent", function(name, data) {
-    $('body').append('<p>You should see me after and only once</p>');
+    $('body').append('<p class="js">You should see me after and only once</p>');
 });
diff --git a/caravel-test/js/two_events.js b/caravel-test/js/two_events.js
@@ -1,9 +1,9 @@
 Caravel.getDefault().register("ThirdEvent", function(name, data) {
-    $('body').append('<p>You should see me and only me</p>');
+    $('body').append('<p class="js">You should see me and only me</p>');
 });
 
 Caravel.getDefault().register("FourthEvent", function(name, data) {
-    $('body').append('<p>You should not see me</p>');
+    $('body').append('<p class="js">You should not see me</p>');
 });
 
 Caravel.getDefault().post("FirstEvent");
diff --git a/caravel/Caravel.swift b/caravel/Caravel.swift
@@ -30,7 +30,6 @@ public class Caravel: NSObject, UIWebViewDelegate {
      */
     private lazy var subscribers: [Subscriber] = [Subscriber]()
     
-    
     /**
      * Denotes if the bus has received the init event from JS
      */
@@ -99,6 +98,7 @@ public class Caravel: NSObject, UIWebViewDelegate {
         // has been raised (aka wait for JS before calling whenReady)
         self.isInitialized = false
         self.webView = webView
+        self.subscribers = []
         UIWebViewDelegateMediator.subscribe(self.webView, subscriber: self)
     }
     
@@ -131,24 +131,20 @@ public class Caravel: NSObject, UIWebViewDelegate {
                 if self.secretName == args.busName {
                     if args.eventName == "CaravelInit" { // Reserved event name. Triggers whenReady
                         if !self.isInitialized {
-                            self.synchronized {
-                                if !self.isInitialized {
-                                    self.isInitialized = true
+                            self.isInitialized = true
+                            
+                            for i in self.initializers {
+                                let index = self.onGoingInitializersId
+                                
+                                self.onGoingInitializers[index] = i
+                                self.onGoingInitializersId++
                                 
-                                    for i in self.initializers {
-                                        let index = self.onGoingInitializersId
-                                        
-                                        self.onGoingInitializers[index] = i
-                                        self.onGoingInitializersId++
-                                        
-                                        dispatch_async(dispatch_get_main_queue()) {
-                                            i(self)
-                                            self.onGoingInitializers.removeValueForKey(index)
-                                        }
-                                    }
-                                    self.initializers = Array<(Caravel) -> Void>()
+                                dispatch_async(dispatch_get_main_queue()) {
+                                    i(self)
+                                    self.onGoingInitializers.removeValueForKey(index)
                                 }
                             }
+                            self.initializers = Array<(Caravel) -> Void>()
                         }
                     } else {
                         var eventData: AnyObject? = nil
@@ -187,7 +183,7 @@ public class Caravel: NSObject, UIWebViewDelegate {
             }
         } else {
             self.synchronized {
-                if self.self.isInitialized {
+                if self.isInitialized {
                     dispatch_async(dispatch_get_main_queue()) {
                         callback(self)
                     }
diff --git a/caravel/UIWebViewDelegateMediator.swift b/caravel/UIWebViewDelegateMediator.swift
@@ -22,10 +22,10 @@ internal class UIWebViewDelegateMediator: NSObject, UIWebViewDelegate {
     /**
      * All the subscribers. They are sorted by webview's hash
      */
-    private lazy var _webViewSubscribers: [Int: [UIWebViewDelegate]] = [Int: [UIWebViewDelegate]]()
+    private lazy var webViewSubscribers: [Int: [UIWebViewDelegate]] = [Int: [UIWebViewDelegate]]()
     
     private func iterateOverDelegates(webView: UIWebView, callback: (UIWebViewDelegate) -> Void) {
-        let array = UIWebViewDelegateMediator.singleton._webViewSubscribers[webView.hash]!
+        let array = UIWebViewDelegateMediator.singleton.webViewSubscribers[webView.hash]!
         
         for e in array {
             callback(e)
@@ -38,16 +38,16 @@ internal class UIWebViewDelegateMediator: NSObject, UIWebViewDelegate {
             var delegates = [UIWebViewDelegate]()
             
             delegates.append(webView.delegate!)
-            singleton._webViewSubscribers[webView.hash] = delegates
+            singleton.webViewSubscribers[webView.hash] = delegates
             
             webView.delegate = singleton
         } else if webView.delegate == nil {
             // No delegate, just initialize
-            singleton._webViewSubscribers[webView.hash] = [UIWebViewDelegate]()
+            singleton.webViewSubscribers[webView.hash] = [UIWebViewDelegate]()
             webView.delegate = singleton
         }
         
-        singleton._webViewSubscribers[webView.hash]!.append(subscriber)
+        singleton.webViewSubscribers[webView.hash]!.append(subscriber)
     }
     
     // About methods below:
diff --git a/caravel/js/Gruntfile.js b/caravel/js/Gruntfile.js
@@ -1,7 +1,7 @@
 module.exports = function (grunt) {
     'use strict';
 
-    var version = '0.4.1';
+    var version = '0.4.2';
 
     // Project configuration
     grunt.initConfig({
diff --git a/caravel/js/caravel.coffee b/caravel/js/caravel.coffee
@@ -12,16 +12,18 @@ class Caravel
   _post: (eventName, data) ->
     # shouldLoadRequest is only triggered when a new content is required
     # Ajax requests are useless
-    iframe = document.createElement 'iframe'
-    src = "caravel://host.com?busName=#{encodeURIComponent(@name)}&eventName=#{encodeURIComponent(eventName)}"
-    if data?
-      if data instanceof Array or data instanceof Object
-        src += "&eventData=#{encodeURIComponent(JSON.stringify(data))}"
-      else
-        src += "&eventData=#{encodeURIComponent(data)}"
-    iframe.setAttribute 'src', src
-    document.documentElement.appendChild iframe
-    iframe.parentNode.removeChild iframe
+    setTimeout (() =>
+      iframe = document.createElement 'iframe'
+      src = "caravel://host.com?busName=#{encodeURIComponent(@name)}&eventName=#{encodeURIComponent(eventName)}"
+      if data?
+        if data instanceof Array or data instanceof Object
+          src += "&eventData=#{encodeURIComponent(JSON.stringify(data))}"
+        else
+          src += "&eventData=#{encodeURIComponent(data)}"
+      iframe.setAttribute 'src', src
+      document.documentElement.appendChild iframe
+      iframe.parentNode.removeChild iframe
+    ), 0
 
   getName: () ->
     @name
diff --git a/caravel/js/caravel.min.js b/caravel/js/caravel.min.js

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ Pod::Spec.new do \|s\|`
`15`	`15`	`# summary should be tweet-length, and the description more in depth.`
`16`	`16`	`#`
`17`	`17`
`18`		`- version = "0.4.1"`
	`18`	`+ version = "0.4.2"`
`19`	`19`
`20`	`20`	`s.name = "Caravel"`
`21`	`21`	`s.version = version`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`function ok(name) {`
`2`		`- $('body').append('<p>' + name + ' ok</p>');`
	`2`	`+ $('body').append('<p class="js">' + name + ' ok</p>');`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`function fail(name, data) {`
`6`	`6`	`if ((data instanceof Array) \|\| (data instanceof Object)) {`
`7`	`7`	`data = JSON.stringify(data);`
`8`	`8`	`}`
`9`		`- $('body').append('<p>Failed for ' + name + ': received ' + data + '</p>');`
	`9`	`+ $('body').append('<p class="js">Failed for ' + name + ': received ' + data + '</p>');`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`Caravel.getDefault().register("Bool", function(name, data) {`