webkit2-gtk 3.1.8 → 3.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '079cf65d0a77adec36c3fbfb85c6e845969d89c4'
-  data.tar.gz: 0bf138bc34797886306fa99b79b85e575ce88913
+  metadata.gz: 7c67dcfb98c0b30132569814916bb0581088e3b2
+  data.tar.gz: 7d49511db9c60fcde1cc56970374953b3c710115
 SHA512:
-  metadata.gz: cb16aa6af6d8da30f307074f11c42afac52310afdea221b37a07e7c5b9c641ee8d2abe7aaefab6b05795a725a3973655f64abb4d77281975fc4b12f0d70e496c
-  data.tar.gz: e2bdd8482bb4be74f29e7ead13702cdb4dbcb4df24811a061e67cee4db437157e3d0299f6d8c043fa2fc16559b62878e7ad14faece2b33b13794525f0003dfa9
+  metadata.gz: 5fe7ea9d31336e204da912090bcee43ed25017680679e6f3b4cd5a70f566db0eea6d6705acf10580fbf93eb3d322303b232468d7c35eacc14486936ab39a2a6e
+  data.tar.gz: 12a06324dad5dfe8cba9f6107cc64afc1dab4a0e649e61ee748a5f55c7722871b99252f0d7edfa2abbdcbb4f622c7a4015c41cb8c38d7d12ef44d716a1c8ec8f

data/Rakefile

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

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

@@ -16,16 +16,16 @@
 
 module WebKit2Gtk
   class WebView
-    class << self
-      def new(*args)
-        return super unless args.size == 1
-        return super unless args[0].is_a?(Hash)
+    unless private_method_defined?(:initialize_new_with_related_view)
+      class << self
+        def new(*args)
+          return super unless args.size == 1
+          return super unless args[0].is_a?(Hash)
 
-        related_view = args[0][:related_view]
-        return super unless related_view
-        # TODO: Workaround for webkit_web_view_new_with_related_view is
-        # handled as method not constructor.
-        related_view.new_with_related_view
+          related_view = args[0][:related_view]
+          return super unless related_view
+          related_view.new_with_related_view
+        end
       end
     end
 
@@ -53,6 +53,7 @@ module WebKit2Gtk
       context = options[:context]
       settings = options[:settings]
       user_content_manager = options[:user_content_manager]
+      related_view = options[:related_view]
 
       if context
         initialize_new_with_context(context)
@@ -60,6 +61,8 @@ module WebKit2Gtk
         initialize_new_with_settings(settings)
       elsif user_content_manager
         initialize_new_with_user_content_manager(user_content_manager)
+      elsif related_view
+        initialize_new_with_related_view(related_view)
       else
         message =
           "must specify :context, :settings, :user_content_manager or :related_view"

data/sample/screenshot.rb

@@ -23,7 +23,7 @@ if ARGV.empty?
   exit(false)
 end
 
-main_context = GLib::MainContext.default
+main_loop = GLib::MainLoop.new
 
 view_context = WebKit2Gtk::WebContext.new(ephemeral: true)
 view = WebKit2Gtk::WebView.new(context: view_context)
@@ -33,12 +33,11 @@ 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
+        main_loop.quit
         snapshot_surface = view.get_snapshot_finish(result)
         base_path = CGI.escape(uri)
         snapshot_surface.write_to_png("#{base_path}.png")
@@ -58,13 +57,11 @@ ARGV.each do |uri|
     end
   end
   view.signal_connect("load-failed") do |_, _, failed_uri, error|
-    finished = true
+    main_loop.quit
     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
+  main_loop.run
 end

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

@@ -24,14 +24,12 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
         context = WebKit2Gtk::WebContext.new
         webview = WebKit2Gtk::WebView.new(context: context)
         assert_equal(context, webview.context)
-        assert_nil(webview.user_content_manager)
       end
 
       test "with settings" do
         settings = WebKit2Gtk::Settings.new
         webview = WebKit2Gtk::WebView.new(settings: settings)
         assert_equal(settings, webview.settings)
-        assert_nil(webview.user_content_manager)
       end
 
       test "with user content manager" do
@@ -43,7 +41,7 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
       test "with related view" do
         settings = WebKit2Gtk::Settings.new
         related = WebKit2Gtk::WebView.new(settings: settings)
-        webview = related.new_with_related_view
+        webview = WebKit2Gtk::WebView.new(related_view: related)
         assert_equal(settings, webview.settings)
       end
 
@@ -89,7 +87,7 @@ class TestWebKit2GtkWebView < Test::Unit::TestCase
       loaded = false
 
       loop = GLib::MainLoop.new
-      timeout_id = GLib::Timeout.add(5000) do
+      timeout_id = GLib::Timeout.add(30000) do
         timeout_id = nil
         loop.quit
         GLib::Source::REMOVE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webkit2-gtk
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2017-10-16 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.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.9
 description: Ruby/WebKit2GTK is a Ruby binding of WebKit2GTK+.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby/WebKit2GTK is a Ruby binding of WebKit2GTK+.