webkit2-gtk 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce720995e08f70f3aca1f40c56c73185fdf82246
-  data.tar.gz: 0de49a7af386acbcb727a000b3328e96bb0ef448
+  metadata.gz: ad6e75e4540a71f86964688580bb87ca11e3f30f
+  data.tar.gz: 26e1e8bc4831d425b16a641b214f9c532fc51375
 SHA512:
-  metadata.gz: 16dda65d7bb5ff105f2eb04cf9ede10555b7dc79986a50ce7dcd587e00e89012e4dca5e55a5e74efd315825c214c06e9d64337f81bb54148fd724ea4af1e0cf1
-  data.tar.gz: a5c8fcb1ff8c7d433169a0515c64105e2863692ca2c2c0902af49ed3d6f9c414bb8e2e3956a4106069c4e00ebe67d37c88339d3680266b100a42246d751c6a99
+  metadata.gz: 31152a358af578a991b7da25686a35089fc7bbe2002b4c2f050244d6b7d7973347bb74ec5ae537827a100cfeb849e9ab250b45fe5508d348b364b27836d2ca87
+  data.tar.gz: 0b53a475012eadc90683cb1463a2178e9406c8249aec9cd770187eb67b9392aca41746544631e714df5d52c15b2ac39f288ef231946a547d3bb55f69037087b7

data/Rakefile

@@ -81,7 +81,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "webkitgtk",
       :download_site => :webkitgtk,
       :label => "WebKitGTK+",
-      :version => "2.16.1",
+      :version => "2.17.4",
       :compression_method => "xz",
       :windows => {
         :build_concurrently => false,

data/lib/webkit2-gtk/loader.rb

@@ -39,6 +39,7 @@ module WebKit2Gtk
     def require_libraries
       require "webkit2-gtk/version" if @version_module.const_defined?(:MAJOR)
 
+      require "webkit2-gtk/web-context"
       require "webkit2-gtk/web-view"
     end
 

data/lib/webkit2-gtk/web-context.rb

@@ -0,0 +1,34 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module WebKit2Gtk
+  class WebContext
+    alias_method :initialize_raw, :initialize
+    def initialize(*args)
+      if args.size == 1 and args[0].is_a?(Hash)
+        options = args[0]
+        ephemeral = options[:ephemeral]
+        if ephemeral
+          initialize_new_ephemeral
+        else
+          initialize_raw
+        end
+      else
+        initialize_raw(*args)
+      end
+    end
+  end
+end

data/sample/browser.rb

@@ -14,15 +14,33 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+require "uri"
 require "webkit2-gtk"
 
+uri = URI.parse(ARGV.shift || "https://webkitgtk.org/")
+
 window = Gtk::Window.new
+window.set_default_size(800, 600)
 window.signal_connect("destroy") do
   Gtk.main_quit
 end
 
 view = WebKit2Gtk::WebView.new
-view.load_uri("http://webkitgtk.org/")
+view.signal_connect("load-changed") do |_, load_event|
+  p [:load_changed, view.uri, load_event]
+end
+view.signal_connect("load-failed") do |_, _, failed_uri, error|
+  message = "failed to load URI: #{failed_uri}: "
+  message << "#{error.class}(#{error.code}): #{error.message}"
+  puts(message)
+  true
+end
+
+if uri.class == URI::Generic
+  view.load_html(File.read(uri.path), uri.to_s)
+else
+  view.load_uri(uri.to_s)
+end
 
 window.add(view)
 window.show_all

data/sample/screenshot.rb

@@ -0,0 +1,70 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "cgi/util"
+require "webkit2-gtk"
+
+if ARGV.empty?
+  puts("Usage: #{$0} URL...")
+  puts(" e.g.: #{$0} https://webkitgtk.org/ https://www.gtk.org/")
+  exit(false)
+end
+
+main_context = GLib::MainContext.default
+
+view_context = WebKit2Gtk::WebContext.new(ephemeral: true)
+view = WebKit2Gtk::WebView.new(context: view_context)
+window = Gtk::OffscreenWindow.new
+window.add(view)
+window.set_default_size(800, 600)
+window.show_all
+ARGV.each do |uri|
+  view.load_uri(uri)
+  finished = false
+  view.signal_connect("load-changed") do |_, load_event|
+    case load_event
+    when WebKit2Gtk::LoadEvent::FINISHED
+      view.get_snapshot(:full_document, :none) do |_, result|
+        finished = true
+        snapshot_surface = view.get_snapshot_finish(result)
+        base_path = CGI.escape(uri)
+        snapshot_surface.write_to_png("#{base_path}.png")
+
+        width = 200
+        height = 200
+        thumbnail_surface = Cairo::ImageSurface.new(:argb32, width, height)
+        context = Cairo::Context.new(thumbnail_surface)
+        context.set_source_color(:white)
+        context.paint
+        ratio = width.to_f / snapshot_surface.width
+        context.scale(ratio, ratio)
+        context.set_source(snapshot_surface)
+        context.paint
+        thumbnail_surface.write_to_png("#{base_path}.thumbnail.png")
+      end
+    end
+  end
+  view.signal_connect("load-failed") do |_, _, failed_uri, error|
+    finished = true
+    message = "failed to load URI: #{failed_uri}: "
+    message << "#{error.class}(#{error.code}): #{error.message}"
+    puts(message)
+    true
+  end
+  until finished
+    main_context.iteration(true)
+  end
+end

data/test/test-webkit2-gtk-web-context.rb

@@ -0,0 +1,41 @@
+# Copyright (C) 2017  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestWebKit2GtkWebContext < Test::Unit::TestCase
+  include WebKit2GtkTestUtils
+
+  sub_test_case(".new") do
+    sub_test_case("Hash form") do
+      setup do
+        only_webkit2_gtk_version(2, 16)
+      end
+
+      test "ephemeral: true" do
+        context = WebKit2Gtk::WebContext.new(ephemeral: true)
+        assert do
+          context.ephemeral?
+        end
+      end
+
+      test "ephemeral: false" do
+        context = WebKit2Gtk::WebContext.new(ephemeral: false)
+        assert do
+          not context.ephemeral?
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webkit2-gtk
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gobject-introspection
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.6
+        version: 3.1.7
 description: Ruby/WebKit2GTK is a Ruby binding of WebKit2GTK+.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -50,10 +50,13 @@ files:
 - lib/webkit2-gtk.rb
 - lib/webkit2-gtk/loader.rb
 - lib/webkit2-gtk/version.rb
+- lib/webkit2-gtk/web-context.rb
 - lib/webkit2-gtk/web-view.rb
 - sample/browser.rb
+- sample/screenshot.rb
 - test/run-test.rb
-- test/test-webkit2-gtk-webview.rb
+- test/test-webkit2-gtk-web-context.rb
+- test/test-webkit2-gtk-web-view.rb
 - test/webkit2-gtk-test-utils.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: