rux 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65ad08596c2e77c802c6f7cb2a458ac8d293d5c80a35c98c8a2eb85a5749b365
-  data.tar.gz: cb6487c91a9b21e328f491f5f23b8703a8b4b20a35ddcfa029a19e56bc835dca
+  metadata.gz: f8b60a8c9f9753af9e86862c0f907f726d5c853e2e7c96613d681ea36f6859ac
+  data.tar.gz: 4ed1a4772678e181f7fa67ccdd4814e726a2731145e0c8a419261c2b40ad4f36
 SHA512:
-  metadata.gz: 4bc663ef90eec4c6a8abcfe997f259ccea9d211e898813280f534e4b8b5853a4bbbf3f8358164f4472f9329594a4a8b24e986d7b2fd621ecf74d92ebe09ea3e7
-  data.tar.gz: 944d83744f268a221cda2c414e7dd16df13efe37110a99c0d553ff2237be99f17aef37ae88d6653cdff43f0abe56e64cac48614bd5dd7f187e154cfe3cc0cead
+  metadata.gz: f70d67e41488c9dc648d4f05692813fe7b00ee86fc3ce34511ab75ad27de888578558775cb075f29b32df3876d0fbc7dfad78be43bdda5c198c52be8a05e5707
+  data.tar.gz: c43ab2dbbeeb1ae8ec17b68cb2b24df38e167787b85004bc6085669fb5963180e7f41712f4b41a5697190e851494e575927a21ed01b3800705b721f399eb76fa

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.1.0
+* Remove newlines between elements. (@aalin, #3)
+
+## 1.0.3
+* Use modern AST format.
+* Switch back to unparser v0.6.
+
 ## 1.0.2
 * Fix bug causing `ArgumentError`s under Ruby 3.0.
   - Related: https://github.com/mbj/unparser/issues/254

data/lib/rux/parser.rb

@@ -188,7 +188,10 @@ module Rux
     end
 
     def squeeze_lit(lit)
-      lit.gsub(/\s/, ' ').squeeze(' ')
+      lit
+        .sub(/\A\s+/) { |s| s.match?(/[\r\n]/) ? "" : s }
+        .sub(/\s+\z/) { |s| s.match?(/[\r\n]/) ? "" : s }
+        .gsub(/\s+/, " ")
     end
 
     def literal_ruby_code

data/lib/rux/version.rb

@@ -1,3 +1,3 @@
 module Rux
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

data/lib/rux.rb

@@ -71,3 +71,15 @@ module Rux
   self.tag_builder = self.default_tag_builder
   self.buffer = self.default_buffer
 end
+
+# unfortunately these have to be set globally :(
+Parser::Builders::Default.tap do |builder|
+  builder.emit_lambda              = true
+  builder.emit_procarg0            = true
+  builder.emit_encoding            = true
+  builder.emit_index               = true
+  builder.emit_arg_inside_procarg0 = true
+  builder.emit_forward_arg         = true
+  builder.emit_kwargs              = true
+  builder.emit_match_pattern       = true
+end

data/rux.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.add_dependency 'parser', '~> 3.0'
-  s.add_dependency 'unparser', '<= 0.5.5'
+  s.add_dependency 'unparser', '~> 0.6'
 
   s.require_path = 'lib'
   s.executables << 'ruxc'

data/spec/parser_spec.rb

@@ -87,7 +87,7 @@ describe Rux::Parser do
 
   it 'handles ruby code with curly braces in attributes' do
     expect(compile('<Hello foo={[1, 2, 3].map { |n| n * 2 }} />')).to eq(<<~RUBY.strip)
-      render(Hello.new(foo: [1, 2, 3].map { |n,|
+      render(Hello.new(foo: [1, 2, 3].map { |n|
         n * 2
       }))
     RUBY
@@ -104,7 +104,7 @@ describe Rux::Parser do
   it 'handles tag bodies containing ruby code with curly braces' do
     expect(compile('<Hello>{[1, 2, 3].map { |n| n * 2 }.join(", ")}</Hello>')).to eq(<<~RUBY.strip)
       render(Hello.new) {
-        [1, 2, 3].map { |n,|
+        [1, 2, 3].map { |n|
           n * 2
         }.join(", ")
       }
@@ -114,7 +114,7 @@ describe Rux::Parser do
   it 'handles tag bodies with intermixed text and ruby code' do
     expect(compile('<Hello>abc {foo} def {bar} baz</Hello>')).to eq(<<~RUBY.strip)
       render(Hello.new) {
-        Rux.create_buffer.tap { |_rux_buf_,|
+        Rux.create_buffer.tap { |_rux_buf_|
           _rux_buf_ << "abc "
           _rux_buf_ << foo
           _rux_buf_ << " def "
@@ -136,18 +136,14 @@ describe Rux::Parser do
 
     expect(compile(rux_code)).to eq(<<~RUBY.strip)
       render(Outer.new) {
-        Rux.create_buffer.tap { |_rux_buf_,|
-          _rux_buf_ << " "
-          _rux_buf_ << 5.times.map {
-            render(Inner.new) {
-              Rux.create_buffer.tap { |_rux_buf_,|
-                _rux_buf_ << "What a "
-                _rux_buf_ << @thing
-              }.to_s
-            }
+        5.times.map {
+          render(Inner.new) {
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_ << "What a "
+              _rux_buf_ << @thing
+            }.to_s
           }
-          _rux_buf_ << " "
-        }.to_s
+        }
       }
     RUBY
   end
@@ -163,18 +159,14 @@ describe Rux::Parser do
 
     expect(compile(rux_code)).to eq(<<~RUBY.strip)
       Rux.tag("div") {
-        Rux.create_buffer.tap { |_rux_buf_,|
-          _rux_buf_ << " "
-          _rux_buf_ << 5.times.map {
-            Rux.tag("p") {
-              Rux.create_buffer.tap { |_rux_buf_,|
-                _rux_buf_ << "What a "
-                _rux_buf_ << @thing
-              }.to_s
-            }
+        5.times.map {
+          Rux.tag("p") {
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_ << "What a "
+              _rux_buf_ << @thing
+            }.to_s
           }
-          _rux_buf_ << " "
-        }.to_s
+        }
       }
     RUBY
   end
@@ -198,18 +190,14 @@ describe Rux::Parser do
 
     expect(compile(rux_code)).to eq(<<~RUBY.strip)
       render(Outer.new) {
-        Rux.create_buffer.tap { |_rux_buf_,|
-          _rux_buf_ << " "
-          _rux_buf_ << 5.times.map {
-            Rux.tag("div") {
-              Rux.create_buffer.tap { |_rux_buf_,|
-                _rux_buf_ << "So "
-                _rux_buf_ << @cool
-              }.to_s
-            }
+        5.times.map {
+          Rux.tag("div") {
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_ << "So "
+              _rux_buf_ << @cool
+            }.to_s
           }
-          _rux_buf_ << " "
-        }.to_s
+        }
       }
     RUBY
   end
@@ -245,7 +233,7 @@ describe Rux::Parser do
   it 'emits handles spaces between adjacent ruby code snippets' do
     expect(compile("<Hello>{first} {second}</Hello>")).to eq(<<~RUBY.strip)
       render(Hello.new) {
-        Rux.create_buffer.tap { |_rux_buf_,|
+        Rux.create_buffer.tap { |_rux_buf_|
           _rux_buf_ << first
           _rux_buf_ << " "
           _rux_buf_ << second
@@ -253,4 +241,33 @@ describe Rux::Parser do
       }
     RUBY
   end
+
+  it 'does not emit spaces for newlines or indentation' do
+    code = <<~RUX
+      <Hello>
+        <Hola>{first} {second}</Hola>
+        <Hola>{first} {second}</Hola>
+      </Hello>
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      render(Hello.new) {
+        Rux.create_buffer.tap { |_rux_buf_|
+          _rux_buf_ << render(Hola.new) {
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_ << first
+              _rux_buf_ << " "
+              _rux_buf_ << second
+            }.to_s
+          }
+          _rux_buf_ << render(Hola.new) {
+            Rux.create_buffer.tap { |_rux_buf_|
+              _rux_buf_ << first
+              _rux_buf_ << " "
+              _rux_buf_ << second
+            }.to_s
+          }
+        }.to_s
+      }
+    RUBY
+  end
 end

data/spec/render_spec.rb

@@ -15,7 +15,7 @@ describe Rux do
       </div>
     RUBY
 
-    expect(result).to eq("<div> <p>Welcome!</p><p>Welcome!</p><p>Welcome!</p> </div>")
+    expect(result).to eq("<div><p>Welcome!</p><p>Welcome!</p><p>Welcome!</p></div>")
   end
 
   it 'handles rux tags inside ruby code' do
@@ -27,7 +27,7 @@ describe Rux do
       </div>
     RUBY
 
-    expect(result).to eq("<div> <p>Welcome!</p><p>Welcome!</p><p>Welcome!</p> </div>")
+    expect(result).to eq("<div><p>Welcome!</p><p>Welcome!</p><p>Welcome!</p></div>")
   end
 
   it 'correctly handles keyword arguments (ruby 3)' do
@@ -37,4 +37,30 @@ describe Rux do
 
     expect(result).to eq("<p>a and b</p>")
   end
-end
+
+  it 'removes whitespace between elements and text' do
+    result = render(<<~RUBY)
+      <div>
+        <p>Hello World</p>
+
+        <p>
+          Hello World
+        </p>
+
+        <p>
+          Hello
+          World
+        </p>
+
+        <p>
+
+          Hello World
+        </p>
+      </div>
+    RUBY
+
+    expect(result).to eq(
+      "<div><p>Hello World</p><p>Hello World</p><p>Hello World</p><p>Hello World</p></div>"
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rux
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -28,16 +28,16 @@ dependencies:
   name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.6'
 description: A jsx-inspired way to write view components.
 email:
 - camertron@gmail.com
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A jsx-inspired way to write view components.