capybara-webkit 0.7.2 → 0.8.0

data/spec/self_signed_ssl_cert.rb

@@ -0,0 +1,42 @@
+require 'openssl'
+
+pem = <<-PEM_ENCODED
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKW+grT6YW3gv79y
+P9JkQDtm3cDSUhAhd/TEyRBt/pSKz3pNSygsleBJl2d7g8k0fteec95a7YnYRKGH
+XhIpUOvl/3uaV2NVipqxwB+Z+0M+7HegxL3e4unaRFy9kf9/UXJzmuA9BTMLrm/w
+IoW17f+dz7BIFZhCvRurkrmvzraNAgMBAAECgYBv4uB3bYJx20N16Jk+3OAjeXh/
+Hzu4me9Rc7pLdgVinyYaaK0wrJBsfSFRASdgnyh1RAjx9K3f3PfPlwMg/XUbA6Yd
+YOYlMnBUwCJX09TH8RFFCzJzbBylpk/sTF1geICln2O2BloT2cM24PlEPvyz1xLa
+XvxCOnJJfgNU1K6kvQJBANcEVyOMJ9RBfI8gj1o7S70J9yJRI4jvqxuvcOxJBCi6
+CDatkh/getHswsE3sLj25VhrNsi6UQcN8Bjm8Yjt8BsCQQDFVe0uCwobseprMOuW
+dPU4+saN1cFnIT5Gp0iwYRPinjUlkh6H/AuUtUulKFXVmxk1KElpp1E3bxpCDgCp
+oe53AkArO1Mt8Ys8kSIzQO+xy8RRsQRAoSHM8atsuJyy1YeBjM4D+GguApuPQ9Rw
+tvrQZcv9OCleuJ98FKBW0XB1AKpLAkEAmOR3bJofDdAuWTjA/4TEzo32MsRwIZBv
+KNzJg+bjOkzrzp1EzIVrD5/b6S20O1j9EeOR5as+UN3jEVS6DLQrBwJAe5OTrDiQ
+vKtUaAwquC4f4Ia05KwJw+vFrPVaOqgc4QLdxRwx4PfV/Uw3OOqMolpPAvpUi9JI
+LAwIaTtCvo18OQ==
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICgDCCAemgAwIBAgIJANWcyeZB2ql1MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xMTA5MjgyMDIx
+MTFaFw0xMjA5MjcyMDIxMTFaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21l
+LVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApb6CtPph
+beC/v3I/0mRAO2bdwNJSECF39MTJEG3+lIrPek1LKCyV4EmXZ3uDyTR+155z3lrt
+idhEoYdeEilQ6+X/e5pXY1WKmrHAH5n7Qz7sd6DEvd7i6dpEXL2R/39RcnOa4D0F
+Mwuub/AihbXt/53PsEgVmEK9G6uSua/Oto0CAwEAAaNQME4wHQYDVR0OBBYEFBAm
+x19zpY8M8FEcMXB4WQeUhqIiMB8GA1UdIwQYMBaAFBAmx19zpY8M8FEcMXB4WQeU
+hqIiMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAcznCusWS5Ws77IUl
+b87vdfCPVphICyfGHGWhHp3BZ3WLOphauAMdOYIiJGtPExyWr4DYpzbvx0+Ljg7G
+2FNaI0QRXqbR5ccpvwm6KELmU0XDhykNaXiXSdnvIanr3z/hZ5e03mXAywo+nGQj
+UYTVCb6g/uHVNzXq1NgHGuqogKY=
+-----END CERTIFICATE-----
+PEM_ENCODED
+
+key  = OpenSSL::PKey::RSA.new(pem)
+cert = OpenSSL::X509::Certificate.new(pem)
+$openssl_self_signed_ctx = OpenSSL::SSL::SSLContext.new
+$openssl_self_signed_ctx.key = key
+$openssl_self_signed_ctx.cert = cert

data/src/CommandFactory.cpp

@@ -0,0 +1,31 @@
+#include "CommandFactory.h"
+#include "Visit.h"
+#include "Find.h"
+#include "Command.h"
+#include "Reset.h"
+#include "Node.h"
+#include "Url.h"
+#include "Source.h"
+#include "Evaluate.h"
+#include "Execute.h"
+#include "FrameFocus.h"
+#include "Header.h"
+#include "Render.h"
+#include "Body.h"
+#include "Status.h"
+#include "Headers.h"
+#include "SetCookie.h"
+#include "ClearCookies.h"
+#include "GetCookies.h"
+#include "SetProxy.h"
+#include "ConsoleMessages.h"
+#include "RequestedUrl.h"
+
+CommandFactory::CommandFactory(WebPage *page, QObject *parent) : QObject(parent) {
+  m_page = page;
+}
+
+Command *CommandFactory::createCommand(const char *name) {
+  #include "find_command.h"
+  return NULL;
+}

data/src/CommandFactory.h

