code-ruby 1.7.8 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863226aa89094a7ba1eaff88e1dbb209e93a09149e12f60849ea90122fdcf750
-  data.tar.gz: 84c2dbfcf70ba9ecd4bcbf5f7a5b9cabe1ccaaf2173d69648907b3da723b3968
+  metadata.gz: 93a5aca92120dbf487443b4cf2f88e3c407326246c38b059bd865f2db1fba0c3
+  data.tar.gz: bd1b6b84eb2adb4f63ce11ccdb81e7666feeece6339ba3cca9a84b33490f076b
 SHA512:
-  metadata.gz: 8026a99f580dacac3bc10d30a97b0e3ee2a34d94e1a61773a0ed55f1b79981076255308fdf9aeabbafbdd77cde5ad884275d5b542f6b785937576f0b3bff8896
-  data.tar.gz: b474157be88e84ef3661f17ba1b73447ec16f8c140d478e3def89f7471c57b3958f3d1a30dcbfd7391935628c4a0d4103dfab709df25cd44e3099dbc5b8ceac0
+  metadata.gz: eedb4f5942efc5ef5ea2f4ee28a1cac8f136d05a9f465949cc8d2b4ad81bdc8f4ef1008358dfcbabb3cf939cbdfe4662f817204a652fdbb1b393f9649a1b0ec9
+  data.tar.gz: '089de3a0fb083295533c6f5ea5024754eaa450e84201792416313dff0544638f75c12e13442714ae3461d8c239b679edb5b2c38300c555d4ded3316cb3f5fd0b'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code-ruby (1.7.8)
+    code-ruby (1.8.0)
       activesupport
       base64
       bigdecimal

data/VERSION

@@ -1 +1 @@
-1.7.8
+1.8.0

data/lib/code/object/function.rb

@@ -107,6 +107,10 @@ class Code
             end
           end + [Object.repeat]
       end
+
+      def code_to_string
+        String.new("<#{self.class.name} #{raw}>")
+      end
     end
   end
 end

data/lib/code/object/global.rb

@@ -178,11 +178,7 @@ class Code
           end
         when "Url"
           sig(args) { Object.repeat }
-          if code_arguments.any?
-            Url.new(*code_arguments.raw)
-          else
-            Class.new(Url)
-          end
+          code_arguments.any? ? Url.new(*code_arguments.raw) : Class.new(Url)
         else
           code_context = code_context.code_lookup!(code_operator)
           code_result = code_context.code_fetch(code_operator)

data/lib/code/object/html.rb

@@ -3,6 +3,18 @@
 class Code
   class Object
     class Html < Object
+      TAGS = %w[
+        a abbr address area article aside audio b base bdi bdo blockquote body br
+        button canvas caption cite code col colgroup data datalist dd del details
+        dfn dialog div dl dt em embed fieldset figcaption figure footer form h1
+        h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins kbd
+        label legend li link main map mark meta meter nav noscript object ol
+        optgroup option output p picture pre progress q rp rt ruby s samp script
+        section select slot small source span strong style sub summary sup table
+        tbody td template textarea tfoot th thead time title tr track u ul var
+        video wbr
+      ].freeze
+
       def initialize(*args, **_kargs, &_block)
         self.raw =
           if args.first.is_an?(Html)
@@ -18,20 +30,129 @@ class Code
       def self.call(**args)
         code_operator = args.fetch(:operator, nil).to_code
         code_arguments = args.fetch(:arguments, []).to_code
+        globals = multi_fetch(args, *GLOBALS)
 
         case code_operator.to_s
         when "escape"
           sig(args) { Object.maybe }
-          code_escape(*code_arguments.raw)
+          code_escape(*code_arguments.raw, **globals)
+        when "join"
+          sig(args) { Object.repeat }
+          code_join(*code_arguments.raw, **globals)
+        when "text"
+          sig(args) { Object.maybe }
+          code_text(code_arguments.code_first, **globals)
+        when "raw"
+          sig(args) { Object.maybe }
+          code_raw(code_arguments.code_first, **globals)
         else
-          super
+          if TAGS.include?(code_operator.to_s.downcase)
+            sig(args) { [Dictionary.maybe, Function.maybe] }
+            code_tag(code_operator, *code_arguments.raw, **globals)
+          else
+            super
+          end
+        end
+      end
+
+      def self.code_tag(name, attributes_or_function = {}, function = nil, **globals)
+        code_name = name.to_code
+
+        if attributes_or_function.is_a?(Function)
+          code_attributes = {}.to_code
+          code_function = attributes_or_function.to_code
+        else
+          code_attributes = attributes_or_function.to_code
+          code_function = function.to_code
+        end
+
+        fragment = Nokogiri::HTML::DocumentFragment.parse("")
+        node = Nokogiri::XML::Node.new(code_name.to_s.downcase, fragment.document)
+
+        code_attributes.raw.each do |code_key, code_value|
+          next if code_key.nothing?
+          next if code_value.nothing?
+
+          node[code_key.to_s] = code_value.to_s
+        end
+
+        if code_function.something?
+          code_content = code_function.call(
+            arguments: List.new([code_name, code_attributes]),
+            **globals
+          )
+
+          if code_content.is_an?(Html)
+            content = Nokogiri::HTML::DocumentFragment.parse(code_content.to_html)
+          else
+            content = Nokogiri::XML::Text.new(code_content.to_s, fragment.document)
+          end
+
+          node.add_child(content)
         end
+
+        fragment.add_child(node)
+
+        Html.new(fragment)
       end
 
-      def self.code_escape(string = nil)
-        code_string = string.to_code
+      def self.code_escape(value_or_function = nil, **globals)
+        if value_or_function.is_a?(Function)
+          code_value = value_or_function.to_code.call(**globals)
+        else
+          code_value = value_or_function.to_code
+        end
 
-        String.new(CGI.escapeHTML(string.to_s))
+        String.new(CGI.escapeHTML(value.to_s))
+      end
+
+      def self.code_join(*contents_or_function, **globals)
+        if contents_or_function.is_a?(Function)
+          code_contents = contents_or_function.to_code.call(**globals)
+        else
+          code_contents = contents_or_function.to_code
+        end
+
+        fragment = Nokogiri::HTML::DocumentFragment.parse("")
+
+        code_contents.raw.each do |code_content|
+          if code_content.is_an?(Html)
+            content = Nokogiri::HTML::DocumentFragment.parse(code_content.to_html)
+          else
+            content = Nokogiri::XML::Text.new(code_content.to_s, fragment.document)
+          end
+
+          fragment.add_child(content)
+        end
+
+        Html.new(fragment)
+      end
+
+      def self.code_text(value_or_function = nil, **globals)
+        if value_or_function.is_a?(Function)
+          code_value = value_or_function.to_code.call(**globals)
+        else
+          code_value = value_or_function.to_code
+        end
+
+        fragment = Nokogiri::HTML::DocumentFragment.parse("")
+        fragment.add_child(Nokogiri::XML::Text.new(code_value.to_s, fragment.document))
+
+        Html.new(fragment)
+      end
+
+      def self.code_raw(value_or_function = nil, **globals)
+        if value_or_function.is_a?(Function)
+          code_value = value_or_function.to_code.call(**globals)
+        else
+          code_value = value_or_function.to_code
+        end
+
+        if code_value.is_an?(Html)
+          Html.new(Nokogiri::HTML::DocumentFragment.parse(code_value.to_html))
+        else
+          Html.new(Nokogiri::HTML::DocumentFragment.parse(code_value.to_s))
+        end
       end
 
       def call(**args)
@@ -53,6 +174,9 @@ class Code
         when "to_string"
           sig(args)
           code_to_string
+        when "to_html"
+          sig(args)
+          code_to_html
         else
           super
         end
@@ -89,6 +213,14 @@ class Code
         raw.text
       end
 
+      def to_html
+        raw.to_html
+      end
+
+      def code_to_html
+        String.new(raw.to_html)
+      end
+
       def code_to_string
         String.new(raw.text)
       end

data/lib/code/type/sig.rb

@@ -134,6 +134,7 @@ class Code
 
         actual_arguments.each do |actual|
           expected = expected_arguments[expected_index]
+
           if expected.is_a?(Repeat)
             if valid_for?(expected: expected, actual: actual)
               repeat_index += 1
@@ -149,6 +150,8 @@ class Code
           elsif valid_for?(expected: expected, actual: actual)
             expected_index += 1
             repeat_index = 0
+          elsif expected.is_a?(Maybe)
+            repeat_index = 0
           else
             raise(
               Error,

data/spec/code_spec.rb

@@ -374,6 +374,29 @@ RSpec.describe Code do
     ["a = [1, 2] a.reject!(&:even?) a", "[1]"],
     ["[1, 2].map(&:even?)", "[false, true]"],
     ["a = [1, 2] a.map!(&:even?) a", "[false, true]"],
+    ["Html.p { \"Hello\" }.to_html", "'<p>Hello</p>'"],
+    ["Html.br.to_html", "'<br>'"],
+    [
+      "Html.div { Html.div { Html.span { :Nested } } }.to_html",
+      "'<div><div><span>Nested</span></div></div>'"
+    ],
+    [
+      "Html.div { Html.p { Html.span { :hello } } }.to_html",
+      "'<div><p><span>hello</span></p></div>'"
+    ],
+    [
+      "Html.join(Html.p { :hello }, Html.p { :world }).to_html",
+      "'<p>hello</p><p>world</p>'"
+    ],
+    ["Html.join.to_html", "''"],
+    [
+      "Html.div { Html.text(\"<span>\") }.to_html",
+      "'<div>&lt;span&gt;</div>'"
+    ],
+    [
+      "Html.div { Html.raw(\"<span>ok</span>\") }.to_html",
+      "'<div><span>ok</span></div>'"
+    ],
     ["[1, 2, 3].any?", "true"],
     ["[1, 2, 3].any?(&:even?)", "true"],
     ["[1, 2, 3].none?", "false"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.8.0
 platform: ruby
 authors:
 - Dorian Marié