otherinbox-capybara-webkit 0.12.0 → 0.12.0.1

data/src/Connection.h

@@ -8,12 +8,13 @@ class Response;
 class CommandParser;
 class CommandFactory;
 class PageLoadingCommand;
+class WebPageManager;
 
 class Connection : public QObject {
   Q_OBJECT
 
   public:
-    Connection(QTcpSocket *socket, WebPage *page, QObject *parent = 0);
+    Connection(QTcpSocket *socket, WebPageManager *manager, QObject *parent = 0);
 
   public slots:
     void commandReady(Command *command);
@@ -27,11 +28,12 @@ class Connection : public QObject {
 
     QTcpSocket *m_socket;
     Command *m_queuedCommand;
-    WebPage *m_page;
+    WebPageManager *m_manager;
     CommandParser *m_commandParser;
     CommandFactory *m_commandFactory;
     PageLoadingCommand *m_runningCommand;
     bool m_pageSuccess;
     bool m_commandWaiting;
+    WebPage *currentPage();
 };
 

data/src/ConsoleMessages.cpp

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

data/src/ConsoleMessages.h

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

data/src/CurrentUrl.cpp

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

data/src/CurrentUrl.h

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

data/src/EnableLogging.cpp

@@ -0,0 +1,10 @@
+#include "EnableLogging.h"
+#include "WebPageManager.h"
+
+EnableLogging::EnableLogging(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void EnableLogging::start() {
+  manager()->enableLogging();
+  emit finished(new Response(true));
+}

data/src/EnableLogging.h

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

data/src/Evaluate.cpp

@@ -1,8 +1,9 @@
 #include "Evaluate.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include <iostream>
 
-Evaluate::Evaluate(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Evaluate::Evaluate(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
   m_buffer = "";
 }
 

data/src/Evaluate.h

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

data/src/Execute.cpp

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

data/src/Execute.h

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

data/src/Find.cpp

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

data/src/Find.h

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

data/src/FrameFocus.cpp

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

data/src/FrameFocus.h

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

data/src/GetCookies.cpp

@@ -1,17 +1,16 @@
 #include "GetCookies.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include "NetworkCookieJar.h"
 
-GetCookies::GetCookies(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent)
+GetCookies::GetCookies(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent)
 {
   m_buffer = "";
 }
 
 void GetCookies::start()
 {
-  NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
-                                                          ->networkAccessManager()
-                                                          ->cookieJar());
+  NetworkCookieJar *jar = manager()->cookieJar();
   foreach (QNetworkCookie cookie, jar->getAllCookies()) {
     m_buffer.append(cookie.toRawForm());
     m_buffer.append("\n");

data/src/GetCookies.h

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

data/src/GetWindowHandle.cpp

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

data/src/GetWindowHandle.h

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

data/src/GetWindowHandles.cpp

@@ -0,0 +1,20 @@
+#include "GetWindowHandles.h"
+#include "WebPageManager.h"
+#include "CommandFactory.h"
+#include "WebPage.h"
+#include <QStringList>
+
+GetWindowHandles::GetWindowHandles(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void GetWindowHandles::start() {
+  QString handles = "[";
+  QStringList stringList;
+
+  foreach(WebPage *page, manager()->pages())
+    stringList.append("\"" + page->uuid() + "\"");
+
+  handles += stringList.join(",") + "]";
+
+  emit finished(new Response(true, handles));
+}

data/src/GetWindowHandles.h

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

data/src/Header.cpp

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

data/src/Header.h

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

data/src/Headers.cpp

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

data/src/Headers.h

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

data/src/IgnoreSslErrors.cpp

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

data/src/IgnoreSslErrors.h

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

data/src/JavascriptInvocation.cpp

@@ -1,6 +1,6 @@
 #include "JavascriptInvocation.h"
 
-JavascriptInvocation::JavascriptInvocation(QString &functionName, QStringList &arguments, QObject *parent) : QObject(parent) {
+JavascriptInvocation::JavascriptInvocation(const QString &functionName, const QStringList &arguments, QObject *parent) : QObject(parent) {
   m_functionName = functionName;
   m_arguments = arguments;
 }

data/src/JavascriptInvocation.h

@@ -8,7 +8,7 @@ class JavascriptInvocation : public QObject {
   Q_PROPERTY(QStringList arguments READ arguments)
 
   public:
-    JavascriptInvocation(QString &functionName, QStringList &arguments, QObject *parent = 0);
+    JavascriptInvocation(const QString &functionName, const QStringList &arguments, QObject *parent = 0);
     QString &functionName();
     QStringList &arguments();
 

data/src/NetworkAccessManager.cpp

@@ -1,9 +1,11 @@
 #include "NetworkAccessManager.h"
 #include "WebPage.h"
 #include <iostream>
+#include <fstream>
 
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent):QNetworkAccessManager(parent) {
+  connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)), SLOT(provideAuthentication(QNetworkReply*,QAuthenticator*)));
 }
 
 QNetworkReply* NetworkAccessManager::createRequest(QNetworkAccessManager::Operation operation, const QNetworkRequest &request, QIODevice * outgoingData = 0) {
@@ -16,7 +18,9 @@ QNetworkReply* NetworkAccessManager::createRequest(QNetworkAccessManager::Operat
       item.next();
       new_request.setRawHeader(item.key().toAscii(), item.value().toAscii());
   }
-  return QNetworkAccessManager::createRequest(operation, new_request, outgoingData);
+  QNetworkReply *reply = QNetworkAccessManager::createRequest(operation, new_request, outgoingData);
+  emit requestCreated(reply);
+  return reply;
 };
 
 void NetworkAccessManager::addHeader(QString key, QString value) {
@@ -27,3 +31,17 @@ void NetworkAccessManager::resetHeaders() {
   m_headers.clear();
 };
 
+void NetworkAccessManager::setUserName(const QString &userName) {
+  m_userName = userName;
+}
+
+void NetworkAccessManager::setPassword(const QString &password) {
+  m_password = password;
+}
+
+
+void NetworkAccessManager::provideAuthentication(QNetworkReply *reply, QAuthenticator *authenticator) {
+  Q_UNUSED(reply);
+  authenticator->setUser(m_userName);
+  authenticator->setPassword(m_password);
+}