eancom 1.6.3 → 2.0.0

data/eancom.gemspec

@@ -23,12 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-nav'
-  spec.add_development_dependency 'pry-remote'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'timecop'
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-remote"
+  spec.add_development_dependency "pry-nav"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "timecop"
 end

data/lib/eancom/edifact/body.rb

@@ -1,9 +1,8 @@
-# frozen_string_literal: true
-
 module Eancom
   module Edifact
     class Body < DocumentElement
-      attr_accessor :hash, :messages, :locations, :items
+
+      attr_accessor :hash, :items, :messages
 
       def initialize
         super
@@ -12,32 +11,52 @@ module Eancom
       end
 
       def to_json_hash
-        @to_json_hash ||= build_json_hash
+        @segments.each do |segment|
+          start_message(segment) if segment.starts_message?
+          start_item(segment) if segment.starts_item?
+          if @item
+            @item << segment
+          else
+            @message << segment
+          end
+        end
+        @message.add_item(@item.to_json_hash)
+        @messages << @message.to_json_hash
+        hash.merge!({ messages: messages })
+        { body: hash }
       end
 
-      def start_message
+      def start_message(segment)
         if @message
           @messages << @message.to_json_hash
+          if @item && !@item.empty?
+            @message.add_item(@item.to_json_hash)
+          end
+          @item = nil
         end
-        @message = Eancom::Edifact::Message.new
+        @message = Eancom::Edifact::Message.new()
       end
 
-      private
-
-      def group_name(segment)
-        segment.group_name
+      def start_item(segment)
+        if @item && !@item.empty?
+          @message.add_item(@item.to_json_hash)
+        end
+        @item = Eancom::Edifact::Item.new()
       end
 
-      def build_json_hash
-        @segments.each do |segment|
-          start_message if segment.starts_message?
-          @message << segment
+      private
+
+      def merge(hash, segment)
+        if name = group_name(segment)
+          hash[name] = [] if hash[name].nil?
+          hash[name] << segment.to_json_hash
+        else
+          hash.merge!(segment.to_json_hash)
         end
-        messages << @message.to_json_hash if @message
+      end
 
-        {
-          body: hash.merge({ messages: messages })
-        }
+      def group_name(segment)
+        return segment.group_name
       end
     end
   end

data/lib/eancom/edifact/document.rb

@@ -1,25 +1,24 @@
-# frozen_string_literal: true
-
 module Eancom
   module Edifact
     class Document
+
       attr_accessor :header_element, :body_element, :footer_element
 
       def initialize
-        @header_element = Header.new
-        @body_element = Body.new
-        @footer_element = Footer.new
+        @header_element = Header.new()
+        @body_element = Body.new()
+        @footer_element = Footer.new()
       end
 
-      def header
+      def header(&block)
         yield(@header_element)
       end
 
-      def body
+      def body(&block)
         yield(@body_element)
       end
 
-      def footer
+      def footer(&block)
         yield(@footer_element)
       end
 
@@ -35,6 +34,7 @@ module Eancom
         @footer_element.segment(segment)
       end
 
+      # Should header and footer segments be added to total_segments?
       def total_segments
         total = 0
         total += @body_element.segments.count
@@ -42,14 +42,18 @@ module Eancom
       end
 
       def to_s(debug: false)
-        "#{@header_element.to_s(debug: debug)}#{@body_element.to_s(debug: debug)}#{@footer_element.to_s(debug: debug)}"
-      end
-
-      def to_json(_obj = nil)
-        {
-          **@header_element.to_json_hash,
-          **@body_element.to_json_hash
-        }.to_json
+        stream = ''
+        stream << @header_element.to_s(debug: debug)
+        stream << @body_element.to_s(debug: debug)
+        stream << @footer_element.to_s(debug: debug)
+        stream
+      end
+
+      def to_json
+        hash = {}
+        hash.merge! @header_element.to_json_hash
+        hash.merge! @body_element.to_json_hash
+        hash.to_json
       end
     end
   end

data/lib/eancom/edifact/footer.rb

@@ -1,6 +1,7 @@
 module Eancom
   module Edifact
     class Footer < DocumentElement
+      # Why is this module empty?
     end
   end
 end

