edifact_rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544b29b77bfc7ab9fd4ccb5bffaaae97bf236aab7b45e66c008297a76dfd7f62
-  data.tar.gz: 62df8594d976c3e38b90757c956ff1ee53a4e3404e8d2570f328b2dd2be34a5d
+  metadata.gz: 3c51652b41747f2b0c07ecd834c5c79b3bebbb1537464a450f37ee58ea68150e
+  data.tar.gz: 2669313b30c7565c60f4dc568c528127577770946f7d4a8ffee7a1fc87f4c07e
 SHA512:
-  metadata.gz: 8892d1d110a2bd8157a0f97fbd4baf627e10fac408a2f85244eb8879a65bb58713d2c68cf9d16018694121a3edffd99b47ffcbec932dc9aecc53eacddbd3bb14
-  data.tar.gz: 89a289437212f3291ad9ba95b8b9412d62e925c24e161e61572e8a618bd270091a1723a2b849fcf8eac04fabb8c56061d6fd7eebddfb2af38c865dd84676f3d9
+  metadata.gz: ded47109a99423254023e4f7316e1bdc3d1dc6602e73225a900c815baa2b2c4d9d14fe16f131aa5e1239b6b49ecab6394d7051ec9fc66923c6ffb5eb0e674ba5
+  data.tar.gz: f3c9d7ae8f793651c62eff11b3356321f6bcc531b5ce61020f23d530a08b0112d46e338edc8ff1711bc514fb53875508b5792795c3cbea8056e5ee97a60e52f1

data/CHANGELOG.md

@@ -15,4 +15,9 @@
 ## 1.2.0 (31/05/2024)
 
 * Added support for UNA segments. Special characters different from the defaults can now be used.
-* Added una_special_characters method that returns just the special characters.
+* Added `#una_special_characters` method that returns just the special characters.
+
+## 1.2.1 (4/06/2024)
+
+* `#una_special_characters` method now also returns decimal notation character, default `.`.
+* `#una_special_characters` method can now take no arguments, and will return the default special characters if so.

data/README.md

@@ -4,7 +4,7 @@ This gem parses EDIFACT or TRADACOMS input, and converts it into a ruby array st
 
 It does not handle validation itself.
 
