glimmer-dsl-web 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cdfd633318946532548053f4ab89f31e423280ae73ba9505b598b0e60695680
-  data.tar.gz: e95ac60a8077a1157abaf6da13cf0f7adab1f3f72fb727bb9cf270ae373cab2e
+  metadata.gz: f636fd9070bcacf8775433ffe589b81f7590710fa9605302b249a3c22be641c7
+  data.tar.gz: 2c40869f1eb9275701eb18c6f9555559b69f26358925845e0000445a143f5bc9
 SHA512:
-  metadata.gz: c77c3cc7a2eabae100de6dd48e5797f8ce28774c4da17e6324bfe61fd8ece5d3e7b811538eabef1989f31de589e2ce64a1bbf122998c963158e844f33ca73987
-  data.tar.gz: a9f1a3ca8a39beae60602248b395621cadf2ae15362be300ff34f2d1d7d9c1464dcdab0614f31838388ae7a3e556abf0437f372642566827bd2ec72ba831934d
+  metadata.gz: 188bcb0445c91ee19342cda641b15e810d80211c1e7c138315d71e83a3be741b5ba98bd0430b2ea5ed743f67c6bafdae15cec2f847d30a83da6f25eb9ad10674
+  data.tar.gz: c41e90e255713b6cd88537c2d34a47b7656c33e9af3c8bbbb70de000da040d26c769f28a16450f27c62aeb2f33cb5e5419412a2baffbc13aa760ed7b513376aa

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.8.0
+
+- Support formatting-paragraph-elements (e.g. 'br', 'strong', 'em') as stand-alone elements (not inside p)
+
 ## 0.7.3
 
 - Hello, Component Attribute Data-Binding! Sample: `require 'glimmer-dsl-web/samples/hello/hello_component_attribute_data_binding.rb'`

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.7.3 (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.8.0 (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!!!
@@ -1418,7 +1418,7 @@ rails new glimmer_app_server
 Add the following to `Gemfile`:
 
 ```
-gem 'glimmer-dsl-web', '~> 0.7.3'
+gem 'glimmer-dsl-web', '~> 0.8.0'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.0

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.7.3 ruby lib
+# stub: glimmer-dsl-web 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-web".freeze
-  s.version = "0.7.3".freeze
+  s.version = "0.8.0".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/dsl/web/formatting_element_expression.rb

@@ -6,12 +6,27 @@ module Glimmer
   module DSL
     module Web
       class FormattingElementExpression < Expression
+        include GeneralElementExpression
+        
         def can_interpret?(parent, keyword, *args, &block)
-          Glimmer::Web::FormattingElementProxy.keyword_supported?(keyword, parent: parent)
+          Glimmer::Web::FormattingElementProxy.keyword_supported?(keyword, parent: parent) ||
+            Glimmer::Web::ElementProxy.keyword_supported?(keyword)
         end
         
         def interpret(parent, keyword, *args, &block)
-          Glimmer::Web::FormattingElementProxy.format(keyword, *args, &block)
+          if Glimmer::Web::FormattingElementProxy.keyword_supported?(keyword, parent: parent)
+            Glimmer::Web::FormattingElementProxy.format(keyword, *args, &block)
+          else
+            super(parent, keyword, *args, &block)
+          end
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          if parent.is_a?(String)
+            parent
+          else
+            super(parent, keyword, *args, &block)
+          end
         end
       end
     end

data/lib/glimmer/web/element_proxy.rb

@@ -28,7 +28,9 @@ module Glimmer
     class ElementProxy
       class << self
         def keyword_supported?(keyword)
-          ELEMENT_KEYWORDS.include?(keyword.to_s)
+          keyword = keyword.to_s
+          ELEMENT_KEYWORDS.include?(keyword) ||
+            FormattingElementProxy::FORMATTING_ELEMENT_KEYWORDS.include?(keyword)
         end
       
         def html_keyword_supported?(keyword)
@@ -39,6 +41,13 @@ module Glimmer
           SVG_ELEMENT_KEYWORDS.include?(keyword.to_s)
         end
       
+        # an HTML element that doesn't need a closing tag
+        # (officially, it's wrong to call it self-closing; it's called void instead)
+        def html_void_keyword?(keyword)
+          HTML_VOID_ELEMENT_KEYWORDS.include?(keyword.to_s)
+        end
+        alias void_keyword? html_void_keyword?
+      
         # NOTE: Avoid using this method until we start supporting ElementProxy subclasses
         # in which case, we must cache them to avoid the slow performance of element_type
         # Factory Method that translates a Glimmer DSL keyword into a ElementProxy object
@@ -85,8 +94,8 @@ module Glimmer
             value = value.to_s.sub('"', '&quot;').sub("'", '&apos;')
             output += " #{attribute}=\"#{value}\""
           end
-          if content.nil?
-            "<#{element}#{attributes} />"
+          if html_void_keyword?(element)
+            "<#{element}#{attributes}>"
           else
             "<#{element}#{attributes}>#{content}</#{element}>"
           end
@@ -103,8 +112,8 @@ module Glimmer
       Event = Struct.new(:widget, keyword_init: true)
       
       HTML_ELEMENT_KEYWORDS = [
-        "a", "abbr", "acronym", "address", "applet", "area", "article", "aside", "audio",
-        "base", "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body",
+        "a", "abbr", "acronym", "address", "applet", "article", "aside", "audio",
+        "basefont", "bdi", "bdo", "bgsound", "big", "blink", "blockquote", "body",
         "button", "canvas", "caption", "center", "cite", "code", "col", "colgroup", "data",
         "datalist", "dd", "decorator", "details", "dfn", "dir", "div", "dl", "dt",
         "element", "embed", "fieldset", "figcaption", "figure", "font", "footer", "form", "frame",
@@ -132,6 +141,11 @@ module Glimmer
  
       ELEMENT_KEYWORDS = HTML_ELEMENT_KEYWORDS + SVG_ELEMENT_KEYWORDS
       
+      HTML_VOID_ELEMENT_KEYWORDS = %w[
+        area base br col embed hr img input link meta param source track wbr
+        keygen menuitem frame
+      ]
+      
       # title is a special attribute because it matches an element tag name (needs special treatment)
       HTML_ELEMENT_SPECIAL_ATTRIBUTES = ['title']
 
@@ -225,6 +239,11 @@ module Glimmer
         ElementProxy.svg_keyword_supported?(keyword)
       end
       
+      def html_void?
+        ElementProxy.html_void_keyword?(keyword)
+      end
+      alias void? html_void?
+      
       def remove
         return if @removed
         on_remove_listeners = listeners_for('on_remove').dup
@@ -1048,3 +1067,4 @@ module Glimmer
 end
 
 require 'glimmer/dsl/web/element_expression'
+require 'glimmer/web/formatting_element_proxy'

data/lib/glimmer/web/formatting_element_proxy.rb

@@ -30,12 +30,16 @@ module Glimmer
         include Glimmer
         
         def keyword_supported?(keyword, parent: nil)
+          # TODO do we need to worry about the parent of the parent being a p tag?
           keyword = keyword.to_s
-          (
-            FORMATTING_ELEMENT_KEYWORDS.include?(keyword) ||
-            (keyword == 'span' && parent&.keyword == 'p') ||
-            (keyword == 'a' && parent&.keyword == 'p')
-          )
+          parent_keyword = parent.is_a?(Component) ? parent.markup_root&.keyword : parent&.keyword
+          
+          parent_keyword == 'p' &&
+            (
+              FORMATTING_ELEMENT_KEYWORDS.include?(keyword) ||
+              (keyword == 'span') ||
+              (keyword == 'a')
+            )
         end
       
         def format(keyword, *args, &block)

metadata

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