ruby2html 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39b469662602b3df3e2444c58474a8c412a90d3556de30c5d404e41f4358eb8
-  data.tar.gz: dbd03a556e2deebf9d795065de00768259c21dc76d9d248a1a6799c80faa5434
+  metadata.gz: b2bea9aba310afffa16b447b62ff3de51cfa14357520b687b048e58af727e766
+  data.tar.gz: f139b135af3c215ec2709b1b30fd8f8a7cd7dc941709dfcd5f5d1ef1d21fe63d
 SHA512:
-  metadata.gz: edc9f77f24cdcc0cedd73f42750989abf6edf4df55ff40114d2543b2e895fa338caadbe9cea0e99f46a4b2f8c32ef42997e543a7e309ed8781181240e12d05e9
-  data.tar.gz: dbc116c78d40ce02a5ce228993e8803ad3afd64d43aabc543a1aa4ec407c4fa93b5d1192d9268f832b6a86bbe313e5df2faa878f0e1ec951a1741c0d3dd8f792
+  metadata.gz: ef60077fcf16bf1e046368280d9a96222c412cbc1f8369350293cdf2149ff6d7cc3f1184c5a6c2acecf93ce2b10406f45bcb6000e70cfa3ba9fc2987e7d64e30
+  data.tar.gz: a71ef6f89836cf773cb4c7de7f9c01ec13081ba1a13cc35a569d2ef90436403ce7b4811862883c16b5002f137a993d88bc5144ee0b1e9f7204683324e0707235

data/.rubocop.yml

@@ -2,6 +2,9 @@ inherit_gem:
   rubocop-rails_config:
     - config/rails.yml
 
+AllCops:
+  TargetRubyVersion: 3.0
+
 Style/ClassAndModuleChildren:
   EnforcedStyle: nested
 

data/README.md

@@ -34,12 +34,12 @@ div class: 'container' do
   h1 'Welcome to Ruby2html! 🎉', class: 'main-title', 'data-controller': 'welcome'
   link_to 'Home Sweet Home 🏠', root_path, class: 'btn btn-primary', 'data-turbo': false
 
-  @items.each do |item|
-    h2 class: 'item-title', id: "item-#{item[:id]}" do
-      item[:title]
+  @products.each do |product|
+    h2 class: 'item-title', id: "product-#{product[:id]}" do
+      product.title
     end
     p class: 'item-description' do
-      item[:description]
+      product.description
     end
   end
 end
@@ -49,7 +49,7 @@ plain '<div>Inline html</div>'.html_safe
 render partial: 'shared/navbar'
 ```
 
-### (Optional) Nicely Format the HTML
+### (Optional) Nicely Format the HTML for source inspection
 
 File: `config/environments/development.rb` or `config/environments/test.rb`
 ```ruby
@@ -84,10 +84,10 @@ Replace your ERB with beautiful Ruby code:
 
     @items.each do |item|
       h2 class: 'item-title', id: "item-#{item[:id]}" do
-        item[:title]
+        item.title
       end
       p class: 'item-description' do
-        item[:description]
+        item.description
       end
     end
 

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

@@ -14,10 +14,13 @@
     h1 "ok"
     h1 "ok"
     div do
-      link_to 'home', root_path
+      link_to 'home 1', root_path
+    end
+    link_to 'home 2', root_path
+
+    div do
+      link_to 'home 3', root_path
     end
-    link_to 'home', root_path
-    link_to 'home', root_path
 
     render partial: 'shared/navbar'
 

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

@@ -6,6 +6,11 @@ h1 'okddwadwa'
 
 div @value
 
+form_with url: '/test' do |f|
+  f.text_field :name, placeholder: 'Name'
+  f.submit 'Submit'
+end
+
 link_to 'Home', root_url
 render partial: 'shared/navbar'
 render partial: 'shared/footer'

data/app/views/layouts/application.html.erb

@@ -9,7 +9,6 @@
 
     <%= yield :head %>
 
-    <link rel="manifest" href="/manifest.json">
     <link rel="icon" href="/icon.png" type="image/png">
     <link rel="icon" href="/icon.svg" type="image/svg+xml">
     <link rel="apple-touch-icon" href="/icon.png">

data/config/routes.rb

@@ -6,6 +6,7 @@ Rails.application.routes.draw do
   get '/benchmark/ruby', to: 'benchmark#ruby_2html'
 
   get '/rb_files', to: 'home#rb_files'
+  get 'form', to: 'home#form'
 
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
 

data/lib/gem/ruby2html/html_beautifier_middleware.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'htmlbeautifier'
+
+module Ruby2html
+  class HtmlBeautifierMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+
+      if headers['Content-Type']&.include?('text/html')
+        new_body = []
+        body.each do |chunk|
+          new_body << HtmlBeautifier.beautify(chunk)
+        end
+        headers['Content-Length'] = new_body.map(&:bytesize).sum.to_s
+        body = new_body
+      end
+
+      [status, headers, body]
+    end
+  end
+end

data/lib/gem/ruby2html/railtie.rb

@@ -17,7 +17,7 @@ module Ruby2html
           #{source}
         end
         Thread.current[:__ruby2html_renderer__] = renderer
-        renderer.render_from_rails(#{template.identifier.inspect})
+        renderer.__render_from_rails(#{template.identifier.inspect})
       ensure
         Thread.current[:__ruby2html_renderer__] = previous_renderer
       end

data/lib/gem/ruby2html/render.rb

@@ -17,9 +17,10 @@ module Ruby2html
 
     VOID_ELEMENTS = %w[area base br col embed hr img input link meta param source track wbr].freeze
 
-    COMMON_RAILS_METHOD_HELPERS = %w[content_tag link_to image_tag form_tag form_for form_with form_with_model button_to].freeze
+    COMMON_RAILS_METHOD_HELPERS = %w[link_to image_tag form_with button_to].freeze
 
     attr_reader :output
+    attr_accessor :current_output
 
     def initialize(context, &root)
       @context = context
@@ -28,14 +29,14 @@ module Ruby2html
       @current_output = @output
     end
 
-    def render_from_rails(template_path)
+    def __render_from_rails(template_path)
       result = render
       return result unless annotate_rendered_view_with_filenames?
 
       template_path = template_path.sub("#{Rails.root}/", '')
 
       "<!-- BEGIN #{template_path} -->#{result}<!-- END #{template_path} -->".html_safe
-    end
+    end if defined?(ActionView)
 
     def render(*args, **options, &block)
       set_instance_variables
@@ -45,9 +46,8 @@ module Ruby2html
       end
       instance_exec(&@root)
       result = @output.string
-      if defined?(ActiveSupport)
-        result = ActiveSupport::SafeBuffer.new(result)
-      end
+
+      result = ActiveSupport::SafeBuffer.new(result) if defined?(ActiveSupport)
 
       result
     end
@@ -62,7 +62,7 @@ module Ruby2html
       HTML5_TAGS.include?(method_name) || super
     end
 
-    def html!(name, *args, **options, &block)
+    def html!(name, *args, **options)
       content = args.first.is_a?(String) ? args.shift : nil
       attributes = options
 
@@ -121,8 +121,9 @@ module Ruby2html
       end
 
       COMMON_RAILS_METHOD_HELPERS.each do |method|
-        define_method(method) do |*args, &block|
-          plain @context.send(method, *args, &block)
+        define_method(method) do |*args, **options, &block|
+          constant = "Ruby2html::RailsComponents::#{method.to_s.camelize}".constantize
+          constant.new(self, @context, method, *args, **options).render(&block)
         end
       end if defined?(ActionView)
 
@@ -130,7 +131,7 @@ module Ruby2html
         return '' if attributes.empty?
 
         result = StringIO.new
-        attributes.each do |k, v|
+        attributes.compact.each do |k, v|
           result << ' '
           result << k.to_s
           result << '="'

data/lib/gem/ruby2html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2html
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - sebi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-10 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
@@ -96,6 +96,7 @@ files:
 - lib/assets/.keep
 - lib/gem/ruby2html.rb
 - lib/gem/ruby2html/component_helper.rb
+- lib/gem/ruby2html/html_beautifier_middleware.rb
 - lib/gem/ruby2html/rails_helper.rb
 - lib/gem/ruby2html/railtie.rb
 - lib/gem/ruby2html/render.rb