glimmer-dsl-web 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64fc435ce1a727a890882f43c0851f932f699a610fbfea88041e0606f1fac8b7
-  data.tar.gz: da253a9bccb769f519c20f53810410360cd45034722fbe5083f2847c8e5f3080
+  metadata.gz: bb3e190dffb57fefc4c23410228b80e5de34131933904fab857e5d29707449de
+  data.tar.gz: 179affcfe00cb768f8d73058f91ff2a14091b9a26632122825bb1a4ad40ea660
 SHA512:
-  metadata.gz: f67ac1fc2adadfd190106296d70fec7aa267368a7d33660836dde5198f9e4ad05942674707758ae10293c9c2213ad7031fd0f9ab9fc8a0ca75dd7cb8f1a75fa4
-  data.tar.gz: aa2115656cc49ec3eafe7f2717051dd6fda8bec038906fcbc574d25265a094231b7409ecd2c49ada131515365729f2bf6fc0331bc5cbe68e07b69cb35967307c
+  metadata.gz: aeeab5675891c33b5024c3f815827efa4e06c605d116e673cb97631940a5a2e55d3cd014d07744c4e8c82510f8c593a9fbcd7e56871348cfb646d27f3136164f
+  data.tar.gz: fedc6227c24dfa601a51bee7de2b2f3f40ce022ec85894f6fdc732bb433aa0c1d3621def13671173d411f9b141121add014c60b5691f42f2e0a1a253aac5dd06

data/CHANGELOG.md

@@ -1,8 +1,15 @@
 # Change Log
 
+## 0.10.5
+
+- Support `parent.before {}` & `parent.after {}` on `ElementProxy` and `Glimmer::Web::Component`, to insert elements before or after the parent element.
+- Fixed issue with how `insert_at` was mistakenly adding a newly inserted element to the parent's parent's children
+- Update Hello, Mutation! sample with "Insert before" and "Insert after" functionality
+- Update Hello, Mutation Content Data-Binding! sample with "Insert before" and "Insert after" functionality
+
 ## 0.10.4
 
