phlex-rails 2.0.0.beta1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba6c0a4545578f13da48e443ca0751b5549eefd6cb9b2f866d0cfe436f5451b
-  data.tar.gz: 21695f056968e79c6f692328d2666b9933fbf63ef3def64a46eced386019faaa
+  metadata.gz: 82a501ef5c7c4fafcc63ec4cab4c4e2463be6dbdb467af0bb87ef03cf0bd4b10
+  data.tar.gz: 781b9217536035e543e9ddc9db55dbfca518faf40974804eced2b49b8b9db97e
 SHA512:
-  metadata.gz: cece72abf570509143731193eaf0052c4a724ee294bf022b041751dc36e832e139cb808db3eb1ffd3d77a8fb41bc22c4013ad1824b86bc3fe3455a28c41d8c3a
-  data.tar.gz: afa2c05f30141978622fb6f964d426742e2ce772bfb3c0752b470f6e44217ac7f00f6800d975f6305a4b1cd498ed98ff613fbdb8a3202c02b155554791a81ff2
+  metadata.gz: b21338b1d04ef04300133459bdbbf27d9cd07c023bbc7bdf0282c310ef214170be4d12a30fc9a1637fcc00db54329728ddd6852cd7d2d14fb047d651b37f3cee
+  data.tar.gz: 05f5a87850528bcf32ec8dafce55971a2dbdfaa5a17e0e7291d6a040e761da706ad83d54310562e8f0da59fb26b8cd5ed3d5642fa41bb95bf6304e187d7ad9a9

data/lib/generators/phlex/component/USAGE

@@ -0,0 +1,8 @@
+Description:
+  Generates a new Phlex component
+
+Example:
+  rails generate phlex:component Sidebar
+
+This will create:
+  app/components/sidebar.rb

data/lib/generators/phlex/component/templates/component.rb.erb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Components::<%= class_name %> < Components::Base
+  def view_template
+    h1 { "<%= class_name %>" }
+    p { "Find me in <%= @path %>" }
+  end
+end

data/lib/generators/phlex/install/USAGE

@@ -0,0 +1,10 @@
+Description:
+  Installs Phlex
+
+Example:
+  rails generate phlex:install
+
+This will create:
+  app/views/base.rb
+  app/components/base.rb
+	app/initializers/phlex.rb

data/lib/generators/phlex/install/install_generator.rb

@@ -10,7 +10,7 @@ module Phlex::Generators
 			if tailwind_configuration_path
 				insert_into_file tailwind_configuration_path, after: "content: [" do
 					"\n    './app/views/**/*.rb', // Phlex views" \
-					"\n    './app/components/**/*.rb', // Phlex components" \
+						"\n    './app/components/**/*.rb', // Phlex components" \
 				end
 			end
 		end
@@ -23,10 +23,6 @@ module Phlex::Generators
 			template "base_view.rb.erb", Rails.root.join("app/views/base.rb")
 		end
 
-		def create_hello_component
-			template "hello_component.rb.erb", Rails.root.join("app/components/hello.rb")
-		end
-
 		def create_initializer
 			template "phlex.rb.erb", Rails.root.join("config/initializers/phlex.rb")
 		end

data/lib/generators/phlex/install/templates/base_component.rb.erb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Components::Base < Phlex::HTML
+  include Components
+
+  # Include any helpers you want to be available across all components
+  include Phlex::Rails::Helpers::Routes
+
+  if Rails.env.development?
+    def before_template
+      comment { "Before #{self.class.name}" }
+      super
+    end
+  end
+end

data/lib/generators/phlex/install/templates/base_view.rb.erb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Views::Base < Components::Base
+  # The `Views::Base` is an abstract class for all your views.
+
+  # By default, it inherits from `Components::Base`, but you
+  # can change that to `Phlex::HTML` if you want to keep views and
+  # components independent.
+end

data/lib/generators/phlex/install/templates/phlex.rb.erb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Views
+end
+
+module Components
+  extend Phlex::Kit
+end
+
+Rails.autoloaders.main.push_dir(
+  "#{Rails.root}/app/views", namespace: Views
+)
+
+Rails.autoloaders.main.push_dir(
+  "#{Rails.root}/app/components", namespace: Components
+)

data/lib/generators/phlex/view/USAGE

@@ -0,0 +1,8 @@
+Description:
+  Generates a Phlex view with the given name
+
+Example:
+  rails generate phlex:view Articles::Index
+
+This will create:
+  app/views/articles/index.rb

data/lib/generators/phlex/view/templates/view.rb.erb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Views::<%= "#{namespace}::" if namespaced? %><%= class_name %> < Views::Base
+  def view_template
+    h1 { "<%= class_name %>" }
+    p { "Find me in <%= @path %>" }
+  end
+end

