automotive-ecu 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a637be59c376e60b87318810ed73285c85b3844fdb7db18017037d79bd57db2b
-  data.tar.gz: 175ce1f9067902c1ac9f58cb0ea4f1108ffc27ad6b97c4b94a70cc6f7970e131
+  metadata.gz: ab586bfaab8ab1d647a8f0f76cd247798baba7e10e207a9e03173a854fb13817
+  data.tar.gz: 39cf49dca991aa8966dd679914d9d88f05585e7b0a34fdff29a8783e2eae19d9
 SHA512:
-  metadata.gz: a8b88466869808c3a932f826ce7584d50ef71eead86502530fc2b6e17b329805ccf9377259d0fbc794706760376bd757504cd24abf52c33d8436f92387546189
-  data.tar.gz: 7e0fccf17e7f344c70ac8b797e7843a330930434cc80544f4cad052fe5abad18dba7e95ab32e0e93c4349c382385655990299cb68d04e09318d4084563b74b93
+  metadata.gz: 21a979a28ff42b637574725b54a0dc46ff5a4659f0a26bdb50ec0e6a81c0262a46d14891af2f09f8846a545f1decb6e2994c4de92dbf05b8f0171c6f946b27f5
+  data.tar.gz: 2f2026c2d122d4ecd2295ff941c4fb397fe5b20383ab927e731a80178733d69e86a23343429abf751c8beab39b8483bd8c35ce62049a3af0302436668a986d6d

data/lib/ecu/interfaces/dcm/dcm_lexer.rb

@@ -24,7 +24,7 @@ class Ecu
 
       HEADER         = "KONSERVIERUNG_FORMAT 2.0"
       WHITESPACE     = %r{ [ \t]+ }x
-      NEWLINE        = %r{ \r\n|\n }x
+      NEWLINE        = %r{ \r\n|\n|\r }x
       COMMENT        = %r{ ^\*.*$ }x
       DIMENSIONS_SEP = %r{ @ }x
       QUOTED_TEXT    = %r{ "[^"]*" }x

data/lib/ecu/interfaces/dcm/dcm_parser.rb

@@ -129,9 +129,17 @@ class Ecu
             raise DcmParserError.new("#{e.message} on #{e.backtrace.first} (state: #{@state})", lexer)
           end
         end
+        fail_on_truncation!
         [labels, headers, subheaders]
       end
 
+      # A well-formed file ends between labels, not inside one.
+      def fail_on_truncation!
+        return if %i[PRE_HEADER POST_HEADER].include?(@state)
+
+        raise DcmParserError.new("Unexpected end of file (state: #{@state})", lexer)
+      end
+
       def debug_token(tok)
         if tok == :UNKNOWN_CHAR
           "UNKNOWN_CHAR: #{lexer.token_value}"

data/lib/ecu/interfaces/dcm/dcm_parser_error.rb

@@ -12,13 +12,14 @@ class Ecu
 
     def message = @msg
     def context
-      @doc
-        .lines[ctx_startline..ctx_endline]
+      lines[ctx_startline..ctx_endline]
         .each
         .with_index(ctx_startline + 1)
         .map { |line, n| present(line, n, n == lineno) }
     end
 
+    def lines = @lines ||= doc.lines
+
     def present(line, n, highlight)
       case highlight
         when true  then fmt(n) + " => | " + line
@@ -27,7 +28,7 @@ class Ecu
     end
 
     def ctx_startline = [0, lineno - CTXLENGHT].max
-    def ctx_endline   = @endline ||= [doc.lines.count - 1, lineno + CTXLENGHT].min
+    def ctx_endline   = @endline ||= [lines.size - 1, lineno + CTXLENGHT].min
     def fmt_str = "%#{(ctx_endline + 1).to_s.length}d"
     def fmt(n)  = fmt_str % n
 

data/lib/ecu/interfaces/dcm/festwert.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ecu
   class Festwert < Label
     def to_dcm(indented=false)

data/lib/ecu/interfaces/dcm/festwerteblock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "../../../core_ext"
 
 class Ecu

data/lib/ecu/interfaces/dcm/kennfeld.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ecu
   class Kennfeld < Label
     def to_dcm(indented=false)

data/lib/ecu/interfaces/dcm/kennlinie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ecu
   class Kennlinie < Label
     def to_dcm(indented=false)

data/lib/ecu/interfaces/dcm/label.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ecu
   class Label
     def to_dcm

data/lib/ecu/interfaces/dcm/label_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "festwert"
 require_relative "festwerteblock"
 require_relative "kennlinie"
@@ -18,7 +20,7 @@ class Ecu
     def self.from_dcm(str)
       DcmParser.new(str)
         .then { _1.call }
-        .then { new(*_1, true) }
+        .then { new(*_1) }
     end
 
     def self.from_dcm_partial(str)
@@ -29,7 +31,7 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      buf = String.new
+      buf = +""
 
       unless headers.empty?
         headers.each { buf << "* " << _1 << "\n" }

data/lib/ecu/interfaces/dcm/stuetzstellenverteilung.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ecu
   class Stuetzstellenverteilung < Label
     def to_dcm(indented=false)

data/lib/ecu/version.rb

@@ -1,3 +1,3 @@
 class Ecu
-  VERSION = "0.3.4"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automotive-ecu
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Jonas Mueller