Rename WebAppCordova to MeteorWebApp

Author: martijnwalraven

plugin.xml

@@ -16,23 +16,23 @@
     <engine name="apple-xcode" version=">=7.2" />
   </engines>
 
-  <js-module src="www/webapp_cordova.js" name="WebAppCordova">
+  <js-module src="www/webapp_cordova.js" name="MeteorWebApp">
     <merges target="WebAppCordova" />
   </js-module>
 
   <platform name="ios">
     <hook type="after_plugin_install" src="scripts/iosAddBridgingHeader.js" />
 
     <config-file target="config.xml" parent="/*">
-      <feature name="WebAppCordova">
-        <param name="ios-package" value="METWebAppCordova"/>
+      <feature name="MeteorWebApp">
+        <param name="ios-package" value="METWebApp"/>
         <param name="onload" value="true"/>
       </feature>
     </config-file>
 
     <header-file src="src/ios/cordova-plugin-meteor-webapp-Bridging-Header.h" />
 
-    <source-file src="src/ios/WebAppCordova.swift" />
+    <source-file src="src/ios/WebApp.swift" />
     <source-file src="src/ios/WebAppConfiguration.swift" />
     <source-file src="src/ios/AssetBundleManager.swift" />
     <source-file src="src/ios/AssetBundle.swift" />
@@ -90,7 +90,7 @@
 
   <platform name="android">
     <config-file target="res/xml/config.xml" parent="/*">
-      <feature name="WebAppCordova" >
+      <feature name="MeteorWebApp" >
         <param name="android-package" value="com.meteor.webapp.WebApp" />
         <param name="onload" value="true" />
       </feature>

src/ios/WebAppCordova.swift renamed to src/ios/WebApp.swift

@@ -16,17 +16,17 @@ let listeningPortRange: Range<UInt> = 12000...13000
 /// we revert to the last known good version
 let startupTimeoutInterval = 10.0
 
-@objc(METWebAppCordova)
-final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
+@objc(METWebApp)
+final public class WebApp: CDVPlugin, AssetBundleManagerDelegate {
   /// The local web server responsible for serving assets to the web app
   private(set) var localServer: GCDWebServer!
-  
+
   /// The listening port of the local web server
   private var localServerPort: UInt = 0
 
   /// The www directory in the app bundle
   private(set) var wwwDirectoryURL: NSURL!
-  
+
   /// Persistent configuration settings for the webapp
   private var configuration: WebAppConfiguration!
 
@@ -98,10 +98,10 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
         NSLog("Could not remove versions directory: \(error)")
         return
       }
-      
+
       configuration.reset()
     }
-    
+
     // We keep track of the last seen initial version (see above)
     configuration.lastSeenInitialVersion = initialAssetBundle.version
 
@@ -151,9 +151,9 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
         self?.revertToLastKnownGoodVersion()
       }
     }
-    
+
     NSNotificationCenter.defaultCenter().addObserver(self, selector: "applicationDidEnterBackground", name: UIApplicationDidEnterBackgroundNotification, object: nil)
-    
+
     NSNotificationCenter.defaultCenter().addObserver(self, selector: "pageDidLoad", name: CDVPageDidLoadNotification, object: webView)
   }
 
@@ -166,7 +166,7 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
       currentAssetBundle = pendingAssetBundle
       self.pendingAssetBundle = nil
     }
-    
+
     startupTimer?.startWithTimeInterval(startupTimeoutInterval)
   }
 
@@ -241,7 +241,7 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
 
   private func notifyDownloadFailure(error: ErrorType) {
     NSLog("Failure: \(error)")
-    
+
     let errorMessage = String(error)
     let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAsString: errorMessage)
     commandDelegate?.sendPluginResult(result, callbackId: downloadFailureCallbackId)
