nodo 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d8c9823753373c6be5ad0c493e7f14346950b611d4ca0d90c5a96bcabfa5e6
-  data.tar.gz: 3ad4b37694f4ef33cfadad03794ce7b4bf2a9fd42dc4e0abb319ec981e529b33
+  metadata.gz: 42cd6c0e3e07674ceb2f10dd670c490b7f23ed6534f22f978a40e0b91d529570
+  data.tar.gz: b560df0c25e2b72842e6d6d5be610503252069bfd1741fb2cd9228066d28f91e
 SHA512:
-  metadata.gz: 0e0004a84541cb4edd4cc398250fe17ee5623aed13f1bbb76b31eee531867906cffd87c5e0f71b50c0c72fdae4f26e57d24f654fdd2623bee90b20c60f3ff0b4
-  data.tar.gz: 539b75f4a8283f4db872db614158403129651f4b0811d9e7f9ef5dfa1f506bedcf238fa0b93896fe776ae936bbc8eba9cbd44ea86fa8f80b87142e5d69cfe957
+  metadata.gz: 012ed2197c0ea3e519884b3295a62986158326027adb08c484fbf87903874763594fe72236bebcc01f47a919a4893ef92cdc7a14b1f8ad02da7ea527ae5eab38
+  data.tar.gz: 6a953be3a789671c966248dcc385740c5964ad0bbb370411d93cdc44ee7ea129c14537d73c08e7a44eb4c19ca1bc2b5465873bec65fd4d56884ba9ed339981d6

data/README.md

@@ -131,6 +131,23 @@ class BarFoo < Nodo::Core
 end
 ```
 
+With the above syntax, the script code will be generated during class definition
+time. In order to have the code generated when the first instance is created, the
+code can be defined inside a block:
+
+```ruby
+class Foo < Nodo::Core
+  script do
+    <<~JS
+      var definitionTime = #{Time.now.to_json};
+    JS
+  end
+end
+```
+
+Note that the script will still be executed only once, when the first instance
+of class is created.
+
 ### Inheritance
 
 Subclasses will inherit functions, constants, dependencies and scripts from
@@ -168,6 +185,37 @@ class SyncFoo < Nodo::Core
 end
 ```
 
+### Deferred function definition
+
+By default, the function code string literal is created when the class
+is defined. Therefore any string interpolation inside the code will take
+place at definition time.
+
+In order to defer the code generation until the first object instantiation,
+the function code can be given inside a block:
+
+```ruby
+class Deferred < Nodo::Core
+  function :now, <<~JS
+    () => { return #{Time.now.to_json}; }
+  JS
+
+  function :later do
+    <<~JS
+      () => { return #{Time.now.to_json}; }
+    JS
+  end
+end
+
+instance = Deferred.new
+sleep 5
+instance.now => "2021-10-28 20:30:00 +0200"
+instance.later => "2021-10-28 20:30:05 +0200"
+```
+
+The block will be invoked when the first instance is created. As with deferred
+scripts, it will only be invoked once.
+
 ### Limiting function execution time
 
 The default timeout for a single JS function call is 60 seconds and can be

data/lib/nodo/core.rb

@@ -111,13 +111,11 @@ module Nodo
         self.dependencies = dependencies + mods.merge(deps).map { |name, package| Dependency.new(name, package) }
       end
 
-      def function(name, _code = nil, timeout: Nodo.timeout, code: nil)
+      def function(name, _code = nil, timeout: Nodo.timeout, code: nil, &block)
         raise ArgumentError, "reserved method name #{name.inspect}" if reserved_method_name?(name)
-        code = (code ||= _code).strip
-        raise ArgumentError, 'function code is required' if '' == code
         loc = caller_locations(1, 1)[0]
         source_location = "#{loc.path}:#{loc.lineno}: in `#{name}'"
-        self.functions = functions.merge(name => Function.new(name, _code || code, source_location, timeout))
+        self.functions = functions.merge(name => Function.new(name, _code || code, source_location, timeout, &block))
         define_method(name) { |*args| call_js_method(name, args) }
       end
       
@@ -129,8 +127,8 @@ module Nodo
         self.constants = constants + [Constant.new(name, value)]
       end
       
-      def script(code)
-        self.scripts = scripts + [Script.new(code)]
+      def script(code = nil, &block)
+        self.scripts = scripts + [Script.new(code, &block)]
       end
       
       def nodo_js
@@ -246,7 +244,7 @@ module Nodo
       request = Net::HTTP::Post.new("/#{clsid}/#{context_id}/#{method}", 'Content-Type': 'application/json')
       request.body = JSON.dump(args)
       client = Client.new("unix://#{socket_path}")
-      client.read_timeout = function.timeout if function
+      client.read_timeout = function&.timeout || Nodo.timeout
       response = client.request(request)
       if response.is_a?(Net::HTTPOK)
         parse_response(response)

data/lib/nodo/function.rb

@@ -2,12 +2,17 @@ module Nodo
   class Function
     attr_reader :name, :code, :source_location, :timeout
   
-    def initialize(name, code, source_location, timeout)
-      @name, @code, @source_location, @timeout = name, code, source_location, timeout
+    def initialize(name, code, source_location, timeout, &block)
+      raise ArgumentError, 'cannot give code when block is given' if code && block
+      code = code.strip if code
+      raise ArgumentError, 'function code is required' if '' == code
+      raise ArgumentError, 'code is required' unless code || block
+      @name, @code, @source_location, @timeout = name, code || block, source_location, timeout
     end
   
     def to_js
-      "const #{name} = __nodo_klass__.#{name} = (#{code});\n"
+      js = code.respond_to?(:call) ? code.call.strip : code
+      "const #{name} = __nodo_klass__.#{name} = (#{js});\n"
     end
   end
 end

data/lib/nodo/script.rb

@@ -2,12 +2,14 @@ module Nodo
   class Script
     attr_reader :code
     
-    def initialize(code)
-      @code = code
+    def initialize(code = nil, &block)
+      raise ArgumentError, 'cannot give code when block is given' if code && block
+      @code = code || block
     end
   
     def to_js
-      "#{code}\n"
+      js = code.respond_to?(:call) ? code.call : code
+      "#{js}\n"
     end
   end
 end

data/lib/nodo/version.rb

@@ -1,3 +1,3 @@
 module Nodo
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nodo
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Matthias Grosser