edir 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cebacb3d342e6e849b771d06dde5931bdce5b118d82be793a9830dd0d087bee
-  data.tar.gz: 117315ab268afe2d40b7016a907a831e068280d94c649fbacc56b0f679e9374f
+  metadata.gz: 6edf58c25b7fef2c55e00d2b0f2a7e92b7bd8abf138ceb20dc7f2a22411c1379
+  data.tar.gz: 2fe71607b7d9f657180cb44637bad0d92a91aad67615954e41d9716e8ddf8e24
 SHA512:
-  metadata.gz: faf065948fe8d41ccaafe5900480f9e576805335b4225d2eb026722f23c1728a89fa5e2b6b288b7453ef53c227a4cee72495f29d12e1dcdf91e56f0621d50258
-  data.tar.gz: 3844441935e8fa8e7d5567ac82ca242f392f7f378042901e6549bb3dfa408e40b412869b043816d341a11b53c21f8a804ccd97f2f1a01e4a5c79e5751f6aa217
+  metadata.gz: 596ffc51ec1505d1132bf08fca9b7ce379dcd77a199db41497ec6792efa24f551a134b96ce9944a8518386c77fd844e2edc0a13f97d00e77f7cf44adb0ff2af4
+  data.tar.gz: 8fd97a4152917829cdb846757824ebc2b6631ddec6f47f85a7990d6ea7de43d7bba172732c8febe7337b4edd860782dcaf70790dfec267185d22926745d64b81

data/Gemfile

@@ -10,12 +10,3 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
-
-gem "lex", "~> 0.1.0"
-
-gem "racc", "~> 1.6.0"
-
-group :development, :test do
-  gem "pry"
-  gem "pry-byebug"
-end

data/Gemfile.lock

@@ -1,59 +1,48 @@
 PATH
   remote: .
   specs:
-    edir (1.0.0)
+    edir (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    byebug (11.1.3)
-    coderay (1.1.3)
     diff-lcs (1.5.0)
-    json (2.6.2)
-    lex (0.1.0)
-    method_source (1.0.0)
+    json (2.6.3)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.8.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.50.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.3.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -62,10 +51,6 @@ PLATFORMS
 
 DEPENDENCIES
   edir!
-  lex (~> 0.1.0)
-  pry
-  pry-byebug
-  racc (~> 1.6.0)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.21)

data/Rakefile

@@ -10,12 +10,3 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
-
-desc "Generate Parser"
-task :parser do
-  `racc lib/edir/parser.y -o lib/edir/parser.rb`
-end
-
-task :parser_debug do
-  `racc -g lib/edir/parser.y -o lib/edir/parser.rb`
-end

data/lib/edir/{convert.rb → converter.rb}

@@ -8,7 +8,9 @@ require_relative "segment"
 
 module Edir
   # Converter methods for parsed EDI
-  module Convert
+  module Converter
+    module_function
+
     # For each transaction set start/end, create a unique transaction set object with
     # the corrsponding segments.
     # For each functional group start/end, create a unique functional group object with

data/lib/edir/parsing.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative "converter"
+
+module Edir
+  # Top level parsing module
+  # Edir::Parsing.parse(raw_edi)
+  module Parsing
+    extend Edir::Converter
+
+    module_function
+
+    def parse(raw_edi)
+      # TODO: Figure out the segment/element separators dynamically
+      segments = raw_edi.gsub("\n", "").gsub("\r", "").split("~")
+      segments = segments.map do |segment|
+        Edir::Segment.new(segment)
+      end
+
+      if segments.length > 1
+        convert_document(segments)
+      else
+        segments
+      end
+    end
+  end
+end

data/lib/edir/segment.rb

@@ -7,19 +7,15 @@ module Edir
 
     def initialize(data)
       @raw_data = data
-      @name = data.first
+      @raw_elements = @raw_data.split("*")
+      @name = @raw_elements.first
       build_elements
     end
 
     def build_elements
       @elements = []
-      position = 0
-      @raw_data[1..].each do |element|
-        if separator?(element)
-          position += 1
-        else
-          @elements.push([element, position])
-        end
+      @raw_elements[1..].each_with_index do |element, index|
+        @elements.push([element.strip, index + 1])
       end
     end
 
@@ -36,5 +32,9 @@ module Edir
         @name => @elements.to_h { |e| ["e#{e.last.to_s.rjust(2, "0")}", e.first] }
       }
     end
+
+    def to_s
+      "#<Edir::Segment #{@name}  #{@elements}>"
+    end
   end
 end

data/lib/edir/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Edir
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/edir.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
 
-require_relative "edir/lexer"
-require_relative "edir/parser"
+require_relative "edir/parsing"
 require_relative "edir/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edir
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kaleb McKone
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -28,13 +28,11 @@ files:
 - bin/console
 - bin/setup
 - lib/edir.rb
-- lib/edir/convert.rb
+- lib/edir/converter.rb
 - lib/edir/document.rb
 - lib/edir/functional_group.rb
 - lib/edir/interchange.rb
-- lib/edir/lexer.rb
-- lib/edir/parser.rb
-- lib/edir/parser.y
+- lib/edir/parsing.rb
 - lib/edir/segment.rb
 - lib/edir/transaction_set.rb
 - lib/edir/version.rb

data/lib/edir/lexer.rb

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-require "lex"
-
-module Edir
-  # Top level API class for providing EDI lexing
-  class Lexer < Lex::Lexer
-    tokens(
-      :SEGSTART,
-      :SEGEND,
-      :ELEMSEP,
-      :ELEM
-    )
-
-    states(
-      insegment: :exclusive,
-      inelement: :exclusive
-    )
-
-    rule(:SEGSTART, /\w{2,3}(?=[*|~])/) do |lexer, token|
-      lexer.push_state(:insegment)
-      token
-    end
-
-    # Rule to match when we have started a segment
-    # but it has no elements
-    rule(:insegment_SEGEND, /~|\n/) do |lexer, token|
-      lexer.pop_state
-      token
-    end
-
-    rule(:insegment_ELEMSEP, /\*|\|/) do |lexer, token|
-      # If we are insegment, when we encounter an element separator it means
-      # we should now be inelement. Otherwise, we were inelement and should
-      # leave the state, back to insegment.
-      if lexer.current_state == :insegment
-        lexer.push_state(:inelement)
-      else
-        lexer.pop_state
-      end
-      token
-    end
-
-    rule(:inelement_ELEMSEP, /\*|\|/)
-
-    rule(:inelement_ELEM, /[\w\s\-().,!:@>'^]+/) do |_lexer, token|
-      token.value = token.value.strip
-      token
-    end
-
-    rule(:inelement_SEGEND, /~|\n/) do |lexer, token|
-      lexer.pop_state
-      lexer.pop_state
-      token
-    end
-
-    ignore "\n"
-    ignore :insegment, "\s"
-    ignore :inelement, "\s"
-
-    error :insegment do |lexer, token|
-      error_handler(lexer, token)
-    end
-
-    error :inelement do |lexer, token|
-      error_handler(lexer, token)
-    end
-
-    def lex_str(str)
-      # NOTE: Need to decide if this is really what we want to do here.
-      # Do the token objects contain any more useful information we
-      # should be passing on?
-      with_empty_elements_added = []
-      tokens = lex(str).map { |o| [o.name, o.value] }
-      # TODO: There's got to be a better way to do this
-      # I just want to know if two adjacent tokens are :ELEMSEP so we can
-      # add back the empty element that isn't easily handled by the lexer
-      tokens.each_with_index.map do |token, i|
-        with_empty_elements_added << token
-        if token.first == :ELEMSEP && i + 1 < tokens.length && tokens[i + 1].first == :ELEMSEP
-          with_empty_elements_added << [:ELEM, ""]
-        end
-      end
-      with_empty_elements_added
-    end
-
-    class << self
-      private
-
-      def error_handler(_lexer, token)
-        puts "Illegal character #{token.value}"
-      end
-    end
-  end
-end

data/lib/edir/parser.rb

@@ -1,181 +0,0 @@
-#
-# DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
-# from Racc grammar file "".
-#
-
-require 'racc/parser.rb'
-
-require_relative 'lexer'
-require_relative 'convert'
-
-module Edir
-  class Parser < Racc::Parser
-
-module_eval(<<'...end parser.y/module_eval...', 'parser.y', 24)
-include Edir::Convert
-
-def initialize(debug: false)
-  @yydebug = debug
-end
-
-def parse(str)
-  @q = Edir::Lexer.new.lex_str(str)
-  data = do_parse
-  # Implicit segment vs document mode
-  if data.length > 1
-    convert_document(data)
-  else
-    data
-  end
-end
-
-def next_token
-  @q.shift
-end
-...end parser.y/module_eval...
-##### State transition tables begin ###
-
-racc_action_table = [
-     7,     8,     9,     8,     9,     8,     9,     3,     4,     3,
-    10,    11 ]
-
-racc_action_check = [
-     3,     3,     3,     8,     8,     9,     9,     0,     1,     2,
-     4,     6 ]
-
-racc_action_pointer = [
-     5,     8,     7,    -3,    10,   nil,     8,   nil,    -1,     1,
-   nil,   nil,   nil,   nil ]
-
-racc_action_default = [
-    -8,    -8,    -2,    -8,    -8,    -1,    -8,    -4,    -8,    -7,
-    14,    -3,    -5,    -6 ]
-
-racc_goto_table = [
-     6,     1,   nil,     5,   nil,    12,    13 ]
-
-racc_goto_check = [
-     3,     1,   nil,     1,   nil,     3,     3 ]
-
-racc_goto_pointer = [
-   nil,     1,   nil,    -3 ]
-
-racc_goto_default = [
-   nil,   nil,     2,   nil ]
-
-racc_reduce_table = [
-  0, 0, :racc_error,
-  2, 7, :_reduce_1,
-  1, 7, :_reduce_2,
-  3, 8, :_reduce_3,
-  2, 8, :_reduce_4,
-  2, 9, :_reduce_5,
-  2, 9, :_reduce_6,
-  1, 9, :_reduce_7 ]
-
-racc_reduce_n = 8
-
-racc_shift_n = 14
-
-racc_token_table = {
-  false => 0,
-  :error => 1,
-  :SEGSTART => 2,
-  :SEGEND => 3,
-  :ELEMSEP => 4,
-  :ELEM => 5 }
-
-racc_nt_base = 6
-
-racc_use_result_var = true
-
-Racc_arg = [
-  racc_action_table,
-  racc_action_check,
-  racc_action_default,
-  racc_action_pointer,
-  racc_goto_table,
-  racc_goto_check,
-  racc_goto_default,
-  racc_goto_pointer,
-  racc_nt_base,
-  racc_reduce_table,
-  racc_token_table,
-  racc_shift_n,
-  racc_reduce_n,
-  racc_use_result_var ]
-
-Racc_token_to_s_table = [
-  "$end",
-  "error",
-  "SEGSTART",
-  "SEGEND",
-  "ELEMSEP",
-  "ELEM",
-  "$start",
-  "segments",
-  "segment",
-  "elems" ]
-
-Racc_debug_parser = false
-
-##### State transition tables end #####
-
-# reduce 0 omitted
-
-module_eval(<<'.,.,', 'parser.y', 9)
-  def _reduce_1(val, _values, result)
-     result = [val[0]] + val[1]
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 10)
-  def _reduce_2(val, _values, result)
-     result = val
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 11)
-  def _reduce_3(val, _values, result)
-     result = Edir::Segment.new([val[0]] + val[1])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 12)
-  def _reduce_4(val, _values, result)
-     result = Edir::Segment.new([val[0]])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 13)
-  def _reduce_5(val, _values, result)
-     result = [val[0]] + val[1]
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 14)
-  def _reduce_6(val, _values, result)
-     result = [val[0]] + val[1]
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'parser.y', 15)
-  def _reduce_7(val, _values, result)
-     result = val
-    result
-  end
-.,.,
-
-def _reduce_none(val, _values, result)
-  val[0]
-end
-
-  end   # class Parser
-end   # module Edir