-This gem is heavily inspired by and attempts to output similar results as [edifact_parser](https://github.com/pvdvreede/edifact_parser), credits to [pvdvreede](https://github.com/pvdvreede)
+This gem is heavily inspired by and attempts to output similar results as [edifact_parser](https://github.com/pvdvreede/edifact_parser)
 
 ## Requirements
 
@@ -20,7 +20,7 @@ This gem has been tested on the following ruby versions:
 In your `Gemfile`:
 
 ```ruby
-gem 'edifact_rails', '~> 1.1'
+gem 'edifact_rails', '~> 1.2'
 ```
 
 Otherwise:
@@ -54,6 +54,7 @@ una_special_characters = EdifactRails.una_special_characters(your_string_input)
 {
   component_data_element_seperator: ":",
   data_element_seperator: "+",
+  decimal_notation: ".",
   escape_character: "?",
   segment_seperator: "'"
 }

data/lib/edifact_rails/parser.rb

@@ -20,7 +20,7 @@ module EdifactRails
       string = treat_input(string)
 
       # Split the input string into segments
-      segments = string.split(/(?<!#{@escape_char_rx})#{@segment_separator_rx}/)
+      segments = string.split(/(?<!#{Regexp.quote(@escape_character)})#{Regexp.quote(@segment_seperator)}/)
 
       # Detect if the input is a tradacoms file
       @is_tradacoms = segments.map { |s| s[3] }.uniq == ["="]
@@ -40,6 +40,7 @@ module EdifactRails
       {
         component_data_element_seperator: @component_data_element_seperator,
         data_element_seperator: @data_element_seperator,
+        decimal_notation: @decimal_notation,
         escape_character: @escape_character,
         segment_seperator: @segment_seperator
       }
@@ -51,20 +52,16 @@ module EdifactRails
       component_data_element_seperator =
         EdifactRails::DEFAULT_SPECIAL_CHARACTERS[:component_data_element_seperator],
       data_element_seperator = EdifactRails::DEFAULT_SPECIAL_CHARACTERS[:data_element_seperator],
+      decimal_notation = EdifactRails::DEFAULT_SPECIAL_CHARACTERS[:decimal_notation],
       escape_character = EdifactRails::DEFAULT_SPECIAL_CHARACTERS[:escape_character],
       segment_seperator = EdifactRails::DEFAULT_SPECIAL_CHARACTERS[:segment_seperator]
     )
       # Set the special characters
       @component_data_element_seperator = component_data_element_seperator
       @data_element_seperator = data_element_seperator
+      @decimal_notation = decimal_notation
       @escape_character = escape_character
       @segment_seperator = segment_seperator
-
-      # Escape the special characters for use in regex later on
-      @component_data_element_separator_rx = Regexp.quote(@component_data_element_seperator)
-      @data_element_separator_rx = Regexp.quote(@data_element_seperator)
-      @escape_char_rx = Regexp.quote(@escape_character)
-      @segment_separator_rx = Regexp.quote(@segment_seperator)
     end
 
     def detect_special_characters(string)
@@ -82,7 +79,7 @@ module EdifactRails
       # 4. Release character (aka escape character)
       # 5. Reserved for future use, so always a space for now
       # 6. Segment terminator
-      set_special_characters(string[3], string[4], string[6], string[8])
+      set_special_characters(string[3], string[4], string[5], string[6], string[8])
     end
 
     def treat_input(string)
@@ -112,7 +109,10 @@ module EdifactRails
       #
       # "LIN+even????+123" => '+' is not escaped, gsub'ed => "even???? +123" => parsed => ['LIN', ['even??'], [123]]
       # "LIN+odd???+123" => '+' is escaped, not gsub'ed => "odd???+123" => parsed => ['LIN', ['odd?+123']]
-      string.gsub(/(?<!#{@escape_char_rx})((#{@escape_char_rx}{2})+)([#{other_specials_rx}])/, '\1 \3')
+      string.gsub(
+        /(?<!#{Regexp.quote(@escape_character)})((#{Regexp.quote(@escape_character)}{2})+)([#{other_specials_rx}])/,
+        '\1 \3'
+      )
     end
 
     # Split the segment into data elements, take the first as the tag, then parse the rest
@@ -123,7 +123,7 @@ module EdifactRails
       segment[3] = @data_element_seperator if @is_tradacoms && segment.length >= 4
 
       # Segments are made up of data elements
-      data_elements = segment.split(/(?<!#{@escape_char_rx})#{@data_element_separator_rx}/)
+      data_elements = segment.split(/(?<!#{Regexp.quote(@escape_character)})#{Regexp.quote(@data_element_seperator)}/)
 
       # The first element is the tag, pop it off
       parsed_segment = []
@@ -136,7 +136,8 @@ module EdifactRails
     # Split the data elements into component data elements, and treat them
     def parse_data_element(element)
       # Split data element into components
-      components = element.split(/(?<!#{@escape_char_rx})#{@component_data_element_separator_rx}/)
+      components =
+        element.split(/(?<!#{Regexp.quote(@escape_character)})#{Regexp.quote(@component_data_element_seperator)}/)
 
       components.map { |component| treat_component(component) }
     end
@@ -156,7 +157,7 @@ module EdifactRails
 
       # If the component has escaped characters in it, remove the escape character and return the character as is
       # "?+" -> "+", "??" -> "?"
-      component.gsub!(/#{@escape_char_rx}([#{Regexp.quote(all_special_characters_string)}])/, '\1')
+      component.gsub!(/#{Regexp.quote(@escape_character)}([#{Regexp.quote(all_special_characters_string)}])/, '\1')
 
       # Convert empty strings to nils
       component = nil if component.empty?

data/lib/edifact_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EdifactRails
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/edifact_rails.rb

@@ -6,6 +6,7 @@ module EdifactRails
   DEFAULT_SPECIAL_CHARACTERS = {
     component_data_element_seperator: ":",
     data_element_seperator: "+",
+    decimal_notation: ".",
     escape_character: "?",
     segment_seperator: "'"
   }.freeze
@@ -19,7 +20,7 @@ module EdifactRails
     parse(File.read(file_path).split("\n").join)
   end
 
-  def self.una_special_characters(string)
+  def self.una_special_characters(string = '')
     parser = EdifactRails::Parser.new
     parser.una_special_characters(string)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edifact_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - David Blackwood
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug