rux 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a29eb709f4897a46f267f53bc09b7e5379385564b46e063e27801dfaf75b6df
-  data.tar.gz: 7873d289f9601f029c3283b28a01f56955b2c88e7eb423ddabb388d42bf02ee1
+  metadata.gz: 2bce30eb18d21630d6f5734554e7f81d24443cad2b97134127a606c2f9f0c341
+  data.tar.gz: 8925dcc3f10f9a21f03951c27218f17c9e6dc491a8b3c08864d5cd06650ccf07
 SHA512:
-  metadata.gz: 20072b74e6c7ecb9c78af907c72ede1b132e28ea6a6d2fe1edbc0675aa8453cedd88de58f397d09d43841c601dd4fd65ff7144e6aaa73bb882ab3de564c897e4
-  data.tar.gz: 19b14226872597dfa750b34debe1c39ea681da99eb4c099c065eb2ea0ff1736666070d82f4ec9e5db489b06fbbec5ea25c648396934e0a47eec7c82233a9ae5a
+  metadata.gz: fa4a8295e55aa4bc1be19afbba78f61633ed384752f85f3f19e61e1b5c8566e8ccb26a354bf679c95e671082eefdbb7b66fc7edefbaf57c8527bf66eb2b3d03a
+  data.tar.gz: 4ae2860e39d8ea6ec56b1c4679b4ffd4418a5fa83ba1b30ac71137938e9f66267aecdbd2ef65d4f141108df5f5a99a305b2e051bfdcc513172c7f48f0859eb96

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.1.1
+* Don't slugify HTML attributes.
+  - Previously rux would emit `<div data-foo="bar">` as `<div data_foo="bar">` because it treated HTML attributes as if they were being passed as Ruby arguments, which don't allow dashes. If these arguments are passed to a component initializer, then they must be slugified, but HTML attributes shouldn't be affected.
+
+# 1.1.0
+* Remove newlines between elements. (@aalin, #3)
+
 ## 1.0.3
 * Use modern AST format.
 * Switch back to unparser v0.6.

data/lib/rux/ast/tag_node.rb

@@ -12,6 +12,10 @@ module Rux
       def accept(visitor)
         visitor.visit_tag(self)
       end
+
+      def component?
+        name.start_with?(/[A-Z]/)
+      end
     end
   end
 end

data/lib/rux/default_visitor.rb

@@ -22,10 +22,10 @@ module Rux
 
         at = node.attrs.each_with_object([]) do |(k, v), ret|
           next if k == 'as'
-          ret << Utils.attr_to_hash_elem(k, visit(v))
+          ret << Utils.attr_to_hash_elem(k, visit(v), slugify: node.component?)
         end
 
-        if node.name.start_with?(/[A-Z]/)
+        if node.component?
           result << "render(#{node.name}.new"
 
           unless node.attrs.empty?

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/utils.rb

@@ -1,7 +1,7 @@
 module Rux
   module Utils
-    def attr_to_hash_elem(key, value)
-      key = key.gsub('-', '_')
+    def attr_to_hash_elem(key, value, slugify: true)
+      key = key.gsub('-', '_') if slugify
 
       if key =~ /\A[\w\d]+\z/
         "#{key}: #{value}"

data/lib/rux/version.rb

@@ -1,3 +1,3 @@
 module Rux
-  VERSION = '1.0.3'
+  VERSION = '1.1.1'
 end

data/spec/parser_spec.rb

@@ -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
@@ -253,4 +241,51 @@ 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
+
+  it 'slugifies ruby arguments' do
+    code = <<~RUX
+      <Hello data-foo="bar" />
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      render(Hello.new(data_foo: "bar"))
+    RUBY
+  end
+
+  it 'does not slugify HTML attributes' do
+    code = <<~RUX
+      <div data-foo="bar" />
+    RUX
+    expect(compile(code)).to eq(<<~RUBY.strip)
+      Rux.tag("div", { :"data-foo" => "bar" })
+    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.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2023-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: A jsx-inspired way to write view components.