Clean up the repo

- Remove outdated CONTRIBUTING document - Stop using `template` - Update outdated helper references
phlex-ruby · Mar 17, 2024 · 16e7ce5 · 16e7ce5
1 parent f8ed079
commit 16e7ce5
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 52 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/lib/generators/phlex/component/templates/component.rb.erb b/lib/generators/phlex/component/templates/component.rb.erb
@@ -2,7 +2,7 @@
 
 <% module_namespacing do -%>
 class <%= class_name %>Component < ApplicationComponent
-  def template
+  def view_template
     h1 { "<%= class_name %>" }
     p { "Find me in <%= @path %>" }
   end

diff --git a/lib/generators/phlex/install/templates/application_layout.rb b/lib/generators/phlex/install/templates/application_layout.rb
@@ -3,7 +3,7 @@
 class ApplicationLayout < ApplicationView
 	include Phlex::Rails::Layout
 
-	def template(&block)
+	def view_template(&block)
 		doctype
 
 		html do

diff --git a/lib/generators/phlex/view/templates/view.rb.erb b/lib/generators/phlex/view/templates/view.rb.erb
@@ -2,7 +2,7 @@
 
 <% module_namespacing do -%>
 class <%= class_name %>View < ApplicationView
-  def template
+  def view_template
     h1 { "<%= class_name %>" }
     p { "Find me in <%= @path %>" }
   end

diff --git a/lib/phlex/rails.rb b/lib/phlex/rails.rb
@@ -10,13 +10,13 @@ module Rails
 		autoload :BufferedFormBuilder, "phlex/rails/buffered_form_builder"
 		autoload :BufferedLabelBuilder, "phlex/rails/buffered_label_builder"
 		autoload :BufferedRadioButtonBuilder, "phlex/rails/buffered_radio_button_builder"
-		autoload :HelperMacros, "phlex/rails/helper_macros"
 		autoload :CSV, "phlex/rails/csv"
-		autoload :SGML, "phlex/rails/sgml"
 		autoload :HTML, "phlex/rails/html"
-		autoload :UnbufferedOverrides, "phlex/rails/unbuffered_overrides"
+		autoload :HelperMacros, "phlex/rails/helper_macros"
 		autoload :Helpers, "phlex/rails/helpers"
 		autoload :Layout, "phlex/rails/layout"
+		autoload :SGML, "phlex/rails/sgml"
+		autoload :UnbufferedOverrides, "phlex/rails/unbuffered_overrides"
 	end
 
 	CSV.prepend Phlex::Rails::CSV::Overrides

diff --git a/lib/phlex/rails/layout.rb b/lib/phlex/rails/layout.rb
@@ -6,12 +6,12 @@ module Layout
 		include Helpers::CSRFMetaTags
 		include Helpers::FaviconLinkTag
 		include Helpers::PreloadLinkTag
-		include Helpers::StyleSheetLinkTag
+		include Helpers::StylesheetLinkTag
 		include Helpers::ActionCableMetaTag
 		include Helpers::AutoDiscoveryLinkTag
-		include Helpers::JavaScriptIncludeTag
-		include Helpers::JavaScriptImportMapTags
-		include Helpers::JavaScriptImportModuleTag
+		include Helpers::JavascriptIncludeTag
+		include Helpers::JavascriptImportmapTags
+		include Helpers::JavascriptImportModuleTag
 
 		# @api private
 		module Interface

diff --git a/spec/c_level_proc_spec.rb b/spec/c_level_proc_spec.rb
@@ -3,7 +3,7 @@
 # require "spec_helper"
 
 # class A < Phlex::HTML
-# 	def template
+# 	def view_template
 # 		yield
 # 	end
 
@@ -13,7 +13,7 @@
 # end
 
 # class B < Phlex::HTML
-# 	def template
+# 	def view_template
 # 		render A.new(&:foo)
 # 	end
 # end

diff --git a/spec/helpers/builder_yielding_helper_spec.rb b/spec/helpers/builder_yielding_helper_spec.rb
@@ -13,7 +13,7 @@
 		Class.new(Phlex::HTML) do
 			include Phlex::Rails::Helpers::FormWith
 
-			def template
+			def view_template
 				form_with url: "/foo" do |f|
 					f.text_field :name
 

diff --git a/spec/helpers/output_helper_spec.rb b/spec/helpers/output_helper_spec.rb
@@ -2,16 +2,16 @@
 
 require "spec_helper"
 
-RSpec.describe Phlex::Rails::Helpers::DateTimeFieldTag do
+RSpec.describe Phlex::Rails::Helpers::DatetimeFieldTag do
 	include ViewHelper
 
 	let(:output) { render example.new }
 
 	let(:example) do
 		Class.new(Phlex::HTML) do
-			include Phlex::Rails::Helpers::DateTimeFieldTag
+			include Phlex::Rails::Helpers::DatetimeFieldTag
 
-			def template
+			def view_template
 				datetime_field_tag :created_at
 			end
 		end

diff --git a/spec/helpers/output_helper_with_capture_block_spec.rb b/spec/helpers/output_helper_with_capture_block_spec.rb
@@ -11,7 +11,7 @@
 		Class.new(Phlex::HTML) do
 			include Phlex::Rails::Helpers::LinkTo
 
-			def template
+			def view_template
 				link_to "Foo", "/foo"
 
 				link_to("/bar") do

diff --git a/spec/helpers/tag_spec.rb b/spec/helpers/tag_spec.rb
@@ -12,7 +12,7 @@
 			Class.new(Phlex::HTML) do
 				include Phlex::Rails::Helpers::Tag
 
-				def template
+				def view_template
 					tag.div "Hello"
 				end
 			end
@@ -28,7 +28,7 @@ def template
 			Class.new(Phlex::HTML) do
 				include Phlex::Rails::Helpers::Tag
 
-				def template
+				def view_template
 					tag.h1 do
 						tag.h2 do
 							h3 { "Hello" }
@@ -48,7 +48,7 @@ def template
 			Class.new(Phlex::HTML) do
 				include Phlex::Rails::Helpers::Tag
 
-				def template
+				def view_template
 					tag(:img, src: "image.jpg")
 				end
 			end

diff --git a/spec/helpers/value_helper_spec.rb b/spec/helpers/value_helper_spec.rb
@@ -11,7 +11,7 @@
 		Class.new(Phlex::HTML) do
 			include Phlex::Rails::Helpers::NumberToHuman
 
-			def template
+			def view_template
 				div do
 					number_to_human 10_000
 				end

diff --git a/spec/internal/app/controllers/examples_controller.rb b/spec/internal/app/controllers/examples_controller.rb
@@ -6,7 +6,7 @@ def form_with
 	end
 
 	def view_component; end
-	def templateless_view_component; end
+	def view_templateless_view_component; end
 	def tabs; end
 	def card; end
 end
diff --git a/spec/internal/app/views/articles/index_view.rb b/spec/internal/app/views/articles/index_view.rb
@@ -3,7 +3,7 @@
 class Articles::IndexView < Phlex::HTML
 	include Phlex::Rails::Helpers::ContentFor
 
-	def template
+	def view_template
 		content_for(:title) { "Articles" }
 		h1 { "Articles" }
 	end

diff --git a/spec/internal/app/views/components/card_component.rb b/spec/internal/app/views/components/card_component.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CardComponent < Phlex::HTML
-	def template(&block)
+	def view_template(&block)
 		article(&block)
 	end
 

diff --git a/spec/internal/app/views/components/tabs_component.rb b/spec/internal/app/views/components/tabs_component.rb
@@ -9,7 +9,7 @@ def initialize
 		@tabs = []
 	end
 
-	def template
+	def view_template
 		div(class: "tabs") do
 			ul(class: "names") do
 				@tabs.each { |t| li { t.name } }

diff --git a/spec/internal/app/views/helpers/form_with_view.rb b/spec/internal/app/views/helpers/form_with_view.rb
@@ -4,7 +4,7 @@ module Helpers
 	class FormWithView < Phlex::HTML
 		include Phlex::Rails::Helpers::FormWith
 
-		def template
+		def view_template
 			form_with do |f|
 				f.text_field :name
 			end

diff --git a/spec/internal/app/views/layouts/application_layout.rb b/spec/internal/app/views/layouts/application_layout.rb
@@ -3,7 +3,7 @@
 class ApplicationLayout < Phlex::HTML
 	include Phlex::Rails::Layout
 
-	def template(&block)
+	def view_template(&block)
 		doctype
 
 		html do

diff --git a/spec/phlex/sgml_spec.rb b/spec/phlex/sgml_spec.rb
@@ -7,7 +7,7 @@
 		context "when given a block" do
 			it "renders content in the proper order" do
 				component = Class.new(Phlex::HTML) do
-					def template(&block)
+					def view_template(&block)
 						plain "Component A\n"
 						render("examples/sgml/wrap", &block)
 						plain "Component B\n"
@@ -38,7 +38,7 @@ def template(&block)
 
 		it "renders a template without a block" do
 			component = Class.new(Phlex::HTML) do
-				def template
+				def view_template
 					render(template: "examples/sgml/template")
 				end
 			end