phlex 2.0.0.beta1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd808f50305105b7fb8cde4624804427da99fa7a3e59a20f6442e1db35e0983d
-  data.tar.gz: f3e7f7b703a27e3a00bbea42749e4682ac0255a3c3c12abca5c94f90de1be23c
+  metadata.gz: 4a6338c8f3742ef6e6bc493e259ba3681d9a651e79c067e030e4aaba8b889396
+  data.tar.gz: b0f21d0994c3ec89bb16f4037997e1327e068e7dce4b9b9bad2355df95f40de8
 SHA512:
-  metadata.gz: d66595c47ec3704a3b06c619e2fe8697252a8e9f5566be7c0c8082c06c69a46361686135411f04268854a1a087a78b24e072e7ca4fa98fd23b64dfaa147f6f07
-  data.tar.gz: e93c80673a2ca16d9585d76b8c348ec0a7ddf04013720d083dc064b432aaf7f1642bbe5a6b8622fea6c18eb453f663de0d36929bd903f3b40a7f243987a46dee
+  metadata.gz: ff0f545fe87d54db6170264df314eaf9190a1ac5718fc66e905b295c66771b61bcf76a302c94df85d1242ba804790707bb387867e25685c112e402516fb2a58e
+  data.tar.gz: 9b4b4615a772814e0b2bb9774802832bd007dd61a08ef5145e750fd43a5984327664050462e6f2cb82f57c9dc46d0d3858d29aa09404c62c9aa1d381c9b32b94

data/README.md

@@ -2,21 +2,18 @@
 
 Phlex lets you compose web views in pure Ruby.
 
-- [1.0 Stable Docs](https://www.phlex.fun)
-- [2.0 Beta Docs](https://beta.phlex.fun)
+- [v1 Stable Docs](https://www.phlex.fun)
+- [v2 Beta Docs](https://beta.phlex.fun)
 
-## Maintenance schedule
+## Versioning and Maintenance
 
-### Bug fixes
+Phlex does not follow semantic versioning (SemVer). Instead, we follow [BreakVer](https://www.taoensso.com/break-versioning).
 
-- Only the latest minor version of each major version will receive bug fixes
-- We may choose to fix bugs by releasing a new minor version rather than patching the existing minor version
-- Major versions will stop receiving bug fixes one year after the next major version is released
+When a security issue is brought to our attention, we aim to release patches as soon as possible. We aim to patch with a new `non-breaking` version:
 
-### Security patches
-
-- When a security issue is brought to our attention, we aim to release patches for any minor version that was released in the last year.
-- Additionally, the latest minor version of the latest major version will receive security patches, even if that version is over a year old.
+- every `minor` version that was released in the last year;
+- the latest `minor` version of the latest two `major` versions, even if over a year old; and
+- the `main` branch in GitHub.
 
 ## Prior Art 🎨
 

data/lib/phlex/context.rb

@@ -2,18 +2,19 @@
 
 # @api private
 class Phlex::Context
-	def initialize(user_context = {})
+	def initialize(user_context: {}, view_context: nil)
 		@buffer = +""
 		@capturing = false
 		@user_context = user_context
 		@fragments = nil
 		@in_target_fragment = false
 		@halt_signal = nil
+		@view_context = view_context
 	end
 
 	attr_accessor :buffer, :capturing, :user_context, :in_target_fragment
 
-	attr_reader :fragments
+	attr_reader :fragments, :view_context
 
 	def target_fragments(fragments)
 		@fragments = fragments.to_h { |it| [it, true] }

data/lib/phlex/csv.rb

@@ -9,13 +9,12 @@ class Phlex::CSV
 		@_headers = []
 		@_current_row = []
 		@_current_column_index = 0
-		@_view_context = nil
 		@_first = true
 	end
 
 	attr_reader :collection
 
-	def call(buffer = +"", view_context: nil)
+	def call(buffer = +"", context: nil)
 		unless escape_csv_injection? == true || escape_csv_injection? == false
 			raise <<~MESSAGE
 				You need to define escape_csv_injection? in #{self.class.name}, returning either `true` or `false`.
@@ -40,8 +39,6 @@ class Phlex::CSV
 			MESSAGE
 		end
 
-		@_view_context = view_context
-
 		each_item do |record|
 			yielder(record) do |*args, **kwargs|
 				view_template(*args, **kwargs)
@@ -73,12 +70,12 @@ class Phlex::CSV
 
 	def column(header = nil, value)
 		if @_first
-			@_headers << escape(header)
+			@_headers << __escape__(header)
 		elsif header != @_headers[@_current_column_index]
 			raise "Inconsistent header."
 		end
 
-		@_current_row << escape(value)
+		@_current_row << __escape__(value)
 		@_current_column_index += 1
 	end
 
@@ -105,11 +102,7 @@ class Phlex::CSV
 		nil
 	end
 
-	def helpers
-		@_view_context
-	end
-
-	def escape(value)
+	def __escape__(value)
 		value = trim_whitespace? ? value.to_s.strip : value.to_s
 		first_char = value[0]
 		last_char = value[-1]

data/lib/phlex/error.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
+# @api private
 module Phlex::Error
 end

data/lib/phlex/fifo.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# @api private
 class Phlex::FIFO
 	def initialize(max_bytesize: 2_000, max_value_bytesize: 2_000)
 		@store = {}

data/lib/phlex/helpers.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
+# @api private
 module Phlex::Helpers
 	private
 
-	# @return [Hash]
 	def mix(*args)
 		args.each_with_object({}) do |object, result|
 			result.merge!(object) do |_key, old, new|
@@ -26,6 +26,8 @@ module Phlex::Helpers
 					[old] + new.to_a
 				in [String, String]
 					"#{old} #{new}"
+				in [_, nil]
+					old
 				else
 					new
 				end