@@ -0,0 +1,16 @@
+#include <QObject>
+
+class Command;
+class WebPage;
+
+class CommandFactory : public QObject {
+  Q_OBJECT
+
+  public:
+    CommandFactory(WebPage *page, QObject *parent = 0);
+    Command *createCommand(const char *name);
+
+  private:
+    WebPage *m_page;
+};
+

data/src/CommandParser.cpp

@@ -0,0 +1,68 @@
+#include "CommandParser.h"
+
+#include <QIODevice>
+
+CommandParser::CommandParser(QIODevice *device, QObject *parent) :
+    QObject(parent) {
+  m_device = device;
+  m_expectingDataSize = -1;
+  connect(m_device, SIGNAL(readyRead()), this, SLOT(checkNext()));
+}
+
+void CommandParser::checkNext() {
+  if (m_expectingDataSize == -1) {
+    if (m_device->canReadLine()) {
+      readLine();
+      checkNext();
+    }
+  } else {
+    if (m_device->bytesAvailable() >= m_expectingDataSize) {
+      readDataBlock();
+      checkNext();
+    }
+  }
+}
+
+void CommandParser::readLine() {
+  char buffer[128];
+  qint64 lineLength = m_device->readLine(buffer, 128);
+  if (lineLength != -1) {
+    buffer[lineLength - 1] = 0;
+    processNext(buffer);
+  }
+}
+
+void CommandParser::readDataBlock() {
+  char *buffer = new char[m_expectingDataSize + 1];
+  m_device->read(buffer, m_expectingDataSize);
+  buffer[m_expectingDataSize] = 0;
+  processNext(buffer);
+  m_expectingDataSize = -1;
+  delete[] buffer;
+}
+
+void CommandParser::processNext(const char *data) {
+  if (m_commandName.isNull()) {
+    m_commandName = data;
+    m_argumentsExpected = -1;
+  } else {
+    processArgument(data);
+  }
+}
+
+void CommandParser::processArgument(const char *data) {
+  if (m_argumentsExpected == -1) {
+    m_argumentsExpected = QString(data).toInt();
+  } else if (m_expectingDataSize == -1) {
+    m_expectingDataSize = QString(data).toInt();
+  } else {
+    m_arguments.append(QString::fromUtf8(data));
+  }
+
+  if (m_arguments.length() == m_argumentsExpected) {
+    emit commandReady(m_commandName, m_arguments);
+    m_commandName = QString();
+    m_arguments.clear();
+    m_argumentsExpected = -1;
+  }
+}

data/src/CommandParser.h

@@ -0,0 +1,29 @@
+#include <QObject>
+#include <QStringList>
+
+class QIODevice;
+
+class CommandParser : public QObject {
+  Q_OBJECT
+
+  public:
+    CommandParser(QIODevice *device, QObject *parent = 0);
+
+  public slots:
+    void checkNext();
+
+  signals:
+    void commandReady(QString commandName, QStringList arguments);
+
+  private:
+    void readLine();
+    void readDataBlock();
+    void processNext(const char *line);
+    void processArgument(const char *data);
+    QIODevice *m_device;
+    QString m_commandName;
+    QStringList m_arguments;
+    int m_argumentsExpected;
+    int m_expectingDataSize;
+};
+

data/src/Connection.cpp

@@ -1,24 +1,9 @@
 #include "Connection.h"
 #include "WebPage.h"
 #include "UnsupportedContentHandler.h"
-#include "Visit.h"
-#include "Find.h"
+#include "CommandParser.h"
+#include "CommandFactory.h"
 #include "Command.h"
-#include "Reset.h"
-#include "Node.h"
-#include "Url.h"
-#include "Source.h"
-#include "Evaluate.h"
-#include "Execute.h"
-#include "FrameFocus.h"
-#include "Header.h"
-#include "Render.h"
-#include "Body.h"
-#include "Status.h"
-#include "Headers.h"
-#include "SetCookie.h"
-#include "ClearCookies.h"
-#include "GetCookies.h"
 
 #include <QTcpSocket>
 #include <iostream>
@@ -27,76 +12,31 @@ Connection::Connection(QTcpSocket *socket, WebPage *page, QObject *parent) :
     QObject(parent) {
   m_socket = socket;
   m_page = page;
+  m_commandParser = new CommandParser(socket, this);
+  m_commandFactory = new CommandFactory(page, this);
   m_command = NULL;
-  m_expectingDataSize = -1;
   m_pageSuccess = true;
   m_commandWaiting = false;
-  connect(m_socket, SIGNAL(readyRead()), this, SLOT(checkNext()));
+  connect(m_socket, SIGNAL(readyRead()), m_commandParser, SLOT(checkNext()));
+  connect(m_commandParser, SIGNAL(commandReady(QString, QStringList)), this, SLOT(commandReady(QString, QStringList)));
   connect(m_page, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
 }
 
-void Connection::checkNext() {
-  if (m_expectingDataSize == -1) {
-    if (m_socket->canReadLine()) {
-      readLine();
-      checkNext();
-    }
-  } else {
-    if (m_socket->bytesAvailable() >= m_expectingDataSize) {
-      readDataBlock();
-      checkNext();
-    }
-  }
-}
-
-void Connection::readLine() {
-  char buffer[128];
-  qint64 lineLength = m_socket->readLine(buffer, 128);
-  if (lineLength != -1) {
-    buffer[lineLength - 1] = 0;
-    processNext(buffer);
-  }
-}
-
-void Connection::readDataBlock() {
-  char *buffer = new char[m_expectingDataSize + 1];
-  m_socket->read(buffer, m_expectingDataSize);
-  buffer[m_expectingDataSize] = 0;
-  processNext(buffer);
-  m_expectingDataSize = -1;
-  delete[] buffer;
-}
-
-void Connection::processNext(const char *data) {
-  if (m_commandName.isNull()) {
-    m_commandName = data;
-    m_argumentsExpected = -1;
-  } else {
-    processArgument(data);
-  }
-}
 
-void Connection::processArgument(const char *data) {
-  if (m_argumentsExpected == -1) {
-    m_argumentsExpected = QString(data).toInt();
-  } else if (m_expectingDataSize == -1) {
-    m_expectingDataSize = QString(data).toInt();
-  } else {
-    m_arguments.append(QString::fromUtf8(data));
-  }
+void Connection::commandReady(QString commandName, QStringList arguments) {
+  m_commandName = commandName;
+  m_arguments = arguments;
 
-  if (m_arguments.length() == m_argumentsExpected) {
-    if (m_page->isLoading())
-      m_commandWaiting = true;
-    else
-      startCommand();
-  }
+  if (m_page->isLoading())
+    m_commandWaiting = true;
+  else
+    startCommand();
 }
 
 void Connection::startCommand() {
   m_commandWaiting = false;
   if (m_pageSuccess) {
-    m_command = createCommand(m_commandName.toAscii().constData());
+    m_command = m_commandFactory->createCommand(m_commandName.toAscii().constData());
     if (m_command) {
       connect(m_command,
               SIGNAL(finished(Response *)),
@@ -115,11 +55,6 @@ void Connection::startCommand() {
   }
 }
 
-Command *Connection::createCommand(const char *name) {
-  #include "find_command.h"
-  return NULL;
-}
-
 void Connection::pendingLoadFinished(bool success) {
   m_pageSuccess = success;
   if (m_commandWaiting)
@@ -143,9 +78,5 @@ void Connection::writeResponse(Response *response) {
   m_socket->write(messageLength.toAscii());
   m_socket->write(messageUtf8);
   delete response;
-
-  m_arguments.clear();
-  m_commandName = QString();
-  m_argumentsExpected = -1;
 }
 

data/src/Connection.h

@@ -5,6 +5,8 @@ class QTcpSocket;
 class WebPage;
 class Command;
 class Response;
+class CommandParser;
+class CommandFactory;
 
 class Connection : public QObject {
   Q_OBJECT
@@ -13,16 +15,11 @@ class Connection : public QObject {
     Connection(QTcpSocket *socket, WebPage *page, QObject *parent = 0);
 
   public slots:
-    void checkNext();
+    void commandReady(QString commandName, QStringList arguments);
     void finishCommand(Response *response);
     void pendingLoadFinished(bool success);
 
   private:
-    void readLine();
-    void readDataBlock();
-    void processNext(const char *line);
-    Command *createCommand(const char *name);
-    void processArgument(const char *line);
     void startCommand();
     void writeResponse(Response *response);
 
@@ -30,9 +27,9 @@ class Connection : public QObject {
     QString m_commandName;
     Command *m_command;
     QStringList m_arguments;
-    int m_argumentsExpected;
     WebPage *m_page;
-    int m_expectingDataSize;
+    CommandParser *m_commandParser;
+    CommandFactory *m_commandFactory;
     bool m_pageSuccess;
     bool m_commandWaiting;
 };

data/src/ConsoleMessages.cpp

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

data/src/ConsoleMessages.h

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

data/src/RequestedUrl.cpp

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

data/src/RequestedUrl.h

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

data/src/Reset.cpp

@@ -15,6 +15,7 @@ void Reset::start(QStringList &arguments) {
   page()->setCustomNetworkAccessManager();
   page()->setUserAgent(NULL);
   page()->resetResponseHeaders();
+  page()->resetConsoleMessages();
   emit finished(new Response(true));
 }
 

data/src/Server.cpp

@@ -4,9 +4,10 @@
 
 #include <QTcpServer>
 
-Server::Server(QObject *parent) : QObject(parent) {
+Server::Server(QObject *parent, bool ignoreSslErrors) : QObject(parent) {
   m_tcp_server = new QTcpServer(this);
   m_page = new WebPage(this);
+  m_page->setIgnoreSslErrors(ignoreSslErrors);
 }
 
 bool Server::start() {

data/src/Server.h

@@ -7,7 +7,7 @@ class Server : public QObject {
   Q_OBJECT
 
   public:
-    Server(QObject *parent = 0);
+    Server(QObject *parent, bool ignoreSslErrors);
     bool start();
     quint16 server_port() const;