view_component 2.61.0 → 2.61.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f46bf10c68e5273401ec52134ae2cf55d844f9b01c55121e082146364194e144
-  data.tar.gz: 81ec5867c81158b0c06fdab309674f2f5a9cef7cf0546575308084ac928116c6
+  metadata.gz: f405812996b460c943dba2ae0802dbc7e924ce3ae45ff69eb917333c77ecb890
+  data.tar.gz: b50121e18674aa4c5f7b569cc4c2edb5078d4685192e8154d4654b4b21a03ef6
 SHA512:
-  metadata.gz: 05450d5c3e5376fe7aa4a2a934ee2b7179cafb91681cf1b6ed7f1469bd3db29f92d0ba6e96930e36403f7e250a3b7b8aeb7cc061aa30954d2d8524c6d7081d6b
-  data.tar.gz: 91101a168fee89fd23dad833c769027db7022a852b07b918d427b40a8b1997b861827724f7390dd470f4e69e1a8351638a43cd2d34f6df9bf20c64be0eb61d43
+  metadata.gz: 23b295998753b2f0d17af1ee5cbc18ec0602cafa48c1ca4ee19568073c38453c79b7aadd1ec42160eab0b522d4a5c3c10f8682a224ed771b4ff25da1e97730fa
+  data.tar.gz: 43e4f27eb614d7de04e6b44747e4d7f2c006367cae62b2b3dc7ad67bdc6a22ea9ea7822308895b704bd19a50879d3bb3ecf2f0209adb9f039eb149217ef479b5

data/docs/CHANGELOG.md

@@ -9,6 +9,20 @@ title: Changelog
 
 ## main
 
+## 2.61.1
+
+* Revert `Expose Capybara DSL methods directly inside tests.` This change unintentionally broke other Capybara methods and thus introduced a regression. We aren't confident that we can fail forward so we have decided to revert this change.
+
+    *Joel Hawksley*, *Blake Williams*
+
+* Revert change making content evaluation consistent.
+
+    *Blake Williams*
+
+* Pin `rails` `main` dependency due to incompatibility with Global Output Buffer.
+
+    *Joel Hawksley*
+
 ## 2.61.0
 
 * Ensure side-effects in `content` are consistently evaluated before components are rendered. This change effectively means that `content` is evaluated for every component render where `render?` returns true. As a result, code that is passed to a component via a block/content will now always be evaluated, before `#call`, which can reveal bugs in existing components.

data/lib/view_component/base.rb

@@ -124,10 +124,6 @@ module ViewComponent
       before_render
 
       if render?
-        # preload content to support slot delegation and to consistently perform
-        # side-effects that may exist in the block
-        content
-
         perform_render
       else
         ""

data/lib/view_component/polymorphic_slots.rb

@@ -10,7 +10,7 @@ module ViewComponent
         location = Kernel.caller_locations(1, 1)[0]
 
         warn(
-          "warning: ViewComponent::PolymorphicSlots is now included in ViewComponent::Base by default "\
+          "warning: ViewComponent::PolymorphicSlots is now included in ViewComponent::Base by default " \
           "and can be removed from #{location.path}:#{location.lineno}"
         )
         # :nocov:
@@ -58,7 +58,7 @@ module ViewComponent
 
           define_method(setter_name) do |*args, &block|
             ViewComponent::Deprecation.warn(
-              "polymorphic slot setters like `#{setter_name}` are deprecated and will be removed in"\
+              "polymorphic slot setters like `#{setter_name}` are deprecated and will be removed in" \
               "ViewComponent v3.0.0.\n\nUse `with_#{setter_name}` instead."
             )
 

data/lib/view_component/slotable_v2.rb

@@ -266,8 +266,8 @@ module ViewComponent
       def raise_if_slot_ends_with_question_mark(slot_name)
         if slot_name.to_s.ends_with?("?")
           raise ArgumentError.new(
-            "#{self} declares a slot named #{slot_name}, which ends with a question mark.\n\n"\
-            "This is not allowed because the ViewComponent framework already provides predicate "\
+            "#{self} declares a slot named #{slot_name}, which ends with a question mark.\n\n" \
+            "This is not allowed because the ViewComponent framework already provides predicate " \
             "methods ending in `?`.\n\n" \
             "To fix this issue, choose a different name."
           )

data/lib/view_component/test_helpers.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "view_component/render_preview_helper"
-require "view_component/capybara_simple_session"
 
 module ViewComponent
   module TestHelpers
@@ -10,28 +9,8 @@ module ViewComponent
 
       include Capybara::Minitest::Assertions
 
-      CapybaraSimpleSession::DSL_METHODS.each do |method|
-        if RUBY_VERSION >= "2.7"
-          class_eval <<~METHOD, __FILE__, __LINE__ + 1
-            def #{method}(...)
-              page.method("#{method}").call(...)
-            end
-          METHOD
-        else
-          define_method method do |*args, &block|
-            page.send method, *args, &block
-          end
-        end
-      end
-
-      def self.included(mod)
-        Capybara::Node::Simple.send(:define_method, :to_capybara_node) do
-          self
-        end
-      end
-
       def page
-        @page ||= CapybaraSimpleSession.new(rendered_content)
+        @page ||= Capybara::Node::Simple.new(rendered_content)
       end
 
       def refute_component_rendered

data/lib/view_component/version.rb

@@ -4,7 +4,7 @@ module ViewComponent
   module VERSION
     MAJOR = 2
     MINOR = 61
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

data/lib/view_component.rb

@@ -7,7 +7,6 @@ module ViewComponent
   extend ActiveSupport::Autoload
 
   autoload :Base
-  autoload :CapybaraSimpleSession
   autoload :Compiler
   autoload :CompileCache
   autoload :ComponentError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: view_component
 version: !ruby/object:Gem::Version
-  version: 2.61.0
+  version: 2.61.1
 platform: ruby
 authors:
 - GitHub Open Source
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -325,7 +325,6 @@ files:
 - lib/rails/generators/test_unit/templates/component_test.rb.tt
 - lib/view_component.rb
 - lib/view_component/base.rb
-- lib/view_component/capybara_simple_session.rb
 - lib/view_component/collection.rb
 - lib/view_component/compile_cache.rb
 - lib/view_component/compiler.rb

data/lib/view_component/capybara_simple_session.rb

@@ -1,132 +0,0 @@
-# frozen_string_literal: true
-
-module ViewComponent
-  # This is a simpler version of {Capybara::Session}.
-  #
-  # It only includes {Capybara::Node::Finders}, {Capybara::Node::Matchers},
-  # {#within} and {#within_element}. It is useful in that it does not require a
-  # session, an application or a driver, but can still use Capybara's finders
-  # and matchers on any string that contains HTML.
-  class CapybaraSimpleSession
-    # Most of the code in this class is shamelessly stolen from the
-    # {Capybara::Session} class in the Capybara gem
-    # (https://github.com/teamcapybara/capybara/blob/e704d00879fb1d1e1a0cc01e04c101bcd8af4a68/lib/capybara/session.rb#L38).
-
-    NODE_METHODS = %i[
-      all
-      first
-      text
-
-      find
-      find_all
-      find_button
-      find_by_id
-      find_field
-      find_link
-
-      has_content?
-      has_text?
-      has_css?
-      has_no_content?
-      has_no_text?
-      has_no_css?
-      has_no_xpath?
-      has_xpath?
-      has_link?
-      has_no_link?
-      has_button?
-      has_no_button?
-      has_field?
-      has_no_field?
-      has_checked_field?
-      has_unchecked_field?
-      has_no_table?
-      has_table?
-      has_select?
-      has_no_select?
-      has_selector?
-      has_no_selector?
-      has_no_checked_field?
-      has_no_unchecked_field?
-
-      assert_selector
-      assert_no_selector
-      assert_all_of_selectors
-      assert_none_of_selectors
-      assert_any_of_selectors
-      assert_text
-      assert_no_text
-    ].freeze
-
-    private_constant :NODE_METHODS
-
-    SESSION_METHODS = %i[within within_element within_fieldset within_table].freeze
-
-    private_constant :SESSION_METHODS
-
-    DSL_METHODS = (NODE_METHODS + SESSION_METHODS).freeze
-
-    # Stolen from: https://github.com/teamcapybara/capybara/blob/e704d00879fb1d1e1a0cc01e04c101bcd8af4a68/lib/capybara/session.rb#L767-L774.
-    NODE_METHODS.each do |method|
-      if RUBY_VERSION >= "2.7"
-        class_eval <<~METHOD, __FILE__, __LINE__ + 1
-          def #{method}(...)
-            current_scope.#{method}(...)
-          end
-        METHOD
-      else
-        define_method method do |*args, &block|
-          current_scope.send(method, *args, &block)
-        end
-      end
-    end
-
-    # Initializes the receiver with the given string of HTML.
-    #
-    # @param html [String] the HTML to create the session out of
-    def initialize(html)
-      @document = Capybara::Node::Simple.new(html)
-    end
-
-    # (see Capybara::Session#within)
-    def within(*args, **kw_args)
-      new_scope = args.first.respond_to?(:to_capybara_node) ? args.first.to_capybara_node : find(*args, **kw_args)
-      begin
-        scopes.push(new_scope)
-        yield if block_given?
-      ensure
-        scopes.pop
-      end
-    end
-
-    # (see Capybara::Session#within_element)
-    alias_method :within_element, :within
-
-    # (see Capybara::Session#within_fieldset)
-    def within_fieldset(locator, &block)
-      within(:fieldset, locator, &block)
-    end
-
-    # (see Capybara::Session#within_table)
-    def within_table(locator, &block)
-      within(:table, locator, &block)
-    end
-
-    # (see Capybara::Node::Element#native)
-    def native
-      current_scope.native
-    end
-
-    private
-
-    attr_reader :document
-
-    def scopes
-      @scopes ||= [nil]
-    end
-
-    def current_scope
-      scopes.last.presence || document
-    end
-  end
-end