zpl-transformer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c374857ea41f937a78a1cb7e694f00a72480f24f
-  data.tar.gz: fc19bdec4ef355d1e979083fc7b0733e5b305c18
+  metadata.gz: 90540d561ecdad6ac549056e73e4d442c06be23b
+  data.tar.gz: e5b8310eeade5270de26ff90cbc7b8756c3ff1fe
 SHA512:
-  metadata.gz: 2390d41d3903ae20a0ade4104a8a6330988c655136f0a6b8f2a64b84ade36fe766d339901ef35a2a764c0060ec4ca7cebb40d898658b2fdff9b57c55a07bd493
-  data.tar.gz: 4b6fce1512268556ae97a9df56bdafc9d15df18891e424319d38dfda531f3820caead9a3491513938979d16f16264f4c54ad018d3fcf35e0391ea9c11330bc44
+  metadata.gz: b8e603cacc349e32c7fff32306a4a7ad4ceb9c13230454f460c91db6e7f54f06de1770734f77539046901fa8202e3a1174170bec1fc9122bb2a95498ac28bd3f
+  data.tar.gz: 42738573dd5cd741bb954a159889bc65e186e8a611438ea3bd091197a33cf80fdf74e072fdb71ed28242404eeaa6ec13a05b54264b52dbda2a0a5c831fdae6c7

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.1
+
+- Fix Reader when next '^' is not a command
+
 ## 0.3.0
 
 - Feature: Add transformer to remove specific cmds by name

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zpl-transformer (0.3.0)
+    zpl-transformer (0.3.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/zpl-transformer/reader.rb

@@ -14,7 +14,7 @@ module Zpl
 
     # Returns the next zpl command or ignored string if any, or nil.
     #
-    # The ignored string can be a newlines, ignored chars, spaces.
+    # The ignored string can be a newlines, ignored chars, spaces or unsupported syntax.
     def next_token
       return if @scanner.eos?
 
@@ -45,13 +45,20 @@ module Zpl
 
     protected
 
+    # Example format: ^XXparam1,param2,,param4
+    # Command name: XX (the command is read as 2 chars, no more no less)
+    # 4 (5) params (param 3 & 5 are not given)
+    #
+    # The command stops at the next `^` or newline.
+    COMMAND_RX = /\^([A-Z0-9@]{2})([^\^\n]*)/
+
     def parse_zpl_cmd
       # Example format: ^XXparam1,param2,,param4
       # Command name: XX (the command is read as 2 chars, no more no less)
       # 4 (5) params (param 3 & 5 are not given)
       #
       # The command stops at the next `^` or newline.
-      @scanner.scan(/\^([A-Z0-9@]{2})([^\^\n]*)/)
+      @scanner.scan(COMMAND_RX)
 
       cmd_name = @scanner[1]
       raw_params = @scanner[2]
@@ -68,7 +75,7 @@ module Zpl
 
     def parse_ignore_chars
       # scan until next command (just before the `^`)
-      chars_skipped = @scanner.scan_until(/(?=\^)/)
+      chars_skipped = @scanner.scan_until(/(?=(#{ COMMAND_RX }))/)
 
       if chars_skipped.nil?
         # No more commands, return the rest

data/lib/zpl-transformer/version.rb

@@ -1,3 +1,3 @@
 module Zpl
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zpl-transformer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Benoit de Chezelles