otherinbox-capybara-webkit 0.12.0 → 0.12.0.1

data/src/NetworkAccessManager.h

@@ -10,10 +10,20 @@ class NetworkAccessManager : public QNetworkAccessManager {
     NetworkAccessManager(QObject *parent = 0);
     void addHeader(QString key, QString value);
     void resetHeaders();
+    void setUserName(const QString &userName);
+    void setPassword(const QString &password);
 
   protected:
     QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice * outgoingData);
+    QString m_userName;
+    QString m_password;
 
   private:
     QHash<QString, QString> m_headers;
+
+  private slots:
+    void provideAuthentication(QNetworkReply *reply, QAuthenticator *authenticator);
+
+  signals:
+    void requestCreated(QNetworkReply *reply);
 };

data/src/Node.cpp

@@ -1,7 +1,8 @@
 #include "Node.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-Node::Node(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Node::Node(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Node::start() {
@@ -12,3 +13,7 @@ void Node::start() {
   emit finished(new Response(true, attributeValue));
 }
 
+QString Node::toString() const {
+  QStringList functionArguments(arguments());
+  return QString("Node.") + functionArguments.takeFirst();
+}

data/src/Node.h

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

data/src/NullCommand.cpp

@@ -1,10 +1,13 @@
 #include "NullCommand.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-NullCommand::NullCommand(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {}
+NullCommand::NullCommand(QString name, QObject *parent) : Command(parent) {
+  m_name = name;
+}
 
 void NullCommand::start() {
-  QString failure = QString("[Capybara WebKit] Unknown command: ") + arguments()[0] + "\n";
+  QString failure = QString("[Capybara WebKit] Unknown command: ") + m_name + "\n";
   emit finished(new Response(false, failure));
 }
 

data/src/NullCommand.h

@@ -1,11 +1,12 @@
 #include "Command.h"
 
