rufo 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8e977df730572c1448155a1bc4e3fd358a1abcdadf78c18700874e75e9c54aa
-  data.tar.gz: 07a074f0137daf3c957dd2d6646efb72281b062b93a7df7b1981b3fdcdd3ca79
+  metadata.gz: ea171b0f22404cea26bb2f1263b5787721a968bc4be3dccb96d258ca7ab1586a
+  data.tar.gz: bdbafe76de95494aadff70e0183805dbe5a1734373b45d8fa5f6c4c8addb4e48
 SHA512:
-  metadata.gz: 32de1903e674e7a21f34b0e092d2fd4af9fa9db9f4570611b9e50bb7ec1ba031df7b940dbc9797855688d3a6956dfa2830a0251bf4ec7296b6f4a7b5117ad5fd
-  data.tar.gz: 9592effea9978267ab0dc2d641b8e033a7a4156723a68e0aaf2b1742f69b768329a6a8d4824fcd0fdaf1ed342279f59a1cb2e15c13514045d350ddbfcbce6060
+  metadata.gz: 79279d81687a7137424100278d5fbc3727052317ad264bbf9b9379ec8f1902bf4e2a8239d6ba43b219149912372f9db78bc82288ff645889bd1333741c072b9d
+  data.tar.gz: 604473d7682a92356a4e3fd9aa865f3a0cb5ee248e7bac2b237c8f917d5feffa7fc66597dfbd5a91101154cfdbd5f9adb4d402fad2e0fcf034b4a3be79452867

data/CHANGELOG.md

@@ -12,6 +12,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+## [0.9.0] - 2020-01-11
+
+### Added
+
+- Support for trim style erb templates ending with `-%>`.
+- Support for rails raw mode erb templates starting with `<%==`.
+- Support for ruby 2.7 features. This includes beginless ranges `..10`, method argument forwarding `def forward(...); to(...); end` and keyword args not being allowed `def foo(*args, **nil)`.
+
 ## [0.8.1] - 2020-01-02
 
 ### Fixed

data/lib/rufo/erb_formatter.rb

@@ -1,6 +1,21 @@
 # frozen_string_literal: true
 require "erb"
 
+class CustomScanner < ERB::Compiler::TrimScanner
+  def initialize(src)
+    super(src, "<>", false)
+    @scan_reg = /(.*?)(%>\r?\n|#{(stags + etags).join("|")}|\n|\z)/m
+  end
+
+  def stags
+    ["<%=="] + super
+  end
+
+  def etags
+    super + ["-%>"]
+  end
+end
+
 class Rufo::ErbFormatter
   def self.format(code, **options)
     new(code, **options).format
@@ -9,9 +24,8 @@ class Rufo::ErbFormatter
   attr_reader :result
 
   def initialize(code, **options)
-    compiler = ERB::Compiler.new("<>")
     @options = options
-    @scanner = compiler.make_scanner(code)
+    @scanner = CustomScanner.new(code)
     @code_mode = false
     @current_lineno = 0
     @current_column = 0

data/lib/rufo/formatter.rb

@@ -484,6 +484,8 @@ class Rufo::Formatter
       visit_begin_node(node)
     when :END
       visit_end_node(node)
+    when :args_forward
+      consume_op("...")
     else
       bug "Unhandled node: #{node.first}"
     end
@@ -2052,6 +2054,7 @@ class Rufo::Formatter
         end
 
         skip_space_or_newline
+        consume_keyword("nil") if current_token[1] == :on_kw
         check :on_rparen
         write ")"
         next_token
@@ -2125,6 +2128,8 @@ class Rufo::Formatter
       case rest_param
       when 0, [:excessed_comma]
         write_params_comma
+      when [:args_forward]
+        consume_op "..."
       else
         # [:rest_param, [:@ident, "x", [1, 15]]]
         _, rest = rest_param
@@ -2377,7 +2382,7 @@ class Rufo::Formatter
     # [:dot2, left, right]
     _, left, right = node
 
-    visit left
+    visit left unless left.nil?
     skip_space_or_newline
     consume_op(inclusive ? ".." : "...")
     skip_space_or_newline

data/lib/rufo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rufo
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufo
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Ary Borenszweig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby code formatter