capybara-webkit 0.7.2 → 0.8.0

data/src/SetProxy.cpp

@@ -0,0 +1,24 @@
+#include "SetProxy.h"
+#include "WebPage.h"
+#include <QNetworkAccessManager>
+#include <QNetworkProxy>
+
+SetProxy::SetProxy(WebPage *page, QObject *parent)
+  : Command(page, parent)
+{ }
+
+void SetProxy::start(QStringList &arguments)
+{
+  // default to empty proxy
+  QNetworkProxy proxy;
+
+  if (arguments.size() > 0)
+    proxy = QNetworkProxy(QNetworkProxy::HttpProxy,
+                          arguments[0],
+                          (quint16)(arguments[1].toInt()),
+                          arguments[2],
+                          arguments[3]);
+
+  page()->networkAccessManager()->setProxy(proxy);
+  emit finished(new Response(true));
+}

data/src/SetProxy.h

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

data/src/UnsupportedContentHandler.cpp

@@ -27,5 +27,6 @@ void UnsupportedContentHandler::loadUnsupportedContent() {
 
 void UnsupportedContentHandler::finish(bool success) {
     connect(m_page, SIGNAL(loadFinished(bool)), m_page, SLOT(loadFinished(bool)));
+    m_page->replyFinished(m_reply);
     m_page->loadFinished(success);
 }

data/src/Visit.cpp

@@ -7,7 +7,7 @@ Visit::Visit(WebPage *page, QObject *parent) : Command(page, parent) {
 }
 
 void Visit::start(QStringList &arguments) {
-  QUrl requestedUrl = QUrl(arguments[0]);
+  QUrl requestedUrl = QUrl::fromEncoded(arguments[0].toUtf8(), QUrl::StrictMode);
   page()->currentFrame()->load(QUrl(requestedUrl));
 }
 

data/src/WebPage.cpp

@@ -20,6 +20,7 @@ WebPage::WebPage(QObject *parent) : QWebPage(parent) {
           this, SLOT(frameCreated(QWebFrame *)));
   connect(this, SIGNAL(unsupportedContent(QNetworkReply*)),
       this, SLOT(handleUnsupportedContent(QNetworkReply*)));
+  this->setViewportSize(QSize(1680, 1050));
 }
 
 void WebPage::setCustomNetworkAccessManager() {
@@ -27,6 +28,7 @@ void WebPage::setCustomNetworkAccessManager() {
   manager->setCookieJar(new NetworkCookieJar());
   this->setNetworkAccessManager(manager);
   connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *)));
+  connect(manager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply *, QList<QSslError>)));
 }
 
 void WebPage::loadJavascript() {
@@ -56,6 +58,10 @@ QString WebPage::userAgentForUrl(const QUrl &url ) const {
   }
 }
 
+QString WebPage::consoleMessages() {
+  return m_consoleMessages.join("\n");
+}
+
 void WebPage::setUserAgent(QString userAgent) {
   m_userAgent = userAgent;
 }
@@ -88,9 +94,11 @@ QVariant WebPage::invokeCapybaraFunction(QString &name, QStringList &arguments)
 }
 
 void WebPage::javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) {
+  QString fullMessage = QString::number(lineNumber) + "|" + message;
   if (!sourceID.isEmpty())
-    std::cout << qPrintable(sourceID) << ":" << lineNumber << " ";
-  std::cout << qPrintable(message) << std::endl;
+    fullMessage = sourceID + "|" + fullMessage;
+  m_consoleMessages.append(fullMessage);
+  std::cout << qPrintable(fullMessage) << std::endl;
 }
 
 void WebPage::javaScriptAlert(QWebFrame *frame, const QString &message) {
@@ -192,6 +200,20 @@ void WebPage::replyFinished(QNetworkReply *reply) {
   }
 }
 
+void WebPage::ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors) {
+  if (m_ignoreSslErrors)
+    reply->ignoreSslErrors(errors);
+}
+
+void WebPage::setIgnoreSslErrors(bool ignore) {
+  m_ignoreSslErrors = ignore;
+}
+
+bool WebPage::ignoreSslErrors() {
+  return m_ignoreSslErrors;
+}
+
+
 int WebPage::getLastStatus() {
   return m_lastStatus;
 }
@@ -201,6 +223,10 @@ void WebPage::resetResponseHeaders() {
   m_pageHeaders = QString();
 }
 
+void WebPage::resetConsoleMessages() {
+  m_consoleMessages.clear();
+}
+
 QString WebPage::pageHeaders() {
   return m_pageHeaders;
 }

data/src/WebPage.h

