rux-rails 1.4.0 → 1.5.0

data/spec/html_safety_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe "html safety" do
+  it "escapes HTML" do
+    render_inline(HtmlSafetyComponent.new(value: "<p>Foo</p>"))
+    expect(rendered_content).to eq(
+      "<div>&lt;p&gt;Foo&lt;/p&gt;</div>"
+    )
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,8 @@
-require 'pry-byebug'
-
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'rails'
-require 'rux-rails'
-
 require 'action_controller/railtie'
+require 'rux-rails'
 
 Dir.chdir(File.join(*%w(spec dummy))) do
   require File.expand_path(File.join(*%w(dummy config application)), __dir__)
@@ -14,13 +11,65 @@ end
 
 require 'rspec/rails'
 
-module SpecHelpers
-  extend RSpec::SharedContext
+module RuxRails
+  module SpecHelpers
+    extend RSpec::SharedContext
+    include Capybara::RSpecMatchers
+
+    let(:app) { Rails.application }
+
+    before(:each) do
+      Dir.glob("spec/dummy/app/components/*.rb").each do |f|
+        File.unlink(f)
+      end
+    end
+
+    def with_file_contents(path, contents)
+      old_contents = ::File.read(path)
+      ::File.write(path, contents)
+      yield
+    ensure
+      ::File.write(path, old_contents)
+    end
+
+    attr_reader :rendered_content
+
+    def page
+      @page ||= Capybara::Node::Simple.new(rendered_content)
+    end
+
+    def render_inline(component, **args, &block)
+      @page = nil
+      @rendered_content =
+        if Rails.version.to_f >= 6.1
+          vc_test_controller.view_context.render(component, args, &block)
+        else
+          vc_test_controller.view_context.render_component(component, &block)
+        end
+
+      Nokogiri::HTML.fragment(@rendered_content)
+    end
+
+    def vc_test_controller
+      @vc_test_controller ||= __vc_test_helpers_build_controller(ViewComponent::Base.test_controller.constantize)
+    end
+
+    def __vc_test_helpers_build_controller(klass)
+      klass.new.tap { |c| c.request = vc_test_request }.extend(Rails.application.routes.url_helpers)
+    end
 
-  let(:app) { Rails.application }
+    def vc_test_request
+      @vc_test_request ||=
+        begin
+          out = ActionDispatch::TestRequest.create
+          out.session = ActionController::TestSession.new
+          out
+        end
+    end
+  end
 end
 
 RSpec.configure do |config|
-  config.include(SpecHelpers)
+  config.include(RuxRails::SpecHelpers)
   config.include(Capybara::RSpecMatchers, type: :request)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rux-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rux
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: onload
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Rux view components on Rails.
 email:
 - camertron@gmail.com
@@ -75,13 +89,9 @@ files:
 - lib/rux-rails/components/audio.rb
 - lib/rux-rails/components/image.rb
 - lib/rux-rails/components/video.rb
-- lib/rux-rails/core_ext/kernel.rb
-- lib/rux-rails/core_ext/kernel_zeitwerk.rb
-- lib/rux-rails/ext/activesupport/dependencies.rb
-- lib/rux-rails/ext/bootsnap/autoload.rb
-- lib/rux-rails/ext/zeitwerk/loader.rb
+- lib/rux-rails/output_buffer.rb
 - lib/rux-rails/railtie.rb
-- lib/rux-rails/safe_buffer.rb
+- lib/rux-rails/rux_loader.rb
 - lib/rux-rails/tag_builder.rb
 - lib/rux-rails/tasks/transpile.rake
 - lib/rux-rails/template_handler.rb
@@ -91,10 +101,10 @@ files:
 - spec/controllers/home_controller_spec.rb
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/cat.png
-- spec/dummy/app/components/button.rb
 - spec/dummy/app/components/button.rux
-- spec/dummy/app/components/home_component.rb
 - spec/dummy/app/components/home_component.rux
+- spec/dummy/app/components/html_safety_component.rb
+- spec/dummy/app/components/html_safety_component.rux
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
 - spec/dummy/app/views/home/index.html.ruxt
@@ -103,11 +113,12 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/log/test.log
+- spec/html_safety_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/camertron/rux-rails
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -122,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Rux view components on Rails.
 test_files: []

data/lib/rux-rails/core_ext/kernel.rb

@@ -1,67 +0,0 @@
-module RuxRails
-  module LoadPatch
-    def load(file, *args)
-      # ActiveSupport::Dependencies adds an extra .rb to the end
-      if file.end_with?('.rux.rb')
-        file = file.chomp('.rb')
-      end
-
-      if file.end_with?('.rux')
-        tmpl = Rux::File.new(file)
-        tmpl.write if RuxRails.transpile_on_load?
-
-        return super(tmpl.default_outfile, *args)
-      end
-
-      super(file, *args)
-    end
-  end
-
-  module RequirePatch
-    def require(file)
-      # check to see if there's a .rux file somewhere on the load path
-      path = nil
-      rux_file = file.end_with?('.rux') ? file : "#{file}.rux"
-
-      if File.absolute_path(rux_file) == rux_file && File.exist?(rux_file)
-        path = rux_file
-      elsif rux_file.start_with?(".#{File::SEPARATOR}")
-        abs_path = File.expand_path(rux_file)
-        path = abs_path if File.exist?(abs_path)
-      else
-        $LOAD_PATH.each do |lp|
-          check_path = File.expand_path(File.join(lp, rux_file))
-
-          if File.exist?(check_path)
-            path = check_path
-            break
-          end
-        end
-      end
-
-      return super(file) unless path
-      return false if $LOADED_FEATURES.include?(path)
-
-      # Must call the Kernel.load class method here because that's the one
-      # activesupport doesn't mess with, and in fact the one activesupport
-      # itself uses to actually load files. In case you were curious,
-      # activesupport redefines Object#load and Object#require i.e. the
-      # instance versions that get inherited by all other objects. Yeah,
-      # it's pretty awful stuff.
-      Kernel.load(path)
-      $LOADED_FEATURES << path
-
-      return true
-    end
-  end
-end
-
-module Kernel
-  class << self
-    prepend RuxRails::LoadPatch
-  end
-end
-
-class Object
-  prepend RuxRails::RequirePatch
-end

data/lib/rux-rails/core_ext/kernel_zeitwerk.rb

@@ -1,63 +0,0 @@
-require 'zeitwerk'
-
-module Kernel
-  alias_method :rux_orig_require, :require
-  alias_method :rux_orig_load, :load
-
-  def load(file, *args)
-    if File.extname(file) == '.rux'
-      tmpl = Rux::File.new(file)
-      tmpl.write if RuxRails.transpile_on_load?
-
-      # I don't understand why, but it's necessary to delete the constant
-      # in order to load the .ruxc file. Otherwise you get an error about
-      # an uninitialized constant, and it's like... yeah, I _know_ it's
-      # uninitialized, that's why I'm loading this file. Whatevs.
-      loader = Zeitwerk::Registry.loader_for(file)
-      parent, cname = loader.send(:autoloads)[file]
-      parent.send(:remove_const, cname)
-
-      return rux_orig_load(tmpl.default_outfile, *args)
-    end
-
-    rux_orig_load(file, *args)
-  end
-
-  def require(file)
-    path = nil
-    loader = Zeitwerk::Registry.loader_for(file)
-    rux_file = file.end_with?('.rux') ? file : "#{file}.rux"
-
-    if File.absolute_path(rux_file) == rux_file && File.exist?(rux_file)
-      path = rux_file
-    elsif rux_file.start_with?(".#{File::SEPARATOR}")
-      abs_path = File.expand_path(rux_file)
-      path = abs_path if File.exist?(abs_path)
-    else
-      $LOAD_PATH.each do |lp|
-        check_path = File.expand_path(File.join(lp, rux_file))
-
-        if File.exist?(check_path)
-          path = check_path
-          break
-        end
-      end
-    end
-
-    unless path
-      # This will be either Ruby's original require or bootsnap's monkeypatched
-      # require in setups that use bootsnap. Lord help us with all these layers
-      # of patches.
-      return rux_orig_require(file)
-    end
-
-    return false if $LOADED_FEATURES.include?(path)
-
-    load path
-    $LOADED_FEATURES << path
-
-    loader.on_file_autoloaded(path) if loader
-
-    return true
-  end
-end

data/lib/rux-rails/ext/activesupport/dependencies.rb

@@ -1,47 +0,0 @@
-require 'active_support/dependencies'
-
-module RuxRails
-  module ActiveSupportDependenciesPatch
-    # Allow activesupport to find .rux files.
-    def search_for_file(path_suffix)
-      path_suffix_with_ext = path_suffix.sub(/(\.rux)?$/, '.rux'.freeze)
-
-      autoload_paths.each do |root|
-        path = File.join(root, path_suffix_with_ext)
-        return path if File.file?(path)
-      end
-
-      super
-    end
-
-    # For some reason, using autoload and a patched Kernel#load doesn't work
-    # by itself for automatically loading .rux files. Due to what I can only
-    # surmise is one of the side-effects of autoload, requiring any .rux file
-    # that's been marked by autoload will result in a NameError, i.e. Ruby
-    # reports the constant isn't defined. Pretty surprising considering we're
-    # literally in the process of _defining_ that constant. The trick is to
-    # essentially undo the autoload by removing the constant just before
-    # loading the .rux file that defines it.
-    def load_missing_constant(from_mod, const_name)
-      if require_path = from_mod.autoload?(const_name)
-        path = search_for_file(require_path)
-
-        if path && path.end_with?('.rux')
-          from_mod.send(:remove_const, const_name)
-          require require_path
-          return from_mod.const_get(const_name)
-        end
-      end
-
-      super
-    end
-  end
-end
-
-module ActiveSupport
-  module Dependencies
-    class << self
-      prepend RuxRails::ActiveSupportDependenciesPatch
-    end
-  end
-end

data/lib/rux-rails/ext/bootsnap/autoload.rb

@@ -1,27 +0,0 @@
-module RuxRails
-  module BootsnapAutoloadPatch
-    def autoload(const, path)
-      # Bootsnap monkeypatches Module.autoload in order to leverage its load
-      # path cache, which effectively converts a relative path into an absolute
-      # one without incurring the cost of searching the load path.
-      # Unfortunately, if a .rux file has already been transpiled, the cache
-      # seems to always return the corresponding .rb file. Bootsnap's autoload
-      # patch passes the .rb file to Ruby's original autoload, effectively
-      # wiping out the previous autoload that pointed to the .rux file. To
-      # fix this we have to intercept the cache lookup and force autoloading
-      # the .rux file if one exists.
-      cached_path = Bootsnap::LoadPathCache.load_path_cache.find(path)
-      cached_rux_path = "#{cached_path.chomp('.rb')}.rux"
-
-      if File.file?(cached_rux_path)
-        autoload_without_bootsnap(const, cached_rux_path)
-      else
-        super
-      end
-    end
-  end
-end
-
-class Module
-  prepend RuxRails::BootsnapAutoloadPatch
-end

data/lib/rux-rails/ext/zeitwerk/loader.rb

@@ -1,35 +0,0 @@
-require 'zeitwerk'
-
-module RuxRails
-  module ZeitwerkLoaderPatch
-    private
-
-    def ruby?(path)
-      super || path.end_with?('.rux')
-    end
-
-    def autoload_file(parent, cname, file)
-      if file.end_with?('.rux')
-        # Some older versions of Zeitwerk very naïvely try to remove only the
-        # last 3 characters in an attempt to strip off the .rb file extension,
-        # while newer ones only remove it if it's actually there. This line is
-        # necessary to remove the trailing leftover period for older versions,
-        # and remove the entire .rux extension for newer versions.
-        cname = cname.to_s.chomp('.').chomp('.rux').to_sym
-      else
-        # if there is a corresponding .rux file, autoload it instead of the .rb
-        # file
-        rux_file = "#{file.chomp('.rb')}.rux"
-        file = rux_file if File.exist?(rux_file)
-      end
-
-      super
-    end
-  end
-end
-
-module Zeitwerk
-  class Loader
-    prepend RuxRails::ZeitwerkLoaderPatch
-  end
-end

data/lib/rux-rails/safe_buffer.rb

@@ -1,13 +0,0 @@
-require 'active_support'
-
-module RuxRails
-  class SafeBuffer < ActiveSupport::SafeBuffer
-    def <<(value)
-      if value.is_a?(Array)
-        super(value.map { |v| html_escape_interpolated_argument(v) }.join.html_safe)
-      else
-        super
-      end
-    end
-  end
-end

data/spec/dummy/app/components/button.rb

@@ -1,15 +0,0 @@
-class Button < ViewComponent::Base
-  attr_reader(:outline, :size, :disabled)
-
-  def initialize(outline:, size:, disabled:)
-    @outline = outline
-    @size = size
-    @disabled = disabled
-  end
-
-  def call
-    Rux.tag("button") {
-      content
-    }
-  end
-end

data/spec/dummy/app/components/home_component.rb

@@ -1,12 +0,0 @@
-class HomeComponent < ViewComponent::Base
-  def call
-    Rux.tag("div", { class: "container" }) {
-      Rux.create_buffer.tap { |_rux_buf_|
-        _rux_buf_ << render(Image.new(src: "cat.png", size: "40"))
-        _rux_buf_ << render(Button.new(outline: true, disabled: "true", size: :large)) {
-          "Click Me!"
-        }
-      }.to_s
-    }
-  end
-end