cocoawebview 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb16f097b461c3a2d024f2010171474fb27b12fcdeb6e267984f1eb769e125a8
-  data.tar.gz: d7d911490621dc00a2db8c4ded4f2e19909406ebf31a930b92d9e73a7a54565e
+  metadata.gz: '068ccf8fd010e4bd17c1879227ea7814f973a5ae9c2fd63311db32b3b42d2ef0'
+  data.tar.gz: 64cbe286c4dbb37292a4e845b45963423a111bb3e74de811e54dd26aa49425c1
 SHA512:
-  metadata.gz: 314995f23a0ff1531ea763f502ec5e2cef7fc5b43cf89b9fbcd3a76760d39aa54d120a6ffd7de98d51d895b84bd575f9ba1f867764397ba42150b0152f49bc77
-  data.tar.gz: 35e62aeb7d7101721cffa2bf2b8aae93cdca6a8bc37807ea30abb40ef7ea35e11d36079013da0d37aa6066c25074fbf30cef0ef26933071c808261d7481bfa45
+  metadata.gz: f90353de2fc60d6a5177db1893c8f0d38fa880a3af912bfeb26c9c8b540b429b4ba59f215b3db3f3a1fff144d6ff0a683aea183978fad49cf879926b64ca53a8
+  data.tar.gz: 5807c58f3d8ad7c3260653dbda863d918de93fa635e22c541ba0882af072b9468b5da424e0fdd9758b9be0ced6660d658648951a6c938498f019912f832868d0

data/ext/cocoawebview/cocoawebview.m

@@ -32,7 +32,7 @@ VALUE webview_eval(VALUE self, VALUE code);
 }
 @end
 
-@interface CocoaWebview : NSWindow {
+@interface CocoaWebview : NSWindow <WKScriptMessageHandler> {
     WKWebView *webView;
     VALUE rb_cocoawebview;
     BOOL showDevTool;
@@ -62,6 +62,15 @@ VALUE webview_eval(VALUE self, VALUE code);
     return self;
 }
 
+- (void)userContentController:(WKUserContentController *)userContentController
+      didReceiveScriptMessage:(WKScriptMessage *)message {
+    if ([message.name isEqualToString:@"native"]) {
+        const char *body = [message.body UTF8String];
+        VALUE rb_body = rb_str_new_cstr(body);
+        rb_funcall(rb_cocoawebview, rb_intern("webview_msg_handler"), 1, rb_body);
+    }
+}
+
 - (void)setDevTool:(BOOL)flag {
     showDevTool = flag;
 }
@@ -79,11 +88,15 @@ VALUE webview_eval(VALUE self, VALUE code);
 }
 
 - (void)addWebViewToWindow:(NSWindow *)window {
+    WKUserContentController *userContentController = [[WKUserContentController alloc] init];
+    [userContentController addScriptMessageHandler:self name:@"native"];
+
     // Create a configuration if needed
     WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
 
     [[config preferences] setValue:@YES forKey:@"fullScreenEnabled"];
 
+    config.userContentController = userContentController;
     if (showDevTool) {
         [[config preferences] setValue:@YES forKey:@"developerExtrasEnabled"];
     }
@@ -162,6 +175,7 @@ VALUE nsapp_run(VALUE self) {
 
 VALUE webview_initialize(VALUE self, VALUE debug) {
   rb_iv_set(self, "@var", rb_hash_new());
+  rb_iv_set(self, "@bindings", rb_hash_new());
   BOOL flag = NO;
   if (debug == Qtrue) {
     flag = YES;
@@ -170,6 +184,7 @@ VALUE webview_initialize(VALUE self, VALUE debug) {
   }
   CocoaWebview *webview = [[CocoaWebview alloc] initWithFrame:NSMakeRect(100, 100, 400, 500) debug:flag];
 
+  [webview setReleasedWhenClosed:NO];
   [webview setCocoaWebview:self];
 
   // Wrap the Objective-C pointer into a Ruby object

data/lib/cocoawebview/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cocoawebview
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/lib/cocoawebview.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'json'
 require_relative "cocoawebview/version"
 require_relative "cocoawebview/cocoawebview"
 
@@ -21,5 +22,27 @@ module CocoaWebview
     def webview_did_load
       puts "CocoaWebview did loaded"
     end
+
+    def bind(name, &block)
+      param_info = block.parameters
+      param_count = param_info.count { |type, _| type == :req || type == :opt }
+      args = (1..param_count).map { |i| "arg#{i}" }.join(", ")
+      code = %`
+        function #{name}(#{args}) {
+          body = {"function": "#{name}", args: [#{args}]};
+          window.webkit.messageHandlers.native.postMessage(JSON.stringify(body));
+        }
+      `
+      @bindings[name] = block
+      self.eval(code)
+    end
+
+    def webview_msg_handler(msg)
+      hash = JSON.parse(msg)
+      function = hash["function"]
+      args = hash["args"]
+      callback = @bindings[function]
+      callback.call(*args) if callback
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoawebview
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Tommy Jeff