ruby2html 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd9834eee45bda437a281566e66300e5e5645dddb45850d571d506c27a94501
-  data.tar.gz: ebe9a74c98f952e049335357fda1e9268f7126fbb090cbf7bf4e8b4e1fbedc1f
+  metadata.gz: 006b9857270b4ad9ebc613ca84e1e00327285e4e52f371417a42d2823e6b3099
+  data.tar.gz: f78b3b0d8929174dde445502d0c90051ff6ac95a8b37f7e05e7722ff91d96aaf
 SHA512:
-  metadata.gz: 4dc38bb961568de810742b8e8c2a8c9231abcbc0244bf0334350b3949eef3e1d81d2f907ab2565bc1acc6b0b6751ccabdc2c04b9855996e72e0ef0c117eaf8fa
-  data.tar.gz: 5e200ab5fd3f5a0941c7d7a32e5729e5a9f249d01158b1906a2797d0b0e8309bf403e0aaf5bd5a8416ef9cf42a8d56c0150bc2a9d5f0ca63bfe987ba8c777dca
+  metadata.gz: aa9a480274cbe132f1053010d218b5f1e3e56be27dd224fc0d41867ea85e2d0afb763b121fb8179f2426d4bcbb5f17a0c70b0c361aff7b722afada0ea7b7a046
+  data.tar.gz: 49c3f7a01bfd9cc058ce68a672b8e2c159a41895a7af6b2352a8d150b192e1da445ea124640807d0d291da8cc53b528e25f9a960bf1e21f0103db7e48463abf0

data/README.md

@@ -25,18 +25,6 @@ Or install it yourself as:
 
 ## 🎨 Usage
 
-### In your ApplicationController
-
-File: `app/controllers/application_controller.rb`
-
-```ruby
-# frozen_string_literal: true
-
-class ApplicationController < ActionController::Base
-  include Ruby2html::RailsHelper
-end
-```
-
 ### In your views
 
 File: `app/views/your_view.html.rb`
@@ -63,6 +51,18 @@ render partial: 'shared/navbar'
 
 #### Or use your current .erb views
 
+### In your ApplicationController
+
+File: `app/controllers/application_controller.rb`
+
+```ruby
+# frozen_string_literal: true
+
+class ApplicationController < ActionController::Base
+  include Ruby2html::RailsHelper
+end
+```
+
 File: `app/views/your_view.html.erb`
 
 Replace your ERB with beautiful Ruby code:
@@ -97,18 +97,18 @@ Replace your ERB with beautiful Ruby code:
 ruby 3.3.3 (2024-06-12 revision f1c7b6f435) +YJIT [x86_64-linux]
 Warming up --------------------------------------
 GET /benchmark/html (ERB)
-                         1.000 i/100ms
+                         2.000 i/100ms
 GET /benchmark/ruby (Ruby2html)
                          1.000 i/100ms
 Calculating -------------------------------------
 GET /benchmark/html (ERB)
-                         20.163 (±19.8%) i/s -     95.000 in   5.062853s
+                         20.989 (±19.1%) i/s -    102.000 in   5.077353s
 GET /benchmark/ruby (Ruby2html)
-                         19.362 (±15.5%) i/s -     92.000 in   5.006433s
+                         20.438 (±19.6%) i/s -     97.000 in   5.010249s
 
 Comparison:
-GET /benchmark/html (ERB):       20.2 i/s
-GET /benchmark/ruby (Ruby2html):       19.4 i/s - same-ish: difference falls within error
+GET /benchmark/html (ERB):       21.0 i/s
+GET /benchmark/ruby (Ruby2html):       20.4 i/s - same-ish: difference falls within error
 ```
 
 ### With ViewComponents
@@ -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`
+File: `app/components/farewell_component.html.rb`
 
-```erb
-<div class="farewell">
-  <h2>Goodbye, <%= @name %>! 👋</h2>
-  <p>We hope you enjoyed using Ruby2html!</p>
-
-  <%=
-    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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+h1 'first component'
+
+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/app/components/second_component.rb

@@ -2,7 +2,7 @@
 
 class SecondComponent < ApplicationComponent
   def call
-    html(self) do
+    html do
       h1 class: 'my-class' do
         plain 'Second Component'
       end

data/app/components/third_component/third_component.html.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+h1 'Third component'

data/app/components/third_component.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ThirdComponent < ApplicationComponent
+  def initialize
+    @item = 'Hello, World!'
+  end
+end

data/app/views/benchmark/ruby_2html.html.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+h1 'Benchmark: Ruby2html'
+
+h2 'User Statistics'
+ul do
+  li { plain "Total Users: #{@complex_data[:stats][:total_users]}" }
+  li { plain "Average Orders per User: #{@complex_data[:stats][:average_orders_per_user]}" }
+  li { plain "Most Expensive Item: #{@complex_data[:stats][:most_expensive_item]}" }
+  li { plain "Most Popular Country: #{@complex_data[:stats][:most_popular_country]}" }
+end
+
+h2 'User List'
+@complex_data[:users].each do |user|
+  div class: 'user-card' do
+    h3 user[:name]
+    p { plain "Email: #{user[:email]}" }
+    p { plain "Address: #{user[:address][:street]}, #{user[:address][:city]}, #{user[:address][:country]}" }
+
+    h4 'Orders'
+    user[:orders].each do |order|
+      div class: 'order' do
+        p { plain "Order ID: #{order[:id]}" }
+        p { plain "Total: $#{order[:total]}" }
+        ul do
+          order[:items].each do |item|
+            li { plain "#{item[:name]} - $#{item[:price]} (Quantity: #{item[:quantity]})" }
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/home/index.html.erb

@@ -2,6 +2,7 @@
 
 <%= render FirstComponent.new %>
 <%= render SecondComponent.new %>
+<%= render ThirdComponent.new %>
 
 <%=
   html(self) do

data/app/views/home/rb_files.html.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+h1 'RbFiles'
+h1 'ok'
+h1 'ok'
+
+div @value
+
+link_to 'Home', root_url
+render partial: 'shared/navbar'

data/lib/gem/ruby2html/component_helper.rb

@@ -2,8 +2,26 @@
 
 module Ruby2html
   module ComponentHelper
-    def html(context, &block)
-      Ruby2html::Render.new(context, &block).render.html_safe
+    def html(&block)
+      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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Ruby2html
+  class TemplateHandler
+    class_attribute :default_format
+    self.default_format = :html
+
+    def self.call(template, source)
+      new.call(template, source)
+    end
+
+    def call(_template, source)
+      <<-RUBY
+      begin
+        previous_renderer = Thread.current[:__ruby2html_renderer__]
+        renderer = Ruby2html::Render.new(self) do
+          #{source}
+        end
+        Thread.current[:__ruby2html_renderer__] = renderer
+        renderer.render
+      ensure
+        Thread.current[:__ruby2html_renderer__] = previous_renderer
+      end
+      RUBY
+    end
+  end
+
+  class Railtie < Rails::Railtie
+    initializer 'ruby2html.initializer' do
+      Rails.autoloaders.main.ignore(
+        Rails.root.join('app/views/**/*.html.rb'),
+        Rails.root.join('app/components/**/*.html.rb')
+      )
+    end
+  end
+end
+
+ActionView::Template.register_template_handler :rb, Ruby2html::TemplateHandler if defined? ActionView::Template

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
 
@@ -35,7 +35,12 @@ module Ruby2html
         return plain @context.render(*args, **options, &block)
       end
       instance_exec(&@root)
-      @output.string
+      result = @output.string
+      if defined?(ActiveSupport)
+        result = ActiveSupport::SafeBuffer.new(result)
+      end
+
+      result
     end
 
     HTML5_TAGS.each do |tag|
@@ -44,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.1.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2html
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - sebi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies: []
 description: Ruby2HTML empowers developers to write view logic in pure Ruby, seamlessly
   converting it into clean, well-formatted HTML. Enhance your templating workflow,
@@ -33,9 +33,11 @@ files:
 - app/channels/application_cable/channel.rb
 - app/channels/application_cable/connection.rb
 - app/components/application_component.rb
-- app/components/first_component.html.erb
+- app/components/first_component.html.rb
 - app/components/first_component.rb
 - app/components/second_component.rb
+- app/components/third_component.rb
+- app/components/third_component/third_component.html.rb
 - app/controllers/application_controller.rb
 - app/controllers/benchmark_controller.rb
 - app/controllers/concerns/.keep
@@ -46,8 +48,9 @@ files:
 - app/models/application_record.rb
 - app/models/concerns/.keep
 - app/views/benchmark/normal_html.html.erb
-- app/views/benchmark/ruby_2html.html.erb
+- app/views/benchmark/ruby_2html.html.rb
 - app/views/home/index.html.erb
+- app/views/home/rb_files.html.rb
 - app/views/layouts/application.html.erb
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
@@ -79,6 +82,7 @@ files:
 - lib/gem/ruby2html.rb
 - lib/gem/ruby2html/component_helper.rb
 - lib/gem/ruby2html/rails_helper.rb
+- lib/gem/ruby2html/railtie.rb
 - lib/gem/ruby2html/render.rb
 - lib/gem/ruby2html/version.rb
 - lib/tasks/.keep

data/app/components/first_component.html.erb

@@ -1,9 +0,0 @@
-<%= html(self) do
-  h1 "first component"
-
-  div do
-    h2 "A subheading"
-  end
-
-  p @item
-end %>

data/app/views/benchmark/ruby_2html.html.erb

@@ -1,35 +0,0 @@
-<%=
-  html(self) do
-    h1 'Benchmark: Ruby2html'
-
-    h2 'User Statistics'
-    ul do
-      li { plain "Total Users: #{@complex_data[:stats][:total_users]}" }
-      li { plain "Average Orders per User: #{@complex_data[:stats][:average_orders_per_user]}" }
-      li { plain "Most Expensive Item: #{@complex_data[:stats][:most_expensive_item]}" }
-      li { plain "Most Popular Country: #{@complex_data[:stats][:most_popular_country]}" }
-    end
-
-    h2 'User List'
-    @complex_data[:users].each do |user|
-      div class: 'user-card' do
-        h3 user[:name]
-        p { plain "Email: #{user[:email]}" }
-        p { plain "Address: #{user[:address][:street]}, #{user[:address][:city]}, #{user[:address][:country]}" }
-
-        h4 'Orders'
-        user[:orders].each do |order|
-          div class: 'order' do
-            p { plain "Order ID: #{order[:id]}" }
-            p { plain "Total: $#{order[:total]}" }
-            ul do
-              order[:items].each do |item|
-                li { plain "#{item[:name]} - $#{item[:price]} (Quantity: #{item[:quantity]})" }
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-%>