data/lib/phlex/rails/partial.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Phlex::Rails::Partial
+	def initialize(path, *args, **kwargs, &block)
+		@path = path
+		@args = args
+		@kwargs = kwargs
+		@block = block
+	end
+
+	def render_in(view_context, &block)
+		block ||= @block
+		view_context.render(@path, *@args, **@kwargs, &block)
+	end
+end

data/lib/phlex/rails/sgml.rb

@@ -10,11 +10,25 @@ module Phlex
 			end
 
 			module Overrides
+				class HelpersCalledBeforeRenderError < StandardError; end
+
+				def partial(*, **, &block)
+					if block
+						Phlex::Rails::Partial.new(*, **) { capture(&block) }
+					else
+						Phlex::Rails::Partial.new(*, **)
+					end
+				end
+
 				def helpers
-					if defined?(ViewComponent::Base) && ViewComponent::Base === @_view_context
-						@_view_context.helpers
+					unless @_context && (view_context = @_context.view_context)
+						raise HelpersCalledBeforeRenderError.new("Do not use rails helpers until after the view has been rendered.") unless view_context
+					end
+
+					if defined?(ViewComponent::Base) && ViewComponent::Base === view_context
+						view_context.helpers
 					else
-						@_view_context
+						view_context
 					end
 				end
 
@@ -28,20 +42,12 @@ module Phlex
 						return super if renderable < Phlex::SGML
 					when Enumerable
 						return super unless ActiveRecord::Relation === renderable
-					when nil
-						partial = kwargs.delete(:partial)
-
-						if partial # this is a hack to get around https://github.com/rails/rails/issues/51015
-							return raw(
-								@_view_context.render(partial, **kwargs) do |*yielded_args|
-									capture(*yielded_args, &block)
-								end,
-							)
-						end
 					end
 
+					return super if args.length == 0 && kwargs.length == 0
+
 					output = if block
-						@_view_context.render(*args, **kwargs) do |*yielded_args|
+						@_context.view_context.render(*args, **kwargs) do |*yielded_args|
 							if yielded_args.length == 1 && defined?(ViewComponent::Base) && ViewComponent::Base === yielded_args[0]
 								capture(Phlex::Rails::Buffered.new(yielded_args[0], view: self), &block)
 							else
@@ -49,7 +55,7 @@ module Phlex
 							end
 						end
 					else
-						@_view_context.render(*args, **kwargs)
+						@_context.view_context.render(*args, **kwargs)
 					end
 
 					raw(output)

data/lib/phlex/rails/testing.rb

@@ -13,6 +13,6 @@ module Phlex::Testing::RailsContext
 	end
 end
 
-Phlex::Testing::SGML.include(
+Phlex::Testing::SGML.prepend(
 	Phlex::Testing::RailsContext,
 )

data/lib/phlex/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Phlex
 	module Rails
-		VERSION = "2.0.0.beta1"
+		VERSION = "2.0.0.rc1"
 	end
 end

data/lib/phlex/rails.rb

@@ -12,11 +12,12 @@ module Phlex
 		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"
 		autoload :Helpers, "phlex/rails/helpers"
-		autoload :HTML, "phlex/rails/html"
 		autoload :Layout, "phlex/rails/layout"
+		autoload :Partial, "phlex/rails/partial"
 		autoload :SGML, "phlex/rails/sgml"
 		autoload :Streaming, "phlex/rails/streaming"
 		autoload :Unbuffered, "phlex/rails/unbuffered"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phlex-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Joel Drapper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta1
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta1
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '9'
 description: A high-performance view framework optimised for fun.
 email:
 - joel@drapper.me
@@ -53,8 +53,16 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
+- lib/generators/phlex/component/USAGE
 - lib/generators/phlex/component/component_generator.rb
+- lib/generators/phlex/component/templates/component.rb.erb
+- lib/generators/phlex/install/USAGE
 - lib/generators/phlex/install/install_generator.rb
+- lib/generators/phlex/install/templates/base_component.rb.erb
+- lib/generators/phlex/install/templates/base_view.rb.erb
+- lib/generators/phlex/install/templates/phlex.rb.erb
+- lib/generators/phlex/view/USAGE
+- lib/generators/phlex/view/templates/view.rb.erb
 - lib/generators/phlex/view/view_generator.rb
 - lib/phlex-rails.rb
 - lib/phlex/rails.rb
@@ -269,6 +277,7 @@ files:
 - lib/phlex/rails/helpers/word_wrap.rb
 - lib/phlex/rails/html.rb
 - lib/phlex/rails/layout.rb
+- lib/phlex/rails/partial.rb
 - lib/phlex/rails/sgml.rb
 - lib/phlex/rails/streaming.rb
 - lib/phlex/rails/testing.rb