data/lib/eancom/edifact/item.rb

@@ -4,7 +4,7 @@ module Eancom
 
       attr_accessor :hash
 
-      def initialize
+      def initialize()
         @hash = {}
       end
 

data/lib/eancom/edifact/message.rb

@@ -1,33 +1,20 @@
-# frozen_string_literal: true
-
 module Eancom
   module Edifact
     class Message
-      attr_accessor :locations, :items, :hash
 
-      def initialize
-        @locations = []
+      attr_accessor :items, :hash
+
+      def initialize()
         @items = []
         @hash = {}
       end
 
-      def add_location(location)
-        @locations << location
-      end
-
       def add_item(item)
         @items << item
       end
 
-      def <<(segment)
-        start_location if segment.starts_location?
-        start_item if segment.starts_item?
-
-        if @location
-          @location << segment
-        elsif @item
-          @item << segment
-        elsif name = group_name(segment)
+      def << (segment)
+        if name = group_name(segment)
           @hash[name] = [] if @hash[name].nil?
           @hash[name] << segment.to_json_hash
         else
@@ -36,16 +23,10 @@ module Eancom
       end
 
       def to_json_hash
-        if @location && !@location.empty?
-          add_location(@location.to_json_hash)
-        end
-        if @item && !@item.empty?
-          add_item(@item.to_json_hash)
-        end
         message_hash = {}
+        items_hash = { items: @items }
         message_hash.merge!(@hash)
-        message_hash.merge!({ locations: @locations }) if !@locations.empty?
-        message_hash.merge!({ items: @items }) if !@items.empty?
+        message_hash.merge!(items_hash)
         message_hash
       end
 
@@ -55,19 +36,6 @@ module Eancom
         segment.group_name
       end
 
-      def start_location
-        if @location && !@location.empty?
-          add_location(@location.to_json_hash)
-        end
-        @location = Eancom::Edifact::Location.new
-      end
-
-      def start_item
-        if @item && !@item.empty?
-          add_item(@item.to_json_hash)
-        end
-        @item = Eancom::Edifact::Item.new
-      end
     end
   end
 end

data/lib/eancom/edifact/segment.rb

@@ -11,18 +11,21 @@ module Eancom
       end
 
       def self.initialize_by_components(structure, array)
-        new(**structure.build_hash(array))
-      rescue StandardError => e
-        raise SegmentParserError, "'Parser Error in structure #{structure.tag} with array #{array}.\n \
-            'Inside Structure: \n \ '#{structure}.\n \
+        begin
+          new(**structure.build_hash(array))
+        rescue StandardError => e
+          raise SegmentParserError.new(
+            "'Parser Error in structure #{structure.tag} with array #{array}.\n \
+            'Inside Structure: \n \ '#{structure.to_s}.\n \
             'Error:\n \
             '#{e}"
+          )
+        end
       end
 
       def validate_structure
         attributes.each do |key, value|
           next if value.nil?
-
           structure.validate!(key, value)
         end
       end
@@ -36,10 +39,9 @@ module Eancom
       end
 
       def to_s
-        string = array.map do |e|
+        string = array.map do |e| 
           e = e.compact
           next if e.empty?
-
           [e.join(component_delimiter)]
         end.join(data_delimiter)
         clean_end_string(string)
@@ -83,10 +85,6 @@ module Eancom
         false
       end
 
-      def starts_location?
-        false
-      end
-
       def starts_item?
         false
       end

data/lib/eancom/edifact/segments/ajt.rb

@@ -0,0 +1,32 @@
+module Eancom
+  module Edifact
+    class AJT < Segment
+      TAG = 'AJT'.freeze
+      TYPE = :body.freeze
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        adjustment_reason_description:
+      )
+        @tag = tag
+        @adjustment_reason_description = adjustment_reason_description
+
+        super(tag: tag || TAG)
+      end
+
+      def to_json_hash
+        hash = {}
+        if @adjustment_reason_description
+          hash.merge!(adjustment_reason_description: find_identifier(:adjustment_reason_description))
+        end
+        hash
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/ali.rb

@@ -2,7 +2,7 @@ module Eancom
   module Edifact
     class ALI < Segment
       TAG = 'ALI'.freeze
-      TYPE = :body.freeze
+      TYPE = :body
 
       attr_reader :segment_type
 
@@ -38,15 +38,13 @@ module Eancom
         hash.merge!(special_condition_code_4: find_identifier(:special_condition_code_4)) if @special_condition_code_4
         hash.merge!(special_condition_code_5: find_identifier(:special_condition_code_5)) if @special_condition_code_5
         outer_hash = {}
-        outer_hash.merge!(additional_information: hash )
+        outer_hash.merge!(additional_information: hash)
         outer_hash
       end
 
       def segment_type
         TYPE
       end
-
-
     end
   end
 end

data/lib/eancom/edifact/segments/bgm.rb

@@ -8,7 +8,7 @@ module Eancom
 
       def initialize(
         tag: nil,
-        document_name_code: nil,
+        document_name_code:,
         code_list_responsible_agency_code: nil,
         code_list_identification_code: nil,
         document_name: nil,
@@ -28,7 +28,9 @@ module Eancom
 
       def to_json_hash
         {
-          document_identifier: @document_identifier
+          document_name_code: @document_name_code,
+          document_identifier: @document_identifier,
+          message_function_code: @message_function_code
         }
       end
 
@@ -39,7 +41,6 @@ module Eancom
       def segment_type
         TYPE
       end
-
     end
   end
 end

data/lib/eancom/edifact/segments/cdi.rb

@@ -0,0 +1,30 @@
+module Eancom
+  module Edifact
+    class CDI < Segment
+      TAG = 'CDI'.freeze
+      TYPE = :body.freeze
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        physical_or_logical_state_type_code_qualifier: nil
+      )
+
+        @tag = tag
+        @physical_or_logical_state_type_code_qualifier = physical_or_logical_state_type_code_qualifier
+        super(tag: @tag || TAG)
+      end
+
+      def to_json_hash
+        hash = {}
+        hash.merge!(physical_or_logical_state_type_code_qualifier: find_identifier(:physical_or_logical_state_type_code_qualifier)) if @physical_or_logical_state_type_code_qualifier
+        hash
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/cnt.rb

@@ -21,7 +21,14 @@ module Eancom
       end
 
       def to_json_hash
-        {}
+        hash = {}
+        hash.merge!(control_total_type_code_quantifier: find_identifier(:control_total_type_code_quantifier)) if @control_total_type_code_quantifier
+        hash.merge!(control_total_value: @control_total_value) if @control_total_value
+        hash
+      end
+
+      def group_name
+        'counts'
       end
 
       def segment_type

data/lib/eancom/edifact/segments/cps.rb

@@ -19,7 +19,10 @@ module Eancom
       end
 
       def to_json_hash
-        {}
+        hash = {}
+        hash.merge!(hierarchical_structure_level_identifier: @hierarchical_structure_level_identifier) if @hierarchical_structure_level_identifier
+        hash.merge!(hierarchical_structure_parent_identifier: @hierarchical_structure_parent_identifier) if @hierarchical_structure_parent_identifier
+        hash
       end
 
       def segment_type

data/lib/eancom/edifact/segments/cta.rb

@@ -0,0 +1,30 @@
+module Eancom
+  module Edifact
+    class CTA < Segment
+      TAG = 'CTA'.freeze
+      TYPE = :body
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        contact_function_code:
+      )
+
+        @tag = tag
+        @contact_function_code = contact_function_code
+        super(tag: tag || TAG)
+      end
+
+      def to_json_hash
+        hash = {}
+        hash.merge!(contact_function_code: find_identifier(:contact_function_code)) if @contact_function_code
+        hash
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/cux.rb

@@ -10,7 +10,7 @@ module Eancom
         tag: nil,
         currency_usage_code_qualifier_1:,
         currency_identification_code_1:,
-        currency_type_code_qualifier_1:,
+        currency_type_code_qualifier_1: nil,
         currency_rate_value_1: nil,
         currency_usage_code_qualifier_2: nil,
         currency_identification_code_2: nil,

data/lib/eancom/edifact/segments/dgs.rb

@@ -0,0 +1,31 @@
+module Eancom
+  module Edifact
+    class DGS < Segment
+      TAG = 'DGS'.freeze
+      TYPE = :body
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        hazard_identification_code:
+      )
+
+        @tag = tag
+        @hazard_identification_code = hazard_identification_code
+
+        super(tag: tag || TAG)
+      end
+
+      def to_json_hash
+        hash = {}
+        hash.merge!(hazard_identification_code: @hazard_identification_code)
+        hash
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/doc.rb

@@ -0,0 +1,30 @@
+module Eancom
+  module Edifact
+    class DOC < Segment
+      TAG = 'DOC'.freeze
+      TYPE = :header
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        document_name_code:
+      )
+        @tag = tag
+        @document_name_code = document_name_code
+
+        super(tag: tag || TAG)
+      end
+
+      def to_json_hash
+        {
+          document_name_code: @document_name_code
+        }
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/dtm.rb

@@ -21,11 +21,16 @@ module Eancom
       end
 
       def to_json_hash
-        {
-          identifier => {
-              date_time: @date_time
-            }
-        }
+        hash = { identifier => {} }
+        hash[identifier].merge!({ date_time: @date_time }) if @date_time
+
+        hash.merge!({ identifier: @identifier }) if @identifier
+        hash = {} if hash[identifier].empty?
+        hash
+      end
+
+      def group_name
+        'date_time_messages'
       end
 
       def segment_type
@@ -40,4 +45,3 @@ module Eancom
     end
   end
 end
-

data/lib/eancom/edifact/segments/efi.rb

@@ -0,0 +1,38 @@
+module Eancom
+  module Edifact
+    class EFI < Segment
+      TAG = 'EFI'.freeze
+      TYPE = :body.freeze
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        file_name: nil,
+        file_format_name:,
+        data_format_description_code:
+      )
+
+        @tag = tag
+        @file_name = file_name
+        @file_format_name = file_format_name
+        @data_format_description_code = data_format_description_code
+
+        super(tag: tag || TAG)
+      end
+    
+
+      def to_json_hash
+        hash = {}
+        hash.merge!(file_name: file_name) if @file_name
+        hash.merge!(file_format_name: file_format_name) if @file_format_name
+        hash.merge!(data_format_description_code: find_identifier(:data_format_description_code)) if @data_format_description_code
+        hash
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/eqd.rb

@@ -0,0 +1,30 @@
+module Eancom
+  module Edifact
+    class EQD < Segment
+      TAG = 'EQD'.freeze
+      TYPE = :header
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        equipment_code_qualifier: nil
+      )
+
+        @tag = tag
+        @equipment_code_qualifier = equipment_code_qualifier
+
+        super(tag: tag || TAG)
+      end
+
+      def to_json_hash
+        hash = {}
+        hash.merge!(equipment_code_qualifier: find_identifier(:equipment_code_qualifier)) if @equipment_code_qualifier
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

data/lib/eancom/edifact/segments/ftx.rb

@@ -38,14 +38,14 @@ module Eancom
         hash = {}
         hash.merge!(text_subject_code_qualifier: @text_subject_code_qualifier) if @text_subject_code_qualifier
         hash.merge!(free_text_function_code: find_identifier(:free_text_function_code)) if @free_text_function_code
-        hash.merge!(free_text_value_code: @free_text_value_code) if @free_text_value_code
+        hash.merge!(free_text_value_code: find_identifier(:free_text_value_code)) if @free_text_value_code
         hash.merge!(code_list_identification_code: @code_list_identification_code) if @code_list_identification_code
         hash.merge!(code_list_responsible_agency_code: find_identifier(:code_list_responsible_agency_code)) if @code_list_responsible_agency_code
         hash.merge!(free_text_value_1: @free_text_value_1) if @free_text_value_1
         hash.merge!(free_text_value_2: @free_text_value_2) if @free_text_value_2
         hash.merge!(free_text_value_3: @free_text_value_3) if @free_text_value_3
         hash.merge!(free_text_value_4: @free_text_value_4) if @free_text_value_4
-        hash.merge!(free_text_value_5: @free_text_value_5) if @free_text_value_4
+        hash.merge!(free_text_value_5: @free_text_value_5) if @free_text_value_5
         hash
       end