Use new good cop rules

Author: joeldrapper

fixtures/components/article.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Components::Article < Phlex::HTML
-	def view_template(&block)
-		article(&block)
+	def view_template(&)
+		article(&)
 	end
 end

lib/phlex/csv.rb

@@ -84,8 +84,8 @@ def column(header = nil, value)
 		@_current_column_index += 1
 	end
 
-	def each_item(&block)
-		collection.each(&block)
+	def each_item(&)
+		collection.each(&)
 	end
 
 	def yielder(record)

lib/phlex/element_clobbering_guard.rb

@@ -4,7 +4,7 @@
 module Phlex::ElementClobberingGuard
 	def method_added(method_name)
 		if method_name[0] == "_" && element_method?(method_name[1..].to_sym)
-			raise Phlex::NameError, "👋 Redefining the method `#{name}##{method_name}` is not a good idea."
+			raise Phlex::NameError.new("👋 Redefining the method `#{name}##{method_name}` is not a good idea.")
 		else
 			super
 		end

lib/phlex/helpers.rb

@@ -21,9 +21,9 @@ module Phlex::Helpers
 	def tokens(*tokens, **conditional_tokens)
 		conditional_tokens.each do |condition, token|
 			truthy = case condition
-				when Symbol then send(condition)
+				when Symbol then __send__(condition)
 				when Proc then condition.call
-				else raise ArgumentError, "The class condition must be a Symbol or a Proc."
+				else raise ArgumentError.new("The class condition must be a Symbol or a Proc.")
 			end
 
 			if truthy
@@ -51,8 +51,7 @@ def __append_token__(tokens, token)
 			when String then tokens << token
 			when Symbol then tokens << token.name
 			when Array then tokens.concat(token)
-			else raise ArgumentError,
-				"Conditional classes must be Symbols, Strings, or Arrays of Symbols or Strings."
+			else raise ArgumentError.new("Conditional classes must be Symbols, Strings, or Arrays of Symbols or Strings.")
 		end
 	end
 

lib/phlex/kit.rb

@@ -2,9 +2,9 @@
 
 module Phlex::Kit
 	module LazyLoader
-		def method_missing(name, *args, **kwargs, &block)
+		def method_missing(name, ...)
 			if name[0] == name[0].upcase && __phlex_kit_constants__.include?(name) && __get_phlex_kit_constant__(name) && methods.include?(name)
-				public_send(name, *args, **kwargs, &block)
+				public_send(name, ...)
 			else
 				super
 			end
@@ -42,9 +42,9 @@ def const_added(name)
 
 		if Class === constant && constant < Phlex::SGML
 			if instance_methods.include?(name)
-				raise NameError, "The instance method `#{name}' is already defined on `#{inspect}`."
+				raise NameError.new("The instance method `#{name}' is already defined on `#{inspect}`.")
 			elsif methods.include?(name)
-				raise NameError, "The method `#{name}' is already defined on `#{inspect}`."
+				raise NameError.new("The method `#{name}' is already defined on `#{inspect}`.")
 			end
 
 			constant.include(self)

lib/phlex/sgml.rb

@@ -13,9 +13,9 @@ def call(...)
 
 			# Create a new instance of the component.
 			# @note The block will not be delegated {#initialize}. Instead, it will be sent to {#template} when rendering.
-			def new(*args, **kwargs, &block)
+			def new(*, **, &block)
 				if block
-					object = super(*args, **kwargs, &nil)
+					object = super(*, **, &nil)
 					object.instance_exec { @_content_block = block }
 					object
 				else
@@ -72,7 +72,7 @@ def await(task)
 				flush if task.running?
 				task.wait
 			else
-				raise ArgumentError, "Expected an asynchronous task / promise."
+				raise ArgumentError.new("Expected an asynchronous task / promise.")
 			end
 		end
 
@@ -83,7 +83,7 @@ def call(buffer = +"", context: Phlex::Context.new, view_context: nil, parent: n
 			@_view_context = view_context
 			@_parent = parent
 
-			raise Phlex::DoubleRenderError, "You can't render a #{self.class.name} more than once." if @_rendered
+			raise Phlex::DoubleRenderError.new("You can't render a #{self.class.name} more than once.") if @_rendered
 			@_rendered = true
 
 			if fragments
@@ -140,7 +140,7 @@ def context
 		# @see #format_object
 		def plain(content)
 			unless __text__(content)
-				raise ArgumentError, "You've passed an object to plain that is not handled by format_object. See https://rubydoc.info/gems/phlex/Phlex/SGML#format_object-instance_method for more information"
+				raise ArgumentError.new("You've passed an object to plain that is not handled by format_object. See https://rubydoc.info/gems/phlex/Phlex/SGML#format_object-instance_method for more information")
 			end
 
 			nil
@@ -149,7 +149,7 @@ def plain(content)
 		# Output a whitespace character. This is useful for getting inline elements to wrap. If you pass a block, a whitespace will be output before and after yielding the block.
 		# @return [nil]
 		# @yield If a block is given, it yields the block with no arguments.
-		def whitespace(&block)
+		def whitespace(&)
 			context = @_context
 			return if context.fragments && !context.in_target_fragment
 
@@ -158,7 +158,7 @@ def whitespace(&block)
 			buffer << " "
 
 			if block_given?
-				yield_content(&block)
+				yield_content(&)
 				buffer << " "
 			end
 
@@ -167,14 +167,14 @@ def whitespace(&block)
 
 		# Output an HTML comment.
 		# @return [nil]
-		def comment(&block)
+		def comment(&)
 			context = @_context
 			return if context.fragments && !context.in_target_fragment
 
 			buffer = context.buffer
 
 			buffer << "<!-- "
-			yield_content(&block)
+			yield_content(&)
 			buffer << " -->"
 
 			nil
@@ -233,16 +233,16 @@ def flush
 		# 	@param enumerable [Enumerable]
 		# 	@example
 		# 		render @items
-		def render(renderable, &block)
+		def render(renderable, &)
 			case renderable
 			when Phlex::SGML
-				renderable.call(@_buffer, context: @_context, view_context: @_view_context, parent: self, &block)
+				renderable.call(@_buffer, context: @_context, view_context: @_view_context, parent: self, &)
 			when Class
 				if renderable < Phlex::SGML
-					renderable.new.call(@_buffer, context: @_context, view_context: @_view_context, parent: self, &block)
+					renderable.new.call(@_buffer, context: @_context, view_context: @_view_context, parent: self, &)
 				end
 			when Enumerable
-				renderable.each { |r| render(r, &block) }
+				renderable.each { |r| render(r, &) }
 			when Proc, Method
 				if renderable.arity == 0
 					yield_content_with_no_args(&renderable)
@@ -252,7 +252,7 @@ def render(renderable, &block)
 			when String
 				plain(renderable)
 			else
-				raise ArgumentError, "You can't render a #{renderable.inspect}."
+				raise ArgumentError.new("You can't render a #{renderable.inspect}.")
 			end
 
 			nil
@@ -385,15 +385,15 @@ def __attributes__(attributes, buffer = +"")
 				name = case k
 					when String then k
 					when Symbol then k.name.tr("_", "-")
-					else raise ArgumentError, "Attribute keys should be Strings or Symbols."
+					else raise ArgumentError.new("Attribute keys should be Strings or Symbols.")
 				end
 
 				lower_name = name.downcase
 				next if lower_name == "href" && v.to_s.downcase.delete("^a-z:").start_with?("javascript:")
 
 				# Detect unsafe attribute names. Attribute names are considered unsafe if they match an event attribute or include unsafe characters.
 				if HTML::EVENT_ATTRIBUTES.include?(lower_name.delete("^a-z-")) || name.match?(/[<>&"']/)
-					raise ArgumentError, "Unsafe attribute name detected: #{k}."
+					raise ArgumentError.new("Unsafe attribute name detected: #{k}.")
 				end
 
 				case v
@@ -406,11 +406,11 @@ def __attributes__(attributes, buffer = +"")
 				when Integer, Float
 					buffer << " " << name << '="' << v.to_s << '"'
 				when Hash
-			    case k
+					case k
 					when :class
 						buffer << " " << name << '="' << __classes__(v).gsub('"', "&quot;") << '"'
 					when :style
-					  buffer << " " << name << '="' << __styles__(v).gsub('"', "&quot;") << '"'
+						buffer << " " << name << '="' << __styles__(v).gsub('"', "&quot;") << '"'
 					else
 						__attributes__(
 							v.transform_keys { |subkey|
@@ -422,11 +422,11 @@ def __attributes__(attributes, buffer = +"")
 						)
 					end
 				when Array
-			    value = case k
+					value = case k
 					when :class
 						__classes__(v)
 					when :style
-					  __styles__(v)
+						__styles__(v)
 					else
 						v.compact.join(" ")
 					end
@@ -465,7 +465,7 @@ def __classes__(c)
 					case c
 						when String then c
 						when Symbol then c.name.tr("_", "-").delete_suffix("?")
-						else raise ArgumentError, "Class keys should be Strings or Symbols."
+						else raise ArgumentError.new("Class keys should be Strings or Symbols.")
 					end
 				}.join(" ")
 			when nil, false
@@ -498,7 +498,7 @@ def __styles__(s)
 					prop = case k
 						when String then k
 						when Symbol then k.name.tr("_", "-")
-						else raise ArgumentError, "Style keys should be Strings or Symbols."
+						else raise ArgumentError.new("Style keys should be Strings or Symbols.")
 					end
 
 					value = __styles__(v)
@@ -520,7 +520,7 @@ def __styles__(s)
 				end
 			end
 
-			style.end_with?(";") ? style : style + ";"
+			style.end_with?(";") ? style : "#{style};"
 		end
 	end
 end

lib/phlex/testing/view_helper.rb

@@ -2,12 +2,12 @@
 
 module Phlex::Testing
 	module ViewHelper
-		def render(view, &block)
+		def render(view, &)
 			if view.is_a?(Class) && view < Phlex::SGML
 				view = view.new
 			end
 
-			view.call(view_context:, &block)
+			view.call(view_context:, &)
 		end
 
 		def view_context

lib/phlex/unbuffered.rb

@@ -21,15 +21,15 @@ def respond_to_missing?(...)
 		@object.respond_to?(...)
 	end
 
-	def method_missing(name, *args, **kwargs, &block)
+	def method_missing(name, ...)
 		if @object.respond_to?(name)
 
 			__class__.define_method(name) do |*a, **k, &b|
 				@object.capture { @object.public_send(name, *a, **k, &b) }
 			end
 
 			# Now we've defined this missing method, we can call it.
-			__public_send__(name, *args, **kwargs, &block)
+			__public_send__(name, ...)
 		else
 			super
 		end
@@ -40,8 +40,8 @@ def call(...)
 		@object.call(...)
 	end
 
-	def send(...)
-		@object.send(...)
+	def __send__(...)
+		@object.__send__(...)
 	end
 
 	def public_send(...)

quickdraw/csv.test.rb

@@ -23,7 +23,7 @@ def render_headers?
 	test "renders a CSV" do
 		products = [
 			Product.new("Apple", 1.00),
-			Product.new("Banana", 2.00)
+			Product.new("Banana", 2.00),
 		]
 
 		csv = Example.new(products).call
@@ -68,7 +68,7 @@ def render_headers?
 	test "renders without headers" do
 		products = [
 			Product.new("Apple", 1.00),
-			Product.new("Banana", 2.00)
+			Product.new("Banana", 2.00),
 		]
 
 		csv = ExampleWithoutHeaders.new(products).call

quickdraw/helpers/mix.test.rb

@@ -25,7 +25,7 @@
 test "supports hash concatenation" do
 	output = mix(
 		{ data: { controller: "foo" } },
-			{ data: { controller: "bar" } }
+		{ data: { controller: "bar" } },
 	)
 
 	expect(output) == { data: { controller: "foo bar" } }
@@ -34,7 +34,7 @@
 test "supports hash override" do
 	output = mix(
 		{ data: { controller: "foo" } },
-			{ data!: { controller: "bar" } }
+		{ data!: { controller: "bar" } },
 	)
 
 	expect(output) == { data: { controller: "bar" } }

quickdraw/sgml/attributes.test.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-{div: "div"}.each do |method_name, tag|
+{ div: "div" }.each do |method_name, tag|
 	describe "<#{tag}> with class array attribute" do
 		example = Class.new(Phlex::HTML) do
 			define_method :view_template do
-				send(method_name, class: ["class", nil, inactive: false, truthy: 1]) { "content" }
+				__send__(method_name, class: ["class", nil, inactive: false, truthy: 1]) { "content" }
 			end
 		end
 
@@ -16,7 +16,7 @@
 	describe "<#{tag}> with class hash attribute" do
 		example = Class.new(Phlex::HTML) do
 			define_method :view_template do
-				send(method_name, class: {class: true, inactive: false, truthy: 1}) { "content" }
+				__send__(method_name, class: { class: true, inactive: false, truthy: 1 }) { "content" }
 			end
 		end
 
@@ -28,7 +28,7 @@
 	describe "<#{tag}> with style array attribute" do
 		example = Class.new(Phlex::HTML) do
 			define_method :view_template do
-				send(method_name, style: ["color: red", nil, font_weight: "bold", opacity: 0]) { "content" }
+				__send__(method_name, style: ["color: red", nil, font_weight: "bold", opacity: 0]) { "content" }
 			end
 		end
 
@@ -40,7 +40,7 @@
 	describe "<#{tag}> with style hash attribute" do
 		example = Class.new(Phlex::HTML) do
 			define_method :view_template do
-				send(method_name, style: {color: "red", word_break: nil, font_weight: "bold"}) { "content" }
+				__send__(method_name, style: { color: "red", word_break: nil, font_weight: "bold" }) { "content" }
 			end
 		end
 

quickdraw/sgml/render_enumerable.test.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
 class Card < Phlex::HTML
-	def view_template(&block)
-		article(&block)
+	def view_template(&)
+		article(&)
 	end
 end
 
 class WithoutBlock < Phlex::HTML
 	def initialize
 		@cards = [
 			Card.new,
-			Card.new
+			Card.new,
 		]
 	end