quince 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b5c0ef933d95f7026239bcfc5685e4aeb1582382056725b245cd37838540bf4
-  data.tar.gz: c790f0bc40602888167f46bf9636c55a739d5191645fd43e3614c78e381c6d1f
+  metadata.gz: 2189200f4bee6758d6a981e3f4ba7b0d8dc558d0e0e2bb66fd421c11b404f954
+  data.tar.gz: 4153ceb85c057cfe7c2e74852aee81b82dde74362aecec53647b485fea191b87
 SHA512:
-  metadata.gz: d7f561f03a959ed9fb221d0462f8901fe9f0cb20bda9e80ede4757a6a5cf89c979da5f80c135054454ef64ad5ddec09751a23088fe08762084b13c097c56db3c
-  data.tar.gz: 47f28845aad32b4ba53f76acf4fab7695c903cb8d94197b6ac0096f16a2f048684f5677d35edeaa0c06554ae19d32152294f878e5ef5e8cbd9eccd581671389a
+  metadata.gz: 923689df34d18c7357785812424acc62f38f89a3966c568bfd6e86f03c41eb1a9dd629eebdee4b1ae9321e42e1180d0be65af560613e31543496ebc312c40a30
+  data.tar.gz: 2624224d31f066ef9562333264e6f1cc00275bf72ab35942a1b0b3097864a14c89f04a6d4ebeee7ffb07ce240f22bde8f07939b61ee64a8019017ceceead23c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    quince (0.2.1)
+    quince (0.3.0)
       oj (~> 3.13)
       typed_struct (>= 0.1.4)
 

data/lib/quince/attributes_by_element.rb

@@ -11,7 +11,7 @@ module Quince
     t = Quince::Types
     opt_string_sym = Rbs("#{t::OptionalString} | Symbol")
     opt_bool = t::OptionalBoolean
-    opt_method = Rbs("Method | Quince::Types::Undefined")
+    opt_callback = Rbs("Quince::Callback::Interface | Quince::Types::Undefined")
     value = opt_string_sym # for now
 
     ATTRIBUTES_BY_ELEMENT = {
@@ -468,13 +468,13 @@ module Quince
     }.freeze
 
     DOM_EVENTS = {
-      onclick: opt_method,
-      onsubmit: opt_method,
-      onblur: opt_method,
-      onchange: opt_method,
-      onsearch: opt_method,
-      onkeyup: opt_method,
-      onselect: opt_method,
+      onclick: opt_callback,
+      onsubmit: opt_callback,
+      onblur: opt_callback,
+      onchange: opt_callback,
+      onsearch: opt_callback,
+      onkeyup: opt_callback,
+      onselect: opt_callback,
     }.freeze
   end
 end

data/lib/quince/callback.rb

@@ -0,0 +1,36 @@
+module Quince
+  class Callback
+    module ComponentHelpers
+      protected
+
+      DEFAULT_CALLBACK_OPTIONS = {
+        prevent_default: false,
+        take_form_values: false,
+      # others could include:
+      # debounce: false,
+      }.freeze
+
+      def callback(method_name, **opts)
+        unless self.class.instance_variable_get(:@exposed_actions).member?(method_name)
+          raise "The action you called is not exposed"
+        end
+
+        opts = DEFAULT_CALLBACK_OPTIONS.merge opts
+
+        Callback.new(self, method_name, **opts)
+      end
+    end
+
+    module Interface
+      attr_reader :receiver, :method_name, :prevent_default, :take_form_values
+    end
+
+    include Interface
+
+    def initialize(receiver, method_name, prevent_default:, take_form_values:)
+      @receiver, @method_name = receiver, method_name
+      @prevent_default = prevent_default
+      @take_form_values = take_form_values
+    end
+  end
+end

data/lib/quince/component.rb

@@ -1,3 +1,5 @@
+require_relative "callback"
+
 module Quince
   class Component
     class << self
@@ -29,7 +31,7 @@ module Quince
           verb: meth0d,
           route: route,
         ) do |params|
-          instance = Quince::Serialiser.deserialise params[:component]
+          instance = Quince::Serialiser.deserialise(CGI.unescapeHTML(params[:component]))
           Quince::Component.class_variable_set :@@params, params
           if @exposed_actions.member? action
             instance.send action
@@ -47,7 +49,8 @@ module Quince
           id = SecureRandom.alphanumeric 6
           instance.instance_variable_set :@__id, id
           instance.instance_variable_set :@props, initialize_props(self, id, **props)
-          instance.instance_variable_set(:@children, block_children || children)
+          kids = block_children ? block_children.call : children
+          instance.instance_variable_set(:@children, kids)
           instance.send :initialize
         end
       end
@@ -59,6 +62,8 @@ module Quince
       end
     end
 
+    include Callback::ComponentHelpers
+
     # set default
     @@params = {}
 
@@ -82,7 +87,7 @@ module Quince
 
     attr_reader :__id
 
-    HTML_SELECTOR_ATTR = :"data-respid"
+    HTML_SELECTOR_ATTR = :"data-quid"
 
     def html_element_selector
       "[#{HTML_SELECTOR_ATTR}='#{__id}']".freeze

data/lib/quince/html_tag_components.rb

@@ -33,26 +33,22 @@ module Quince
           attrib = case value
             when String, Integer, Float, Symbol
               value.to_s
-            when Method
-              owner = value.owner
+            when Callback::Interface
               receiver = value.receiver
-              name = value.name
+              owner = receiver.class.name
+              name = value.method_name
               selector = receiver.send :html_element_selector
               internal = Quince::Serialiser.serialise receiver
-              payload = { component: internal }.to_json
-              case key
-              when :onclick
-                CGI.escape_html(
-                  "callRemoteEndpoint(`/api/#{owner}/#{name}`,`#{payload}`,`#{selector}`)"
-                )
-              when :onsubmit, :onchange, :onblur, :onsearch, :onkeyup, :onselect
-                ev = "const p = #{payload}; callRemoteEndpoint( `/api/#{owner}/#{name}`, JSON.stringify({...p, params: getFormValues(this)}), `#{selector}`)"
-                case key
-                when :onsubmit
-                  ev += "; return false"
+              payload = { component: CGI.escapeHTML(internal) }.to_json
+              payload_var_name = "p"
+              stringify_payload = if value.take_form_values
+                  "{...#{payload_var_name}, params: getFormValues(this)}"
+                else
+                  payload_var_name
                 end
-                CGI.escape_html(ev)
-              end
+              cb = %Q{const #{payload_var_name} = #{payload}; callRemoteEndpoint(`/api/#{owner}/#{name}`, JSON.stringify(#{stringify_payload}),`#{selector}`)}
+              cb += ";return false" if value.prevent_default
+              CGI.escape_html(cb)
             when true
               return key
             when false, nil, Quince::Types::Undefined

data/lib/quince/serialiser.rb

@@ -2,98 +2,11 @@ module Quince
   class Serialiser
     class << self
       def serialise(obj)
-        val = case obj
-          when Quince::Component
-            {
-              id: serialise(obj.send(:__id)),
-              props: serialise(obj.props),
-              state: serialise(obj.state),
-              children: serialise(obj.children),
-              html_element_selector: serialise(obj.send(:html_element_selector)),
-            }
-          when Array
-            obj.map { |e| serialise e }
-          when TypedStruct, Struct, OpenStruct, Hash
-            result = obj.each_pair.each_with_object({}) do |(k, v), ob|
-              case v
-              when Undefined
-                next
-              else
-                ob[k] = serialise(v)
-              end
-            end
-            if result.empty? && !obj.is_a?(Hash)
-              obj = nil
-              nil
-            else
-              result
-            end
-          when Proc
-            obj = obj.call # is there a more efficient way of doing this?
-            serialise(obj)
-          when String
-            res = obj.gsub "\n", '\n'
-            res.gsub! ?", '\"'
-            res
-          else
-            obj
-          end
-
-        { t: obj.class&.name, v: val }
+        Oj.dump(obj)
       end
 
       def deserialise(json)
-        case json[:t]
-        when "String", "Integer", "Float", "NilClass", "TrueClass", "FalseClass"
-          json[:v]
-        when "Symbol"
-          json[:v].to_sym
-        when "Array"
-          json[:v].map { |e| deserialise e }
-        when "Hash"
-          transform_hash json[:v]
-        when "OpenStruct"
-          OpenStruct.new(**transform_hash(props))
-        when nil
-          nil
-        else
-          klass = Object.const_get(json[:t])
-          if klass < TypedStruct
-            transform_hash_for_struct(json[:v]) || {}
-          elsif klass < Quince::Component
-            instance = klass.allocate
-            val = json[:v]
-            id = deserialise val[:id]
-
-            instance.instance_variable_set :@__id, id
-            instance.instance_variable_set(
-              :@props,
-              klass.send(
-                :initialize_props,
-                klass,
-                id,
-                **(deserialise(val[:props]) || {}),
-              ),
-            )
-            st = deserialise(val[:state])
-            instance.instance_variable_set :@state, klass::State.new(**st) if st
-            instance.instance_variable_set :@children, deserialise(val[:children])
-            instance
-          else
-            klass = Object.const_get(json[:t])
-            klass.new(deserialise(json[:v]))
-          end
-        end
-      end
-
-      private
-
-      def transform_hash(hsh)
-        hsh.transform_values! { |v| deserialise v }
-      end
-
-      def transform_hash_for_struct(hsh)
-        hsh.to_h { |k, v| [k.to_sym, deserialise(v)] }
+        Oj.load(json)
       end
     end
   end

data/lib/quince/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quince
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quince
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Joseph Johansen
@@ -57,6 +57,7 @@ files:
 - bin/setup
 - lib/quince.rb
 - lib/quince/attributes_by_element.rb
+- lib/quince/callback.rb
 - lib/quince/component.rb
 - lib/quince/html_tag_components.rb
 - lib/quince/serialiser.rb