@@ -252,7 +252,7 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
   func revertToLastKnownGoodVersion() {
     // Blacklist the current version, so we don't update to it again rightaway
     configuration.addBlacklistedVersion(currentAssetBundle.version)
-    
+
     if let lastKnownGoodVersion = configuration.lastKnownGoodVersion,
         let lastKnownGoodAssetBundle = assetBundleManager.downloadedAssetBundleWithVersion(lastKnownGoodVersion) {
       pendingAssetBundle = lastKnownGoodAssetBundle
@@ -287,31 +287,31 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
 
   func assetBundleManager(assetBundleManager: AssetBundleManager, didFinishDownloadingBundle assetBundle: AssetBundle) {
     NSLog("Finished downloading new asset bundle version: \(assetBundle.version)")
-    
+
     do {
       try verifyDownloadedAssetBundle(assetBundle)
-      
+
       configuration.lastDownloadedVersion = assetBundle.version
       pendingAssetBundle = assetBundle
       notifyNewVersionDownloaded(assetBundle.version)
     } catch {
       notifyDownloadFailure(error)
     }
   }
-  
+
   private func verifyDownloadedAssetBundle(assetBundle: AssetBundle) throws {
     guard let appId = assetBundle.appId else {
       throw WebAppError.UnsuitableAssetBundle(reason: "Could not find appId in downloaded asset bundle", underlyingError: nil)
     }
-    
+
     if appId != configuration.appId {
       throw WebAppError.UnsuitableAssetBundle(reason: "appId in downloaded asset bundle does not match current appId", underlyingError: nil)
     }
-    
+
     guard let rootURL = assetBundle.rootURL else {
       throw WebAppError.UnsuitableAssetBundle(reason: "Could not find ROOT_URL in downloaded asset bundle", underlyingError: nil)
     }
-    
+
     if configuration.rootURL?.host != "localhost" && rootURL.host == "localhost" {
       throw WebAppError.UnsuitableAssetBundle(reason: "ROOT_URL in downloaded asset bundle would change current ROOT_URL to localhost. Make sure ROOT_URL has been configured correctly on the server.", underlyingError: nil)
     }
@@ -389,11 +389,11 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
   private func addIndexFileHandler() {
     localServer.addHandlerWithMatchBlock({ [weak self] (requestMethod, requestURL, requestHeaders, URLPath, URLQuery) -> GCDWebServerRequest! in
       if requestMethod != "GET" { return nil }
-      
+
       if URLPath == "/favicon.ico" { return nil }
 
       guard let indexFile = self?.currentAssetBundle?.indexFile else { return nil }
-        
+
       let request = GCDWebServerRequest(method: requestMethod, url: requestURL, headers: requestHeaders, path: URLPath, query: URLQuery)
       request.setAttribute(Box(indexFile), forKey: GCDWebServerRequestAttribute_Asset)
       return request
@@ -402,7 +402,7 @@ final public class WebAppCordova: CDVPlugin, AssetBundleManagerDelegate {
         return self.responseForAsset(request, asset: asset)
     }
   }
-  
+
   private func addNotFoundHandler() {
     localServer.addDefaultHandlerForMethod("GET", requestClass: GCDWebServerRequest.self) { (request) -> GCDWebServerResponse! in
            return GCDWebServerResponse(statusCode: GCDWebServerClientErrorHTTPStatusCode.HTTPStatusCode_NotFound.rawValue)

tests/plugin.xml

@@ -18,7 +18,7 @@
     <clobbers target="WebAppMockRemoteServer" />
   </js-module>
 
-  <js-module src="www/webapp_cordova_testing.js" name="WebAppCordovaTesting">
+  <js-module src="www/webapp_cordova_testing.js" name="MeteorWebAppTesting">
     <merges target="WebAppCordova" />
   </js-module>
 

tests/src/ios/WebAppCordova+Testing.swift

@@ -1,4 +1,4 @@
-extension WebAppCordova {
+extension WebApp {
   func resetToInitialState(command: CDVInvokedUrlCommand) {
     commandDelegate?.runInBackground() {
       self.stopLocalServer()

tests/www/webapp_cordova_testing.js

@@ -3,7 +3,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "resetToInitialState",
       []);
   },
@@ -12,7 +12,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "simulatePageReload",
       []);
   },
@@ -21,7 +21,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "simulateAppRestart",
       []);
   },
@@ -30,7 +30,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "downloadedVersionExists",
       [version]);
   },
@@ -39,7 +39,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "simulatePartialDownload",
       [version]);
   }

www/webapp_cordova.js

@@ -3,7 +3,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "startupDidComplete",
       []);
   },
@@ -12,7 +12,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "checkForUpdates",
       []);
   },
@@ -21,7 +21,7 @@ module.exports = {
     cordova.exec(
       callback,
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "onNewVersionDownloaded",
       []);
   },
@@ -34,7 +34,7 @@ module.exports = {
         callback(error);
       },
       console.error,
-      "WebAppCordova",
+      "MeteorWebApp",
       "onDownloadFailure",
       []);
   }