phlex 2.3.2 → 2.4.0.beta1

data/lib/phlex/sgml.rb

@@ -2,15 +2,6 @@
 
 # **Standard Generalized Markup Language** for behaviour common to {HTML} and {SVG}.
 class Phlex::SGML
-	UNSAFE_ATTRIBUTES = Set.new(%w[srcdoc sandbox http-equiv]).freeze
-	REF_ATTRIBUTES = Set.new(%w[href src action formaction lowsrc dynsrc background ping xlinkhref]).freeze
-	NAMED_CHARACTER_REFERENCES = {
-		"colon" => ":",
-		"tab" => "\t",
-		"newline" => "\n",
-	}.freeze
-	UNSAFE_ATTRIBUTE_NAME_CHARS = %r([<>&"'/=\s\x00])
-
 	ERBCompiler = ERB::Compiler.new("<>").tap do |compiler|
 		compiler.pre_cmd    = [""]
 		compiler.put_cmd    = "@_state.buffer.<<"
@@ -468,284 +459,10 @@ class Phlex::SGML
 		true
 	end
 
-	private def __attributes__(attributes, buffer = +"")
-		attributes.each do |k, v|
-			next unless v
-
-			name = case k
-				when String then k
-				when Symbol then k.name.tr("_", "-")
-				else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols.")
-			end
-
-			value = case v
-			when true
-				true
-			when String
-				v.gsub('"', "&quot;")
-			when Symbol
-				v.name.tr("_", "-").gsub('"', "&quot;")
-			when Integer, Float
-				v.to_s
-			when Date
-				v.iso8601
-			when Time
-				v.respond_to?(:iso8601) ? v.iso8601 : v.strftime("%Y-%m-%dT%H:%M:%S%:z")
-			when Hash
-				case k
-				when :style
-					__styles__(v).gsub('"', "&quot;")
-				else
-					__nested_attributes__(v, "#{name}-", buffer)
-				end
-			when Array
-				case k
-				when :style
-					__styles__(v).gsub('"', "&quot;")
-				else
-					__nested_tokens__(v)
-				end
-			when Set
-				case k
-				when :style
-					__styles__(v).gsub('"', "&quot;")
-				else
-					__nested_tokens__(v.to_a)
-				end
-			when Phlex::SGML::SafeObject
-				v.to_s.gsub('"', "&quot;")
-			else
-				raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
-			end
-
-			lower_name = name.downcase
-
-			unless Phlex::SGML::SafeObject === v
-				normalized_name = lower_name.delete("^a-z-")
-
-				if value != true && REF_ATTRIBUTES.include?(normalized_name)
-					case value
-					when String
-						decoded_value = decode_html_character_references(value)
-
-						if decoded_value.downcase.delete("^a-z:").start_with?("javascript:")
-							# We just ignore these because they were likely not specified by the developer.
-							next
-						end
-					else
-						raise Phlex::ArgumentError.new("Invalid attribute value for #{k}: #{v.inspect}.")
-					end
-				end
-
-				if normalized_name.bytesize > 2 && normalized_name.start_with?("on") && !normalized_name.include?("-")
-					raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
-				end
-
-				if UNSAFE_ATTRIBUTES.include?(normalized_name)
-					raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
-				end
-			end
-
-			if name.match?(UNSAFE_ATTRIBUTE_NAME_CHARS)
-				raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
-			end
-
-			if lower_name.to_sym == :id && k != :id
-				raise Phlex::ArgumentError.new(":id attribute should only be passed as a lowercase symbol.")
-			end
-
-			case value
-			when true
-				buffer << " " << name
-			when String
-				buffer << " " << name << '="' << value << '"'
-			end
-		end
-
-		buffer
-	end
-
-	# Provides the nested-attributes case for serializing out attributes.
-	# This allows us to skip many of the checks the `__attributes__` method must perform.
-	private def __nested_attributes__(attributes, base_name, buffer = +"")
-		attributes.each do |k, v|
-			next unless v
-
-			if (root_key = (:_ == k))
-				name = ""
-				original_base_name = base_name
-				base_name = base_name.delete_suffix("-")
-			else
-				name = case k
-					when String then k
-					when Symbol then k.name.tr("_", "-")
-					else raise Phlex::ArgumentError.new("Attribute keys should be Strings or Symbols")
-				end
-
-				if name.match?(UNSAFE_ATTRIBUTE_NAME_CHARS)
-					raise Phlex::ArgumentError.new("Unsafe attribute name detected: #{k}.")
-				end
-			end
-
-			case v
-			when true
-				buffer << " " << base_name << name
-			when String
-				buffer << " " << base_name << name << '="' << v.gsub('"', "&quot;") << '"'
-			when Symbol
-				buffer << " " << base_name << name << '="' << v.name.tr("_", "-").gsub('"', "&quot;") << '"'
-			when Integer, Float
-				buffer << " " << base_name << name << '="' << v.to_s << '"'
-			when Hash
-				__nested_attributes__(v, "#{base_name}#{name}-", buffer)
-			when Array
-				buffer << " " << base_name << name << '="' << __nested_tokens__(v) << '"'
-			when Set
-				buffer << " " << base_name << name << '="' << __nested_tokens__(v.to_a) << '"'
-			when Phlex::SGML::SafeObject
-				buffer << " " << base_name << name << '="' << v.to_s.gsub('"', "&quot;") << '"'
-			else
-				raise Phlex::ArgumentError.new("Invalid attribute value #{v.inspect}.")
-			end
-
-			if root_key
-				base_name = original_base_name
-			end
-
-			buffer
-		end
-	end
-
-	private def __nested_tokens__(tokens, sep = " ")
-		buffer = +""
-
-		i, length = 0, tokens.length
-
-		while i < length
-			token = tokens[i]
-
-			case token
-			when String
-				if i > 0
-					buffer << sep << token
-				else
-					buffer << token
-				end
-			when Symbol
-				if i > 0
-					buffer << sep << token.name.tr("_", "-")
-				else
-					buffer << token.name.tr("_", "-")
-				end
-			when Integer, Float, Phlex::SGML::SafeObject
-				if i > 0
-					buffer << sep << token.to_s
-				else
-					buffer << token.to_s
-				end
-			when Array
-				if token.length > 0
-					if i > 0
-						buffer << sep << __nested_tokens__(token, sep)
-					else
-						buffer << __nested_tokens__(token, sep)
-					end
-				end
-			when nil
-				# Do nothing
-			else
-				raise Phlex::ArgumentError.new("Invalid token type: #{token.class}.")
-			end
-
-			i += 1
-		end
-
-		buffer.gsub('"', "&quot;")
-	end
-
-	private def decode_html_character_references(value)
-		value
-			.gsub(/&#x([0-9a-f]+);?/i) {
-				begin
-					[$1.to_i(16)].pack("U*")
-				rescue
-					""
-				end
-			}
-			.gsub(/&#(\d+);?/) {
-				begin
-					[$1.to_i].pack("U*")
-				rescue
-					""
-				end
-			}
-			.gsub(/&([a-z][a-z0-9]+);?/i) {
-				NAMED_CHARACTER_REFERENCES[$1.downcase] || ""
-			}
-	end
-
-	# Result is **unsafe**, so it should be escaped!
-	private def __styles__(styles)
-		case styles
-		when Array, Set
-			styles.filter_map do |s|
-				case s
-				when String
-					if s == "" || s.end_with?(";")
-						s
-					else
-						"#{s};"
-					end
-				when Phlex::SGML::SafeObject
-					value = s.to_s
-					value.end_with?(";") ? value : "#{value};"
-				when Hash
-					next __styles__(s)
-				when nil
-					next nil
-				else
-					raise Phlex::ArgumentError.new("Invalid style: #{s.inspect}.")
-				end
-			end.join(" ")
-		when Hash
-			buffer = +""
-			i = 0
-			styles.each do |k, v|
-				prop = case k
-				when String
-					k
-				when Symbol
-					k.name.tr("_", "-")
-				else
-					raise Phlex::ArgumentError.new("Style keys should be Strings or Symbols.")
-				end
-
-				value = case v
-				when String
-					v
-				when Symbol
-					v.name.tr("_", "-")
-				when Integer, Float, Phlex::SGML::SafeObject
-					v.to_s
-				when nil
-					nil
-				else
-					raise Phlex::ArgumentError.new("Invalid style value: #{v.inspect}")
-				end
-
-				if value
-					if i == 0
-						buffer << prop << ": " << value << ";"
-					else
-						buffer << " " << prop << ": " << value << ";"
-					end
-				end
-
-				i += 1
-			end
-
-			buffer
-		end
+	private def __render_attributes__(attributes)
+		state = @_state
+		return unless state.should_render?
+		state.buffer << (Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes))
 	end
 
 	private_class_method def self.method_added(method_name)
@@ -755,8 +472,13 @@ class Phlex::SGML
 			if location[0] in "/" | "."
 				Phlex.__expand_attribute_cache__(location)
 			end
-		else
-			super
 		end
+
+		super
+	end
+
+	def self.__compile__(method_name)
+		path, line = instance_method(method_name).source_location
+		Phlex::Compiler::Method.new(self, path, line, method_name).compile
 	end
 end

data/lib/phlex/svg.rb

@@ -41,14 +41,14 @@ class Phlex::SVG < Phlex::SGML
 			raise Phlex::ArgumentError.new("Expected the tag name to be a Symbol.")
 		end
 
-		if (tag = StandardElements.__registered_elements__[name]) || ((tag = name.name.tr("_", "-")).include?("-") && tag.match?(/\A[a-z0-9-]+\z/))
+		if (tag = StandardElements.__registered_elements__[name]) || (tag = name.name.tr("_", "-")).include?("-")
 			if attributes.length > 0 # with attributes
 				if block_given # with content block
-					buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << ">"
+					buffer << "<#{tag}" << (Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << ">"
 					__yield_content__(&)
 					buffer << "</#{tag}>"
 				else # without content
-					buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= __attributes__(attributes)) << "></#{tag}>"
+					buffer << "<#{tag}" << (::Phlex::ATTRIBUTE_CACHE[attributes] ||= Phlex::SGML::Attributes.generate_attributes(attributes)) << "></#{tag}>"
 				end
 			else # without attributes
 				if block_given # with content block

data/lib/phlex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Phlex
-	VERSION = "2.3.2"
+	VERSION = "2.4.0.beta1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phlex
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0.beta1
 platform: ruby
 authors:
 - Joel Drapper
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: refract
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Build HTML, SVG and CSV views with Ruby classes.
 email:
 - joel@drapper.me
@@ -34,6 +48,11 @@ files:
 - LICENSE.txt
 - README.md
 - lib/phlex.rb
+- lib/phlex/compiler.rb
+- lib/phlex/compiler/class_compiler.rb
+- lib/phlex/compiler/compilation.rb
+- lib/phlex/compiler/file_compiler.rb
+- lib/phlex/compiler/method_compiler.rb
 - lib/phlex/csv.rb
 - lib/phlex/error.rb
 - lib/phlex/errors/argument_error.rb
@@ -48,6 +67,7 @@ files:
 - lib/phlex/html/void_elements.rb
 - lib/phlex/kit.rb
 - lib/phlex/sgml.rb
+- lib/phlex/sgml/attributes.rb
 - lib/phlex/sgml/elements.rb
 - lib/phlex/sgml/safe_object.rb
 - lib/phlex/sgml/safe_value.rb
@@ -79,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Object-oriented views in Ruby.
 test_files: []