webkit2-gtk 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca91e59a12307acb699b2ee456735fc67ba274b
-  data.tar.gz: 02e5e9a2ce39072c7ffe67251f26758013e8bd3c
+  metadata.gz: 266cd1a1720986f15405e36674522de99f90b63d
+  data.tar.gz: b33cb2c0dd4eef325d0438d46a9ff387a94b92dc
 SHA512:
-  metadata.gz: 27ecea74762ceb34b553d98d4fff7f4d1f547a2bd251ffea00bedcc4d0b5d050c05c56eaea97ab20e5f74c1370c47e4e5ec81f2848463cda217aa0cf4984b809
-  data.tar.gz: 93004136c2bdc18b002885753cb50a0db63a4135bb47c30a4192de932fb7861244438c0ce7b6a2079727cc7d667093320c3387f2e97a0a82ad0ecd09d5dd9557
+  metadata.gz: d1f3cf8e88e9b507148cf8cf27270af5198d92ef522294cc8eb1d36300aea15573236e215b0db3ce6da73e6a6d78b9a072bd67082ce21408970abf510b52f87a
+  data.tar.gz: 1a75deffe8a9190553d9ff971f0ea9981f255237acf5cbffe8c595b957b30651a08b3caf9aec19c73cb5e013fd3a5df5f0c6615ffe4a5f63fe3d76b78e19464d

data/dependency-check/Rakefile

@@ -17,8 +17,7 @@
 require "pkg-config"
 require "native-package-installer"
 
-case RUBY_PLATFORM
-when /mingw|mswin/
+if File.exist?(File.join(__dir__, "..", "vendor"))
   task :default => "nothing"
 else
   task :default => "dependency:check"

data/lib/webkit2-gtk/loader.rb

@@ -0,0 +1,54 @@
+# Copyright (C) 2015-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 Loader < GObjectIntrospection::Loader
+    NAMESPACE = "WebKit2"
+
+    def load
+      super(NAMESPACE)
+    end
+
+    private
+    def pre_load(repository, namespace)
+      define_version_module
+    end
+
+    def post_load(repository, namespace)
+      require_libraries
+    end
+
+    def define_version_module
+      @version_module = Module.new
+      @base_module.const_set("Version", @version_module)
+    end
+
+    def require_libraries
+      require "webkit2-gtk/version" if @version_module.const_defined?(:MAJOR)
+
+      require "webkit2-gtk/web-view"
+    end
+
+    def load_constant_info(info)
+      case info.name
+      when /_VERSION\z/
+        @version_module.const_set($PREMATCH, info.value)
+      else
+        super
+      end
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+# 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 WebView
+    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
+      end
+    end
+
+    alias_method :initialize_raw, :initialize
+    def initialize(*args)
+      case args.size
+      when 1
+        case args[0]
+        when Hash
+          initialize_with_hash(args[0])
+        when WebContext
+          message = "#{caller[0]}: #{self.class}.new(context) is deprecated. "
+          message << "Use #{self.class}.new(:context => context) instead."
+          warn(message)
+          initialize_raw(args[0])
+        else
+          raise ArgumentError, "must be options: #{args[0].inspect}"
+        end
+      else
+        initialize_raw(*args)
+      end
+    end
+
+    def initialize_with_hash(options)
+      context = options[:context]
+      settings = options[:settings]
+      user_content_manager = options[:user_content_manager]
+
+      if context
+        initialize_new_with_context(context)
+      elsif settings
+        initialize_new_with_settings(settings)
+      elsif user_content_manager
+        initialize_new_with_user_content_manager(user_content_manager)
+      else
+        message =
+          "must specify :context, :settings, :user_content_manager or :related_view"
+        raise ArgumentError, message
+      end
+    end
+    private :initialize_with_hash
+  end
+end

data/lib/webkit2-gtk.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-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
@@ -22,6 +22,8 @@ vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
 
+require "webkit2-gtk/loader"
+
 module WebKit2Gtk
   class << self
     def const_missing(name)
@@ -43,39 +45,4 @@ module WebKit2Gtk
       loader.load
     end
   end
-
-  class Loader < GObjectIntrospection::Loader
-    NAMESPACE = "WebKit2"
-
-    def load
-      super(NAMESPACE)
-    end
-
-    private
-    def pre_load(repository, namespace)
-      define_version_module
-    end
-
-    def post_load(repository, namespace)
-      require_libraries
-    end
-
-    def define_version_module
-      @version_module = Module.new
-      @base_module.const_set("Version", @version_module)
-    end
-
-    def require_libraries
-      require "webkit2-gtk/version" if @version_module.const_defined?(:MAJOR)
-    end
-
-    def load_constant_info(info)
-      case info.name
-      when /_VERSION\z/
-        @version_module.const_set($PREMATCH, info.value)
-      else
-        super
-      end
-    end
-  end
 end

data/test/run-test.rb

@@ -43,7 +43,7 @@ modules = [
   [webkit2_gtk_base, "webkit2-gtk"],
 ]
 modules.each do |target, module_name|
-  if File.exist?("Makefile") and system("which make > /dev/null")
+  if File.exist?("#{target}/Makefile") and system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
   $LOAD_PATH.unshift(File.join(target, "ext", module_name))

data/test/test-webkit2-gtk-webview.rb

@@ -15,47 +15,97 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TestWebKit2GtkWebView < Test::Unit::TestCase
-  def setup
-    @view = WebKit2Gtk::WebView.new
-    @http_server = WEBrick::HTTPServer.new(:Port => 0)
-    @http_server.mount_proc("/") do |request, response|
-      response.body = "Hello"
-    end
-    @http_server_thread = Thread.new do
-      @http_server.start
+  include WebKit2GtkTestUtils
+
+  sub_test_case(".new") do
+    sub_test_case("Hash form") do
+      test "with context" do
+        only_webkit2_gtk_version(2, 8)
+        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
+        manager = WebKit2Gtk::UserContentManager.new
+        webview = WebKit2Gtk::WebView.new(user_content_manager: manager)
+        assert_equal(manager, webview.user_content_manager)
+      end
+
+      test "with related view" do
+        settings = WebKit2Gtk::Settings.new
+        related = WebKit2Gtk::WebView.new(settings: settings)
+        webview = related.new_with_related_view
+        assert_equal(settings, webview.settings)
+      end
+
+      test "with unknown option" do
+        assert_raises do
+          WebKit2Gtk::WebView.new(foo: 'bar')
+        end
+      end
     end
-  end
 
-  def teardown
-    @http_server.shutdown
-    @http_server_thread.join
+    sub_test_case("legacy form") do
+      test "with unknown argument" do
+        assert_raises ArgumentError do
+          WebKit2Gtk::WebView.new('foo')
+        end
+      end
+    end
   end
 
-  def http_url
-    port = @http_server[:Port]
-    "http://127.0.0.1:#{port}/"
-  end
+  sub_test_case("#load_uri") do
+    def setup
+      @view = WebKit2Gtk::WebView.new
+      @http_server = WEBrick::HTTPServer.new(:Port => 0)
+      @http_server.mount_proc("/") do |request, response|
+        response.body = "Hello"
+      end
+      @http_server_thread = Thread.new do
+        @http_server.start
+      end
+    end
 
-  test "#load_uri" do
-    loaded = false
+    def teardown
+      @http_server.shutdown
+      @http_server_thread.join
+    end
 
-    loop = GLib::MainLoop.new
-    timeout_id = GLib::Timeout.add(5000) do
-      timeout_id = nil
-      loop.quit
-      GLib::Source::REMOVE
+    def http_url
+      port = @http_server[:Port]
+      "http://127.0.0.1:#{port}/"
     end
-    @view.signal_connect("load-changed") do |view, event|
-      case event
-      when WebKit2Gtk::LoadEvent::FINISHED
-        GLib::Source.remove(timeout_id) if timeout_id
-        loaded = true
+
+    test "#load_uri" do
+      loaded = false
+
+      loop = GLib::MainLoop.new
+      timeout_id = GLib::Timeout.add(5000) do
+        timeout_id = nil
         loop.quit
+        GLib::Source::REMOVE
       end
-    end
-    @view.load_uri(http_url)
-    loop.run
+      @view.signal_connect("load-changed") do |view, event|
+        case event
+        when WebKit2Gtk::LoadEvent::FINISHED
+          GLib::Source.remove(timeout_id) if timeout_id
+          loaded = true
+          loop.quit
+        end
+      end
+      @view.load_uri(http_url)
+      loop.run
 
-    assert_true(loaded)
+      assert_true(loaded)
+    end
   end
 end

data/test/webkit2-gtk-test-utils.rb

@@ -21,7 +21,7 @@ require "webrick"
 module WebKit2GtkTestUtils
   def only_webkit2_gtk_version(major, minor, micro=nil)
     micro ||= 0
-    unless WebKit2Gtk.or_later?(major, minor, micro)
+    unless WebKit2Gtk::Version.or_later?(major, minor, micro)
       omit("Require WebKit2Gtk >= #{major}.#{minor}.#{micro}")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webkit2-gtk
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-30 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.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 description: Ruby/WebKit2GTK is a Ruby binding of WebKit2GTK+.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -48,7 +48,9 @@ files:
 - Rakefile
 - dependency-check/Rakefile
 - lib/webkit2-gtk.rb
+- lib/webkit2-gtk/loader.rb
 - lib/webkit2-gtk/version.rb
+- lib/webkit2-gtk/web-view.rb
 - sample/browser.rb
 - test/run-test.rb
 - test/test-webkit2-gtk-webview.rb