").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b

Chat

Click on a row to see details

Hi! I'm XWebView

Date: Tue, 29 Sep 2015 11:40:53 -0300 Subject: [PATCH 05/11] Bump version to 0.9.4 and improve README --- README.md | 88 ++++++++++++++++++++++++++++++++++++++++++++---- XWebView.podspec | 22 ++++++------ 2 files changed, 92 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 33b2629..f4000f1 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,91 @@ [![Build Status](https://travis-ci.org/XWebView/XWebView.svg?branch=master)](https://travis-ci.org/XWebView/XWebView) -## Introduction - XWebView is an extensible WebView which is built on top of [WKWebView](https://developer.apple.com/library/ios/documentation/WebKit/Reference/WKWebView_Ref/), the modern WebKit framework debuted in iOS 8.0. It provides fast Web runtime with carefully designed plugin API for developing sophisticated iOS native or hybrid applications. Plugins written in Objective-C or Swift programming language can be automatically exposed in JavaScript context. With capabilities offered by plugins, Web apps can look and behave exactly like native apps. They will be no longer a second-class citizen on iOS platform. +## Installing + +### Cocoapods + +Add in your `Podfile` + +``` +pod 'XWebView' '~> 0.9.4' +``` + +and install it: `pod install` + +### Carthage + +Add in yout Cartfile + +``` +github "XWebView" 0.9.4 +``` + +add checkout it: `carthage update` + +### Minimum Requirements: + +* Development: Xcode 7 +* Deployment: iOS 8.0 + +### Sample + +``` +pod try XWebView +``` + +## Usage + +With XWebView you can inject JS Plugins tha can communicate with native code of your app. There are two method for local content loading. So first of all you need to load your local html page or from an url. (You may see Example). + +### Plugins + +Plugins must be inherited from `NSObject`. + +```swift +//Sample Plugin + +class MyPlugin: NSObject { + + func onSendClicked(data: String) { + //Do something + } +} +``` + +1. Functions can receive any primitive data from JS, like strings, integers, ... +2. **Attention**! `onSendClicked` will be executed in a different thread from ui thread. So if you pretend to handle ui components you must call you method in an ui thread. + +### Injecting Plugin + +It's quite simple, just do: + +```swift +let plugin = MyPlugin() +webView.loadPlugin(plugin, namespace: "MyPlugin") +``` + +To access your plugin from js code you need to call functions from injected object named _MyPlugin_ (namespace). So: + +```javascript +MyPlugin.onSendClicked("message typed"); +``` + +### Details + +In iOS 8.x there aren't functions to load local content. So XWebView simulated a local connection for your resources folder or base folder for an HTML String template. For that you need to use: + +``` +loadFileURL:allowingReadAccessToURL: +loadHTMLString:html:baseURL: +``` + +In iOS 9.x you have `loadFileURL:allowingReadAccessToURL:` and `loadHTMLString:html:baseURL:` both of these are native and XWebView will prefer native methods. So don't worry about backward compatibility and new api methods from iOS 9.x + ## Features Basically, plugins are native classes which can export their interfaces to a JavaScript environment. Calling methods and accessing properties of a plugin object in JavaScript result in same operations to the native plugin object. If you know the [Apache Cordova](https://cordova.apache.org/), you may have the concept of plugins. Well, XWebView does more in simpler manner. @@ -24,11 +103,6 @@ XWebView is designed for embedding. It's easy to adopt since it's an extension o For more documents, please go to the project [Wiki](../../wiki). -## Minimum Requirements: - -* Development: Xcode 7 -* Deployment: iOS 8.0 - ## License XWebView is distributed under the [Apache License 2.0](LICENSE). diff --git a/XWebView.podspec b/XWebView.podspec index 220f377..5355d13 100644 --- a/XWebView.podspec +++ b/XWebView.podspec @@ -16,20 +16,20 @@ Pod::Spec.new do |s| # s.name = "XWebView" - s.version = "0.9.3" + s.version = "0.9.4" s.summary = "An extensible WebView (based on WKWebView) for iOS." s.description = <<-DESC - XWebView is an extensible WebView which is built on top of WKWebView, - the modern WebKit framework debuted in iOS 8.0. It provides fast Web - runtime with carefully designed plugin API for developing sophisticated - iOS native or hybrid applications. + XWebView is an extensible WebView which is built on top of WKWebView, + the modern WebKit framework debuted in iOS 8.0. It provides fast Web + runtime with carefully designed plugin API for developing sophisticated + iOS native or hybrid applications. - Plugins written in Objective-C or Swift programming language can be - automatically exposed in JavaScript context. With capabilities offered - by plugins, Web apps can look and behave exactly like native apps. They - will be no longer a second-class citizen on iOS platform. - DESC + Plugins written in Objective-C or Swift programming language can be + automatically exposed in JavaScript context. With capabilities offered + by plugins, Web apps can look and behave exactly like native apps. They + will be no longer a second-class citizen on iOS platform. + DESC s.homepage = "https://github.com/XWebView/XWebView" # s.screenshots = "www.example.com/screenshots_1.gif", "www.example.com/screenshots_2.gif" @@ -55,7 +55,7 @@ Pod::Spec.new do |s| # profile URL. # - s.authors = { "Zhenyu Liang" => "xwebview@sofla.re", 'Jonathan Dong' => 'dongyan09@gmail.com' } + s.authors = { 'Zhenyu Liang' => 'xwebview@sofla.re', 'Jonathan Dong' => 'dongyan09@gmail.com', 'David Kim' => 'david@xwebview.org', 'Fernando Martínez' => 'contact@fernandodev.com'} # s.social_media_url = "" # ――― Platform Specifics ――――――――――――――――――――――――――――――――――――――――――――――――――――――― # From 048db01cfc6d68b7945c82ac1466a0184f152e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Mart=C3=ADnez?= Date: Tue, 29 Sep 2015 13:44:50 -0300 Subject: [PATCH 06/11] Enable testability --- XWebView.xcodeproj/project.pbxproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/XWebView.xcodeproj/project.pbxproj b/XWebView.xcodeproj/project.pbxproj index 338bea0..7da82ee 100644 --- a/XWebView.xcodeproj/project.pbxproj +++ b/XWebView.xcodeproj/project.pbxproj @@ -527,7 +527,7 @@ COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; + ENABLE_TESTABILITY = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -575,6 +575,7 @@ CURRENT_PROJECT_VERSION = 1; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -599,6 +600,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTABILITY = YES; INFOPLIST_FILE = XWebView/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -615,6 +617,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_TESTABILITY = YES; INFOPLIST_FILE = XWebView/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -643,6 +646,7 @@ EDC0BA201BB9BD2800241B2D /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; EE62682F19FA323900EFC3F8 /* Build configuration list for PBXProject "XWebView" */ = { isa = XCConfigurationList; From e6e2b4e2e303005ca61981f6f635b45c06d0a4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Mart=C3=ADnez?= Date: Wed, 30 Sep 2015 15:22:46 -0300 Subject: [PATCH 07/11] Add assertions and description messages for XWVChannel --- XWebView/XWVChannel.swift | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/XWebView/XWVChannel.swift b/XWebView/XWVChannel.swift index 7e4cdfe..a8b5ef2 100644 --- a/XWebView/XWVChannel.swift +++ b/XWebView/XWVChannel.swift @@ -54,11 +54,10 @@ public class XWVChannel : NSObject, WKScriptMessageHandler { } public func bindPlugin(object: AnyObject, toNamespace namespace: String) -> XWVScriptObject? { - if webView == nil || typeInfo != nil { - return nil - } + assert(typeInfo == nil) + guard let webView = webView else { return nil } - webView!.configuration.userContentController.addScriptMessageHandler(self, name: name) + webView.configuration.userContentController.addScriptMessageHandler(self, name: name) typeInfo = XWVMetaObject(plugin: object.dynamicType) let plugin = XWVBindingObject(namespace: namespace, channel: self, object: object) @@ -66,18 +65,14 @@ public class XWVChannel : NSObject, WKScriptMessageHandler { let script = WKUserScript(source: (object as? XWVScripting)?.javascriptStub?(stub) ?? stub, injectionTime: WKUserScriptInjectionTime.AtDocumentStart, forMainFrameOnly: true) - userScript = XWVUserScript(webView: webView!, script: script) + userScript = XWVUserScript(webView: webView, script: script) instances[0] = plugin return plugin as XWVScriptObject } public func unbind() { - if typeInfo == nil { - print(" Warning: can't unbind inexistent plugin.") - return - } - + assert(typeInfo != nil, " Error: can't unbind inexistent plugin.") instances.removeAll(keepCapacity: false) webView?.configuration.userContentController.removeScriptMessageHandlerForName(name) } @@ -94,7 +89,7 @@ public class XWVChannel : NSObject, WKScriptMessageHandler { } else { // Dispose instance let object = instances.removeValueForKey(target) - print(" Instance \(object) was disposed") + assert(object != nil, " Warning: bad instance id was received") } } else if let member = typeInfo[opcode] where member.isProperty { // Update property From 9b1d926d02ab3e2ad103c461de517cd30f826b47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Mart=C3=ADnez?= Date: Wed, 30 Sep 2015 16:32:21 -0300 Subject: [PATCH 08/11] Add override for function loadHTMLString:baseURL even though in iOS 9.x --- XWebView/XWebView.swift | 42 +++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/XWebView/XWebView.swift b/XWebView/XWebView.swift index 62549e1..5dce5b7 100644 --- a/XWebView/XWebView.swift +++ b/XWebView/XWebView.swift @@ -104,16 +104,32 @@ extension WKWebView { public override class func initialize() { guard self == WKWebView.self else { return } dispatch_once(&initialized) { - let selector = Selector("loadFileURL:allowingReadAccessToURL:") - let method = class_getInstanceMethod(self, Selector("_loadFileURL:allowingReadAccessToURL:")) - assert(method != nil) - if class_addMethod(self, selector, method_getImplementation(method), method_getTypeEncoding(method)) { - print(" using backward compatibility for iOS 8.x") - method_exchangeImplementations( - class_getInstanceMethod(self, Selector("loadHTMLString:baseURL:")), - class_getInstanceMethod(self, Selector("_loadHTMLString:baseURL:")) - ) - } + let loadFileURLSelector = Selector("loadFileURL:allowingReadAccessToURL:") + let loadHTMLStringSelector = Selector("loadHTMLString:baseURL:") + let customLoadHTMLStringSelector = Selector("_loadHTMLString:baseURL:") + let customLoadFileURLSelector = Selector("_loadFileURL:allowingReadAccessToURL:") + + let loadFileURLMethod = class_getInstanceMethod( + self, + customLoadFileURLSelector + ) + let loadHTMLStringMethod = class_getInstanceMethod( + self, + customLoadHTMLStringSelector + ) + + assert(loadFileURLMethod != nil && loadHTMLStringMethod != nil) + + class_addMethod( + self, + loadFileURLSelector, + method_getImplementation(loadFileURLMethod), + method_getTypeEncoding(loadFileURLMethod) + ) + method_exchangeImplementations( + class_getInstanceMethod(self, loadHTMLStringSelector), + class_getInstanceMethod(self, customLoadHTMLStringSelector) + ) } } @@ -136,6 +152,12 @@ extension WKWebView { return nil } + // Although iOS 9.x loadHTMLString and loadData can't use baseURL with file protocol access. + // But for Simulator you can use loadHTMLString and loadData with file:/// as baseURL and access + // all of your resources. Accessing local data is restricted for devices and the unique folder + // that you can access is tmp folder. + // + // It continues to be necessary with you pretend to render pages such as dynamic templates. @objc private func _loadHTMLString(html: String, baseURL: NSURL) -> WKNavigation? { guard baseURL.fileURL else { // call original method implementation From 8792599fa781460451d9d6535765da7409cd3b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Mart=C3=ADnez?= Date: Thu, 1 Oct 2015 11:51:50 -0300 Subject: [PATCH 09/11] Fix namespace key for test expectation: 'can't define expectations with especial symbols such as ., ,, /.. --- XWebViewTests/XWVTestCase.swift | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/XWebViewTests/XWVTestCase.swift b/XWebViewTests/XWVTestCase.swift index 383c526..d16e93e 100644 --- a/XWebViewTests/XWVTestCase.swift +++ b/XWebViewTests/XWVTestCase.swift @@ -30,13 +30,15 @@ extension XCTestExpectation : XWVScripting { class XWVTestCase : XCTestCase, WKNavigationDelegate { var webview: WKWebView! + private let nameForExpectation = "expectationWithDescription" private let namespaceForExpectation = "xwvexpectations" private var onReady: ((WKWebView)->Void)? override func setUp() { super.setUp() - let source = "function fulfill(name){\(namespaceForExpectation)[name].fulfill();}\n" + - "function expectation(name){return \(namespaceForExpectation)[name];}\n" + let source = "function fulfill(name){\(namespaceForExpectation)['\(nameForExpectation)'].fulfill();}\n" + + "function expectation(name){return \(namespaceForExpectation)[\(nameForExpectation)];}\n" + let script = WKUserScript( source: source, injectionTime: WKUserScriptInjectionTime.AtDocumentStart, @@ -49,16 +51,17 @@ class XWVTestCase : XCTestCase, WKNavigationDelegate { webview = nil super.tearDown() } - + override func expectationWithDescription(description: String) -> XCTestExpectation { let e = super.expectationWithDescription(description) - webview.loadPlugin(e, namespace: "\(namespaceForExpectation).\(description)") + webview.loadPlugin(e, namespace: "\(namespaceForExpectation).\(nameForExpectation)") return e } func loadPlugin(object: NSObject, namespace: String, script: String) { loadPlugin(object, namespace: namespace, script: script, onReady: nil) } + func loadPlugin(object: NSObject, namespace: String, script: String, onReady: ((WKWebView)->Void)?) { self.onReady = onReady webview.loadPlugin(object, namespace: namespace) @@ -74,6 +77,7 @@ class XWVTestCase : XCTestCase, WKNavigationDelegate { class XWVTestCaseTest : XWVTestCase { class Plugin : NSObject { } + func testXWVTestCase() { let desc = "selftest" _ = expectationWithDescription(desc) From ac327742fe27fd6cb9d0d0b11465d5b1d0a909e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Mart=C3=ADnez?= Date: Thu, 1 Oct 2015 11:52:09 -0300 Subject: [PATCH 10/11] Tests for loadHTMLString checking baseURL --- XWebViewTests/XWebViewTests.swift | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/XWebViewTests/XWebViewTests.swift b/XWebViewTests/XWebViewTests.swift index 4c88b71..13a1f7b 100644 --- a/XWebViewTests/XWebViewTests.swift +++ b/XWebViewTests/XWebViewTests.swift @@ -48,4 +48,38 @@ class XWebViewTests: XWVTestCase { waitForExpectationsWithTimeout(2, handler: nil) } } + + func testLoadHtmlStringWithNoBaseURL() { + expectationWithDescription("about:blank") + webview.loadHTMLString("", baseURL: nil) + waitForExpectationsWithTimeout(2, handler: nil) + } + + func testLoadHtmlStringWithFileAsBaseURL() { + let bundle = NSBundle(identifier:"org.xwebview.XWebViewTests") + let baseURL = bundle?.bundleURL.URLByAppendingPathComponent("www") + let split = "/:\\/\\/|:/" + expectationWithDescription("127.0.0.1") + webview.loadHTMLString("", baseURL: baseURL) + waitForExpectationsWithTimeout(2, handler: nil) + } + + func testLoadHtmlStringWithHostAsBaseURL() { + let bundle = NSBundle(identifier:"org.xwebview.XWebViewTests") + let baseURL = bundle?.bundleURL.URLByAppendingPathComponent("www") + expectationWithDescription("www.github.com") + webview.loadHTMLString("", baseURL: baseURL) + waitForExpectationsWithTimeout(2, handler: nil) + } + + //Test for !fileURL (default implementation) + func testLoadHTMLStringWithBaseURL2() { + _ = expectationWithDescription("loadHTMLStringWithBaseURL") + let bundle = NSBundle(identifier:"org.xwebview.XWebViewTests") + if let baseURL = bundle?.bundleURL.URLByAppendingPathComponent("www") { + XCTAssert(baseURL.checkResourceIsReachableAndReturnError(nil), "Directory not found") + webview.loadHTMLString("

", baseURL: baseURL) + waitForExpectationsWithTimeout(2, handler: nil) + } + } } From 1aca559627877628e3eec59aa320b58eb63c07de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Mart=C3=ADnez?= Date: Thu, 1 Oct 2015 16:38:15 -0300 Subject: [PATCH 11/11] Replace exceptions by assertions with description --- XWebView.xcodeproj/project.pbxproj | 6 ---- XWebView/XWVException.h | 28 ---------------- XWebView/XWVException.m | 53 ------------------------------ XWebView/XWVHttpConnection.m | 6 ++-- 4 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 XWebView/XWVException.h delete mode 100644 XWebView/XWVException.m diff --git a/XWebView.xcodeproj/project.pbxproj b/XWebView.xcodeproj/project.pbxproj index 7da82ee..53283df 100644 --- a/XWebView.xcodeproj/project.pbxproj +++ b/XWebView.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ AB023EBE1A8C8BC700580A2A /* XWebView.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = EE62683519FA323900EFC3F8 /* XWebView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; AB2273E51AA6FDA700F9207A /* www in Resources */ = {isa = PBXBuildFile; fileRef = AB2273E41AA6FDA700F9207A /* www */; }; ABF68ECD1A6B45FC0058267B /* XWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = EE62691C19FA52FC00EFC3F8 /* XWebView.h */; settings = {ATTRIBUTES = (Public, ); }; }; - EDAFD9ED1BB981C300DD660E /* XWVException.m in Sources */ = {isa = PBXBuildFile; fileRef = EDAFD9EC1BB981C300DD660E /* XWVException.m */; settings = {ASSET_TAGS = (); }; }; EDC0BA131BB9BD2800241B2D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC0BA121BB9BD2800241B2D /* AppDelegate.swift */; }; EDC0BA151BB9BD2800241B2D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDC0BA141BB9BD2800241B2D /* ViewController.swift */; }; EDC0BA181BB9BD2800241B2D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EDC0BA161BB9BD2800241B2D /* Main.storyboard */; }; @@ -73,7 +72,6 @@ AB023EA31A8C506600580A2A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; AB023EA41A8C506600580A2A /* XWebViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XWebViewTests.swift; sourceTree = ""; }; AB2273E41AA6FDA700F9207A /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = ""; }; - EDAFD9EC1BB981C300DD660E /* XWVException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XWVException.m; path = XWebView/XWVException.m; sourceTree = ""; }; EDC0BA101BB9BD2700241B2D /* XWebViewExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XWebViewExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; EDC0BA121BB9BD2800241B2D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; EDC0BA141BB9BD2800241B2D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -83,7 +81,6 @@ EDC0BA1E1BB9BD2800241B2D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; EDC0BA231BB9BD7600241B2D /* SamplePlugin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SamplePlugin.swift; sourceTree = ""; }; EDC0BA261BB9BFBE00241B2D /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = ""; }; - EDC0BA291BBAD11C00241B2D /* XWVException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XWVException.h; path = XWebView/XWVException.h; sourceTree = ""; }; EE0A1DD21A52775400C9E6D3 /* XWVChannel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XWVChannel.swift; path = XWebView/XWVChannel.swift; sourceTree = ""; }; EE131CA61B5F900400A9E790 /* XWVUserScript.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = XWVUserScript.swift; path = XWebView/XWVUserScript.swift; sourceTree = ""; }; EE174E771A0361CB00168D96 /* xwebview.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = xwebview.js; path = XWebView/xwebview.js; sourceTree = ""; }; @@ -203,7 +200,6 @@ EE62683719FA323900EFC3F8 /* XWebView */ = { isa = PBXGroup; children = ( - EDC0BA291BBAD11C00241B2D /* XWVException.h */, EEDF305F1B6555B900A21659 /* XWVInvocation.swift */, EE131CA61B5F900400A9E790 /* XWVUserScript.swift */, EE92C65E1B5ACF81000FE1DA /* XWVMetaObject.swift */, @@ -218,7 +214,6 @@ EEE6F9A51AE02E8600A2EC89 /* XWVObject.swift */, EE33793D1AE56875009124A4 /* XWVScriptObject.swift */, EEE6F9A71AE02F5000A2EC89 /* XWVBindingObject.swift */, - EDAFD9EC1BB981C300DD660E /* XWVException.m */, EE174E771A0361CB00168D96 /* xwebview.js */, EE62683819FA323900EFC3F8 /* Supporting Files */, ); @@ -410,7 +405,6 @@ EEE6F9A81AE02F5000A2EC89 /* XWVBindingObject.swift in Sources */, EE131CA71B5F900400A9E790 /* XWVUserScript.swift in Sources */, EE7164921A716C9F00078FF9 /* XWVHttpServer.m in Sources */, - EDAFD9ED1BB981C300DD660E /* XWVException.m in Sources */, EE92C65F1B5ACF81000FE1DA /* XWVMetaObject.swift in Sources */, EEE6F9A61AE02E8600A2EC89 /* XWVObject.swift in Sources */, EE33793E1AE56875009124A4 /* XWVScriptObject.swift in Sources */, diff --git a/XWebView/XWVException.h b/XWebView/XWVException.h deleted file mode 100644 index cab3258..0000000 --- a/XWebView/XWVException.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - Copyright 2015 XWebView - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - -#ifndef XWVException_h -#define XWVException_h - -#import - -@interface XWVException : NSObject - -+ (void)raiseUnlessRoot:(NSURL *)root; -+ (void)raiseUnlessBadResponse:(const NSHTTPURLResponse *)response; -@end - -#endif /* XWVException_h */ diff --git a/XWebView/XWVException.m b/XWebView/XWVException.m deleted file mode 100644 index a5dd543..0000000 --- a/XWebView/XWVException.m +++ /dev/null @@ -1,53 +0,0 @@ -/* - Copyright 2015 XWebView - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -#import "XWVException.h" - -@interface XWVException () -@end - -@implementation XWVException { - -} - -+ (void)raiseUnlessRoot:(NSURL *)root { - if (root != nil) return; - NSException *exception = [NSException exceptionWithName:@"XWVRootDirectoryNotFound" - reason:@"Can't find root directory" - userInfo:nil]; - @throw exception; -} - -+ (void)raiseUnlessBadResponse:(const NSHTTPURLResponse *)response { - int class = (int)response.statusCode / 100 - 1; - if (class >= 0 && class < 5) return; - - NSDictionary *headers = response.allHeaderFields; - NSException *exception = [NSException exceptionWithName:@"XWVWrongServerStatusCode" - reason:@"Server returnered a status code >= 500" - userInfo:@{ - @"response": response, - @"headers": headers, - @"statusCode": @(response.statusCode) - }]; - @throw exception; -} - -@end diff --git a/XWebView/XWVHttpConnection.m b/XWebView/XWVHttpConnection.m index ed9bc72..0843d4e 100644 --- a/XWebView/XWVHttpConnection.m +++ b/XWebView/XWVHttpConnection.m @@ -30,7 +30,7 @@ #endif #import "XWVHttpConnection.h" -#import "XWVException.h" + static NSMutableURLRequest *parseRequest(NSMutableURLRequest *request, NSData *line); static NSHTTPURLResponse *buildResponse(NSURLRequest *request, NSURL *rootURL); @@ -107,7 +107,7 @@ - (NSURL *)rootURL { NSURL *root; if (_delegate && [_delegate respondsToSelector:@selector(documentRoot)]) { root = [NSURL fileURLWithPath:_delegate.documentRoot isDirectory:YES]; - [XWVException raiseUnlessRoot:root]; + NSCAssert(root != nil, @" you must set a valid documentRoot"); } else { NSBundle *bundle = [NSBundle mainBundle]; root = bundle.resourceURL ?: bundle.bundleURL; @@ -343,7 +343,7 @@ - (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode { NSString *name; int class = (int)response.statusCode / 100 - 1; - [XWVException raiseUnlessBadResponse:response]; + NSCAssert(class >= 0 && class < 5, @" status code must be in the range [0, 500)"); int code = (int)response.statusCode % 100; if (code >= sizeof(HttpResponseReasonPhrase[class]) / sizeof(char *) ||