prism-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f161e74b571c60a4bbada7dad031201b4279719bacfcf2dc8301700f42e4ef74
-  data.tar.gz: 39280c35e35d0e047b8c7df6e7f034b7862b5e428ac2da7dbf226d5343f33d01
+  metadata.gz: 6b42693d9f9891a549d9ad40045572a87a4b64479e685d5228ed803b2a587177
+  data.tar.gz: fa3187c76f76cdd80f8af5b8cd49a5a9e23980e74e8aba77f4bf8bf0ba6e9a58
 SHA512:
-  metadata.gz: 25615ff3dade6c8c2b3e255b89251be2e7bff76b0b26c0fa48da6cad85ba079cff4b8cc905e535c1740715afa9db475f47bf6683827d2f2367dfde41ec35b078
-  data.tar.gz: 994bfbf156df566de1c1d7af59bdb0a0fda920f25afcfb81029c94b73b3b07100bfe430119d9bdcb24dc95da07edd7acfa45d835bfc540871c74b0ff7de6190e
+  metadata.gz: 96659210b1e7808f118938642f988f279ca79c0227f615b5914cdf304b7436b5e1b6157e7b5e7fe8f685d7d26adb8ecde1fac3c7b99753c3bc2e566dc62e9e1d
+  data.tar.gz: e9e5b95812026f315e3d73b92fb3d50630aa851fb82e45c4c0984ca0850c81bc6dc747da85a33bc2cf73c4805b9c4cb1daa5f7363fb9a0e072fcf645e436c342

data/build/prism.js

@@ -905,10 +905,6 @@ function rubyVTreeToSnabbdom(rvtree) {
         let args = [];
 
         for (let arg of handler.args) {
-          if (arg.type === "constant") {
-            args.push(arg.value);
-          }
-
           if (arg.type === "event") {
             args.push(serializeEvent(event));
           }

data/src/prism.rb

@@ -23,11 +23,7 @@ module Prism
 
       instance = Prism.instances[message["instance"]]
 
-      if instance.respond_to? message["type"]
-        instance.send(message["type"], *message["args"])
-      else
-        raise "Component #{instance.class} has no method ##{message["type"]}"
-      end
+      instance.process(message)
     end
 
     def event(eventJSON, id)
@@ -191,14 +187,13 @@ module Prism
         end
 
         result[:on] ||= {}
-        result[:on][:click] = options[:onClick].to_hash if options[:onClick]
-        result[:on][:change] = options[:onChange].to_hash if options[:onChange]
-        result[:on][:input] = options[:onInput].to_hash if options[:onInput]
-        result[:on][:mousedown] = options[:onMousedown].to_hash if options[:onMousedown]
-        result[:on][:mouseup] = options[:onMouseup].to_hash if options[:onMouseup]
-        result[:on][:keydown] = options[:onKeydown].to_hash if options[:onKeydown]
-        result[:on][:keyup] = options[:onKeyup].to_hash if options[:onKeyup]
-        result[:on][:scroll] = options[:onScroll].to_hash if options[:onScroll]
+
+        options.each do |key, value|
+          key_as_string = key.to_s
+          next unless key_as_string.start_with?('on')
+          event_name = key_as_string.sub('on', '').downcase
+          result[:on][event_name] = _register_handler(value)
+        end
 
         if options[:on]
           event_handlers = {}
@@ -219,18 +214,20 @@ module Prism
     end
 
     def call(method_name, *args)
-      Prism.instances[object_id] = self # TODO - this is a memory leak
-      EventHandler.new(object_id, method_name).with(*args)
+      EventHandler.new(self, method_name).with(*args)
     end
 
     def stop_propagation
-      Prism.instances[object_id] = self # TODO - this is a memory leak
-      EventHandler.new(object_id, nil).stop_propagation
+      EventHandler.new(self, method_name).stop_propagation
     end
 
     def prevent_default
-      Prism.instances[object_id] = self # TODO - this is a memory leak
-      EventHandler.new(object_id, nil).prevent_default
+      EventHandler.new(self, method_name).prevent_default
+    end
+
+    def _register_handler(handler)
+      Prism.instances[handler.id] = handler # TODO - this is a memory leak
+      handler.to_hash
     end
 
     def render
@@ -239,10 +236,11 @@ module Prism
   end
 
   class EventHandler
-    attr_reader :method_name
+    attr_reader :method_name, :id
 
-    def initialize(id, method_name, args = [], options = {})
-      @id = id
+    def initialize(instance, method_name, args = [], options = {})
+      @instance = instance
+      @id = self.object_id
       @method_name = method_name
       @args = args
       @options = {prevent_default: false, stop_propagation: false}.merge(options)
@@ -251,30 +249,50 @@ module Prism
     def with(*additionalArgs)
       new_args = additionalArgs.map { |a| {type: :constant, value: a} }
 
-      EventHandler.new(@id, method_name, @args + new_args, @options)
+      EventHandler.new(@instance, method_name, @args + new_args, @options)
     end
 
     def with_event
-      EventHandler.new(@id, method_name, @args + [{type: :event}], @options)
+      EventHandler.new(@instance, method_name, @args + [{type: :event}], @options)
     end
 
     def with_event_data(*property_names)
       new_args = property_names.map { |item| {type: :event_data, key: item } }
 
-      EventHandler.new(@id, method_name, @args + new_args, @options)
+      EventHandler.new(@instance, method_name, @args + new_args, @options)
     end
 
     def with_target_data(*items)
       target_args = items.map { |item| {type: :target_data, key: item } }
-      EventHandler.new(@id, method_name, @args + target_args, @options)
+      EventHandler.new(@instance, method_name, @args + target_args, @options)
     end
 
     def prevent_default
-      EventHandler.new(@id, method_name, @args, @options.merge(prevent_default: true))
+      EventHandler.new(@instance, method_name, @args, @options.merge(prevent_default: true))
     end
 
     def stop_propagation
-      EventHandler.new(@id, method_name, @args, @options.merge(stop_propagation: true))
+      EventHandler.new(@instance, method_name, @args, @options.merge(stop_propagation: true))
+    end
+
+    def process(message)
+      call_args = []
+      message_args = message["args"]
+
+      @args.each do |arg|
+        case arg[:type]
+        when :constant
+          call_args << arg[:value]
+        else
+          call_args << message_args.shift
+        end
+      end
+
+      if @instance.respond_to? message["type"]
+        @instance.send(message["type"], *call_args)
+      else
+        raise "Component #{@instance.class} has no method ##{message["type"]}"
+      end
     end
 
     def to_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prism-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Johnstone