otherinbox-capybara-webkit 0.12.0 → 0.12.0.1

data/src/WebPageManager.cpp

@@ -0,0 +1,117 @@
+#include "WebPageManager.h"
+#include "WebPage.h"
+#include "NetworkCookieJar.h"
+
+WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
+  m_ignoreSslErrors = false;
+  m_cookieJar = new NetworkCookieJar(this);
+  m_success = true;
+  m_loggingEnabled = false;
+  m_ignoredOutput = new QString();
+  createPage(this)->setFocus();
+}
+
+void WebPageManager::append(WebPage *value) {
+  m_pages.append(value);
+}
+
+QList<WebPage *> WebPageManager::pages() const {
+  return m_pages;
+}
+
+void WebPageManager::setCurrentPage(WebPage *page) {
+  m_currentPage = page;
+}
+
+WebPage *WebPageManager::currentPage() const {
+  return m_currentPage;
+}
+
+WebPage *WebPageManager::createPage(QObject *parent) {
+  WebPage *page = new WebPage(this, parent);
+  connect(page, SIGNAL(loadStarted()),
+          this, SLOT(emitLoadStarted()));
+  connect(page, SIGNAL(pageFinished(bool)),
+          this, SLOT(setPageStatus(bool)));
+  connect(page, SIGNAL(requestCreated(QNetworkReply *)),
+          this, SLOT(requestCreated(QNetworkReply *)));
+  connect(page, SIGNAL(replyFinished(QNetworkReply *)),
+          this, SLOT(replyFinished(QNetworkReply *)));
+  append(page);
+  return page;
+}
+
+void WebPageManager::emitLoadStarted() {
+  if (m_started.empty()) {
+    logger() << "Load started";
+    emit loadStarted();
+  }
+}
+
+void WebPageManager::requestCreated(QNetworkReply *reply) {
+  logger() << "Started request to" << reply->url().toString();
+  m_started += reply;
+}
+
+void WebPageManager::replyFinished(QNetworkReply *reply) {
+  int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+  logger() << "Received" << status << "from" << reply->url().toString();
+  m_started.remove(reply);
+  logger() << m_started.size() << "requests remaining";
+  if (m_started.empty() && !m_success) {
+    emitPageFinished();
+  }
+}
+
+void WebPageManager::setPageStatus(bool success) {
+  logger() << "Page finished with" << success;
+  m_success = success && m_success;
+  if (m_started.empty()) {
+    emitPageFinished();
+  }
+}
+
+void WebPageManager::emitPageFinished() {
+  logger() << "Load finished";
+  emit pageFinished(m_success);
+  m_success = true;
+}
+
+void WebPageManager::setIgnoreSslErrors(bool value) {
+  m_ignoreSslErrors = value;
+}
+
+bool WebPageManager::ignoreSslErrors() {
+  return m_ignoreSslErrors;
+}
+
+void WebPageManager::reset() {
+  m_cookieJar->clearCookies();
+  m_pages.first()->deleteLater();
+  m_pages.clear();
+  createPage(this)->setFocus();
+}
+
+NetworkCookieJar *WebPageManager::cookieJar() {
+  return m_cookieJar;
+}
+
+bool WebPageManager::isLoading() const {
+  foreach(WebPage *page, pages()) {
+    if (page->isLoading()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+QDebug WebPageManager::logger() const {
+  if (m_loggingEnabled)
+    return qDebug();
+  else
+    return QDebug(m_ignoredOutput);
+}
+
+void WebPageManager::enableLogging() {
+  m_loggingEnabled = true;
+}

data/src/WebPageManager.h

@@ -0,0 +1,56 @@
+#ifndef _WEBPAGEMANAGER_H
+#define _WEBPAGEMANAGER_H
+#include <QList>
+#include <QSet>
+#include <QObject>
+#include <QNetworkReply>
+#include <QDebug>
+#include <QFile>
+
+class WebPage;
+class NetworkCookieJar;
+
+class WebPageManager : public QObject {
+  Q_OBJECT
+
+  public:
+    WebPageManager(QObject *parent = 0);
+    void append(WebPage *value);
+    QList<WebPage *> pages() const;
+    void setCurrentPage(WebPage *);
+    WebPage *currentPage() const;
+    WebPage *createPage(QObject *parent);
+    void setIgnoreSslErrors(bool);
+    bool ignoreSslErrors();
+    void reset();
+    NetworkCookieJar *cookieJar();
+    bool isLoading() const;
+    QDebug logger() const;
+    void enableLogging();
+
+  public slots:
+    void emitLoadStarted();
+    void setPageStatus(bool);
+    void requestCreated(QNetworkReply *reply);
+    void replyFinished(QNetworkReply *reply);
+
+  signals:
+    void pageFinished(bool);
+    void loadStarted();
+
+  private:
+    void emitPageFinished();
+    static void handleDebugMessage(QtMsgType type, const char *message);
+
+    QList<WebPage *> m_pages;
+    WebPage *m_currentPage;
+    bool m_ignoreSslErrors;
+    NetworkCookieJar *m_cookieJar;
+    QSet<QNetworkReply*> m_started;
+    bool m_success;
+    bool m_loggingEnabled;
+    QString *m_ignoredOutput;
+};
+
+#endif // _WEBPAGEMANAGER_H
+

data/src/WindowFocus.cpp

@@ -0,0 +1,32 @@
+#include "WindowFocus.h"
+#include "SocketCommand.h"
+#include "WebPage.h"
+#include "CommandFactory.h"
+#include "WebPageManager.h"
+
+WindowFocus::WindowFocus(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void WindowFocus::start() {
+  focusWindow(arguments()[0]);
+}
+
+void WindowFocus::windowNotFound() {
+  emit finished(new Response(false, QString("Unable to locate window. ")));
+}
+
+void WindowFocus::success(WebPage *page) {
+  page->setFocus();
+  emit finished(new Response(true));
+}
+
+void WindowFocus::focusWindow(QString selector) {
+  foreach(WebPage *page, manager()->pages()) {
+    if (page->matchesWindowSelector(selector)) {
+      success(page);
+      return;
+    }
+  }
+
+  windowNotFound();
+}

data/src/WindowFocus.h

@@ -0,0 +1,15 @@
+#include "SocketCommand.h"
+
+class WindowFocus : public SocketCommand {
+  Q_OBJECT
+
+  public:
+    WindowFocus(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
+
+  private:
+    void success(WebPage *);
+    void windowNotFound();
+    void focusWindow(QString);
+};
+

data/src/body.cpp

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

data/src/find_command.h

@@ -1,6 +1,6 @@
 #define CHECK_COMMAND(expectedName) \
   if (strcmp(#expectedName, name) == 0) { \
-    return new expectedName(m_page, arguments, this); \
+    return new expectedName(m_manager, arguments, this); \
   }
 
 CHECK_COMMAND(Visit)
@@ -20,7 +20,6 @@ CHECK_COMMAND(Headers)
 CHECK_COMMAND(SetCookie)
 CHECK_COMMAND(ClearCookies)
 CHECK_COMMAND(GetCookies)
-CHECK_COMMAND(Headers)
 CHECK_COMMAND(SetProxy)
 CHECK_COMMAND(ConsoleMessages)
 CHECK_COMMAND(RequestedUrl)
@@ -28,3 +27,8 @@ CHECK_COMMAND(CurrentUrl)
 CHECK_COMMAND(ResizeWindow)
 CHECK_COMMAND(IgnoreSslErrors)
 CHECK_COMMAND(SetSkipImageLoading)
+CHECK_COMMAND(WindowFocus)
+CHECK_COMMAND(GetWindowHandles)
+CHECK_COMMAND(GetWindowHandle)
+CHECK_COMMAND(Authenticate)
+CHECK_COMMAND(EnableLogging)

data/src/webkit_server.pro

@@ -2,6 +2,8 @@ TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
 HEADERS = \
+  EnableLogging.h \
+  Authenticate.h \
   IgnoreSslErrors.h \
   ResizeWindow.h \
   CurrentUrl.h \
@@ -11,6 +13,7 @@ HEADERS = \
   Server.h \
   Connection.h \
   Command.h \
+  SocketCommand.h \
   Visit.h \
   Find.h \
   Reset.h \
@@ -39,8 +42,14 @@ HEADERS = \
   NullCommand.h \
   PageLoadingCommand.h \
   SetSkipImageLoading.h \
+  WebPageManager.h \
+  WindowFocus.h \
+  GetWindowHandles.h \
+  GetWindowHandle.h \
 
 SOURCES = \
+  EnableLogging.cpp \
+  Authenticate.cpp \
   IgnoreSslErrors.cpp \
   ResizeWindow.cpp \
   CurrentUrl.cpp \
@@ -51,6 +60,7 @@ SOURCES = \
   Server.cpp \
   Connection.cpp \
   Command.cpp \
+  SocketCommand.cpp \
   Visit.cpp \
   Find.cpp \
   Reset.cpp \
@@ -79,6 +89,10 @@ SOURCES = \
   NullCommand.cpp \
   PageLoadingCommand.cpp \
   SetSkipImageLoading.cpp \
+  WebPageManager.cpp \
+  WindowFocus.cpp \
+  GetWindowHandles.cpp \
+  GetWindowHandle.cpp \
 
 RESOURCES = webkit_server.qrc
 QT += network webkit

data/templates/Command.cpp

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

data/templates/Command.h

@@ -2,11 +2,11 @@
 
 class WebPage;
 
-class NAME : public Command {
+class NAME : public SocketCommand {
   Q_OBJECT
 
   public:
-    NAME(WebPage *page, QObject *parent = 0);
-    virtual void start(QStringList &arguments);
+    NAME(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otherinbox-capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -145,6 +145,7 @@ files:
 - Appraisals
 - CONTRIBUTING.md
 - ChangeLog
+- GOALS
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -159,15 +160,16 @@ files:
 - gemfiles/1.1.gemfile
 - gemfiles/1.1.gemfile.lock
 - lib/capybara-webkit.rb
-- lib/capybara/driver/webkit.rb
-- lib/capybara/driver/webkit/browser.rb
-- lib/capybara/driver/webkit/connection.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/browser.rb
+- lib/capybara/webkit/connection.rb
+- lib/capybara/webkit/cookie_jar.rb
+- lib/capybara/webkit/driver.rb
+- lib/capybara/webkit/errors.rb
 - lib/capybara/webkit/matchers.rb
+- lib/capybara/webkit/node.rb
+- lib/capybara/webkit/socket_debugger.rb
+- lib/capybara/webkit/version.rb
 - lib/capybara_webkit_builder.rb
 - spec/browser_spec.rb
 - spec/capybara_webkit_builder_spec.rb
@@ -180,6 +182,9 @@ files:
 - spec/integration/session_spec.rb
 - spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb
+- spec/support/app_runner.rb
+- src/Authenticate.cpp
+- src/Authenticate.h
 - src/Body.h
 - src/ClearCookies.cpp
 - src/ClearCookies.h
@@ -195,6 +200,8 @@ files:
 - src/ConsoleMessages.h
 - src/CurrentUrl.cpp
 - src/CurrentUrl.h
+- src/EnableLogging.cpp
+- src/EnableLogging.h
 - src/Evaluate.cpp
 - src/Evaluate.h
 - src/Execute.cpp
@@ -205,6 +212,10 @@ files:
 - src/FrameFocus.h
 - src/GetCookies.cpp
 - src/GetCookies.h
+- src/GetWindowHandle.cpp
+- src/GetWindowHandle.h
+- src/GetWindowHandles.cpp
+- src/GetWindowHandles.h
 - src/Header.cpp
 - src/Header.h
 - src/Headers.cpp
@@ -241,6 +252,8 @@ files:
 - src/SetProxy.h
 - src/SetSkipImageLoading.cpp
 - src/SetSkipImageLoading.h
+- src/SocketCommand.cpp
+- src/SocketCommand.h
 - src/Source.cpp
 - src/Source.h
 - src/Status.cpp
@@ -253,6 +266,10 @@ files:
 - src/Visit.h
 - src/WebPage.cpp
 - src/WebPage.h
+- src/WebPageManager.cpp
+- src/WebPageManager.h
+- src/WindowFocus.cpp
+- src/WindowFocus.h
 - src/body.cpp
 - src/capybara.js
 - src/find_command.h
@@ -282,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Headless Webkit driver for Capybara
@@ -298,3 +315,5 @@ test_files:
 - spec/integration/session_spec.rb
 - spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb
+- spec/support/app_runner.rb
+has_rdoc: