diff --git a/lib/phlex/rails.rb b/lib/phlex/rails.rb index a800302..ec05905 100644 --- a/lib/phlex/rails.rb +++ b/lib/phlex/rails.rb @@ -11,7 +11,6 @@ module Rails autoload :BufferedLabelBuilder, "phlex/rails/buffered_label_builder" autoload :BufferedRadioButtonBuilder, "phlex/rails/buffered_radio_button_builder" autoload :CSV, "phlex/rails/csv" - autoload :FragmentFinder, "phlex/rails/fragment_finder" autoload :HTML, "phlex/rails/html" autoload :HelperFinder, "phlex/rails/helper_finder" autoload :HelperMacros, "phlex/rails/helper_macros" diff --git a/lib/phlex/rails/fragment_finder.rb b/lib/phlex/rails/fragment_finder.rb deleted file mode 100644 index 4fea5e6..0000000 --- a/lib/phlex/rails/fragment_finder.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true - -module Phlex::Rails::FragmentFinder - extend self - - Parser = if defined?(Nokolexbor) - Nokolexbor - else - require "nokogiri" - Nokogiri::HTML - end - - def extract(html, ids) - parsed = Parser.parse(html) - selector = ids.map { |id| "##{id}" }.join(", ") - - result = +"" - - ids.count.times do - if (fragment = parsed.at_css(selector)) - result << fragment.to_s - fragment.remove - end - end - - result - end -end diff --git a/lib/phlex/rails/helper_macros.rb b/lib/phlex/rails/helper_macros.rb index 360274b..31fe6a8 100644 --- a/lib/phlex/rails/helper_macros.rb +++ b/lib/phlex/rails/helper_macros.rb @@ -8,7 +8,6 @@ def register_output_helper(method_name) def #{method_name}(*args, **kwargs, &block) context = @_context - return if context.fragments && !context.in_target_fragment output = if block helpers.#{method_name}(*args, **kwargs) { capture(&block) } @@ -43,7 +42,6 @@ def register_builder_yielding_helper(method_name, builder) def #{method_name}(*args, **kwargs) context = @_context - return if context.fragments && !context.in_target_fragment output = if block_given? helpers.#{method_name}(*args, **kwargs) { |form| capture do diff --git a/lib/phlex/rails/sgml.rb b/lib/phlex/rails/sgml.rb index 9fcad14..d74ef3b 100644 --- a/lib/phlex/rails/sgml.rb +++ b/lib/phlex/rails/sgml.rb @@ -64,12 +64,8 @@ def render(*args, **kwargs, &block) end def render_in(view_context, &erb) - fragments = if view_context.request && (fragment_header = view_context.request.headers["X-Fragment"]) - fragment_header.split - end - if erb - call(view_context:, fragments:) { |*args| + call(view_context:) { |*args| if args.length == 1 && Phlex::SGML === args[0] && !erb.source_location&.[](0)&.end_with?(".rb") unbuffered = Phlex::Rails::Unbuffered.new(args[0]) raw(helpers.capture(unbuffered, &erb)) @@ -78,7 +74,7 @@ def render_in(view_context, &erb) end }.html_safe else - call(view_context:, fragments:).html_safe + call(view_context:).html_safe end end diff --git a/test/phlex/fragment_finder_test.rb b/test/phlex/fragment_finder_test.rb deleted file mode 100644 index f66a2cc..0000000 --- a/test/phlex/fragment_finder_test.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -require "test_helper" - -class FragmentFinderTest < ActiveSupport::TestCase - include Phlex::Rails::FragmentFinder - - test "find one" do - result = extract(<<~HTML, ["b"]) -