otherinbox-capybara-webkit 0.12.0 → 0.12.0.1

data/src/SocketCommand.cpp

@@ -0,0 +1,21 @@
+#include "SocketCommand.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+SocketCommand::SocketCommand(WebPageManager *manager, QStringList &arguments, QObject *parent) : Command(parent) {
+  m_manager = manager;
+  m_arguments = arguments;
+}
+
+WebPage *SocketCommand::page() const {
+  return m_manager->currentPage();
+}
+
+const QStringList &SocketCommand::arguments() const {
+  return m_arguments;
+}
+
+WebPageManager *SocketCommand::manager() const {
+  return m_manager;
+}
+

data/src/SocketCommand.h

@@ -0,0 +1,29 @@
+#ifndef SOCKET_COMMAND_H
+#define SOCKET_COMMAND_H
+
+#include <QObject>
+#include <QStringList>
+#include "Command.h"
+
+class WebPage;
+class WebPageManager;
+class Response;
+
+class SocketCommand : public Command {
+  Q_OBJECT
+
+  public:
+    SocketCommand(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+
+  protected:
+    WebPage *page() const;
+    const QStringList &arguments() const;
+    WebPageManager *manager() const;
+
+  private:
+    QStringList m_arguments;
+    WebPageManager *m_manager;
+
+};
+
+#endif

data/src/Source.cpp

@@ -1,7 +1,8 @@
 #include "Source.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-Source::Source(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Source::Source(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Source::start() {

data/src/Source.h

@@ -1,13 +1,12 @@
-#include "Command.h"
+#include "SocketCommand.h"
 
-class WebPage;
 class QNetworkReply;
 
-class Source : public Command {
+class Source : public SocketCommand {
   Q_OBJECT
 
   public:
-    Source(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    Source(WebPageManager *, QStringList &arguments, QObject *parent = 0);
     virtual void start();
 
   public slots:

data/src/Status.cpp

@@ -1,8 +1,9 @@
 #include "Status.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include <sstream>
 
-Status::Status(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Status::Status(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Status::start() {

data/src/Status.h

@@ -1,12 +1,10 @@
-#include "Command.h"
+#include "SocketCommand.h"
 
-class WebPage;
-
-class Status : public Command {
+class Status : public SocketCommand {
   Q_OBJECT
 
   public:
-    Status(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    Status(WebPageManager *, QStringList &arguments, QObject *parent = 0);
     virtual void start();
 };
 

data/src/UnsupportedContentHandler.cpp

@@ -27,6 +27,6 @@ void UnsupportedContentHandler::loadUnsupportedContent() {
 
 void UnsupportedContentHandler::finish(bool success) {
     connect(m_page, SIGNAL(loadFinished(bool)), m_page, SLOT(loadFinished(bool)));
-    m_page->replyFinished(m_reply);
+    m_page->networkAccessManagerFinishedReply(m_reply);
     m_page->loadFinished(success);
 }

data/src/Url.cpp

@@ -1,7 +1,8 @@
 #include "Url.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-Url::Url(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Url::Url(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Url::start() {

data/src/Url.h

@@ -1,12 +1,10 @@
-#include "Command.h"
+#include "SocketCommand.h"
 
-class WebPage;
-
-class Url : public Command {
+class Url : public SocketCommand {
   Q_OBJECT
 
   public:
-    Url(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    Url(WebPageManager *, QStringList &arguments, QObject *parent = 0);
     virtual void start();
 };
 

data/src/Visit.cpp

@@ -1,8 +1,9 @@
 #include "Visit.h"
-#include "Command.h"
+#include "SocketCommand.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-Visit::Visit(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Visit::Visit(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Visit::start() {

data/src/Visit.h

@@ -1,12 +1,10 @@
-#include "Command.h"
+#include "SocketCommand.h"
 
-class WebPage;
-
-class Visit : public Command {
+class Visit : public SocketCommand {
   Q_OBJECT
 
   public:
-    Visit(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    Visit(WebPageManager *manager, QStringList &arguments, QObject *parent = 0);
     virtual void start();
 };
 

data/src/WebPage.cpp

@@ -1,4 +1,5 @@
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include "JavascriptInvocation.h"
 #include "NetworkAccessManager.h"
 #include "NetworkCookieJar.h"
@@ -6,14 +7,18 @@
 #include <QResource>
 #include <iostream>
 #include <QWebSettings>
+#include <QUuid>
+
+WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
+  m_loading = false;
+  m_manager = manager;
+  m_uuid = QUuid::createUuid().toString();
+  m_lastStatus = 0;
 
-WebPage::WebPage(QObject *parent) : QWebPage(parent) {
   setForwardUnsupportedContent(true);
   loadJavascript();
   setUserStylesheet();
 
-  m_loading = false;
-  m_ignoreSslErrors = false;
   this->setCustomNetworkAccessManager();
 
   this->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
@@ -25,6 +30,8 @@ WebPage::WebPage(QObject *parent) : QWebPage(parent) {
   connect(this, SIGNAL(unsupportedContent(QNetworkReply*)),
       this, SLOT(handleUnsupportedContent(QNetworkReply*)));
   resetWindowSize();
+
+  settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
 }
 
 void WebPage::resetWindowSize() {
@@ -33,12 +40,33 @@ void WebPage::resetWindowSize() {
 }
 
 void WebPage::setCustomNetworkAccessManager() {
-  NetworkAccessManager *manager = new NetworkAccessManager();
-  manager->setCookieJar(new NetworkCookieJar());
+  NetworkAccessManager *manager = new NetworkAccessManager(this);
+  manager->setCookieJar(m_manager->cookieJar());
   this->setNetworkAccessManager(manager);
-  connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *)));
+  connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(networkAccessManagerFinishedReply(QNetworkReply *)));
   connect(manager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
           this, SLOT(handleSslErrorsForReply(QNetworkReply *, QList<QSslError>)));
+  connect(manager, SIGNAL(requestCreated(QNetworkReply *)), this, SLOT(networkAccessManagerCreatedRequest(QNetworkReply *)));
+}
+
+void WebPage::networkAccessManagerCreatedRequest(QNetworkReply *reply) {
+  emit requestCreated(reply);
+}
+
+void WebPage::networkAccessManagerFinishedReply(QNetworkReply *reply) {
+  if (reply->url() == this->currentFrame()->url()) {
+    QStringList headers;
+    m_lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    QList<QByteArray> list = reply->rawHeaderList();
+
+    int length = list.size();
+    for(int i = 0; i < length; i++) {
+      headers << list.at(i)+": "+reply->rawHeader(list.at(i));
+    }
+
+    m_pageHeaders = headers.join("\n");
+  }
+  emit replyFinished(reply);
 }
 
 void WebPage::loadJavascript() {
@@ -90,7 +118,7 @@ bool WebPage::shouldInterruptJavaScript() {
   return false;
 }
 
-QVariant WebPage::invokeCapybaraFunction(const char *name, QStringList &arguments) {
+QVariant WebPage::invokeCapybaraFunction(const char *name, const QStringList &arguments) {
   QString qname(name);
   QString objectName("CapybaraInvocation");
   JavascriptInvocation invocation(qname, arguments);
@@ -99,7 +127,7 @@ QVariant WebPage::invokeCapybaraFunction(const char *name, QStringList &argument
   return currentFrame()->evaluateJavaScript(javascript);
 }
 
-QVariant WebPage::invokeCapybaraFunction(QString &name, QStringList &arguments) {
+QVariant WebPage::invokeCapybaraFunction(QString &name, const QStringList &arguments) {
   return invokeCapybaraFunction(name.toAscii().data(), arguments);
 }
 
@@ -132,6 +160,7 @@ bool WebPage::javaScriptPrompt(QWebFrame *frame, const QString &message, const Q
 
 void WebPage::loadStarted() {
   m_loading = true;
+  m_errorPageMessage = QString();
 }
 
 void WebPage::loadFinished(bool success) {
@@ -144,7 +173,11 @@ bool WebPage::isLoading() const {
 }
 
 QString WebPage::failureString() {
-  return QString("Unable to load URL: ") + currentFrame()->requestedUrl().toString();
+  QString message = QString("Unable to load URL: ") + currentFrame()->requestedUrl().toString();
+  if (m_errorPageMessage.isEmpty())
+    return message;
+  else
+    return message + m_errorPageMessage;
 }
 
 bool WebPage::render(const QString &fileName) {
@@ -182,12 +215,16 @@ QString WebPage::chooseFile(QWebFrame *parentFrame, const QString &suggestedFile
 }
 
 bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output) {
-  Q_UNUSED(option);
   if (extension == ChooseMultipleFilesExtension) {
     QStringList names = QStringList() << getLastAttachedFileName();
     static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names;
     return true;
   }
+  else if (extension == QWebPage::ErrorPageExtension) {
+    ErrorPageExtensionOption *errorOption = (ErrorPageExtensionOption*) option;
+    m_errorPageMessage = " because of error loading " + errorOption->url.toString() + ": " + errorOption->errorString;
+    return false;
+  }
   return false;
 }
 
@@ -195,30 +232,11 @@ QString WebPage::getLastAttachedFileName() {
   return currentFrame()->evaluateJavaScript(QString("Capybara.lastAttachedFile")).toString();
 }
 
-void WebPage::replyFinished(QNetworkReply *reply) {
-  if (reply->url() == this->currentFrame()->url()) {
-    QStringList headers;
-    m_lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    QList<QByteArray> list = reply->rawHeaderList();
-
-    int length = list.size();
-    for(int i = 0; i < length; i++) {
-      headers << list.at(i)+": "+reply->rawHeader(list.at(i));
-    }
-
-    m_pageHeaders = headers.join("\n");
-  }
-}
-
 void WebPage::handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &errors) {
-  if (m_ignoreSslErrors)
+  if (m_manager->ignoreSslErrors())
     reply->ignoreSslErrors(errors);
 }
 
-void WebPage::ignoreSslErrors() {
-  m_ignoreSslErrors = true;
-}
-
 void WebPage::setSkipImageLoading(bool skip) {
   settings()->setAttribute(QWebSettings::AutoLoadImages, !skip);
 }
@@ -227,15 +245,6 @@ int WebPage::getLastStatus() {
   return m_lastStatus;
 }
 
-void WebPage::resetResponseHeaders() {
-  m_lastStatus = 0;
-  m_pageHeaders = QString();
-}
-
-void WebPage::resetConsoleMessages() {
-  m_consoleMessages.clear();
-}
-
 QString WebPage::pageHeaders() {
   return m_pageHeaders;
 }
@@ -244,3 +253,41 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
   UnsupportedContentHandler *handler = new UnsupportedContentHandler(this, reply);
   Q_UNUSED(handler);
 }
+
+bool WebPage::supportsExtension(Extension extension) const {
+  if (extension == ErrorPageExtension)
+    return true;
+  else if (extension == ChooseMultipleFilesExtension)
+    return true;
+  else
+    return false;
+}
+
+QWebPage *WebPage::createWindow(WebWindowType type) {
+  Q_UNUSED(type);
+  return m_manager->createPage(this);
+}
+
+QString WebPage::uuid() {
+  return m_uuid;
+}
+
+QString WebPage::getWindowName() {
+  QVariant windowName = mainFrame()->evaluateJavaScript("window.name");
+
+  if (windowName.isValid())
+    return windowName.toString();
+  else
+    return "";
+}
+
+bool WebPage::matchesWindowSelector(QString selector) {
+  return (selector == getWindowName()           ||
+      selector == mainFrame()->title()          ||
+      selector == mainFrame()->url().toString() ||
+      selector == uuid());
+}
+
+void WebPage::setFocus() {
+  m_manager->setCurrentPage(this);
+}

data/src/WebPage.h

@@ -1,25 +1,31 @@
+#ifndef _WEBPAGE_H
+#define _WEBPAGE_H
 #include <QtWebKit>
 
+class WebPageManager;
+
 class WebPage : public QWebPage {
   Q_OBJECT
 
   public:
-    WebPage(QObject *parent = 0);
-    QVariant invokeCapybaraFunction(const char *name, QStringList &arguments);
-    QVariant invokeCapybaraFunction(QString &name, QStringList &arguments);
+    WebPage(WebPageManager *, QObject *parent = 0);
+    QVariant invokeCapybaraFunction(const char *name, const QStringList &arguments);
+    QVariant invokeCapybaraFunction(QString &name, const QStringList &arguments);
     QString failureString();
     QString userAgentForUrl(const QUrl &url ) const;
     void setUserAgent(QString userAgent);
     int getLastStatus();
-    void resetResponseHeaders();
     void setCustomNetworkAccessManager();
     bool render(const QString &fileName);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
-    void ignoreSslErrors();
     void setSkipImageLoading(bool skip);
     QString consoleMessages();
-    void resetConsoleMessages();
     void resetWindowSize();
+    QWebPage *createWindow(WebWindowType type);
+    QString uuid();
+    QString getWindowName();
+    bool matchesWindowSelector(QString);
+    void setFocus();
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -29,12 +35,15 @@ class WebPage : public QWebPage {
     bool isLoading() const;
     QString pageHeaders();
     void frameCreated(QWebFrame *);
-    void replyFinished(QNetworkReply *reply);
     void handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &);
     void handleUnsupportedContent(QNetworkReply *reply);
+    void networkAccessManagerCreatedRequest(QNetworkReply *reply);
+    void networkAccessManagerFinishedReply(QNetworkReply *reply);
 
   signals:
     void pageFinished(bool);
+    void requestCreated(QNetworkReply *reply);
+    void replyFinished(QNetworkReply *reply);
 
   protected:
     virtual void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID);
@@ -42,6 +51,7 @@ class WebPage : public QWebPage {
     virtual bool javaScriptConfirm(QWebFrame *frame, const QString &message);
     virtual bool javaScriptPrompt(QWebFrame *frame, const QString &message, const QString &defaultValue, QString *result);
     virtual QString chooseFile(QWebFrame * parentFrame, const QString &suggestedFile);
+    virtual bool supportsExtension(Extension extension) const;
 
   private:
     QString m_capybaraJavascript;
@@ -52,7 +62,11 @@ class WebPage : public QWebPage {
     void setUserStylesheet();
     int m_lastStatus;
     QString m_pageHeaders;
-    bool m_ignoreSslErrors;
     QStringList m_consoleMessages;
+    QString m_uuid;
+    WebPageManager *m_manager;
+    QString m_errorPageMessage;
 };
 
+#endif //_WEBPAGE_H
+