@@ -15,6 +15,10 @@ class WebPage : public QWebPage {
     void setCustomNetworkAccessManager();
     bool render(const QString &fileName);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
+    void setIgnoreSslErrors(bool ignore);
+    bool ignoreSslErrors();
+    QString consoleMessages();
+    void resetConsoleMessages();
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -25,6 +29,7 @@ class WebPage : public QWebPage {
     QString pageHeaders();
     void frameCreated(QWebFrame *);
     void replyFinished(QNetworkReply *reply);
+    void ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &);
     void handleUnsupportedContent(QNetworkReply *reply);
 
   signals:
@@ -46,5 +51,7 @@ class WebPage : public QWebPage {
     void setUserStylesheet();
     int m_lastStatus;
     QString m_pageHeaders;
+    bool m_ignoreSslErrors;
+    QStringList m_consoleMessages;
 };
 

data/src/capybara.js

@@ -56,10 +56,46 @@ Capybara = {
     }
   },
 
+  path: function(index) {
+    return "/" + this.getXPathNode(this.nodes[index]).join("/");
+  },
+
+  getXPathNode: function(node, path) {
+    path = path || [];
+    if (node.parentNode) {
+      path = this.getXPathNode(node.parentNode, path);
+    }
+
+    var first = node;
+    while (first.previousSibling)
+      first = first.previousSibling;
+
+    var count = 0;
+    var index = 0;
+    var iter = first;
+    while (iter) {
+      if (iter.nodeType == 1 && iter.nodeName == node.nodeName)
+        count++;
+      if (iter.isSameNode(node))
+         index = count;
+      iter = iter.nextSibling;
+      continue;
+    }
+
+    if (node.nodeType == 1)
+      path.push(node.nodeName.toLowerCase() + (node.id ? "[@id='"+node.id+"']" : count > 1 ? "["+index+"]" : ''));
+
+    return path;
+  },
+
   tagName: function(index) {
     return this.nodes[index].tagName.toLowerCase();
   },
 
+  submit: function(index) {
+    return this.nodes[index].submit();
+  },
+
   click: function (index) {
     var clickEvent = document.createEvent('MouseEvents');
     clickEvent.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
@@ -103,21 +139,25 @@ Capybara = {
     return this.nodes[index].value;
   },
 
-  set: function(index, value) {
-    var node = this.nodes[index];
-    var type = (node.type || node.tagName).toLowerCase();
-    if (type == "text" || type == "textarea" || type == "password") {
+  set: function (index, value) {
+    var length, maxLength, node, strindex, textTypes, type;
+
+    node = this.nodes[index];
+    type = (node.type || node.tagName).toLowerCase();
+    textTypes = ["email", "number", "password", "search", "tel", "text", "textarea", "url"];
+
+    if (textTypes.indexOf(type) != -1) {
       this.trigger(index, "focus");
-      node.value = "";
-      var maxLength = this.attribute(index, "maxlength"),
-          length;
+
+      maxLength = this.attribute(index, "maxlength");
       if (maxLength && value.length > maxLength) {
         length = maxLength;
       } else {
         length = value.length;
       }
 
-      for(var strindex = 0; strindex < length; strindex++) {
+      node.value = "";
+      for (strindex = 0; strindex < length; strindex++) {
         node.value += value[strindex];
         this.trigger(index, "keydown");
         this.keypress(index, false, false, false, false, 0, value[strindex]);
@@ -125,13 +165,16 @@ Capybara = {
       }
       this.trigger(index, "change");
       this.trigger(index, "blur");
-    } else if(type == "checkbox" || type == "radio") {
-      node.checked = (value == "true");
+
+    } else if (type === "checkbox" || type === "radio") {
+      node.checked = (value === "true");
       this.trigger(index, "click");
       this.trigger(index, "change");
-    } else if(type == "file") {
+
+    } else if (type === "file") {
       this.lastAttachedFile = value;
       this.trigger(index, "click");
+
     } else {
       node.value = value;
     }

data/src/find_command.h

@@ -20,3 +20,7 @@ CHECK_COMMAND(Headers)
 CHECK_COMMAND(SetCookie)
 CHECK_COMMAND(ClearCookies)
 CHECK_COMMAND(GetCookies)
+CHECK_COMMAND(Headers)
+CHECK_COMMAND(SetProxy)
+CHECK_COMMAND(ConsoleMessages)
+CHECK_COMMAND(RequestedUrl)

data/src/main.cpp

@@ -18,7 +18,10 @@ int main(int argc, char **argv) {
   app.setOrganizationName("thoughtbot, inc");
   app.setOrganizationDomain("thoughtbot.com");
 
-  Server server;
+  QStringList args = app.arguments();
+  bool ignoreSslErrors = args.contains("--ignore-ssl-errors");
+
+  Server server(0, ignoreSslErrors);
 
   if (server.start()) {
     std::cout << "Capybara-webkit server started, listening on port: " << server.server_port() << std::endl;

data/src/webkit_server.pro

@@ -2,6 +2,8 @@ TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
 HEADERS = \
+  RequestedUrl.h \
+  ConsoleMessages.h \
   WebPage.h \
   Server.h \
   Connection.h \
@@ -28,8 +30,13 @@ HEADERS = \
   SetCookie.h \
   ClearCookies.h \
   GetCookies.h \
+  CommandParser.h \
+  CommandFactory.h \
+  SetProxy.h \
 
 SOURCES = \
+  RequestedUrl.cpp \
+  ConsoleMessages.cpp \
   main.cpp \
   WebPage.cpp \
   Server.cpp \
@@ -57,6 +64,9 @@ SOURCES = \
   SetCookie.cpp \
   ClearCookies.cpp \
   GetCookies.cpp \
+  CommandParser.cpp \
+  CommandFactory.cpp \
+  SetProxy.cpp \
 
 RESOURCES = webkit_server.qrc
 QT += network webkit

metadata

@@ -1,41 +1,28 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-webkit
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 2
-  version: 0.7.2
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - thoughtbot
 - Joe Ferris
+- Matt Mongeau
+- Mike Burns
 - Jason Morrison
-- Tristan Dunn
-- Joshua Clayton
-- Yuichi Tateno
-- Aaron Gibralter
-- Vasily Reys
-- petrushka
-- John Bintz
-- Chad Pytel
-- Christopher Meiklejohn
-- John Barker
-- Jeremy Wells
-- Chris Griego
-- Shigeya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 -04:00
-default_executable: 
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -53,12 +40,26 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  version_requirements: *id001
+  requirement: *id001
+  type: :runtime
+  prerelease: false
   name: capybara
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
+  type: :runtime
   prerelease: false
+  name: json
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -69,12 +70,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id002
-  name: rspec
+  requirement: *id003
+  type: :development
   prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,12 +84,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: sinatra
+  requirement: *id004
+  type: :development
   prerelease: false
+  name: sinatra
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +98,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: mini_magick
+  requirement: *id005
+  type: :development
   prerelease: false
+  name: mini_magick
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,23 +112,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rake
+  requirement: *id006
+  type: :development
   prerelease: false
+  name: rake
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
-  version_requirements: *id006
-  name: appraisal
+        - 4
+        - 0
+        version: 0.4.0
+  requirement: *id007
+  type: :development
   prerelease: false
+  name: appraisal
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -156,23 +160,34 @@ files:
 - lib/capybara-webkit.rb
 - lib/capybara/driver/webkit.rb
 - lib/capybara/driver/webkit/browser.rb
+- lib/capybara/driver/webkit/cookie_jar.rb
 - lib/capybara/driver/webkit/node.rb
 - lib/capybara/driver/webkit/socket_debugger.rb
+- lib/capybara/driver/webkit/version.rb
 - lib/capybara/webkit.rb
+- lib/capybara/webkit/matchers.rb
 - lib/capybara_webkit_builder.rb
 - spec/browser_spec.rb
+- spec/cookie_jar_spec.rb
 - spec/driver_rendering_spec.rb
 - spec/driver_spec.rb
 - spec/integration/driver_spec.rb
 - spec/integration/session_spec.rb
+- spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb
 - src/Body.h
 - src/ClearCookies.cpp
 - src/ClearCookies.h
 - src/Command.cpp
 - src/Command.h
+- src/CommandFactory.cpp
+- src/CommandFactory.h
+- src/CommandParser.cpp
+- src/CommandParser.h
 - src/Connection.cpp
 - src/Connection.h
+- src/ConsoleMessages.cpp
+- src/ConsoleMessages.h
 - src/Evaluate.cpp
 - src/Evaluate.h
 - src/Execute.cpp
@@ -197,6 +212,8 @@ files:
 - src/Node.h
 - src/Render.cpp
 - src/Render.h
+- src/RequestedUrl.cpp
+- src/RequestedUrl.h
 - src/Reset.cpp
 - src/Reset.h
 - src/Response.cpp
@@ -205,6 +222,8 @@ files:
 - src/Server.h
 - src/SetCookie.cpp
 - src/SetCookie.h
+- src/SetProxy.cpp
+- src/SetProxy.h
 - src/Source.cpp
 - src/Source.h
 - src/Status.cpp
@@ -226,7 +245,6 @@ files:
 - templates/Command.cpp
 - templates/Command.h
 - webkit_server.pro
-has_rdoc: true
 homepage: http://github.com/thoughtbot/capybara-webkit
 licenses: []
 
@@ -256,14 +274,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Headless Webkit driver for Capybara
 test_files: 
 - spec/browser_spec.rb
+- spec/cookie_jar_spec.rb
 - spec/driver_rendering_spec.rb
 - spec/driver_spec.rb
 - spec/integration/driver_spec.rb
 - spec/integration/session_spec.rb
+- spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb