glimmer-dsl-web 0.0.8 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.10

data/glimmer-dsl-web.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-web 0.0.8 ruby lib
+# stub: glimmer-dsl-web 0.0.10 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-web".freeze
-  s.version = "0.0.8".freeze
+  s.version = "0.0.10".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2024-01-03"
+  s.date = "2024-01-05"
   s.description = "Glimmer DSL for Web (Ruby in the Browser Web GUI Frontend Library) - Enables frontend GUI development with Ruby by adopting a DSL that follows web-like HTML syntax, enabling the transfer of HTML/CSS/JS skills to Ruby frontend development. This library relies on Opal Ruby.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -31,15 +31,18 @@ Gem::Specification.new do |s|
     "lib/glimmer-dsl-web/ext/date.rb",
     "lib/glimmer-dsl-web/ext/exception.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_button.rb",
+    "lib/glimmer-dsl-web/samples/hello/hello_component.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_content_data_binding.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_data_binding.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_form.rb",
+    "lib/glimmer-dsl-web/samples/hello/hello_glimmer_component_helper/address_form.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_input_date_time.rb",
     "lib/glimmer-dsl-web/samples/hello/hello_world.rb",
     "lib/glimmer-dsl-web/vendor/jquery.js",
     "lib/glimmer/config/opal_logger.rb",
     "lib/glimmer/data_binding/element_binding.rb",
     "lib/glimmer/dsl/web/bind_expression.rb",
+    "lib/glimmer/dsl/web/component_expression.rb",
     "lib/glimmer/dsl/web/content_data_binding_expression.rb",
     "lib/glimmer/dsl/web/data_binding_expression.rb",
     "lib/glimmer/dsl/web/dsl.rb",
@@ -50,8 +53,10 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/web/property_expression.rb",
     "lib/glimmer/dsl/web/select_expression.rb",
     "lib/glimmer/dsl/web/shine_data_binding_expression.rb",
+    "lib/glimmer/helpers/glimmer_helper.rb",
     "lib/glimmer/util/proc_tracker.rb",
     "lib/glimmer/web.rb",
+    "lib/glimmer/web/component.rb",
     "lib/glimmer/web/element_proxy.rb",
     "lib/glimmer/web/event_proxy.rb",
     "lib/glimmer/web/listener_proxy.rb"
@@ -66,8 +71,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 2.7.6".freeze])
   s.add_runtime_dependency(%q<glimmer-dsl-xml>.freeze, ["~> 1.3.2".freeze])
   s.add_runtime_dependency(%q<glimmer-dsl-css>.freeze, ["~> 1.2.2".freeze])
-  s.add_runtime_dependency(%q<opal>.freeze, ["= 1.4.1".freeze])
-  s.add_runtime_dependency(%q<opal-rails>.freeze, ["= 2.0.2".freeze])
+  s.add_runtime_dependency(%q<opal>.freeze, ["= 1.8.2".freeze])
+  s.add_runtime_dependency(%q<opal-rails>.freeze, ["= 2.0.3".freeze])
   s.add_runtime_dependency(%q<opal-async>.freeze, ["~> 1.4.0".freeze])
   s.add_runtime_dependency(%q<opal-jquery>.freeze, ["~> 0.4.6".freeze])
   s.add_runtime_dependency(%q<to_collection>.freeze, [">= 2.0.1".freeze, "< 3.0.0".freeze])

data/lib/glimmer/dsl/web/component_expression.rb

@@ -0,0 +1,30 @@
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/web/component'
+
+module Glimmer
+  module DSL
+    module Web
+      class ComponentExpression < Expression
+        include ParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          !!Glimmer::Web::Component.for(keyword)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          custom_widget_class = Glimmer::Web::Component.for(keyword)
+          custom_widget_class.new(parent, args, {}, &block)
+        end
+  
+        def add_content(parent, keyword, *args, &block)
+          # TODO consider avoiding source_location since it does not work in Opal
+          if block.source_location && (block.source_location == parent.content&.__getobj__&.source_location)
+            parent.content.call(parent) unless parent.content.called?
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/web/dsl.rb

@@ -8,6 +8,7 @@ require 'glimmer/dsl/web/bind_expression'
 require 'glimmer/dsl/web/data_binding_expression'
 require 'glimmer/dsl/web/content_data_binding_expression'
 require 'glimmer/dsl/web/shine_data_binding_expression'
+require 'glimmer/dsl/web/component_expression'
 
 module Glimmer
   module DSL
@@ -15,6 +16,7 @@ module Glimmer
       Engine.add_dynamic_expressions(
        Web,
        %w[
+         component
          listener
          data_binding
          property

data/lib/glimmer/helpers/glimmer_helper.rb

@@ -0,0 +1,32 @@
+module GlimmerHelper
+  class << self
+    def next_id_number
+      @next_id_number ||= 0
+      @next_id_number += 1
+    end
+  end
+  
+  def glimmer_component(component_asset_path, *component_args)
+    component_file = component_asset_path.split('/').last
+    component_class_name = component_file.classify
+    next_id_number = GlimmerHelper.next_id_number
+    component_id = "glimmer_component_#{next_id_number}"
+    component_script_container_id = "glimmer_component_script_container_#{next_id_number}"
+    component_args_json = JSON.dump(component_args)
+    opal_script = <<~Opal
+      require 'glimmer-dsl-web'
+      Document.ready? do
+        component_args_json = '#{component_args_json}'
+        component_args = JSON.parse(component_args_json)
+        component_args << {} if !component_args.last.is_a?(Hash)
+        component_args.last[:parent] = "##{component_id}"
+        #{component_class_name}.render(*component_args)
+      end
+    Opal
+    content_tag(:div, id: component_script_container_id, class: ['glimmer_component_script_container', "#{component_file}_script_container"]) do
+      content_tag(:div, '', id: component_id, class: ['glimmer_component', component_file]) +
+      javascript_include_tag(component_asset_path, "data-turbolinks-track": "reload") +
+        content_tag(:script, raw(opal_script), type: 'text/ruby')
+    end
+  end
+end

data/lib/glimmer/web/component.rb

@@ -0,0 +1,319 @@
+# Copyright (c) 2023-2024 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer'
+require 'glimmer/error'
+require 'glimmer/util/proc_tracker'
+require 'glimmer/data_binding/observer'
+require 'glimmer/data_binding/observable_model'
+
+module Glimmer
+  module Web
+    module Component
+      include DataBinding::ObservableModel
+      
+      module ClassMethods
+        include Glimmer
+        
+        # Allows defining convenience option accessors for an array of option names
+        # Example: `options :color1, :color2` defines `#color1` and `#color2`
+        # where they return the instance values `options[:color1]` and `options[:color2]`
+        # respectively.
+        # Can be called multiple times to set more options additively.
+        # When passed no arguments, it returns list of all option names captured so far
+        def options(*new_options)
+          new_options = new_options.compact.map(&:to_s).map(&:to_sym)
+          if new_options.empty?
+            @options ||= {} # maps options to defaults
+          else
+            new_options = new_options.reduce({}) {|new_options_hash, new_option| new_options_hash.merge(new_option => nil)}
+            @options = options.merge(new_options)
+            def_option_attr_accessors(new_options)
+          end
+        end
+
+        def option(new_option, default: nil)
+          new_option = new_option.to_s.to_sym
+          new_options = {new_option => default}
+          '@options = options.merge(new_options)'
+          @options = options.merge(new_options)
+          'def_option_attr_accessors(new_options)'
+          def_option_attr_accessors(new_options)
+        end
+
+        def def_option_attr_accessors(new_options)
+          new_options.each do |option, default|
+            define_method(option) do
+              options[:"#{option}"]
+            end
+            define_method("#{option}=") do |option_value|
+              self.options[:"#{option}"] = option_value
+            end
+          end
+        end
+
+        def before_render(&block)
+          @before_render_blocks ||= []
+          @before_render_blocks << block
+        end
+
+        def markup(&block)
+          @markup_block = block
+        end
+
+        def after_render(&block)
+          @after_render_blocks ||= []
+          @after_render_blocks << block
+        end
+        
+        def keyword
+          self.name.underscore.gsub('::', '__')
+        end
+        
+        # Returns shortcut keyword to use for this component (keyword minus namespace)
+        def shortcut_keyword
+          self.name.underscore.gsub('::', '__').split('__').last
+        end
+        
+        def render(*args)
+          rendered_component = send(keyword, *args)
+          options = args.last.is_a?(Hash) ? args.last.slice(:parent, :custom_parent_dom_element, :brand_new) : {}
+          rendered_component.render(**options)
+          rendered_component
+        end
+      end
+      
+      # This module was only created to prevent Glimmer from checking method_missing first
+      module GlimmerSupersedable
+        def method_missing(method_name, *args, &block)
+          Glimmer::DSL::Engine.interpret(method_name, *args, &block)
+        rescue
+          super(method_name, *args, &block)
+        end
+      end
+      
+      class << self
+        def included(klass)
+          if !klass.ancestors.include?(GlimmerSupersedable)
+            klass.extend(ClassMethods)
+            klass.include(Glimmer)
+            klass.prepend(GlimmerSupersedable)
+            Glimmer::Web::Component.add_component_namespaces_for(klass)
+          end
+        end
+      
+        def for(underscored_component_name)
+          extracted_namespaces = underscored_component_name.
+            to_s.
+            split(/__/).map do |namespace|
+              namespace.camelcase(:upper)
+            end
+          Glimmer::Web::Component.component_namespaces.each do |base|
+            extracted_namespaces.reduce(base) do |result, namespace|
+              if !result.constants.include?(namespace)
+                namespace = result.constants.detect {|c| c.to_s.upcase == namespace.to_s.upcase } || namespace
+              end
+              begin
+                constant = result.const_get(namespace)
+                return constant if constant&.respond_to?(:ancestors) &&
+                                   (
+                                     constant&.ancestors&.to_a.include?(Glimmer::Web::Component) ||
+                                     # TODO checking GlimmerSupersedable as a hack because when a class is loaded twice (like when loading samples
+                                     # by reloading ruby files), it loses its Glimmer::Web::Component ancestor as a bug in Opal
+                                     # but somehow the prepend module remains
+                                     constant&.ancestors&.to_a.include?(GlimmerSupersedable)
+                                   )
+                constant
+              rescue => e
+                # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+                result
+              end
+            end
+          end
+          raise "#{underscored_component_name} has no Glimmer web component class!"
+        rescue => e
+          Glimmer::Config.logger.debug {e.message}
+          Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
+          nil
+        end
+ 
+        def add_component_namespaces_for(klass)
+          Glimmer::Web::Component.namespaces_for_class(klass).drop(1).each do |namespace|
+            Glimmer::Web::Component.component_namespaces << namespace
+          end
+        end
+
+        def namespaces_for_class(m)
+          return [m] if m.name.nil?
+          namespace_constants = m.name.split(/::/).map(&:to_sym)
+          namespace_constants.reduce([Object]) do |output, namespace_constant|
+            output += [output.last.const_get(namespace_constant)]
+          end[1..-1].uniq.reverse
+        end
+
+        def component_namespaces
+          @component_namespaces ||= reset_component_namespaces
+        end
+
+        def reset_component_namespaces
+          @component_namespaces = Set[Object, Glimmer::Web]
+        end
+      end
+      # <- end of class methods
+      
+
+      attr_reader :markup_root, :parent, :args, :options
+      alias parent_proxy parent
+
+      def initialize(parent, args, options, &content)
+        @parent = parent
+        options = args.delete_at(-1) if args.is_a?(Array) && args.last.is_a?(Hash)
+        if args.is_a?(Hash)
+          options = args
+          args = []
+        end
+        options ||= {}
+        @args = args
+        options ||= {}
+        @options = self.class.options.merge(options)
+        @content = Util::ProcTracker.new(content) if content
+        execute_hooks('before_render')
+        markup_block = self.class.instance_variable_get("@markup_block")
+        raise Glimmer::Error, 'Invalid Glimmer web component for having no markup! Please define markup block!' if markup_block.nil?
+        @markup_root = instance_exec(&markup_block)
+        @markup_root.options[:parent] = options[:parent] if options[:parent]
+        @parent ||= @markup_root.parent
+        raise Glimmer::Error, 'Invalid Glimmer web component for having an empty markup! Please fill markup block!' if @markup_root.nil?
+        execute_hooks('after_render')
+      end
+      
+      # Subclasses may override to perform post initialization work on an added child
+      def post_initialize_child(child)
+        # No Op by default
+      end
+
+      def can_handle_observation_request?(observation_request)
+        observation_request = observation_request.to_s
+        result = false
+        if observation_request.start_with?('on_updated_')
+          property = observation_request.sub(/^on_updated_/, '')
+          result = can_add_observer?(property)
+        end
+        result || markup_root&.can_handle_observation_request?(observation_request)
+      end
+
+      def handle_observation_request(observation_request, block)
+        observation_request = observation_request.to_s
+        if observation_request.start_with?('on_updated_')
+          property = observation_request.sub(/^on_updated_/, '') # TODO look into eliminating duplication from above
+          add_observer(DataBinding::Observer.proc(&block), property) if can_add_observer?(property)
+        else
+          markup_root.handle_observation_request(observation_request, block)
+        end
+      end
+
+      def can_add_observer?(attribute_name)
+        has_instance_method?(attribute_name) || has_instance_method?("#{attribute_name}?") || @markup_root.can_add_observer?(attribute_name)
+      end
+
+      def add_observer(observer, attribute_name)
+        if has_instance_method?(attribute_name)
+          super(observer, attribute_name)
+        else
+          @markup_root.add_observer(observer, attribute_name)
+        end
+      end
+
+      def has_attribute?(attribute_name, *args)
+        has_instance_method?(attribute_setter(attribute_name)) ||
+          @markup_root.has_attribute?(attribute_name, *args)
+      end
+
+      def set_attribute(attribute_name, *args)
+        if has_instance_method?(attribute_setter(attribute_name))
+          send(attribute_setter(attribute_name), *args)
+        else
+          @markup_root.set_attribute(attribute_name, *args)
+        end
+      end
+
+      # This method ensures it has an instance method not coming from Glimmer DSL
+      def has_instance_method?(method_name)
+        respond_to?(method_name) and
+          !markup_root&.respond_to?(method_name) and
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') and
+          !method(method_name)&.source_location&.first&.include?('glimmer/web/element_proxy.rb')
+      end
+
+      def get_attribute(attribute_name)
+        if has_instance_method?(attribute_name)
+          send(attribute_name)
+        else
+          @markup_root.get_attribute(attribute_name)
+        end
+      end
+
+      def attribute_setter(attribute_name)
+        "#{attribute_name}="
+      end
+      
+      def render(parent: nil, custom_parent_dom_element: nil, brand_new: false)
+        # this method is defined to prevent displaying a harmless Glimmer no keyword error as an annoying useless warning
+        @markup_root&.render(parent: parent, custom_parent_dom_element: custom_parent_dom_element, brand_new: brand_new)
+      end
+      
+      # Returns content block if used as an attribute reader (no args)
+      # Otherwise, if a block is passed, it adds it as content to this Glimmer web component
+      def content(&block)
+        if block_given?
+          Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::Web::ComponentExpression.new, self.class.keyword, &block)
+        else
+          @content
+        end
+      end
+
+      def method_missing(method_name, *args, &block)
+        if can_handle_observation_request?(method_name)
+          handle_observation_request(method_name, block)
+        elsif markup_root.respond_to?(method_name, true)
+          markup_root.send(method_name, *args, &block)
+        else
+          super(method_name, *args, &block)
+        end
+      end
+
+      alias local_respond_to? respond_to_missing?
+      def respond_to_missing?(method_name, include_private = false)
+        super(method_name, include_private) or
+          can_handle_observation_request?(method_name) or
+          markup_root.respond_to?(method_name, include_private)
+      end
+
+      private
+
+      def execute_hooks(hook_name)
+        self.class.instance_variable_get("@#{hook_name}_blocks")&.each do |hook_block|
+          instance_exec(&hook_block)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/web/element_proxy.rb

@@ -1,3 +1,5 @@
+# backtick_javascript: true
+
 # Copyright (c) 2023-2024 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -223,10 +225,17 @@ module Glimmer
         end
       end
       
-      def render(custom_parent_dom_element: nil, brand_new: false)
+      def render(parent: nil, custom_parent_dom_element: nil, brand_new: false)
+        parent_selector = parent
+        options[:parent] = parent_selector if !parent_selector.to_s.empty?
+        if !options[:parent].to_s.empty?
+          # ensure element is orphaned as it is becoming a top-level root element
+          @parent&.post_remove_child(self)
+          @parent = nil
+        end
         the_parent_dom_element = custom_parent_dom_element || parent_dom_element
         old_element = dom_element
-        brand_new = @dom.nil? || old_element.empty? || brand_new
+        brand_new = @dom.nil? || old_element.empty? || !options[:parent].to_s.empty? || brand_new
         build_dom(layout: !custom_parent_dom_element) # TODO handle custom parent layout by passing parent instead of parent dom element
         if brand_new
           # TODO make a method attach to allow subclasses to override if needed
@@ -493,7 +502,7 @@ module Glimmer
       end
       
       def respond_to_missing?(method_name, include_private = false)
-        # TODO consider doing more correct checking of availability of properties/methods using native `` ticks
+        # TODO consider doing more correct checking of availability of properties/methods using native ticks
         property_name = property_name_for(method_name)
         unnormalized_property_name = unnormalized_property_name_for(method_name)
         super(method_name, include_private) ||
@@ -506,7 +515,7 @@ module Glimmer
       end
       
       def method_missing(method_name, *args, &block)
-        # TODO consider doing more correct checking of availability of properties/methods using native `` ticks
+        # TODO consider doing more correct checking of availability of properties/methods using native ticks
         property_name = property_name_for(method_name)
         unnormalized_property_name = unnormalized_property_name_for(method_name)
         if method_name.to_s.start_with?('on_')