glimmer-dsl-web 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6147bc2c609c3b5d7871c0d7f16b84f57c5b10c83c22a8ab63fb7e7120a69e65
-  data.tar.gz: e469cc54afb68870470d1bb5ab4a265000d87901873119e01c68f7586ebd883e
+  metadata.gz: fda2e015b57a53d9281d9f04b7c222d8d42bf61bb33d670cb6ddb8cb0893d2c5
+  data.tar.gz: 327db5ff9687b0fb8f5ed96533c9c86dc71ca20876b8db39e28d7b156aed280b
 SHA512:
-  metadata.gz: dadb81d22299adef771b31cc9152881a61f2cde0a93bd4a46223669d688fd78bae4fe33311875baa2cf6ee30f6f53d534ba2d4af2b5d57a49e3e902b00605dad
-  data.tar.gz: a3426ea5baa49c13d0091bd1e3410f43ac168b1c3f04dbff5b7c7eb4c584b61bf9463b9ad59e89d3e7827abc6a48ad5c468219762a9b58332b46c8980a74397d
+  metadata.gz: 7b36ba84170c0a90ac89a28218275fa4da16b21972bb298cd59b675fb41670c367aec3524f8582a7181d91f2a723ea36f7d7e6b8e2a1d4e2733b634b7e8e808f
+  data.tar.gz: 4d88b75d775ca693fe50602f7d6b9fd136188f1d88d8d13dee8d7e281c9218a1fc81540e662b1428ff67ac1ee124a015919aec31b2853eb49378ff022003c225

data/CHANGELOG.md

@@ -1,8 +1,23 @@
 # Change Log
 
+## 0.3.2
+
+- Optimize performance (~248% faster) of rendering by changing DSL ordering to avoid component checks at the top
+- Optimize performance of formatting html elements by adding Glimmer DSL shortcut methods
+- Optimize performance of component expressions by indexing component keywords
+
+## 0.3.1
+
+- Optimize Todo MVC performance for filtering between all, active, and completed (it happens instantly now)
+- Append Todo MVC todos at the bottom instead of prepending them at the top (I copied the ES6 version initially which did things the opposite way from how Todo MVC behaves normally in other versions)
+- Make Todo MVC "items left" text show "item left" if there is only 1 todo (I missed this detail before)
+- Make Todo MVC footer links open a new tab/window (with `target: '_blank'` option)
+- Refactor/Simplify Todo MVC sample code
+- Upgrade to glimmer 2.7.8
+
 ## 0.3.0
 
-- Optimize performance (~170%-226% faster) by building GUI with a bulk_render call that assembles html as a string from all nested elements and mounts all HTML at once (instead of making many small DOM mount calls). The trade-off is not being able to interact with elements until rendering of the complete hierarchy is complete, which is acceptable because interactions do not happen till after everything is rendered anyways. Can be disabled by passing `bulk_render: false` option to the top-level element of a frontend app.
+- Optimize performance (~170%-226% faster) of rendering by building GUI in bulk, assembling html as a string from all nested elements and mounting all HTML at once (instead of making many small DOM mount calls). The trade-off is not being able to interact with elements until rendering of the complete hierarchy is complete, which is acceptable because interactions do not happen till after everything is rendered anyways. Can be disabled by passing the `bulk_render: false` option to the top-level component/element of a frontend app.
 - Fix issue with not being able to add content to a custom control by opening a block that should add content inside its markup root element
 
 ## 0.2.8

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Web 0.3.0 (Beta)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Web 0.3.2 (Beta)
 ## Ruby in the Browser Web Frontend Framework
 ### Finally, Ruby Developer Productivity, Happiness, and Fun in the Frontend!!!
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-web.svg)](http://badge.fury.io/rb/glimmer-dsl-web)
@@ -1154,6 +1154,10 @@ Screenshot:
 
 [Todo MVC Ruby Edition Is the One Todo MVC To Rule Them All!!!](https://andymaleh.blogspot.com/2024/06/todo-mvc-in-ruby-is-one-todo-mvc-to.html)
 
+[lib/glimmer-dsl-web/samples/regular/todo_mvc.rb](/lib/glimmer-dsl-web/samples/regular/todo_mvc.rb)
+
+[lib/glimmer-dsl-web/samples/regular/todo_mvc](/lib/glimmer-dsl-web/samples/regular/todo_mvc)
+
 ```ruby
 require 'glimmer-dsl-web'
 
@@ -1329,7 +1333,7 @@ rails new glimmer_app_server
 Add the following to `Gemfile`:
 
 ```
-gem 'glimmer-dsl-web', '~> 0.3.0'
+gem 'glimmer-dsl-web', '~> 0.3.2'
 ```
 
 Run:
@@ -1521,6 +1525,8 @@ module ApplicationHelper
 end
 ```
 
+By default, elements are rendered in bulk for faster performance, meaning you cannot interact with element objects until rendering is done. This is a sensible default because most of the time, there is no need to interact with elements until the full frontend application is fully rendered. That said, if it is preferred every once in a while to render elements piecemeal instead of in bulk, this behavior can be adjusted by passing the option `bulk_render: false` to the top-level component or top-level element (if there is no component).
+
 Note that Turbo is disabled on Glimmer elements/components. You can still use Turbo/Hotwire side by side with Glimmer DSL for Web by using one of the two technologies in every page. But, mixing them in the same pages is not recommended at the moment, so any pages loaded with Glimmer DSL for Web must be loaded without Turbo (e.g. by putting "data-turbo"="false" on anchor "a" tag links to Glimmer pages).
 
 If you run into any issues in setup, refer to the [Sample Glimmer DSL for Web Rails 7 App](https://github.com/AndyObtiva/sample-glimmer-dsl-web-rails7-app) project (in case I forgot to include some setup steps by mistake).
@@ -1556,7 +1562,7 @@ Disable the `webpacker` gem line in `Gemfile`:
 Add the following to `Gemfile`:
 
 ```ruby
-gem 'glimmer-dsl-web', '~> 0.3.0'
+gem 'glimmer-dsl-web', '~> 0.3.2'
 ```
 
 Run:
@@ -3262,6 +3268,8 @@ Screenshot:
 
 [lib/glimmer-dsl-web/samples/regular/todo_mvc.rb](/lib/glimmer-dsl-web/samples/regular/todo_mvc.rb)
 
+[lib/glimmer-dsl-web/samples/regular/todo_mvc](/lib/glimmer-dsl-web/samples/regular/todo_mvc)
+
 ```ruby
 require 'glimmer-dsl-web'
 
@@ -3354,10 +3362,6 @@ end
 
 ![Todo MVC](/images/glimmer-dsl-web-samples-regular-todo-mvc.gif)
 
-The rest of the files are found at:
-
-[lib/glimmer-dsl-web/samples/regular/todo_mvc](/lib/glimmer-dsl-web/samples/regular/todo_mvc)
-
 ## Design Principles
 
 - The Ruby Way (including TIMTOWTDI: There Is More Than One Way To Do It)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

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.3.0 ruby lib
+# stub: glimmer-dsl-web 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-web".freeze
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   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-06-25"
+  s.date = "2024-07-02"
   s.description = "Glimmer DSL for Web (Ruby in the Browser Web Frontend Framework) enables building Web Frontends using Ruby in the Browser, as per Matz's recommendation in his RubyConf 2022 keynote speech to replace JavaScript with Ruby. It aims at providing the simplest, most intuitive, most straight-forward, and most productive frontend framework in existence. The framework follows the Ruby way (with DSLs and TIMTOWTDI) and the Rails way (Convention over Configuration) in building Isomorphic Ruby on Rails Applications. It provides a Ruby HTML DSL, which uniquely enables writing both structure code and logic code in one language. It supports both Unidirectional (One-Way) Data-Binding (using <=) and Bidirectional (Two-Way) Data-Binding (using <=>). Dynamic rendering (and re-rendering) of HTML content is also supported via Content Data-Binding. Modular design is supported with Glimmer Web Components. And, a Ruby CSS DSL is supported with the included Glimmer DSL for CSS. Many samples are demonstrated in the Rails sample app (there is a very minimal Standalone [No Rails] sample app too). You can finally live in pure Rubyland on the Web in both the frontend and backend with Glimmer DSL for Web! This gem relies on Opal Ruby.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -93,7 +93,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 2.7.6"])
+  s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 2.7.9"])
   s.add_runtime_dependency(%q<glimmer-dsl-xml>.freeze, ["~> 1.4.0"])
   s.add_runtime_dependency(%q<glimmer-dsl-css>.freeze, ["~> 1.4.0"])
   s.add_runtime_dependency(%q<opal>.freeze, ["= 1.8.2"])
@@ -101,7 +101,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<opal-async>.freeze, ["~> 1.4.1"])
   s.add_runtime_dependency(%q<opal-jquery>.freeze, ["~> 0.5.1"])
   s.add_runtime_dependency(%q<to_collection>.freeze, [">= 2.0.1", "< 3.0.0"])
-  s.add_development_dependency(%q<puts_debuggerer>.freeze, [">= 1.0.0"])
+  s.add_development_dependency(%q<puts_debuggerer>.freeze, [">= 1.0.1"])
   s.add_development_dependency(%q<rake>.freeze, [">= 10.1.0", "< 14.0.0"])
   s.add_development_dependency(%q<rake-tui>.freeze, [">= 0"])
   s.add_development_dependency(%q<jeweler>.freeze, [">= 2.3.9", "< 3.0.0"])

data/lib/glimmer/data_binding/element_binding.rb

@@ -4,7 +4,6 @@ require 'glimmer/data_binding/observer'
 module Glimmer
   module DataBinding
     class ElementBinding
-      include Glimmer
       include Observable
       include Observer
 
@@ -12,7 +11,7 @@ module Glimmer
       def initialize(element, property, translator = nil)
         @element = element
         @property = property
-        @translator = translator || proc {|value| value}
+        @translator = translator
 
         # TODO implement automatic cleanup upon calling element.remove
         # Alternatively, have this be built into ElementProxy and remove this code
@@ -24,8 +23,9 @@ module Glimmer
       end
       
       def call(value)
-        converted_value = translated_value = @translator.call(value, evaluate_property)
-        @element.send("#{@property}=", converted_value) unless evaluate_property == converted_value
+        evaluated_property_value = evaluate_property
+        converted_value = @translator&.call(value, evaluated_property_value) || value
+        @element.send("#{@property}=", converted_value) unless converted_value == evaluated_property_value
       end
       
       def evaluate_property

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

@@ -8,7 +8,7 @@ module Glimmer
         include ParentExpression
 
         def can_interpret?(parent, keyword, *args, &block)
-          !!Glimmer::Web::Component.for(keyword)
+          Glimmer::Web::Component.for(keyword)
         end
   
         def interpret(parent, keyword, *args, &block)

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

@@ -40,14 +40,14 @@ module Glimmer
       Engine.add_dynamic_expressions(
        Web,
        %w[
-         component
          listener
-         data_binding
-         property
-         content_data_binding
-         shine_data_binding
          style
+         content_data_binding
+         component
          formatting_element
+         data_binding
+         shine_data_binding
+         property
        ]
       )
     end

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

@@ -17,3 +17,14 @@ module Glimmer
     end
   end
 end
+
+module Glimmer
+  # Optimize performance through shortcut methods for all HTML formatting elements that circumvent the DSL chain of responsibility
+  element_expression = Glimmer::DSL::Web::FormattingElementExpression.new
+  Glimmer::Web::FormattingElementProxy::FORMATTING_ELEMENT_KEYWORDS.each do |keyword|
+    Glimmer::DSL::Engine.static_expressions[keyword] ||= Concurrent::Hash.new
+    element_expression_dsl = element_expression.class.dsl
+    Glimmer::DSL::Engine.static_expressions[keyword][element_expression_dsl] = element_expression
+    Glimmer.send(:define_method, keyword, &Glimmer::DSL::Engine::STATIC_EXPRESSION_METHOD_FACTORY.call(keyword))
+  end
+end

data/lib/glimmer/web/component.rb

@@ -119,71 +119,54 @@ module Glimmer
         end
       end
       
+      ADD_COMPONENT_KEYWORDS_UPON_INHERITANCE = proc do
+        class << self
+          def inherited(subclass)
+            Glimmer::Web::Component.add_component_keyword_to_classes_map_for(subclass)
+            subclass.class_eval(&Glimmer::Web::Component::ADD_COMPONENT_KEYWORDS_UPON_INHERITANCE)
+          end
+        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)
+            Glimmer::Web::Component.add_component_keyword_to_classes_map_for(klass)
+            klass.class_eval(&Glimmer::Web::Component::ADD_COMPONENT_KEYWORDS_UPON_INHERITANCE)
           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
+          component_classes = Glimmer::Web::Component.component_keyword_to_classes_map[underscored_component_name]
+          if component_classes.nil? || component_classes.empty?
+            Glimmer::Config.logger.debug {"#{underscored_component_name} has no Glimmer web component class!" }
+            nil
+          else
+            component_class = component_classes.first
           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
+        def add_component_keyword_to_classes_map_for(component_class)
+          keywords_for_class(component_class).each do |keyword|
+            Glimmer::Web::Component.component_keyword_to_classes_map[keyword] ||= []
+            Glimmer::Web::Component.component_keyword_to_classes_map[keyword] << component_class
           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
+        def keywords_for_class(component_class)
+          namespaces = component_class.to_s.split(/::/).map(&:underscore).reverse
+          namespaces.size.times.map { |n| namespaces[0..n].reverse.join('__') }
         end
 
-        def component_namespaces
-          @component_namespaces ||= reset_component_namespaces
+        def component_keyword_to_classes_map
+          @component_keyword_to_classes_map ||= reset_component_keyword_to_classes_map
         end
 
-        def reset_component_namespaces
-          @component_namespaces = Set[Object, Glimmer::Web]
+        def reset_component_keyword_to_classes_map
+          @component_keyword_to_classes_map = {}
         end
         
         def interpretation_stack
@@ -316,6 +299,18 @@ module Glimmer
         @markup_root&.render(parent: parent, custom_parent_dom_element: custom_parent_dom_element, brand_new: brand_new)
       end
       
+      def remove
+        @markup_root&.remove
+      end
+
+      def data_bind(property, model_binding)
+        @markup_root&.data_bind(property, model_binding)
+      end
+      
+      def bind_content(*binding_args, &content_block)
+        @markup_root&.bind_content(*binding_args, &content_block)
+      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(*args, &block)

data/lib/glimmer/web/element_proxy.rb

@@ -539,12 +539,12 @@ module Glimmer
       end
       
       def data_bind(property, model_binding)
-        element_binding_translator = value_converters_for_input_type(type)[:model_to_view]
-        element_binding_parameters = [self, property, element_binding_translator]
+        element_binding_read_translator = value_converters_for_input_type(type)&.[](:model_to_view)
+        element_binding_parameters = [self, property, element_binding_read_translator]
         element_binding = DataBinding::ElementBinding.new(*element_binding_parameters)
-        element_binding.call(model_binding.evaluate_property)
         #TODO make this options observer dependent and all similar observers in element specific data binding handlers
         element_binding.observe(model_binding)
+        element_binding.call(model_binding.evaluate_property)
         data_bindings[element_binding] = model_binding
         unless model_binding.binding_options[:read_only]
           # TODO add guards against nil cases for hash below
@@ -552,7 +552,8 @@ module Glimmer
           if listener_keyword
             data_binding_read_listener = lambda do |event|
               view_property_value = send(property)
-              converted_view_property_value = value_converters_for_input_type(type)[:view_to_model].call(view_property_value, model_binding.evaluate_property)
+              element_binding_write_translator = value_converters_for_input_type(type)&.[](:view_to_model)
+              converted_view_property_value = element_binding_write_translator&.call(view_property_value, model_binding.evaluate_property) || view_property_value
               model_binding.call(converted_view_property_value)
             end
             handle_observation_request(listener_keyword, data_binding_read_listener)
@@ -722,7 +723,7 @@ module Glimmer
       end
       
       def value_converters_for_input_type(input_type)
-        input_value_converters[input_type] || {model_to_view: ->(value, old_value) {value}, view_to_model: ->(value, old_value) {value}}
+        input_value_converters[input_type]
       end
       
       def input_value_converters

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/models/todo.rb

@@ -1,28 +1,9 @@
-Todo = Struct.new(:task, :completed, :editing, keyword_init: true) do
-  class << self
-    attr_writer :all
-    
-    def all
-      @all ||= []
-    end
-    
-    def active
-      all.select(&:active?)
-    end
-    
-    def completed
-      all.select(&:completed?)
-    end
-  end
-  
-  FILTERS = [:all, :active, :completed]
-  
+Todo = Struct.new(:task, :completed, :editing, :deleted, keyword_init: true) do
   alias completed? completed
   alias editing? editing
+  alias deleted? deleted
   
-  def active
-    !completed
-  end
+  def active = !completed
   alias active? active
   
   def start_editing

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/presenters/todo_presenter.rb

@@ -3,53 +3,54 @@ require 'glimmer/data_binding/observer'
 require_relative '../models/todo'
 
 class TodoPresenter
+  FILTERS = [:all, :active, :completed]
   FILTER_ROUTE_REGEXP = /\#\/([^\/]*)$/
   
-  attr_accessor :todos, :can_clear_completed, :active_todo_count
-  attr_reader :new_todo, :filter
+  attr_accessor :can_clear_completed, :active_todo_count, :created_todo
+  attr_reader :todos, :new_todo, :filter
   
   def initialize
-    @todos = Todo.all.clone
+    @todos = []
     @new_todo = Todo.new(task: '')
     @filter = :all
-    refresh_todo_stats
+    @can_clear_completed = false
+    @active_todo_count = 0
+    todo_stat_refresh_observer.observe(todos) # refresh stats if todos array adds/removes todo objects
   end
   
-  def create_todo(todo = nil)
-    todo ||= new_todo.clone
-    Todo.all.prepend(todo)
-    observers_for_todo_stats[todo.object_id] = todo_stat_observer.observe(todo, :completed) unless observers_for_todo_stats.has_key?(todo.object_id)
-    refresh_todos_with_filter
-    refresh_todo_stats
-    new_todo.task = ''
-  end
+  def active_todos = todos.select(&:active?)
+  
+  def completed_todos = todos.select(&:completed?)
   
-  def refresh_todos_with_filter
-    self.todos = Todo.send(filter).clone
+  def create_todo
+    todo = new_todo.clone
+    todos.append(todo)
+    observe_todo_completion_to_update_todo_stats(todo)
+    new_todo.task = ''
+    self.created_todo = todo # notifies View observer indirectly to add created todo to todo list
   end
   
   def filter=(filter)
     return if filter == @filter
     @filter = filter
-    refresh_todos_with_filter
   end
   
   def destroy(todo)
     delete(todo)
-    refresh_todos_with_filter
-    refresh_todo_stats
   end
   
   def clear_completed
-    Todo.completed.each { |todo| delete(todo) }
-    refresh_todos_with_filter
-    refresh_todo_stats
+    refresh_todo_stats do
+      completed_todos.each { |todo| delete(todo) }
+    end
   end
   
   def toggle_all_completed
-    target_completed_value = Todo.active.any?
-    todos_to_update = target_completed_value ? Todo.active : Todo.completed
-    todos_to_update.each { |todo| todo.completed = target_completed_value }
+    target_completed_value = active_todos.any?
+    todos_to_update = target_completed_value ? active_todos : completed_todos
+    refresh_todo_stats do
+      todos_to_update.each { |todo| todo.completed = target_completed_value }
+    end
   end
   
   def setup_filter_routes
@@ -73,30 +74,42 @@ class TodoPresenter
   
   private
   
+  def observe_todo_completion_to_update_todo_stats(todo)
+    # saving observer registration object to deregister when deleting todo
+    observers_for_todo_stats[todo.object_id] = todo_stat_refresh_observer.observe(todo, :completed)
+  end
+  
+  def todo_stat_refresh_observer
+    @todo_stat_refresh_observer ||= Glimmer::DataBinding::Observer.proc { refresh_todo_stats }
+  end
+  
   def delete(todo)
-    Todo.all.delete(todo)
+    todos.delete(todo)
     observer_registration = observers_for_todo_stats.delete(todo.object_id)
     observer_registration&.deregister
+    todo.deleted = true # notifies View observer indirectly to delete todo
   end
   
   def observers_for_todo_stats
     @observers_for_todo_stats = {}
   end
   
-  def todo_stat_observer
-    @todo_stat_observer ||= Glimmer::DataBinding::Observer.proc { refresh_todo_stats }
-  end
-  
-  def refresh_todo_stats
+  def refresh_todo_stats(&work_before_refresh)
+    if work_before_refresh
+      @do_not_refresh_todo_stats = true
+      work_before_refresh.call
+      @do_not_refresh_todo_stats = nil
+    end
+    return if @do_not_refresh_todo_stats
     refresh_can_clear_completed
     refresh_active_todo_count
   end
   
   def refresh_can_clear_completed
-    self.can_clear_completed = Todo.completed.any?
+    self.can_clear_completed = todos.any?(&:completed?)
   end
   
   def refresh_active_todo_count
-    self.active_todo_count = Todo.active.count
+    self.active_todo_count = active_todos.count
   end
 end

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/edit_todo_input.rb

@@ -5,10 +5,10 @@ class EditTodoInput < TodoInput
   option :todo
   
   markup {
-    input(class: todo_input_class) { |edit_input|
+    input(class: self.class.todo_input_class) { |edit_input|
       style <= [ todo, :editing,
                  on_read: ->(editing) { editing ? '' : 'display: none;' },
-                 after_read: ->(_) { edit_input.focus if todo.editing? }
+                 after_read: -> { edit_input.focus if todo.editing? }
                ]
     
       value <=> [todo, :task]
@@ -25,31 +25,29 @@ class EditTodoInput < TodoInput
       onblur do |event|
         todo.save_editing
       end
-      
-      style {
-        todo_input_styles
-      }
     }
   }
   
-  def todo_input_class
-    'edit-todo'
-  end
-  
-  def todo_input_styles
-    super
-    
-    rule("*:has(> .#{todo_input_class})") {
-      position 'relative'
-    }
+  class << self
+    def todo_input_class
+      'edit-todo'
+    end
     
-    rule(".#{todo_input_class}") {
-      position 'absolute'
-      display 'block'
-      width 'calc(100% - 43px)'
-      padding '12px 16px'
-      margin '0 0 0 43px'
-      top '0'
-    }
+    def todo_input_styles
+      super
+      
+      rule("*:has(> .#{todo_input_class})") {
+        position 'relative'
+      }
+      
+      rule(".#{todo_input_class}") {
+        position 'absolute'
+        display 'block'
+        width 'calc(100% - 43px)'
+        padding '12px 16px'
+        margin '0 0 0 43px'
+        top '0'
+      }
+    end
   end
 end

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/new_todo_input.rb

@@ -4,7 +4,7 @@ class NewTodoInput < TodoInput
   option :presenter
   
   markup {
-    input(class: todo_input_class, placeholder: "What needs to be done?", autofocus: "") {
+    input(class: self.class.todo_input_class, placeholder: "What needs to be done?", autofocus: "") {
       value <=> [presenter.new_todo, :task]
     
       onkeyup do |event|
@@ -12,30 +12,32 @@ class NewTodoInput < TodoInput
       end
     
       style {
-        todo_input_styles
+        self.class.todo_input_styles
       }
     }
   }
   
-  def todo_input_class
-    'new-todo'
-  end
-  
-  def todo_input_styles
-    super
-    
-    rule(".#{todo_input_class}") {
-      padding '16px 16px 16px 60px'
-      height '65px'
-      border 'none'
-      background 'rgba(0, 0, 0, 0.003)'
-      box_shadow 'inset 0 -2px 1px rgba(0,0,0,0.03)'
-    }
+  class << self
+    def todo_input_class
+      'new-todo'
+    end
     
-    rule(".#{todo_input_class}::placeholder") {
-      font_style 'italic'
-      font_weight '400'
-      color 'rgba(0, 0, 0, 0.4)'
-    }
+    def todo_input_styles
+      super
+      
+      rule(".#{todo_input_class}") {
+        padding '16px 16px 16px 60px'
+        height '65px'
+        border 'none'
+        background 'rgba(0, 0, 0, 0.003)'
+        box_shadow 'inset 0 -2px 1px rgba(0,0,0,0.03)'
+      }
+      
+      rule(".#{todo_input_class}::placeholder") {
+        font_style 'italic'
+        font_weight '400'
+        color 'rgba(0, 0, 0, 0.4)'
+      }
+    end
   end
 end

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/todo_filters.rb

@@ -5,7 +5,7 @@ class TodoFilters
   
   markup {
     footer(class: 'todo-filters') {
-      style <= [ Todo, :all,
+      style <= [ presenter, :todos,
                  on_read: ->(todos) { todos.empty? ? 'display: none;' : '' }
                ]
       
@@ -14,12 +14,14 @@ class TodoFilters
           inner_text <= [presenter, :active_todo_count]
         }
         span {
-          " items left"
+          inner_text <= [presenter, :active_todo_count,
+                          on_read: -> (active_todo_count) { " item#{'s' if active_todo_count != 1} left" }
+                        ]
         }
       }
       
       ul(class: 'filters') {
-        Todo::FILTERS.each do |filter|
+        TodoPresenter::FILTERS.each do |filter|
           li {
             a(filter.to_s.capitalize, href: "#/#{filter unless filter == :all}") {
               class_name <= [ presenter, :filter,

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/todo_input.rb

@@ -2,29 +2,31 @@
 class TodoInput
   include Glimmer::Web::Component
   
-  def todo_input_class
-    'todo-input'
-  end
-  
-  def todo_input_styles
-    rule(".#{todo_input_class}") {
-      position 'relative'
-      margin '0'
-      width '100%'
-      font_size '24px'
-      font_family 'inherit'
-      font_weight 'inherit'
-      line_height '1.4em'
-      color 'inherit'
-      padding '6px'
-      border '1px solid #999'
-      box_shadow 'inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2)'
-      box_sizing 'border-box'
-      _webkit_font_smoothing 'antialiased'
-    }
+  class << self
+    def todo_input_class
+      'todo-input'
+    end
     
-    rule(".#{todo_input_class}::selection") {
-      background 'red'
-    }
+    def todo_input_styles
+      rule(".#{todo_input_class}") {
+        position 'relative'
+        margin '0'
+        width '100%'
+        font_size '24px'
+        font_family 'inherit'
+        font_weight 'inherit'
+        line_height '1.4em'
+        color 'inherit'
+        padding '6px'
+        border '1px solid #999'
+        box_shadow 'inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2)'
+        box_sizing 'border-box'
+        _webkit_font_smoothing 'antialiased'
+      }
+      
+      rule(".#{todo_input_class}::selection") {
+        background 'red'
+      }
+    end
   end
 end

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/todo_list.rb

@@ -5,9 +5,17 @@ class TodoList
   
   option :presenter
   
+  after_render do
+    observe(presenter, :created_todo) do |todo|
+      @todo_ul.content { # re-open todo ul content to add created todo
+        todo_list_item(presenter:, todo:)
+      }
+    end
+  end
+  
   markup {
     main(class: 'main') {
-      style <= [ Todo, :all,
+      style <= [ presenter, :todos,
                  on_read: ->(todos) { todos.empty? ? 'display: none;' : '' }
                ]
       
@@ -21,12 +29,14 @@ class TodoList
         }
       }
       
-      ul(class: 'todo-list') {
-        content(presenter, :todos) {
-          presenter.todos.each do |todo|
-            todo_list_item(presenter:, todo:)
-          end
-        }
+      @todo_ul = ul {
+        class_name <= [presenter, :filter,
+                        on_read: ->(filter) { "todo-list #{filter}" }
+                      ]
+      
+        presenter.todos.each do |todo|
+          todo_list_item(presenter:, todo:)
+        end
       }
       
       style {
@@ -36,6 +46,8 @@ class TodoList
   }
   
   def todo_list_styles
+    TodoListItem.todo_list_item_styles
+    
     rule('.main') {
       border_top '1px solid #e6e6e6'
       position 'relative'
@@ -84,5 +96,13 @@ class TodoList
       margin '0'
       padding '0'
     }
+    
+    rule('.todo-list.active li.completed') {
+      display 'none'
+    }
+    
+    rule('.todo-list.completed li.active') {
+      display 'none'
+    }
   end
 end

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/todo_list_item.rb

@@ -6,20 +6,25 @@ class TodoListItem
   option :presenter
   option :todo
   
+  after_render do
+    # after rendering markup, observe todo deleted attribute and remove component when deleted
+    observe(todo, :deleted) do |deleted|
+      self.remove if deleted
+    end
+  end
+  
   markup {
     li {
       class_name <= [ todo, :completed,
-                      on_read: -> (completed) { li_class_name(todo) }
+                      on_read: -> { li_class_name(todo) }
                     ]
       class_name <= [ todo, :editing,
-                      on_read: -> (editing) { li_class_name(todo) }
+                      on_read: -> { li_class_name(todo) }
                     ]
       
       div(class: 'view') {
         input(class: 'toggle', type: 'checkbox') {
-          checked <=> [ todo, :completed,
-                        after_write: -> (_) { presenter.refresh_todos_with_filter if presenter.filter != :all }
-                      ]
+          checked <=> [todo, :completed]
         }
         
         label {
@@ -38,23 +43,20 @@ class TodoListItem
       }
       
       edit_todo_input(presenter:, todo:)
-      
-      if todo == presenter.todos.first
-        style {
-          todo_list_item_styles
-        }
-      end
     }
   }
   
   def li_class_name(todo)
     classes = []
     classes << 'completed' if todo.completed?
+    classes << 'active' if !todo.completed?
     classes << 'editing' if todo.editing?
     classes.join(' ')
   end
   
-  def todo_list_item_styles
+  def self.todo_list_item_styles
+    EditTodoInput.todo_input_styles
+    
     rule('.todo-list li.completed label') {
       color '#949494'
       text_decoration 'line-through'

data/lib/glimmer-dsl-web/samples/regular/todo_mvc/views/todo_mvc_footer.rb

@@ -7,10 +7,10 @@ class TodoMvcFooter
         "Double-click to edit a todo"
       }
       p {
-        "Created by #{a('Andy Maleh', href: 'https://github.com/AndyObtiva')}"
+        "Created by #{a('Andy Maleh', href: 'https://github.com/AndyObtiva', target: '_blank')}"
       }
       p {
-        "Part of #{a('TodoMVC', href: 'http://todomvc.com')}"
+        "Part of #{a('TodoMVC', href: 'http://todomvc.com', target: '_blank')}"
       }
       
       style {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-web
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.6
+        version: 2.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.6
+        version: 2.7.9
 - !ruby/object:Gem::Dependency
   name: glimmer-dsl-xml
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement