code-ruby 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a5aca92120dbf487443b4cf2f88e3c407326246c38b059bd865f2db1fba0c3
-  data.tar.gz: bd1b6b84eb2adb4f63ce11ccdb81e7666feeece6339ba3cca9a84b33490f076b
+  metadata.gz: d066f06aab2a2ae00bcbcbeedea154305c0fbc19f920ca13cb4cef1d787a1884
+  data.tar.gz: eca3f011e3bd8811743a3412947fff667c8c1e0f5838ccc8c4e7d3e2360ab6e8
 SHA512:
-  metadata.gz: eedb4f5942efc5ef5ea2f4ee28a1cac8f136d05a9f465949cc8d2b4ad81bdc8f4ef1008358dfcbabb3cf939cbdfe4662f817204a652fdbb1b393f9649a1b0ec9
-  data.tar.gz: '089de3a0fb083295533c6f5ea5024754eaa450e84201792416313dff0544638f75c12e13442714ae3461d8c239b679edb5b2c38300c555d4ded3316cb3f5fd0b'
+  metadata.gz: bdc06dddc2a05ce5c88f8dabfa25eb8b3a44811f94d99dcb65011dc8ed05daeabcbc68a2431d3705ec90435838f13fe88663a6cd4299f1dbb1da454972694c57
+  data.tar.gz: 0cc4c89d00285ff43b96916c05855dbd74671c001b115dcf4a303323af6f563b2b813e872080cc115f4a26f3b5cc30f812011e191044ae70d94125b7ae6cd5b6

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/lib/code/object/html.rb

@@ -37,7 +37,7 @@ class Code
           sig(args) { Object.maybe }
           code_escape(*code_arguments.raw, **globals)
         when "join"
-          sig(args) { Object.repeat }
+          sig(args) { [Object.maybe, Object.maybe] }
           code_join(*code_arguments.raw, **globals)
         when "text"
           sig(args) { Object.maybe }
@@ -106,22 +106,34 @@ class Code
         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)
+      def self.code_join(first = nil, second = nil, **globals)
+        if second.is_a?(Function)
+          code_contents = second.to_code.call(**globals)
+          code_separator = first.to_code
         else
-          code_contents = contents_or_function.to_code
+          code_contents = first.to_code
+          code_separator = second.to_code
         end
 
         fragment = Nokogiri::HTML::DocumentFragment.parse("")
 
-        code_contents.raw.each do |code_content|
+        return Html.new(fragment) if code_contents.nothing?
+        return Html.new(fragment) unless code_contents.is_a?(List)
+
+        code_contents.raw.each.with_index do |code_content, index|
           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
 
+          if code_separator.is_an?(Html)
+            separator = Nokogiri::HTML::DocumentFragment.parse(code_separator.to_html)
+          else
+            separator = Nokogiri::XML::Text.new(code_separator.to_s, fragment.document)
+          end
+
+          fragment.add_child(separator) unless index.zero?
           fragment.add_child(content)
         end
 

data/spec/code_spec.rb

@@ -385,8 +385,8 @@ RSpec.describe Code do
       "'<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([Html.p { :hello }, Html.p { :world }], Html.br).to_html",
+      "'<p>hello</p><br><p>world</p>'"
     ],
     ["Html.join.to_html", "''"],
     [

metadata

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