oedipus_lex 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4d847d43454e2e7497b7737efea33c3ac3639d2
-  data.tar.gz: 94c532557bd692ed547f901b40667befe44fe39a
+  metadata.gz: c56dcc885b6ee098fa6e988db8ffd9a423134640
+  data.tar.gz: 03ee3915b080e450e7ff564842b5c7298dde0672
 SHA512:
-  metadata.gz: 7d8ed1a67c28ca5ffafcf7d48abac036d6d3ccb88254bfd11e953d646f35b08a27e3c246f40317e13127961c6ca77f98a71b0eaa9aded873ae5d4f207176efe2
-  data.tar.gz: 473a2296045308dec98b4a9355d4f1dd89168f2fae68cdea7f70efa6c4249f630fccf4b3be02d96478f343e995cdd61f96ce766f523ccaa9d7f59123b93ab4e9
+  metadata.gz: a2843b5841203dbc901caded1175e7cdb392e392429f0cdb8723054cd5bb04de9e4351a83e56ba75a5fa43a0144ee50e70a430d4cbbd04d7598370788ae76c64
+  data.tar.gz: 369ae18943123aca8e0b5d331932747d98c5eb7dee8ff100fab4bfba3e81078e776871237c52fc74055f6b4ccb45e8989b32af31a8dae009abbbae3e10d06eb4

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 2.3.1 / 2014-06-09
+
+* 1 minor enhancement:
+
+  * If there is an encoding comment on the first line, put it above generated headers.
+
 === 2.3.0 / 2014-05-16
 
 * 4 minor enhancements:

data/lib/oedipus_lex.rb

@@ -4,7 +4,7 @@ require "erb"
 require "oedipus_lex.rex"
 
 class OedipusLex
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 
   attr_accessor :class_name
   attr_accessor :header
@@ -232,10 +232,14 @@ class OedipusLex
       all_states = [[nil, *inclusives],          # nil+incls # eg [[nil, :a],
                     *exclusives.map { |s| [s] }] # [excls]   #     [:A], [:B]]
 
+    encoding = header.shift if header.first =~ /encoding:/
+    encoding ||= "# encoding: UTF-8"
+
     ERB.new(TEMPLATE, nil, "%").result binding
   end
 
   TEMPLATE = <<-'REX'.gsub(/^ {6}/, '')
+      <%= encoding %>
       #--
       # This file is automatically generated. Do not modify it.
       # Generated by: oedipus_lex version <%= VERSION %>.

data/lib/oedipus_lex.rex.rb

@@ -1,6 +1,7 @@
+# encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.2.1.
+# Generated by: oedipus_lex version 2.3.0.
 # Source: lib/oedipus_lex.rex
 #++
 

data/test/test_oedipus_lex.rb

@@ -592,15 +592,46 @@ class TestOedipusLex < Minitest::Test
 
     ruby = generate_lexer src
 
-    exp = ["#--\n",
-           "# This file is automatically generated. Do not modify it.\n",
-           "# Generated by: oedipus_lex version #{OedipusLex::VERSION}.\n",
-           "#++\n",
-           "\n",
-           "module X\n",
-           "module Y\n"]
-
-    assert_equal exp, ruby.lines.first(7)
+    exp = ["# encoding: UTF-8",
+           "#--",
+           "# This file is automatically generated. Do not modify it.",
+           "# Generated by: oedipus_lex version #{OedipusLex::VERSION}.",
+           "#++",
+           "",
+           "module X",
+           "module Y"]
+
+    assert_equal exp, ruby.lines.map(&:chomp).first(8)
+  end
+
+  def test_header_encoding_is_on_top
+    src = <<-'REX'
+      # encoding: UTF-8
+
+      module X
+      module Y
+      class Calculator
+      rule
+        /\d+/       { [:number, text.to_i] }
+        /\s+/
+        /[+-]/      { [:op, text] }
+      end
+      end
+      end
+    REX
+
+    ruby = generate_lexer src
+
+    exp = ["# encoding: UTF-8",
+           "#--",
+           "# This file is automatically generated. Do not modify it.",
+           "# Generated by: oedipus_lex version #{OedipusLex::VERSION}.",
+           "#++",
+           "",
+           "",
+           "module X"]
+
+    assert_equal exp, ruby.lines.map(&:chomp).first(8)
   end
 
   def test_read_non_existent_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest