webview 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c48d69ff8dd6f7dbf4220a5a481e4af44e8b542493a9274005378e326764b5c1
-  data.tar.gz: cd11ae6d0ee8627ced9548fe321cf5165b2e4c37d4da096ec5a653ffb24abf7c
+  metadata.gz: 71067f7cf653b0246423225eedfcf954ca345d14b3d180698cdea616d7f237ae
+  data.tar.gz: 135bed20ebfc2cbd0710d01a0198918c68d01bdf51b630dc5415ef651569647e
 SHA512:
-  metadata.gz: 56645c7bde105ace3fbe47187add745cd7896a99c6a1e8aa1af120f41d31b0a209770dea7dab8aee986397b876c5faed5b8e3b930581e7de3f9aa61317941627
-  data.tar.gz: e991be01929ad140d398e6054a76af9d5017fcc75580e35210b666725080caac2fc1e1d877195cf2463ab4e7a83118879d00a7bc5d2914fa806c398a7134a533
+  metadata.gz: 20da9dcdd1a136e08b493407fb4311b300a1fc167c3f32b1b936385c9459e1542953a8c7487e85e65158a097d2e7f962dadfd7a287e2d134889e0a1e611beedc
+  data.tar.gz: 906ae1b839bb19dc1421e7f5b9b66f77ad79232a3d291373c605a6b76e3ce05b60068a8c46f54e44940e8431f9680a07585501472bdb0e13c1e49a742be1e06e

data/.travis.yml

@@ -1,7 +1,22 @@
 ---
 sudo: false
 language: ruby
-cache: bundler
+cache:
+  - bundler
+  - apt
 rvm:
   - 2.6.3
-before_install: gem install bundler -v 2.0.1
+before_install:
+  - gem install bundler -v 2.0.1
+
+  - sudo add-apt-repository ppa:webkit-team/ppa -y
+  - sudo apt-get update
+  - sudo apt-get install libwebkit2gtk-4.0-dev -y
+
+  - cd ext
+  - ruby extconf.rb
+  - make && make install
+  - cd ..
+
+script:
+  - bundle exec rspec

data/README.md

@@ -1,6 +1,13 @@
 # Webview
 
-a webview GUI based on [zserge/webview](https://github.com/zserge/webview)
+[![Build Status](https://travis-ci.org/xiejiangzhi/webview.svg?branch=master)](https://travis-ci.org/xiejiangzhi/webview)
+[![Gem Version](https://badge.fury.io/rb/webview.svg)](https://badge.fury.io/rb/webview)
+
+A webview GUI based on [zserge/webview](https://github.com/zserge/webview)
+
+## Require
+
+* `golang`
 
 ## Installation
 
@@ -35,10 +42,16 @@ end
 Allow debug page
 
 ```ruby
-app = Webview::App.new(debug: true)
+Webview::App.new(debug: true).open('http://example.com')
+```
+
+All options
+
+```ruby
+Webview::App.new(title: 'ttt', width: 600, height: 400, resizable: true, debug: true)
 ```
 
-Run with your backend
+Run with your backend.
 
 ```ruby
 app = Webview::App.new
@@ -78,6 +91,19 @@ window.external.invoke('invalid_type' + ',' + 'my_data');
 * opendir: Open a dialog, and call rpc_cb('opendir', path, user_data) 
 * savefile: Open a dialog, and call rpc_cb('savefile', path, user_data) 
 
+
+## GUI Application
+
+If we build ruby binary for different systems, then we can public our App for normal user
+
+Some ways:
+
+* [Traveling Ruby](https://github.com/phusion/traveling-ruby). I have made a version to support ruby 2.6.3 [here](https://github.com/xiejiangzhi/traveling-ruby) for OSX and Linux
+* [Ruby Packer](https://github.com/pmq20/ruby-packer)
+
+
+When I finish my application, I will make a gem of the framework.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/ext/webview/main.go

@@ -9,8 +9,8 @@ import "os"
 import "strings"
 
 func EvalCallback(w webview.WebView, name string, value string, userdata string) {
-  value = strings.ReplaceAll(value, "'", "\\'")
-  userdata = strings.ReplaceAll(userdata, "'", "\\'")
+  value = strings.Replace(value, "'", "\\'", -1)
+  userdata = strings.Replace(userdata, "'", "\\'", -1)
 
 	w.Eval(fmt.Sprintf(`
     (function(){
@@ -26,7 +26,10 @@ func EvalCallback(w webview.WebView, name string, value string, userdata string)
 
 func handleRPC(w webview.WebView, data string) {
   s := strings.SplitN(data, ",", 2)
-  action, userdata := s[0], s[1]
+  action, userdata := s[0], ""
+  if len(s) > 1 {
+    userdata = s[1]
+  }
 
 	switch {
 	case action == "close":

data/lib/webview/app.rb

@@ -14,6 +14,9 @@ module Webview
         debug: debug
       }
       @options.delete_if { |k, v| v.nil? }
+      @app_out = nil
+      @app_err = nil
+      @app_process = nil
     end
 
     def open(url)
@@ -37,12 +40,11 @@ module Webview
       app_err.close
 
       pid = app_process.pid
-      Process.kill('QUIT', pid)
+      signal('QUIT')
       begin
         Timeout.timeout(3) { Process.wait(pid) }
       rescue Timeout::Error
         kill
-      rescue Errno::ECHILD
       end
 
       @app_process = nil
@@ -55,8 +57,15 @@ module Webview
     end
 
     def kill
-      return unless app_process&.pid
-      Process.kill('TERM', app_process.pid)
+      signal('TERM')
+    end
+
+    def signal(name)
+      return false unless app_process&.pid
+      Process.kill(name, app_process.pid)
+      true
+    rescue Errno::ECHILD, Errno::ESRCH
+      false
     end
 
     private
@@ -71,5 +80,4 @@ module Webview
       end
     end
   end
-
 end

data/lib/webview/version.rb

@@ -1,3 +1,3 @@
 module Webview
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webview
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - jiangzhi.xie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler