capybara-webkit 0.12.1 → 0.13.0

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/Response.cpp

@@ -22,3 +22,7 @@ bool Response::isSuccess() const {
 QByteArray Response::message() const {
   return m_message;
 }
+
+QString Response::toString() const {
+  return QString(m_success ? "Success(" : "Failure(") + m_message + ")";
+}

data/src/Response.h

@@ -8,6 +8,7 @@ class Response {
     Response(bool success);
     bool isSuccess() const;
     QByteArray message() const;
+    QString toString() const;
 
   private:
     bool m_success;

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/SetConfirmAction.cpp

@@ -0,0 +1,11 @@
+#include "SetConfirmAction.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+SetConfirmAction::SetConfirmAction(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {}
+
+void SetConfirmAction::start()
+{
+  page()->setConfirmAction(arguments()[0]);
+  emit finished(new Response(true));
+}

data/src/SetConfirmAction.h

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

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/SetPromptAction.cpp

@@ -0,0 +1,11 @@
+#include "SetPromptAction.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+SetPromptAction::SetPromptAction(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {}
+
+void SetPromptAction::start()
+{
+  page()->setPromptAction(arguments()[0]);
+  emit finished(new Response(true));
+}

data/src/SetPromptAction.h

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

data/src/SetPromptText.cpp

@@ -0,0 +1,11 @@
+#include "SetPromptText.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+SetPromptText::SetPromptText(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {}
+
+void SetPromptText::start()
+{
+  page()->setPromptText(arguments()[0]);
+  emit finished(new Response(true));
+}

data/src/SetPromptText.h

@@ -0,0 +1,9 @@
+#include "SocketCommand.h"
+
+class SetPromptText : public SocketCommand {
+  Q_OBJECT;
+
+ public:
+  SetPromptText(WebPageManager *manager, 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

@@ -0,0 +1,12 @@
+#include "SetSkipImageLoading.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+SetSkipImageLoading::SetSkipImageLoading(WebPageManager *manager, QStringList &arguments, QObject *parent) :
+  SocketCommand(manager, arguments, parent) {
+}
+
+void SetSkipImageLoading::start() {
+  page()->setSkipImageLoading(arguments().contains("true"));
+  emit finished(new Response(true));
+}

data/src/SetSkipImageLoading.h

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

data/src/SetTimeout.cpp

@@ -0,0 +1,19 @@
+#include "SetTimeout.h"
+#include "WebPageManager.h"
+
+SetTimeout::SetTimeout(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void SetTimeout::start() {
+  QString timeoutString = arguments()[0];
+  bool ok;
+  int timeout = timeoutString.toInt(&ok);
+
+  if (ok) {
+    manager()->setTimeout(timeout);
+    emit finished(new Response(true));
+  } else {
+    emit finished(new Response(false, QString("Invalid value for timeout")));
+  }
+}
+

data/src/SetTimeout.h

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

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,12 +1,13 @@
 #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() {
   QNetworkAccessManager* accessManager = page()->networkAccessManager();
-  QNetworkRequest request(page()->currentFrame()->url());
+  QNetworkRequest request(page()->currentFrame()->requestedUrl());
   reply = accessManager->get(request);
 
   connect(reply, SIGNAL(finished()), this, SLOT(sourceLoaded()));

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() {