chupa-text-decomposer-webkit 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cfa2e299e210eed4fcdafa1f85934d377eb56f1
-  data.tar.gz: a4658b1c5b840ad94e6185ba1d41e4ba703e83c4
+  metadata.gz: 8517897f7ddbaa789f62ac121f66f875eb6a1dfe
+  data.tar.gz: 3783319afd02620126d691e9b4c3cce5fa04d8e4
 SHA512:
-  metadata.gz: 5ff6407a451e09c91b670b1ee85361bffa7c3ed166d15ef7cd88d1cbc16af1ee0381f7c011d116346090325f6d0237703b331f9d692ca25d5de04d0ed9c283e1
-  data.tar.gz: 122344f3cfcda27ec94131a933aed1836289c8565c439d09b6e5b37962718db211dece223af7c565fefd4d94fe50627493bbf26ad2b5288ca55224b92353a0c4
+  metadata.gz: 8c097c1800d2cbafb859216bc2218ceab2f2005ae8b0c2f2d82eaf42d6c326a1d48411c14e14fdafd2ce54d5d603a658557e0fbfdd04031f02494e3d0c749a12
+  data.tar.gz: 9465dd3692b81e47fdb5d10147a66f4cc6744561db76b14157d66bcb7f2e3793e0ea4777cd1c0e6b16d7ffda6dc3784dc9f0e8f57faa04432e68e7f1867afa92

data/chupa-text-decomposer-webkit.gemspec

@@ -22,7 +22,7 @@ end
 
 Gem::Specification.new do |spec|
   spec.name = "chupa-text-decomposer-webkit"
-  spec.version = "1.0.2"
+  spec.version = "1.0.3"
   spec.homepage = "https://github.com/ranguba/chupa-text-decomposer-webkit"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]

data/doc/text/news.md

@@ -1,10 +1,16 @@
 # News
 
+## 1.0.3: 2017-07-11
+
+### Improvements
+
+  * Supported timeout.
+
 ## 1.0.2: 2017-07-11
 
 ### Improvements
 
-  * Reduces required resources.
+  * Reduced required resources.
 
 ## 1.0.1: 2017-07-11
 

data/lib/chupa-text/decomposers/webkit.rb

@@ -66,7 +66,29 @@ module ChupaText
         window.add(view)
         window.show_all
 
-        finished = false
+        status = {
+          finished: false,
+          screenshot: nil,
+        }
+        prepare_screenshot(data, view, status)
+        debug do
+          "#{log_tag}[load][html] #{data.uri}"
+        end
+        view.load_html(data.body, data.uri.to_s)
+
+        main_context = GLib::MainContext.default
+        timeout(compute_timeout_second, view, main_context, status) do
+          until status[:finished]
+            main_context.iteration(true)
+          end
+        end
+
+        window.destroy
+
+        status[:screenshot]
+      end
+
+      def prepare_screenshot(data, view, status)
         view.signal_connect("load-changed") do |_, load_event|
           debug do
             "#{log_tag}[load][#{load_event.nick}] #{view.uri}"
@@ -75,19 +97,19 @@ module ChupaText
           case load_event
           when WebKit2Gtk::LoadEvent::FINISHED
             view.get_snapshot(:full_document, :none) do |_, result|
-              finished = true
+              status[:finished] = true
               snapshot_surface = view.get_snapshot_finish(result)
               unless snapshot_surface.width.zero?
                 png = convert_snapshot_surface_to_png(data, snapshot_surface)
-                screenshot = Screenshot.new("image/png",
-                                            [png].pack("m*"),
-                                            "base64")
+                status[:screenshot] = Screenshot.new("image/png",
+                                                     [png].pack("m*"),
+                                                     "base64")
               end
             end
           end
         end
         view.signal_connect("load-failed") do |_, _, failed_uri, error|
-          finished = true
+          status[:finished] = true
           error do
             message = "failed to load URI: #{failed_uri}: "
             message << "#{error.class}(#{error.code}): #{error.message}"
@@ -95,18 +117,6 @@ module ChupaText
           end
           true
         end
-        debug do
-          "#{log_tag}[load][html] #{data.uri}"
-        end
-        view.load_html(data.body, data.uri.to_s)
-
-        main_context = GLib::MainContext.default
-        until finished
-          main_context.iteration(true)
-        end
-        window.destroy
-
-        screenshot
       end
 
       def convert_snapshot_surface_to_png(data, snapshot_surface)
@@ -129,6 +139,34 @@ module ChupaText
         png.string
       end
 
+      def timeout(second, view, main_context, status)
+        timeout_id = nil
+        timeout_source = GLib::Timeout.source_new_seconds(second)
+        timeout_source.set_callback do
+          timeout_id = nil
+          status[:finished] = true
+          error do
+            message = "timeout to load URI: #{second}s: #{view.uri}"
+            "#{log_tag}[load][timeout] #{message}"
+          end
+          GLib::Source::REMOVE
+        end
+        timeout_id = timeout_source.attach(main_context)
+        yield
+        GLib::Source.remove(timeout_id) if timeout_id
+      end
+
+      def compute_timeout_second
+        default_timeout = 5
+        timeout_string =
+          ENV["CHUPA_TEXT_DECOMPOSER_WEBKIT_TIMEOUT"] || default_timeout.to_s
+        begin
+          Integer(timeout_string)
+        rescue ArgumentError
+          default_timeout
+        end
+      end
+
       def log_tag
         "[decomposer][webkit]"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chupa-text-decomposer-webkit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kouhei Sutou