Merge pull request #1 from ariya/master

rebase to upstream

CONTRIBUTING.md

@@ -28,7 +28,7 @@ In the commit message:
 
 **Task management**. Once the feature idea is agreed upon and translated into concrete actions and tasks, please use the [issue tracker](https://github.com/ariya/phantomjs/issues) to create an issue for each individual task. Further technical discussion about the task and the implementation details should be carried out in the issue tracker.
 
-**Extending with new API**. Whenever you want to introduce a new API, please send an email to the mailing list along with the link to the issue. Consider good API name for the object or function, read the [API Design Principle](http://developer.qt.nokia.com/wiki/API_Design_Principles) article. It may require few iterations to agree on the final API and hence it is important to engage all interested parties as early as possible.
+**Extending with new API**. Whenever you want to introduce a new API, please send an email to the mailing list along with the link to the issue. Consider good API name for the object or function, read the [API Design Principle](http://wiki.qt.io/API_Design_Principles) article. It may require few iterations to agree on the final API and hence it is important to engage all interested parties as early as possible.
 
 ## Get Ready
 

ChangeLog

@@ -1,17 +1,20 @@
 Please see also http://phantomjs.org/releases.html.
 
-Some future version:
+2015-01-23: Version 2.0.0
 
     New features
 
-      * Added POST data in the resource request (issue 10158)
+      * Switched to Qt 5 and updated WebKit (issue 10448)
+      * Implemented clearing of memory cache (issue 10357)
       * Added support for HTTP header change for every request (issue 11299)
 
     Improvements
 
       * Fixed rendering of CJK text by always linking the codecs (issue 10249)
       * Ensured onResourceReceived is still fired on an error (issue 11163)
       * Fixed possible crash in handling network requests (issue 11252)
+      * Removed hardcoded GhostDriver launching message (issue 12681)
+      * Allowed disk cache more than 2 GB (issue 12303)
 
     Examples
 

README.md

@@ -2,9 +2,7 @@
 
 PhantomJS ([www.phantomjs.org](http://phantomjs.org)) is a headless WebKit scriptable with JavaScript. It is used by hundreds of [developers](http://phantomjs.org/buzz.html) and dozens of [organizations](http://phantomjs.org/users.html) for web-related development workflow.
 
-The latest [stable release](http://phantomjs.org/release-1.9.html) is version 1.9 (codenamed <a href="http://phantomjs.org/release-names.html">"Sakura"</a>). Follow the official Twitter stream [@PhantomJS](http://twitter.com/PhantomJS) to get the frequent development updates.
-
-The next major version, PhantomJS 2, is a significant upgrade. It is still in [heavy development](https://github.com/ariya/phantomjs/wiki/PhantomJS-2). There is **no timeline** for the release yet, please monitor the [mailing-list](https://groups.google.com/forum/#!forum/phantomjs) for the progress.
+The latest [stable release](http://phantomjs.org/release-2.0.html) is version 2.0.
 
 **Note**: Please **do not** create a GitHub pull request **without** reading the [Contribution Guide](https://github.com/ariya/phantomjs/blob/master/CONTRIBUTING.md) first. Failure to do so may result in the rejection of the pull request.
 
@@ -43,5 +41,6 @@ and many others [related projects](http://phantomjs.org/related-projects.html).
 
 PhantomJS is free software/open source, and is distributed under the [BSD license](http://opensource.org/licenses/BSD-3-Clause). It contains third-party code, see the included `third-party.txt` file for the license information on third-party code.
 
-PhantomJS is created and maintained by [Ariya Hidayat](http://ariya.ofilabs.com/about) (Twitter: [@ariyahidayat](http://twitter.com/ariyahidayat)), with the help of [many contributors](https://github.com/ariya/phantomjs/contributors).
+PhantomJS is created and maintained by [Ariya Hidayat](http://ariya.ofilabs.com/about) (Twitter: [@ariyahidayat](http://twitter.com/ariyahidayat)), with the help of [many contributors](https://github.com/ariya/phantomjs/contributors). Follow the official Twitter stream [@PhantomJS](http://twitter.com/PhantomJS) to get the frequent development updates.
+
 

build.sh

@@ -19,7 +19,7 @@ elif [[ $OSTYPE = darwin* ]]; then
    # We only support modern Mac machines, they are at least using
    # hyperthreaded dual-core CPU.
    COMPILE_JOBS=4
-elif [[ $OSTYPE == freebsd* ]]; then
+elif [[ $OSTYPE == freebsd* ]] || [[ $OSTYPE == openbsd* ]]; then
    COMPILE_JOBS=`sysctl -n hw.ncpu`
 else
    CPU_CORES=`grep -c ^processor /proc/cpuinfo`

examples/phantomwebintro.js

@@ -6,7 +6,7 @@ page.onConsoleMessage = function(msg) {
     console.log(msg);
 };
 
-page.open("http://www.phantomjs.org", function(status) {
+page.open("http://phantomjs.org", function(status) {
     if ( status === "success" ) {
         page.includeJs("http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js", function() {
             page.evaluate(function() {

rpm/mkrpm.sh

@@ -9,16 +9,18 @@ topdir=$(mktemp -d)
 version=$(awk '/define version/ { print $NF }' ${name}.spec)
 builddir=${TMPDIR:-/tmp}/${name}-${version}
 sourcedir="${topdir}/SOURCES"
-buildroot="${topdir}/BUILD/${name}-${version}-root"
+buildroot="${topdir}/BUILDROOT"
 mkdir -p ${topdir}/RPMS ${topdir}/SRPMS ${topdir}/SOURCES ${topdir}/BUILD
 mkdir -p ${buildroot} ${builddir}
 echo "=> Copying sources..."
 ( cd .. && tar cf - ./[A-Z]* ./bin ./examples | tar xf - -C ${builddir} )
 echo "=> Creating source tarball under ${sourcedir}..."
-( cd ${builddir}/.. && tar zcf ${sourcedir}/${name}-${version}.tar.gz ${name}-${version} )
+( cd ${builddir}/.. && zip -r ${sourcedir}/${name}-${version}-source.zip ${name}-${version}
 echo "=> Building RPM..."
-rpm=$(rpmbuild --define "_topdir ${topdir}" --buildroot ${buildroot} --clean -bb ${name}.spec 2>/dev/null | \
-	awk '/\/RPMS\// { print $2; }')
-cp ${rpm} ${TMPDIR:-/tmp}/
+rpmbuild --define "_topdir ${topdir}" --buildroot ${buildroot} --clean -bb ${name}.spec
+RPMS=(`ls ${topdir}/RPMS/*/*.rpm`)
+cp ${topdir}/RPMS/*/*.rpm 
 rm -fr ${topdir}
-echo ${TMPDIR:-/tmp}/${rpm##*/}
+for rpm in "${RPMS[@]}"; do
+    echo ${TMPDIR:-/tmp}/${rpm##*/}
+done

rpm/phantomjs.spec

@@ -1,9 +1,6 @@
 %define name	phantomjs
-%define version	1.9
+%define version	2.0.0
 %define release 1
-%define prefix	/usr
-
-%define mybuilddir %{_builddir}/%{name}-%{version}-root
 
 Summary:	a headless WebKit with JavaScript API
 Name:		%{name}
@@ -12,8 +9,23 @@ License:	BSD
 Release:	%{release}
 Packager:	Matthew Barr <mbarr@snap-interactive.com>
 Group:		Utilities/Misc
-Source:		%{name}-%{version}.tar.gz
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:  %{_topdir}/BUILDROOT/
+Source:		https://bitbucket.org/ariya/phantomjs/downloads/%{name}-%{version}-source.zip
+
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: make
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: gperf
+BuildRequires: ruby
+BuildRequires: openssl-devel
+BuildRequires: freetype-devel
+BuildRequires: fontconfig-devel
+BuildRequires: libicu-devel
+BuildRequires: sqlite-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-devel
 
 %description
 PhantomJS is a headless WebKit with JavaScript API. It has fast and native
@@ -23,130 +35,28 @@ Canvas, and SVG. PhantomJS is created by Ariya Hidayat.
 %prep
 %setup -q
 
+%build
+./build.sh --confirm
+
 %install
-mkdir -p %{mybuilddir}%{prefix}/bin
-mkdir -p %{mybuilddir}%{prefix}/share/%{name}/examples
-cp bin/%{name} %{mybuilddir}%{prefix}/bin/%{name}
-cp examples/* %{mybuilddir}%{prefix}/share/%{name}/examples/
-cp CONTRIBUTING.md %{mybuilddir}%{prefix}/share/%{name}/
-cp ChangeLog %{mybuilddir}%{prefix}/share/%{name}/
-cp LICENSE.BSD %{mybuilddir}%{prefix}/share/%{name}/
-cp README.md %{mybuilddir}%{prefix}/share/%{name}/
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/%{name}/examples
+cp bin/%{name} %{buildroot}%{_bindir}/%{name}
+cp examples/* %{buildroot}%{_datadir}/%{name}/examples/
+cp CONTRIBUTING.md %{buildroot}%{_datadir}/%{name}/
+cp ChangeLog %{buildroot}%{_datadir}/%{name}/
+cp LICENSE.BSD %{buildroot}%{_datadir}/%{name}/
+cp README.md %{buildroot}%{_datadir}/%{name}/
 
 %files
 %defattr(0444,root,root)
-%attr(0555,root,root)%{prefix}/bin/%{name}
-%{prefix}/share/%{name}/ChangeLog
-%{prefix}/share/%{name}/CONTRIBUTING.md
-%{prefix}/share/%{name}/examples/arguments.coffee
-%{prefix}/share/%{name}/examples/arguments.js
-%{prefix}/share/%{name}/examples/child_process-examples.coffee
-%{prefix}/share/%{name}/examples/child_process-examples.js
-%{prefix}/share/%{name}/examples/colorwheel.coffee
-%{prefix}/share/%{name}/examples/colorwheel.js
-%{prefix}/share/%{name}/examples/countdown.coffee
-%{prefix}/share/%{name}/examples/countdown.js
-%{prefix}/share/%{name}/examples/detectsniff.coffee
-%{prefix}/share/%{name}/examples/detectsniff.js
-%{prefix}/share/%{name}/examples/direction.coffee
-%{prefix}/share/%{name}/examples/direction.js
-%{prefix}/share/%{name}/examples/echoToFile.coffee
-%{prefix}/share/%{name}/examples/echoToFile.js
-%{prefix}/share/%{name}/examples/features.coffee
-%{prefix}/share/%{name}/examples/features.js
-%{prefix}/share/%{name}/examples/fibo.coffee
-%{prefix}/share/%{name}/examples/fibo.js
-%{prefix}/share/%{name}/examples/follow.coffee
-%{prefix}/share/%{name}/examples/follow.js
-%{prefix}/share/%{name}/examples/hello.coffee
-%{prefix}/share/%{name}/examples/hello.js
-%{prefix}/share/%{name}/examples/imagebin.coffee
-%{prefix}/share/%{name}/examples/imagebin.js
-%{prefix}/share/%{name}/examples/injectme.coffee
-%{prefix}/share/%{name}/examples/injectme.js
-%{prefix}/share/%{name}/examples/ipgeocode.coffee
-%{prefix}/share/%{name}/examples/ipgeocode.js
-%{prefix}/share/%{name}/examples/loadspeed.coffee
-%{prefix}/share/%{name}/examples/loadspeed.js
-%{prefix}/share/%{name}/examples/loadurlwithoutcss.coffee
-%{prefix}/share/%{name}/examples/loadurlwithoutcss.js
-%{prefix}/share/%{name}/examples/modernizr.js
-%{prefix}/share/%{name}/examples/module.coffee
-%{prefix}/share/%{name}/examples/module.js
-%{prefix}/share/%{name}/examples/movies.coffee
-%{prefix}/share/%{name}/examples/movies.js
-%{prefix}/share/%{name}/examples/netlog.coffee
-%{prefix}/share/%{name}/examples/netlog.js
-%{prefix}/share/%{name}/examples/netsniff.coffee
-%{prefix}/share/%{name}/examples/netsniff.js
-%{prefix}/share/%{name}/examples/openurlwithproxy.coffee
-%{prefix}/share/%{name}/examples/openurlwithproxy.js
-%{prefix}/share/%{name}/examples/outputEncoding.coffee
-%{prefix}/share/%{name}/examples/outputEncoding.js
-%{prefix}/share/%{name}/examples/page_events.coffee
-%{prefix}/share/%{name}/examples/page_events.js
-%{prefix}/share/%{name}/examples/pagecallback.coffee
-%{prefix}/share/%{name}/examples/pagecallback.js
-%{prefix}/share/%{name}/examples/phantomwebintro.coffee
-%{prefix}/share/%{name}/examples/phantomwebintro.js
-%{prefix}/share/%{name}/examples/pizza.coffee
-%{prefix}/share/%{name}/examples/pizza.js
-%{prefix}/share/%{name}/examples/post.coffee
-%{prefix}/share/%{name}/examples/post.js
-%{prefix}/share/%{name}/examples/postjson.coffee
-%{prefix}/share/%{name}/examples/postjson.js
-%{prefix}/share/%{name}/examples/postserver.coffee
-%{prefix}/share/%{name}/examples/postserver.js
-%{prefix}/share/%{name}/examples/printenv.coffee
-%{prefix}/share/%{name}/examples/printenv.js
-%{prefix}/share/%{name}/examples/printheaderfooter.coffee
-%{prefix}/share/%{name}/examples/printheaderfooter.js
-%{prefix}/share/%{name}/examples/printmargins.coffee
-%{prefix}/share/%{name}/examples/printmargins.js
-%{prefix}/share/%{name}/examples/rasterize.coffee
-%{prefix}/share/%{name}/examples/rasterize.js
-%{prefix}/share/%{name}/examples/render_multi_url.coffee
-%{prefix}/share/%{name}/examples/render_multi_url.js
-%{prefix}/share/%{name}/examples/run-jasmine.coffee
-%{prefix}/share/%{name}/examples/run-jasmine.js
-%{prefix}/share/%{name}/examples/run-jasmine2.js
-%{prefix}/share/%{name}/examples/run-qunit.coffee
-%{prefix}/share/%{name}/examples/run-qunit.js
-%{prefix}/share/%{name}/examples/scandir.coffee
-%{prefix}/share/%{name}/examples/scandir.js
-%{prefix}/share/%{name}/examples/seasonfood.coffee
-%{prefix}/share/%{name}/examples/seasonfood.js
-%{prefix}/share/%{name}/examples/server.coffee
-%{prefix}/share/%{name}/examples/server.js
-%{prefix}/share/%{name}/examples/serverkeepalive.coffee
-%{prefix}/share/%{name}/examples/serverkeepalive.js
-%{prefix}/share/%{name}/examples/simpleserver.coffee
-%{prefix}/share/%{name}/examples/simpleserver.js
-%{prefix}/share/%{name}/examples/sleepsort.coffee
-%{prefix}/share/%{name}/examples/sleepsort.js
-%{prefix}/share/%{name}/examples/stdin-stdout-stderr.coffee
-%{prefix}/share/%{name}/examples/stdin-stdout-stderr.js
-%{prefix}/share/%{name}/examples/technews.coffee
-%{prefix}/share/%{name}/examples/technews.js
-%{prefix}/share/%{name}/examples/tweets.coffee
-%{prefix}/share/%{name}/examples/tweets.js
-%{prefix}/share/%{name}/examples/universe.js
-%{prefix}/share/%{name}/examples/unrandomize.coffee
-%{prefix}/share/%{name}/examples/unrandomize.js
-%{prefix}/share/%{name}/examples/useragent.coffee
-%{prefix}/share/%{name}/examples/useragent.js
-%{prefix}/share/%{name}/examples/version.coffee
-%{prefix}/share/%{name}/examples/version.js
-%{prefix}/share/%{name}/examples/waitfor.coffee
-%{prefix}/share/%{name}/examples/waitfor.js
-%{prefix}/share/%{name}/examples/walk_through_frames.coffee
-%{prefix}/share/%{name}/examples/walk_through_frames.js
-%{prefix}/share/%{name}/examples/weather.coffee
-%{prefix}/share/%{name}/examples/weather.js
-%{prefix}/share/%{name}/LICENSE.BSD
-%{prefix}/share/%{name}/README.md
+%attr(0555,root,root)%{_bindir}/%{name}
+%{_datadir}/%{name}/
 
 %changelog
+* Sat May 9 2015 Frankie Dintino <fdintino@gmail.com>
+- updated to version 2.0, added BuildRequires directives
+
 * Fri Apr 18 2014 Eric Heydenberk <heydenberk@gmail.com>
 - add missing filenames for examples to files section
 

src/config.cpp

@@ -56,6 +56,7 @@ static const struct QCommandLineConfigEntry flags[] =
     { QCommandLine::Option, '\0', "load-images", "Loads all inlined images: 'true' (default) or 'false'", QCommandLine::Optional },
     { QCommandLine::Option, '\0', "local-storage-path", "Specifies the location for offline local storage", QCommandLine::Optional },
     { QCommandLine::Option, '\0', "local-storage-quota", "Sets the maximum size of the offline local storage (in KB)", QCommandLine::Optional },
+    { QCommandLine::Option, '\0', "local-url-access", "Allows use of 'file:///' URLs: 'true' (default) or 'false'", QCommandLine::Optional },
     { QCommandLine::Option, '\0', "local-to-remote-url-access", "Allows local content to access remote URL: 'true' or 'false' (default)", QCommandLine::Optional },
     { QCommandLine::Option, '\0', "max-disk-cache-size", "Limits the size of the disk cache (in KB)", QCommandLine::Optional },
     { QCommandLine::Option, '\0', "output-encoding", "Sets the encoding for the terminal output, default is 'utf8'", QCommandLine::Optional },
@@ -249,6 +250,16 @@ void Config::setIgnoreSslErrors(const bool value)
     m_ignoreSslErrors = value;
 }
 
+bool Config::localUrlAccessEnabled() const
+{
+    return m_localUrlAccessEnabled;
+}
+
+void Config::setLocalUrlAccessEnabled(const bool value)
+{
+    m_localUrlAccessEnabled = value;
+}
+
 bool Config::localToRemoteUrlAccessEnabled() const
 {
     return m_localToRemoteUrlAccessEnabled;
@@ -535,6 +546,7 @@ void Config::resetToDefaults()
     m_diskCacheEnabled = false;
     m_maxDiskCacheSize = -1;
     m_ignoreSslErrors = false;
+    m_localUrlAccessEnabled = true;
     m_localToRemoteUrlAccessEnabled = false;
     m_outputEncoding = "UTF-8";
     m_proxyType = "http";
@@ -643,6 +655,7 @@ void Config::handleOption(const QString &option, const QVariant &value)
     booleanFlags << "disk-cache";
     booleanFlags << "ignore-ssl-errors";
     booleanFlags << "load-images";
+    booleanFlags << "local-url-access";
     booleanFlags << "local-to-remote-url-access";
     booleanFlags << "remote-debugger-autorun";
     booleanFlags << "web-security";
@@ -686,6 +699,10 @@ void Config::handleOption(const QString &option, const QVariant &value)
         setOfflineStorageDefaultQuota(value.toInt());
     }
 
+    if (option == "local-url-access") {
+        setLocalUrlAccessEnabled(boolValue);
+    }
+
     if (option == "local-to-remote-url-access") {
         setLocalToRemoteUrlAccessEnabled(boolValue);
     }

src/config.h

@@ -45,6 +45,7 @@ class Config: public QObject
     Q_PROPERTY(bool diskCacheEnabled READ diskCacheEnabled WRITE setDiskCacheEnabled)
     Q_PROPERTY(int maxDiskCacheSize READ maxDiskCacheSize WRITE setMaxDiskCacheSize)
     Q_PROPERTY(bool ignoreSslErrors READ ignoreSslErrors WRITE setIgnoreSslErrors)
+    Q_PROPERTY(bool localUrlAccessEnabled READ localUrlAccessEnabled WRITE setLocalUrlAccessEnabled)
     Q_PROPERTY(bool localToRemoteUrlAccessEnabled READ localToRemoteUrlAccessEnabled WRITE setLocalToRemoteUrlAccessEnabled)
     Q_PROPERTY(QString outputEncoding READ outputEncoding WRITE setOutputEncoding)
     Q_PROPERTY(QString proxyType READ proxyType WRITE setProxyType)
@@ -95,6 +96,9 @@ class Config: public QObject
     bool ignoreSslErrors() const;
     void setIgnoreSslErrors(const bool value);
 
+    bool localUrlAccessEnabled() const;
+    void setLocalUrlAccessEnabled(const bool value);
+
     bool localToRemoteUrlAccessEnabled() const;
     void setLocalToRemoteUrlAccessEnabled(const bool value);
 
@@ -201,6 +205,7 @@ public slots:
     bool m_diskCacheEnabled;
     int m_maxDiskCacheSize;
     bool m_ignoreSslErrors;
+    bool m_localUrlAccessEnabled;
     bool m_localToRemoteUrlAccessEnabled;
     QString m_outputEncoding;
     QString m_proxyType;

src/consts.h

@@ -35,7 +35,7 @@
 #define PHANTOMJS_VERSION_MAJOR     2
 #define PHANTOMJS_VERSION_MINOR     0
 #define PHANTOMJS_VERSION_PATCH     0
-#define PHANTOMJS_VERSION_STRING    "2.0.0 (development)"
+#define PHANTOMJS_VERSION_STRING    "2.0.0"
 
 #define HTTP_HEADER_CONTENT_LENGTH      "content-length"
 #define HTTP_HEADER_CONTENT_TYPE        "content-type"

src/modules/webpage.js

@@ -370,8 +370,10 @@ function decorateNewPage(opts, page) {
             switch (argType) {
             case "object":      //< for type "object"
             case "array":       //< for type "array"
+                str += JSON.stringify(arg) + ","
+                break;
             case "date":        //< for type "date"
-                str += "JSON.parse(" + JSON.stringify(JSON.stringify(arg)) + "),"
+                str += "new Date(" + JSON.stringify(arg) + "),"
                 break;
             case "string":      //< for type "string"
                 str += quoteString(arg) + ',';