ruby2html 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e43d3eb304652b48e727067ce4361d654936cc0258589efd82adf55136a687d
-  data.tar.gz: 25900c6ed9f1a441f3f5a2b6d457e13caa5bfca3db99a7573daa89af92351544
+  metadata.gz: 006b9857270b4ad9ebc613ca84e1e00327285e4e52f371417a42d2823e6b3099
+  data.tar.gz: f78b3b0d8929174dde445502d0c90051ff6ac95a8b37f7e05e7722ff91d96aaf
 SHA512:
-  metadata.gz: 214487bc59cf8ebc35698f7c16ffca8add3d59dfb52142ef1273e5c1dc67d8351fad286f1b417bfd6e9913ae3c06be8e3bba06c81b9670a5a5561cb47e1ba683
-  data.tar.gz: 430e623e958a739a33cdfd16d9d0039ff3354f1461cfe8d7db0a2418ce6fbff4a0352e37a67227e36058088c9c26fac0ffd2aaad50c3842a1ea71a536133610f
+  metadata.gz: aa9a480274cbe132f1053010d218b5f1e3e56be27dd224fc0d41867ea85e2d0afb763b121fb8179f2426d4bcbb5f17a0c70b0c361aff7b722afada0ea7b7a046
+  data.tar.gz: 49c3f7a01bfd9cc058ce68a672b8e2c159a41895a7af6b2352a8d150b192e1da445ea124640807d0d291da8cc53b528e25f9a960bf1e21f0103db7e48463abf0

data/README.md

@@ -138,7 +138,7 @@ class GreetingComponent < ApplicationComponent
   end
 
   def call
-    html(self) do
+    html do
       h1 class: 'greeting', 'data-user': @name do
         "Hello, #{@name}! 👋"
       end
@@ -164,19 +164,17 @@ class FarewellComponent < ApplicationComponent
 end
 ```
 
-File: `app/components/farewell_component.html.erb`
-
-```erb
-<div class="farewell">
-  <h2>Goodbye, <%= @name %>! 👋</h2>
-  <p>We hope you enjoyed using Ruby2html!</p>
+File: `app/components/farewell_component.html.rb`
 
-  <%=
-    html do
-      link_to 'Home', root_path, class: 'btn btn-primary', 'data-turbo': false
-    end
-  %>
-</div>
+```rb
+div class: 'farewell' do
+  h1 class: 'farewell-message' do
+    "Goodbye, #{@name}! 👋"
+  end
+  p class: 'farewell-text' do
+    'We hope to see you again soon!'
+  end
+end
 ```
 
 This flexibility allows you to:
@@ -197,7 +195,7 @@ class FirstComponent < ApplicationComponent
   end
 
   def call
-    html(self) do
+    html do
       h1 id: 'first-component-title' do
         'first component'
       end
@@ -219,7 +217,7 @@ File: `app/components/second_component.rb`
 
 class SecondComponent < ApplicationComponent
   def call
-    html(self) do
+    html do
       h1 class: 'my-class', id: 'second-component-title', 'data-controller': 'second' do
         'second component'
       end

data/app/components/first_component.html.rb

@@ -6,4 +6,6 @@ div do
   h2 'A subheading'
 end
 
+another_div
+
 p @item

data/app/components/first_component.rb

@@ -4,4 +4,12 @@ class FirstComponent < ApplicationComponent
   def initialize
     @item = 'Hello, World!'
   end
+
+  def another_div
+    div do
+      h2 'Another subheading from component'
+    end
+
+    h1 'Yet Another heading from component'
+  end
 end

data/lib/gem/ruby2html/component_helper.rb

@@ -3,7 +3,25 @@
 module Ruby2html
   module ComponentHelper
     def html(&block)
-      Ruby2html::Render.new(self, &block).render.html_safe
+      previous_renderer = __ruby2html_renderer__
+      Ruby2html::Render.new(self, &block).yield_self do |component_renderer|
+        Thread.current[:__ruby2html_renderer__] = component_renderer
+        component_renderer.render.html_safe
+      end
+    ensure
+      Thread.current[:__ruby2html_renderer__] = previous_renderer
+    end
+
+    def method_missing(method, *args, &block)
+      if __ruby2html_renderer__.respond_to?(method)
+        __ruby2html_renderer__.send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def __ruby2html_renderer__
+      Thread.current[:__ruby2html_renderer__]
     end
   end
 end

data/lib/gem/ruby2html/railtie.rb

@@ -11,9 +11,16 @@ module Ruby2html
 
     def call(_template, source)
       <<-RUBY
-        Ruby2html::Render.new(self) do
+      begin
+        previous_renderer = Thread.current[:__ruby2html_renderer__]
+        renderer = Ruby2html::Render.new(self) do
           #{source}
-        end.render
+        end
+        Thread.current[:__ruby2html_renderer__] = renderer
+        renderer.render
+      ensure
+        Thread.current[:__ruby2html_renderer__] = previous_renderer
+      end
       RUBY
     end
   end

data/lib/gem/ruby2html/render.rb

@@ -6,14 +6,14 @@ require 'stringio'
 module Ruby2html
   class Render
     HTML5_TAGS = %w[
-        a abbr address area article aside audio b base bdi bdo blockquote body br button canvas caption
-        cite code col colgroup data datalist dd del details dfn dialog div dl dt em embed fieldset
-        figcaption figure footer form h1 h2 h3 h4 h5 h6 head header hr html i iframe img input ins
-        kbd label legend li link main map mark meta meter nav noscript object ol optgroup option
-        output p param picture pre progress q rp rt ruby s samp script section select small source
-        span strong style sub summary sup table tbody td template textarea tfoot th thead time title
-        tr track u ul var video wbr
-      ].freeze
+      a abbr address area article aside audio b base bdi bdo blockquote body br button canvas caption
+      cite code col colgroup data datalist dd del details dfn dialog div dl dt em embed fieldset
+      figcaption figure footer form h1 h2 h3 h4 h5 h6 head header hr html i iframe img input ins
+      kbd label legend li link main map mark meta meter nav noscript object ol optgroup option
+      output p param picture pre progress q rp rt ruby s samp script section select small source
+      span strong style sub summary sup table tbody td template textarea tfoot th thead time title
+      tr track u ul var video wbr
+    ].freeze
 
     VOID_ELEMENTS = %w[area base br col embed hr img input link meta param source track wbr].freeze
 
@@ -49,6 +49,10 @@ module Ruby2html
       end
     end
 
+    def respond_to?(method_name, include_private = false)
+      HTML5_TAGS.include?(method_name) || super
+    end
+
     def html!(name, *args, **options, &block)
       content = args.first.is_a?(String) ? args.shift : nil
       attributes = options

data/lib/gem/ruby2html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruby2html
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2html
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - sebi