-class WebPage;
-
 class NullCommand : public Command {
   Q_OBJECT
 
   public:
-    NullCommand(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    NullCommand(QString name, QObject *parent = 0);
     virtual void start();
+
+  private:
+    QString m_name;
 };

data/src/PageLoadingCommand.cpp

@@ -1,18 +1,20 @@
 #include "PageLoadingCommand.h"
-#include "Command.h"
+#include "SocketCommand.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-PageLoadingCommand::PageLoadingCommand(Command *command, WebPage *page, QObject *parent) : QObject(parent) {
-  m_page = page;
+PageLoadingCommand::PageLoadingCommand(Command *command, WebPageManager *manager, QObject *parent) : Command(parent) {
+  m_manager = manager;
   m_command = command;
   m_pageLoadingFromCommand = false;
   m_pageSuccess = true;
   m_pendingResponse = NULL;
-  connect(m_page, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
-  connect(m_page, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
+  connect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
+  connect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
 }
 
 void PageLoadingCommand::start() {
+  m_manager->logger() << "Started" << m_command->toString();
   connect(m_command, SIGNAL(finished(Response *)), this, SLOT(commandFinished(Response *)));
   m_command->start();
 };
@@ -22,10 +24,11 @@ void PageLoadingCommand::pendingLoadFinished(bool success) {
   if (m_pageLoadingFromCommand) {
     m_pageLoadingFromCommand = false;
     if (m_pendingResponse) {
+      m_manager->logger() << "Page load from command finished";
       if (m_pageSuccess) {
         emit finished(m_pendingResponse);
       } else {
-        QString message = m_page->failureString();
+        QString message = m_manager->currentPage()->failureString();
         emit finished(new Response(false, message));
       }
     }
@@ -33,11 +36,13 @@ void PageLoadingCommand::pendingLoadFinished(bool success) {
 }
 
 void PageLoadingCommand::pageLoadingFromCommand() {
+  m_manager->logger() << m_command->toString() << "started page load";
   m_pageLoadingFromCommand = true;
 }
 
 void PageLoadingCommand::commandFinished(Response *response) {
-  disconnect(m_page, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
+  disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
+  m_manager->logger() << "Finished" << m_command->toString();
   m_command->deleteLater();
   if (m_pageLoadingFromCommand)
     m_pendingResponse = response;

data/src/PageLoadingCommand.h

@@ -1,9 +1,9 @@
 #include <QObject>
 #include <QStringList>
+#include "Command.h"
 
-class Command;
 class Response;
-class WebPage;
+class WebPageManager;
 
 /*
  * Decorates a Command by deferring the finished() signal until any pending
@@ -15,23 +15,20 @@ class WebPage;
  * If a pending page load fails, the command's response will be discarded and a
  * failure response will be emitted instead.
  */
-class PageLoadingCommand : public QObject {
+class PageLoadingCommand : public Command {
   Q_OBJECT
 
   public:
-    PageLoadingCommand(Command *command, WebPage *page, QObject *parent = 0);
-    void start();
+    PageLoadingCommand(Command *command, WebPageManager *page, QObject *parent = 0);
+    virtual void start();
 
   public slots:
     void pageLoadingFromCommand();
     void pendingLoadFinished(bool success);
     void commandFinished(Response *response);
 
-  signals:
-    void finished(Response *response);
-
   private:
-    WebPage *m_page;
+    WebPageManager *m_manager;
     Command *m_command;
     Response *m_pendingResponse;
     bool m_pageSuccess;

data/src/Render.cpp

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

data/src/Render.h

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

data/src/RequestedUrl.cpp

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

data/src/RequestedUrl.h

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

data/src/Reset.cpp

@@ -1,29 +1,15 @@
 #include "Reset.h"
 #include "WebPage.h"
-#include "NetworkAccessManager.h"
-#include "NetworkCookieJar.h"
+#include "WebPageManager.h"
 
-Reset::Reset(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Reset::Reset(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Reset::start() {
   page()->triggerAction(QWebPage::Stop);
 
-  NetworkAccessManager* networkAccessManager = qobject_cast<NetworkAccessManager*>(page()->networkAccessManager());
-  networkAccessManager->setCookieJar(new NetworkCookieJar());
-  networkAccessManager->resetHeaders();
+  manager()->reset();
 
-  page()->setUserAgent(NULL);
-  page()->resetResponseHeaders();
-  page()->resetConsoleMessages();
-  page()->resetWindowSize();
-  resetHistory();
   emit finished(new Response(true));
 }
 
-void Reset::resetHistory() {
-  // Clearing the history preserves the current history item, so set it to blank first.
-  page()->currentFrame()->setUrl(QUrl("about:blank"));
-  page()->history()->clear();
-}
-

data/src/Reset.h

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

data/src/ResizeWindow.cpp

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

data/src/ResizeWindow.h

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

data/src/Server.cpp

@@ -1,12 +1,11 @@
 #include "Server.h"
-#include "WebPage.h"
 #include "Connection.h"
+#include "WebPageManager.h"
 
 #include <QTcpServer>
 
 Server::Server(QObject *parent) : QObject(parent) {
   m_tcp_server = new QTcpServer(this);
-  m_page = new WebPage(this);
 }
 
 bool Server::start() {
@@ -20,5 +19,5 @@ quint16 Server::server_port() const {
 
 void Server::handleConnection() {
   QTcpSocket *socket = m_tcp_server->nextPendingConnection();
-  new Connection(socket, m_page, this);
+  new Connection(socket, new WebPageManager(this), this);
 }

data/src/Server.h

@@ -1,7 +1,6 @@
 #include <QObject>
 
 class QTcpServer;
-class WebPage;
 
 class Server : public QObject {
   Q_OBJECT
@@ -16,6 +15,5 @@ class Server : public QObject {
 
   private:
     QTcpServer *m_tcp_server;
-    WebPage *m_page;
 };
 

data/src/SetCookie.cpp

@@ -1,16 +1,15 @@
 #include "SetCookie.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include "NetworkCookieJar.h"
 #include <QNetworkCookie>
 
-SetCookie::SetCookie(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {}
+SetCookie::SetCookie(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {}
 
 void SetCookie::start()
 {
   QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(arguments()[0].toAscii());
-  NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
-                                                          ->networkAccessManager()
-                                                          ->cookieJar());
+  NetworkCookieJar *jar = manager()->cookieJar();
   jar->overwriteCookies(cookies);
   emit finished(new Response(true));
 }

data/src/SetCookie.h

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

data/src/SetProxy.cpp

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

data/src/SetProxy.h

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

data/src/SetSkipImageLoading.cpp

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

data/src/SetSkipImageLoading.h

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