capybara-webkit 0.11.0 → 0.12.0

data/src/Evaluate.h

@@ -8,8 +8,8 @@ class Evaluate : public Command {
   Q_OBJECT
 
   public:
-    Evaluate(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Evaluate(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 
   private:
     void addVariant(QVariant &object);

data/src/Execute.cpp

@@ -1,16 +1,16 @@
 #include "Execute.h"
 #include "WebPage.h"
 
-Execute::Execute(WebPage *page, QObject *parent) : Command(page, parent) {
+Execute::Execute(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void Execute::start(QStringList &arguments) {
-  QString script = arguments[0] + QString("; 'success'");
+void Execute::start() {
+  QString script = arguments()[0] + QString("; 'success'");
   QVariant result = page()->currentFrame()->evaluateJavaScript(script);
   if (result.isValid()) {
     emit finished(new Response(true));
   } else {
-    emit finished(new Response(false, "Javascript failed to execute"));
+    emit finished(new Response(false, QString("Javascript failed to execute")));
   }
 }
 

data/src/Execute.h

@@ -6,7 +6,7 @@ class Execute : public Command {
   Q_OBJECT
 
   public:
-    Execute(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Execute(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };
 

data/src/Find.cpp

@@ -2,18 +2,18 @@
 #include "Command.h"
 #include "WebPage.h"
 
-Find::Find(WebPage *page, QObject *parent) : Command(page, parent) {
+Find::Find(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void Find::start(QStringList &arguments) {
+void Find::start() {
   QString message;
-  QVariant result = page()->invokeCapybaraFunction("find", arguments);
+  QVariant result = page()->invokeCapybaraFunction("find", arguments());
 
   if (result.isValid()) {
     message = result.toString();
     emit finished(new Response(true, message));
   } else {
-    emit finished(new Response(false, "Invalid XPath expression"));
+    emit finished(new Response(false, QString("Invalid XPath expression")));
   }
 }
 

data/src/Find.h

@@ -6,8 +6,8 @@ class Find : public Command {
   Q_OBJECT
 
   public:
-    Find(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Find(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };
 
 

data/src/FrameFocus.cpp

@@ -2,17 +2,17 @@
 #include "Command.h"
 #include "WebPage.h"
 
-FrameFocus::FrameFocus(WebPage *page, QObject *parent) : Command(page, parent) {
+FrameFocus::FrameFocus(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void FrameFocus::start(QStringList &arguments) {
+void FrameFocus::start() {
   findFrames();
-  switch(arguments.length()) {
+  switch(arguments().length()) {
     case 1:
-      focusId(arguments[0]);
+      focusId(arguments()[0]);
       break;
     case 2:
-      focusIndex(arguments[1].toInt());
+      focusIndex(arguments()[1].toInt());
       break;
     default:
       focusParent();
@@ -50,7 +50,7 @@ void FrameFocus::focusId(QString name) {
 
 void FrameFocus::focusParent() {
   if (page()->currentFrame()->parentFrame() == 0) {
-    emit finished(new Response(false, "Already at parent frame."));
+    emit finished(new Response(false, QString("Already at parent frame.")));
   } else {
     page()->currentFrame()->parentFrame()->setFocus();
     success();
@@ -58,7 +58,7 @@ void FrameFocus::focusParent() {
 }
 
 void FrameFocus::frameNotFound() {
-  emit finished(new Response(false, "Unable to locate frame. "));
+  emit finished(new Response(false, QString("Unable to locate frame. ")));
 }
 
 void FrameFocus::success() {

data/src/FrameFocus.h

@@ -7,8 +7,8 @@ class FrameFocus : public Command {
   Q_OBJECT
 
   public:
-    FrameFocus(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    FrameFocus(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 
   private:
     void findFrames();

data/src/GetCookies.cpp

@@ -2,15 +2,13 @@
 #include "WebPage.h"
 #include "NetworkCookieJar.h"
 
-GetCookies::GetCookies(WebPage *page, QObject *parent)
-  : Command(page, parent)
+GetCookies::GetCookies(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent)
 {
   m_buffer = "";
 }
 
-void GetCookies::start(QStringList &arguments)
+void GetCookies::start()
 {
-  Q_UNUSED(arguments);
   NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
                                                           ->networkAccessManager()
                                                           ->cookieJar());

data/src/GetCookies.h

@@ -6,8 +6,8 @@ class GetCookies : public Command {
   Q_OBJECT;
 
  public:
-  GetCookies(WebPage *page, QObject *parent = 0);
-  virtual void start(QStringList &arguments);
+  GetCookies(WebPage *page, QStringList &arguments, QObject *parent = 0);
+  virtual void start();
 
  private:
   QString m_buffer;

data/src/Header.cpp

@@ -2,12 +2,12 @@
 #include "WebPage.h"
 #include "NetworkAccessManager.h"
 
-Header::Header(WebPage *page, QObject *parent) : Command(page, parent) {
+Header::Header(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void Header::start(QStringList &arguments) {
-  QString key = arguments[0];
-  QString value = arguments[1];
+void Header::start() {
+  QString key = arguments()[0];
+  QString value = arguments()[1];
   NetworkAccessManager* networkAccessManager = qobject_cast<NetworkAccessManager*>(page()->networkAccessManager());
   if (key.toLower().replace("-", "_") == "user_agent") {
     page()->setUserAgent(value);

data/src/Header.h

@@ -6,6 +6,6 @@ class Header : public Command {
   Q_OBJECT
 
   public:
-    Header(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Header(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };

data/src/Headers.cpp

@@ -1,11 +1,10 @@
 #include "Headers.h"
 #include "WebPage.h"
 
-Headers::Headers(WebPage *page, QObject *parent) : Command(page, parent) {
+Headers::Headers(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void Headers::start(QStringList &arguments) {
-  Q_UNUSED(arguments);
+void Headers::start() {
   emit finished(new Response(true, page()->pageHeaders()));
 }
 

data/src/Headers.h

@@ -6,7 +6,7 @@ class Headers : public Command {
   Q_OBJECT
 
   public:
-    Headers(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Headers(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };
 

data/src/IgnoreSslErrors.cpp

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

data/src/IgnoreSslErrors.h

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

data/src/NetworkAccessManager.cpp

@@ -23,3 +23,7 @@ void NetworkAccessManager::addHeader(QString key, QString value) {
   m_headers.insert(key, value);
 };
 
+void NetworkAccessManager::resetHeaders() {
+  m_headers.clear();
+};
+

data/src/NetworkAccessManager.h

@@ -9,10 +9,11 @@ class NetworkAccessManager : public QNetworkAccessManager {
   public:
     NetworkAccessManager(QObject *parent = 0);
     void addHeader(QString key, QString value);
+    void resetHeaders();
 
   protected:
     QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice * outgoingData);
 
   private:
     QHash<QString, QString> m_headers;
-};
+};

data/src/Node.cpp

@@ -1,11 +1,11 @@
 #include "Node.h"
 #include "WebPage.h"
 
-Node::Node(WebPage *page, QObject *parent) : Command(page, parent) {
+Node::Node(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void Node::start(QStringList &arguments) {
-  QStringList functionArguments(arguments);
+void Node::start() {
+  QStringList functionArguments(arguments());
   QString functionName = functionArguments.takeFirst();
   QVariant result = page()->invokeCapybaraFunction(functionName, functionArguments);
   QString attributeValue = result.toString();

data/src/Node.h

@@ -7,7 +7,7 @@ class Node : public Command {
   Q_OBJECT
 
   public:
-    Node(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Node(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };
 

data/src/NullCommand.cpp

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

data/src/NullCommand.h

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

data/src/PageLoadingCommand.cpp

@@ -0,0 +1,46 @@
+#include "PageLoadingCommand.h"
+#include "Command.h"
+#include "WebPage.h"
+
+PageLoadingCommand::PageLoadingCommand(Command *command, WebPage *page, QObject *parent) : QObject(parent) {
+  m_page = page;
+  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)));
+}
+
+void PageLoadingCommand::start() {
+  connect(m_command, SIGNAL(finished(Response *)), this, SLOT(commandFinished(Response *)));
+  m_command->start();
+};
+
+void PageLoadingCommand::pendingLoadFinished(bool success) {
+  m_pageSuccess = success;
+  if (m_pageLoadingFromCommand) {
+    m_pageLoadingFromCommand = false;
+    if (m_pendingResponse) {
+      if (m_pageSuccess) {
+        emit finished(m_pendingResponse);
+      } else {
+        QString message = m_page->failureString();
+        emit finished(new Response(false, message));
+      }
+    }
+  }
+}
+
+void PageLoadingCommand::pageLoadingFromCommand() {
+  m_pageLoadingFromCommand = true;
+}
+
+void PageLoadingCommand::commandFinished(Response *response) {
+  disconnect(m_page, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
+  m_command->deleteLater();
+  if (m_pageLoadingFromCommand)
+    m_pendingResponse = response;
+  else
+    emit finished(response);
+}

data/src/PageLoadingCommand.h

@@ -0,0 +1,40 @@
+#include <QObject>
+#include <QStringList>
+
+class Command;
+class Response;
+class WebPage;
+
+/*
+ * Decorates a Command by deferring the finished() signal until any pending
+ * page loads are complete.
+ *
+ * If a Command starts a page load, no signal will be emitted until the page
+ * load is finished.
+ *
+ * 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 {
+  Q_OBJECT
+
+  public:
+    PageLoadingCommand(Command *command, WebPage *page, QObject *parent = 0);
+    void start();
+
+  public slots:
+    void pageLoadingFromCommand();
+    void pendingLoadFinished(bool success);
+    void commandFinished(Response *response);
+
+  signals:
+    void finished(Response *response);
+
+  private:
+    WebPage *m_page;
+    Command *m_command;
+    Response *m_pendingResponse;
+    bool m_pageSuccess;
+    bool m_pageLoadingFromCommand;
+};
+

data/src/Render.cpp

@@ -1,14 +1,13 @@
 #include "Render.h"
 #include "WebPage.h"
 
-Render::Render(WebPage *page, QObject *parent) : Command(page, parent) {
+Render::Render(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void Render::start(QStringList &arguments) {
-  QStringList functionArguments(arguments);
-  QString imagePath = functionArguments.takeFirst();
-  int     width     = functionArguments.takeFirst().toInt();
-  int     height    = functionArguments.takeFirst().toInt();
+void Render::start() {
+  QString imagePath = arguments()[0];
+  int width = arguments()[1].toInt();
+  int height = arguments()[2].toInt();
 
   QSize size(width, height);
   page()->setViewportSize(size);

data/src/Render.h

@@ -7,6 +7,6 @@ class Render : public Command {
   Q_OBJECT
 
   public:
-    Render(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    Render(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };

data/src/RequestedUrl.cpp

@@ -1,15 +1,12 @@
 #include "RequestedUrl.h"
 #include "WebPage.h"
 
-RequestedUrl::RequestedUrl(WebPage *page, QObject *parent) : Command(page, parent) {
+RequestedUrl::RequestedUrl(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
 }
 
-void RequestedUrl::start(QStringList &arguments) {
-  Q_UNUSED(arguments);
-
+void RequestedUrl::start() {
   QUrl humanUrl = page()->currentFrame()->requestedUrl();
   QByteArray encodedBytes = humanUrl.toEncoded();
-  QString urlString = QString(encodedBytes);
-  emit finished(new Response(true, urlString));
+  emit finished(new Response(true, encodedBytes));
 }