data/lib/edir/parser.y

@@ -1,43 +0,0 @@
-class Edir::Parser
-  token SEGSTART SEGEND ELEMSEP ELEM
-  # local variables that racc provides in the environment of action:
-  # * val is the right hand side
-  # * result is the left hand side
-  # The plural definitions return an array while the singular ones
-  # return a single element. In order to build a sensibly flat representation of the
-  # document, we concatenate the single elements with the ones that return an array
-  rule
-    segments : segment segments { result = [val[0]] + val[1] }
-             | segment { result = val }
-    segment  : SEGSTART elems SEGEND { result = Edir::Segment.new([val[0]] + val[1]) }
-             | SEGSTART SEGEND { result = Edir::Segment.new([val[0]]) }
-    elems    : ELEMSEP elems { result = [val[0]] + val[1] }
-             | ELEM elems { result = [val[0]] + val[1] }
-             | ELEM { result = val }
-end
-
----- header
-require_relative 'lexer'
-require_relative 'convert'
-
----- inner
-include Edir::Convert
-
-def initialize(debug: false)
-  @yydebug = debug
-end
-
-def parse(str)
-  @q = Edir::Lexer.new.lex_str(str)
-  data = do_parse
-  # Implicit segment vs document mode
-  if data.length > 1
-    convert_document(data)
-  else
-    data
-  end
-end
-
-def next_token
-  @q.shift
-end