ruby2html 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39b469662602b3df3e2444c58474a8c412a90d3556de30c5d404e41f4358eb8
-  data.tar.gz: dbd03a556e2deebf9d795065de00768259c21dc76d9d248a1a6799c80faa5434
+  metadata.gz: f23a95af48405360717b40b2da95c55592066f6ac054e95bc07974d90fefd205
+  data.tar.gz: a2ee6ccafaeb77d085ee8227b51315ebed73a5a1a46eef7eb885f8b1a1b88ed6
 SHA512:
-  metadata.gz: edc9f77f24cdcc0cedd73f42750989abf6edf4df55ff40114d2543b2e895fa338caadbe9cea0e99f46a4b2f8c32ef42997e543a7e309ed8781181240e12d05e9
-  data.tar.gz: dbc116c78d40ce02a5ce228993e8803ad3afd64d43aabc543a1aa4ec407c4fa93b5d1192d9268f832b6a86bbe313e5df2faa878f0e1ec951a1741c0d3dd8f792
+  metadata.gz: a09d5f0288ca174e8348620f62b1ac11331fb53f34ea9790f16b81c27fae218aa4c22076512c5716b41b1c4ddc3376f77d5f593ac8359f65be71c9a002fcd280
+  data.tar.gz: 64e555a4b2cb1f4470f00a967b310cd7a23cdc79bdf2b2650af5ee044aef1049bd37677e771e6d65f84f6e15234c9cd39fadf45af3086481e30a83c9d3b7b8a4

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/form.html.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+div do
+  h1 'form'
+
+  form_with url: '/form', method: 'post' do |f|
+    f.label :name
+    f.text_field :name
+    f.submit 'submit'
+  end
+
+  link_to 'Home', root_path
+  # button_to 'home', '/'
+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/rails_components/base_component.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Ruby2html
+  module RailsComponents
+    class BaseComponent
+      def initialize(render, context, method, *args, **options)
+        @render = render
+        @context = context
+        @method = method
+        @args = args
+        @options = options
+      end
+
+      def render(&block)
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/gem/ruby2html/rails_components/button_to.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Ruby2html
+  module RailsComponents
+    class ButtonTo < BaseComponent
+      def render(&block)
+        @render.plain(@context.button_to(*@args, **@options, &block))
+      end
+    end
+  end
+end

data/lib/gem/ruby2html/rails_components/form_with.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Ruby2html
+  module RailsComponents
+    class FormWith < BaseComponent
+      include ActionView::Helpers::FormHelper
+      def render(&block)
+        model = @options[:model]
+        scope = @options[:scope]
+        url = @options[:url]
+        method = @options[:method]
+        local = @options[:local]
+
+        form_options = @options.except(:model, :scope, :url, :method, :local)
+        form_options[:action] = determine_url(model, url)
+        form_options[:method] = determine_method(model, method)
+        form_options['data-remote'] = 'true' unless local
+        @model = model
+        @scope = determine_scope(model, scope)
+
+        @render.form(**form_options) do
+          authenticity_token_tag
+          utf8_enforcer_tag
+          block.call(self)
+        end
+      end
+
+      def label(method, text = nil, options = {})
+        @render.label(**options.merge(for: field_id(method))) do
+          text || method.to_s.humanize
+        end
+      end
+
+      def text_field(method, options = {})
+        @render.input(**options.merge(type: 'text', name: field_name(method), id: field_id(method), value: object_value_for(method)))
+      end
+
+      def hidden_field(method, options = {})
+        @render.input(**options.merge(type: 'hidden', name: field_name(method), id: field_id(method), value: object_value_for(method)))
+      end
+
+      def password_field(method, options = {})
+        @render.input(**options.merge(type: 'password', name: field_name(method), id: field_id(method)))
+      end
+
+      def file_field(method, options = {})
+        @render.input(**options.merge(type: 'file', name: field_name(method), id: field_id(method)))
+      end
+
+      def submit(value = nil, options = {})
+        @render.input(**options.merge(type: 'submit', value: value || submit_default_value))
+      end
+
+      private
+        def determine_url(model, url)
+          return url if url
+          return polymorphic_path(model) if model && model.respond_to?(:persisted?)
+          nil
+        end
+
+        def determine_method(model, method)
+          return method if method
+          return 'post' unless model
+          model.respond_to?(:persisted?) && model.persisted? ? 'patch' : 'post'
+        end
+
+        def determine_scope(model, scope)
+          return scope if scope
+          model.model_name.param_key if model.respond_to?(:model_name)
+        end
+
+        def authenticity_token_tag
+          @render.input(type: 'hidden', name: 'authenticity_token', value: @context.session[:_csrf_token])
+        end
+
+        def utf8_enforcer_tag
+          @render.input(type: 'hidden', name: 'utf8', value: '✓')
+        end
+
+        def field_name(method)
+          @scope ? "#{@scope}[#{method}]" : method.to_s
+        end
+
+        def field_id(method)
+          @scope ? "#{@scope}_#{method}" : method.to_s
+        end
+
+        def object_value_for(method)
+          @model&.public_send(method) if @model
+        end
+    end
+  end
+end

data/lib/gem/ruby2html/rails_components/image_tag.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Ruby2html
+  module RailsComponents
+    class ImageTag < BaseComponent
+      def render(&block)
+        @render.plain(@context.image_tag(*@args, **@options, &block))
+      end
+    end
+  end
+end

data/lib/gem/ruby2html/rails_components/link_to.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Ruby2html
+  module RailsComponents
+    class LinkTo < BaseComponent
+      def render(&block)
+        @render.plain(@context.button_to(*@args, **@options, &block))
+      end
+    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.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2html
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 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
@@ -63,6 +63,7 @@ files:
 - app/models/concerns/.keep
 - app/views/benchmark/normal_html.html.erb
 - app/views/benchmark/ruby_2html.html.rb
+- app/views/home/form.html.rb
 - app/views/home/index.html.erb
 - app/views/home/rb_files.html.rb
 - app/views/layouts/application.html.erb
@@ -96,6 +97,12 @@ 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_components/base_component.rb
+- lib/gem/ruby2html/rails_components/button_to.rb
+- lib/gem/ruby2html/rails_components/form_with.rb
+- lib/gem/ruby2html/rails_components/image_tag.rb
+- lib/gem/ruby2html/rails_components/link_to.rb
 - lib/gem/ruby2html/rails_helper.rb
 - lib/gem/ruby2html/railtie.rb
 - lib/gem/ruby2html/render.rb