-- Support `parent.insert_at(index) {}` on `ElementProxy` and `Glimmer::Web::Component`, which is a method that inserts elements to the content of a parent element at a specified index
+- Support `parent.insert_at(index) {}` on `ElementProxy` and `Glimmer::Web::Component`, which is a method that inserts elements to the content of a parent element at a specified index.
 - Support `parent.insert(index) {}` alias for `parent.insert_at(index) {}`
 - Update Hello, Mutation! sample with "Insert list item" functionality
 - Update Hello, Mutation Content Data-Binding! sample with "Insert list item" functionality

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.10.4 (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.10.5 (Beta)
 ## Ruby-in-the-Browser Web Frontend Framework
 ### The "Rails" of Frontend Frameworks!!! ([Fukuoka Award Winning](https://andymaleh.blogspot.com/2025/01/glimmer-dsl-for-web-wins-in-fukuoka.html))
 #### Finally, Ruby Developer Productivity, Happiness, and Fun in the Frontend!!!

data/VERSION

@@ -1 +1 @@
-0.10.4
+0.10.5

data/glimmer-dsl-web.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-web 0.10.4 ruby lib
+# stub: glimmer-dsl-web 0.10.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-web".freeze
-  s.version = "0.10.4".freeze
+  s.version = "0.10.5".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/glimmer/web/component.rb

@@ -521,6 +521,14 @@ module Glimmer
       end
       alias insert insert_at
       
+      def before(bulk_render: false, &block)
+        @markup_root.before(bulk_render:, &block)
+      end
+      
+      def after(bulk_render: false, &block)
+        @markup_root.after(bulk_render:, &block)
+      end
+      
       def remove_all_listeners
         data_bindings.each do |option_binding, model_binding|
           option_binding.unregister_all_observables

data/lib/glimmer/web/element_proxy.rb

@@ -224,11 +224,11 @@ module Glimmer
       
       # Executes for the parent of a child that just got added
       def post_initialize_child(child)
-        case parent&.add_child_mutation
+        case self.add_child_mutation # TODO this is where the problem is.. It's an append instead of an insert_at
         when :prepend
           @children.prepend(child)
         when :insert_at
-          @children.insert(parent&.insert_index, child)
+          @children.insert(self.insert_index, child)
         else # append
           @children << child
         end
@@ -602,6 +602,18 @@ module Glimmer
       end
       alias insert insert_at
       
+      def before(bulk_render: false, &block)
+        return if parent.nil?
+        parent_insert_index = parent.children.index(self)
+        parent.content(bulk_render:, add_child_mutation: :insert_at, insert_index: parent_insert_index, &block)
+      end
+      
+      def after(bulk_render: false, &block)
+        return if parent.nil?
+        parent_insert_index = parent.children.index(self) + 1
+        parent.content(bulk_render:, add_child_mutation: :insert_at, insert_index: parent_insert_index, &block)
+      end
+      
       # Subclasses must override with their own mappings
       def observation_request_to_event_mapping
         {}

data/lib/glimmer-dsl-web/samples/hello/hello_mutation.rb

@@ -4,8 +4,12 @@ unless Object.const_defined?(:HelloMutation) # this is only needed in sample sel
   class HelloMutation
     include Glimmer::Web::Component
     
+    before_render do
+      @action_buttons = []
+    end
+    
     after_render do
-      @append_button.disabled = @prepend_button.disabled = @insert_button.disabled = true
+      toggle_action_buttons_disabled(true)
     end
     
     markup {
@@ -20,44 +24,38 @@ unless Object.const_defined?(:HelloMutation) # this is only needed in sample sel
           @input = input(placeholder: 'Enter list item content') {
             oninput do
               if @input.value.to_s.strip == ''
-                @append_button.disabled = @prepend_button.disabled = @insert_button.disabled = true
+                toggle_action_buttons_disabled(true)
               else
-                @append_button.disabled = @prepend_button.disabled = @insert_button.disabled = false
+                toggle_action_buttons_disabled(false)
               end
             end
           }
           
-          @append_button = button('Append list item') {
+          @action_buttons << button('Append list item') {
             onclick do
               @list.append {
-                li { @input.value }
+                new_li
               }
-              @append_button.disabled = @prepend_button.disabled = @insert_button.disabled = true
-              @input.value = ''
-              @input.focus
+              reset_input_and_button_enablement
             end
           }
           
-          @prepend_button = button('Prepend list item') {
+          @action_buttons << button('Prepend list item') {
             onclick do
               @list.prepend {
-                li { @input.value }
+                new_li
               }
-              @append_button.disabled = @prepend_button.disabled = @insert_button.disabled = true
-              @input.value = ''
-              @input.focus
+              reset_input_and_button_enablement
             end
           }
           
-          @insert_button = button('Insert list item') {
+          @action_buttons << button('Insert list item') {
             onclick do
               index = [@insert_index_input.value.to_i, @list.children.size].min
               @list.insert_at(index) {
-                li { @input.value }
+                new_li
               }
-              @append_button.disabled = @prepend_button.disabled = @insert_button.disabled = true
-              @input.value = ''
-              @input.focus
+              reset_input_and_button_enablement
             end
           }
           
@@ -86,8 +84,55 @@ unless Object.const_defined?(:HelloMutation) # this is only needed in sample sel
       r('.actions label[for=insert-index-input]') {
         margin_left -5
       }
+      
+      r('ul li') {
+        height 22.5
+      }
+      
+      r('ul li button') {
+        display :none
+        margin_left 5
+      }
+      
+      r('ul li:hover button') {
+        display :initial
+      }
     }
   end
+  
+  private
+  
+  def new_li
+    li { |current_li|
+      span { @input.value }
+      @action_buttons << button('Insert before') {
+        onclick do
+          current_li.before {
+            new_li
+          }
+          reset_input_and_button_enablement
+        end
+      }
+      @action_buttons << button('Insert after') {
+        onclick do
+          current_li.after {
+            new_li
+          }
+          reset_input_and_button_enablement
+        end
+      }
+    }
+  end
+  
+  def reset_input_and_button_enablement
+    toggle_action_buttons_disabled(true)
+    @input.value = ''
+    @input.focus
+  end
+  
+  def toggle_action_buttons_disabled(disabled)
+    @action_buttons.each { |action_button| action_button.disabled = disabled }
+  end
 end
 
 Document.ready? do

data/lib/glimmer-dsl-web/samples/hello/hello_mutation_content_data_binding.rb

@@ -96,8 +96,26 @@ unless Object.const_defined?(:HelloMutationContentDataBinding) # this is only ne
         
         ul {
           content(@list_presenter, :list) {
-            @list_presenter.list.each do |list_item|
-              li { list_item }
+            @list_presenter.list.each_with_index do |list_item, index|
+              li { |current_li|
+                span { list_item }
+                button('Insert before') {
+                  disabled <= [@list_presenter, :edit_list_disabled?, computed_by: :new_list_item]
+                  
+                  onclick do
+                    @list_presenter.insert_index = index
+                    @list_presenter.insert_list_item
+                  end
+                }
+                button('Insert after') {
+                  disabled <= [@list_presenter, :edit_list_disabled?, computed_by: :new_list_item]
+                  
+                  onclick do
+                    @list_presenter.insert_index = index + 1
+                    @list_presenter.insert_list_item
+                  end
+                }
+              }
             end
           }
         }
@@ -116,6 +134,19 @@ unless Object.const_defined?(:HelloMutationContentDataBinding) # this is only ne
       r('.actions label[for=insert-index-input]') {
         margin_left -5
       }
+      
+      r('ul li') {
+        height 22.5
+      }
+      
+      r('ul li button') {
+        display :none
+        margin_left 5
+      }
+      
+      r('ul li:hover button') {
+        display :initial
+      }
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-web
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Andy Maleh