eancom 1.6.2 → 2.0.0

data/definitions/slsrpt/d96a.rb

@@ -1,17 +1,18 @@
 Eancom::Definition.create(name: 'D96A', type: :slsrpt) do |document, config|
+  # Creates a template for an slsrpt d01b formatted edifact document
   document.header do |header|
-    header.segment Eancom::Edifact::UNA.new()
+    header.segment Eancom::Edifact::UNA.new
 
     header.segment Eancom::Edifact::UNB.new(
-      syntax_identifier: config.header.syntax_identifier || 'UNOA',
-      syntax_version_number: config.header.syntax_version_number || '2',
+      syntax_identifier: 'UNOA',
+      syntax_version_number: '2',
       interchange_sender_identification: config.header.interchange_sender_identification,
-      sender_identifiction_code_qualifier: config.header.sender_identification_code_qualifier || '14',
+      sender_identifiction_code_qualifier: '14',
       interchange_recipient_identification: config.header.interchange_recipient_identification,
-      recipient_identifiction_code_qualifier: config.header.recipient_identification_code_qualifier || '14',
+      recipient_identifiction_code_qualifier: '14',
       date: config.header.date,
       time: config.header.time,
-      interchange_control_reference: config.header.interchange_control_reference,
+      interchange_control_reference: config.header.interchange_control_reference
     )
 
     header.segment Eancom::Edifact::UNH.new(
@@ -25,172 +26,174 @@ Eancom::Definition.create(name: 'D96A', type: :slsrpt) do |document, config|
   end
 
   document.body do |body|
-
     # Messages
     messages = config.body.messages
 
     messages.each do |message|
-
       body.segment Eancom::Edifact::BGM.new(
-        document_name_code: '11',
-        document_identifier: message.document_identifier,
+        document_name_code: message.document_name_code,
+        document_identifier: message.document_identifier
       )
 
-      # Document Date
-      body.segment Eancom::Edifact::DTM.new(
-        type: '137',
-        date_time: message.document_message_date_time.date_time,
-        format: '102'
-      )
-
-      # Report Start Date
-      if date_time = message.report_start_date.date_time
+      date_time_messages = message.date_time_messages
+      date_time_messages.each_with_index do |dtm, index|
+        next unless index == 0
+        structure = Eancom.find_structure(tag: 'DTM')
+        key = dtm.identifier.intern.to_sym
         body.segment Eancom::Edifact::DTM.new(
-          type: '90',
-          date_time: date_time,
+          type: structure.dictionary_lookup(:type, dtm.identifier),
+          date_time: dtm[key].date_time,
           format: '102'
         )
       end
 
-      # Report End Date
-      if date_time = message.report_end_date.date_time
-        body.segment Eancom::Edifact::DTM.new(
-          type: '91',
-          date_time: date_time,
-          format: '102'
-        )
-      end
+        date_time_messages.each_with_index do |dtm, index|
+          next unless index == 1
+          structure = Eancom.find_structure(tag: 'DTM')
+          key = dtm.identifier.intern.to_sym
+          body.segment Eancom::Edifact::DTM.new(
+            type: structure.dictionary_lookup(:type, dtm.identifier),
+            date_time: dtm[key].date_time,
+            format: '102'
+          )
+        end
+
+        date_time_messages.each_with_index do |dtm, index|
+          next unless index == 2
+          structure = Eancom.find_structure(tag: 'DTM')
+          key = dtm.identifier.intern.to_sym
+          body.segment Eancom::Edifact::DTM.new(
+            type: structure.dictionary_lookup(:type, dtm.identifier),
+            date_time: dtm[key].date_time,
+            format: '102'
+          )
+        end
+
 
       # Supplier
-      if supplier = message.supplier
-        code_list_responsible_agency_code_1 = if supplier.code_list_responsible_agancy_code_1
-                                                structure = Eancom.find_structure(tag: 'NAD')
-                                                structure.dictionary_lookup(
-                                                  :code_list_responsible_agancy_code_1,
-                                                  supplier.code_list_responsible_agancy_code_1
-                                                )
-                                              else
-                                                '9'
-                                              end
+      nads = message.nads
+      nads.each_with_index do |nad, index|
+        next unless index == 0
+
+        structure = Eancom.find_structure(tag: 'NAD')
+        key = nad.identifier.intern.to_sym
         body.segment Eancom::Edifact::NAD.new(
-          party_function_code_qualifier: 'SU',
-          party_identifier: supplier.party_identifier,
-          code_list_responsible_agancy_code_1: code_list_responsible_agency_code_1
+          party_function_code_qualifier: structure.dictionary_lookup(:party_function_code_qualifier, nad.identifier),
+          party_identifier: nad[key].party_identifier,
+          code_list_responsible_agency_code_1: '9'
         )
       end
 
       # Buyer
-      if buyer = message.buyer
-        code_list_responsible_agency_code_1 = if supplier.code_list_responsible_agancy_code_1
-                                                structure = Eancom.find_structure(tag: 'NAD')
-                                                structure.dictionary_lookup(
-                                                  :code_list_responsible_agancy_code_1,
-                                                  supplier.code_list_responsible_agancy_code_1
-                                                )
-                                              else
-                                                '9'
-                                              end
+      nads.each_with_index do |nad, index|
+        next unless index == 1
+
+        structure = Eancom.find_structure(tag: 'NAD')
+        key = nad.identifier.intern.to_sym
         body.segment Eancom::Edifact::NAD.new(
-          party_function_code_qualifier: 'BY',
-          party_identifier: buyer.party_identifier,
-          code_list_responsible_agancy_code_1: code_list_responsible_agency_code_1
+          party_function_code_qualifier: structure.dictionary_lookup(:party_function_code_qualifier, nad.identifier),
+          party_identifier: nad[key].party_identifier,
+          code_list_responsible_agency_code_1: '9'
         )
       end
 
       # Reference Currency
       if currency = message.currency
+        structure = Eancom.find_structure(tag: 'CUX')
         body.segment Eancom::Edifact::CUX.new(
           currency_identification_code_1: currency.currency_identification_code_1,
-          currency_type_code_qualifier_1: '10',
-          currency_usage_code_qualifier_1: '2'
+          currency_type_code_qualifier_1: structure.dictionary_lookup(:currency_type_code_qualifier_1,
+                                                                      currency.currency_type_code_qualifier_1),
+          currency_usage_code_qualifier_1: structure.dictionary_lookup(:currency_usage_code_qualifier_1, currency.currency_usage_code_qualifier_1)
+        )
+      end
+
+      # Location
+      if location = message.location
+        structure = Eancom.find_structure(tag: 'LOC')
+        body.segment Eancom::Edifact::LOC.new(
+          code_list_identification_code: location.code_list_identification_code,
+          code_list_responsible_agency_code: structure.dictionary_lookup(:code_list_responsible_agency_code, location.code_list_responsible_agency_code),
+          location_function_qualifier: structure.dictionary_lookup(:location_function_qualifier, location.location_function_qualifier),
+          location_name_code: location.location_name_code
+        )
+      end
+
+      date_time_messages.each_with_index do |dtm, index|
+        next unless index == 3
+        structure = Eancom.find_structure(tag: 'DTM')
+        key = dtm.identifier.intern.to_sym
+        body.segment Eancom::Edifact::DTM.new(
+          type: structure.dictionary_lookup(:type, dtm.identifier),
+          date_time: dtm[key].date_time,
+          format: '203'
         )
       end
 
-      item_counter = 0
-
-      message.locations.each do |location_group|
-
-        # Location
-        if location = location_group.location
-          code_list_responsible_agency_code = if location.code_list_responsible_agancy_code
-                                                structure = Eancom.find_structure(tag: 'LOC')
-                                                structure.dictionary_lookup(
-                                                  :code_list_responsible_agancy_code,
-                                                  location.code_list_responsible_agancy_code
-                                                )
-                                              else
-                                                '9'
-                                              end
-          body.segment Eancom::Edifact::LOC.new(
-            code_list_identification_code: location.code_list_identification_code,
-            code_list_responsible_agancy_code: code_list_responsible_agency_code,
-            location_function_qualifier: '150',
-            location_name_code: location.location_name_code
+      # Items
+      total_quantity = 0
+
+      items = message.items
+
+      items.each_with_index do |item, index|
+        total_quantity += item.quantity.to_i
+
+        structure = Eancom.find_structure(tag: 'LIN')
+        body.segment Eancom::Edifact::LIN.new(
+          line_item_identifier_1: (index + 1).to_s,
+          item_identifier: item.ean,
+          item_type_identification_code: structure.dictionary_lookup(:item_type_identification_code, item.item_type_identification_code)
+        )
+
+        references = item.references
+        references.each_with_index do |rff, index|
+          structure = Eancom.find_structure(tag: 'RFF')
+          key = rff.identifier.intern.to_sym
+          body.segment Eancom::Edifact::RFF.new(
+            reference_code_qualifier: structure.dictionary_lookup(:reference_code_qualifier, rff.identifier),
+            reference_identifier: rff[key].reference_identifier
           )
         end
 
-        # Sales Date
-        if date_time = location_group.sales_date_and_or_time_and_or_period&.date_time
-          body.segment Eancom::Edifact::DTM.new(
-            type: '356',
-            date_time: date_time,
-            format: '203'
+        prices = item.prices
+        prices.each do |price|
+          next unless price = price.price
+
+          structure = Eancom.find_structure(tag: 'PRI')
+          body.segment Eancom::Edifact::PRI.new(
+            price_amount: price.price_amount,
+            price_code_qualifier: structure.dictionary_lookup(:price_code_qualifier, price.price_code_qualifier),
+            price_specification_code: structure.dictionary_lookup(:price_specification_code,
+                                                                  price.price_specification_code),
+            price_type_code: price.price_type_code
           )
         end
 
-        # Items
-        location_group.items.each do |item|
-          item_counter += 1
-
-          body.segment Eancom::Edifact::LIN.new(
-            line_item_identifier_1: item_counter.to_s,
-            item_identifier: item.ean,
-            item_type_identification_code: 'EN'
+        qty = item.quantities
+        qty.each_with_index do |qty, index|
+          structure = Eancom.find_structure(tag: 'QTY')
+          key = qty.identifier.intern.to_sym
+          body.segment Eancom::Edifact::QTY.new(
+            quantity_type_code_qualifier: structure.dictionary_lookup(:quantity_type_code_qualifier, qty.identifier),
+            quantity: qty[key].quantity,
+            measurement_unit_code: structure.dictionary_lookup(:measurement_unit_code, qty.measurement_unit_code)
           )
-
-          if transaction_reference_number = item.transaction_reference_number
-            body.segment Eancom::Edifact::RFF.new(
-              reference_code_qualifier: 'TN',
-              reference_identifier: transaction_reference_number.reference_identifier
-            )
-          end
-
-          prices = item.prices
-          prices.each do |price|
-            if price = price.price
-              structure = Eancom.find_structure(tag: 'PRI')
-              body.segment Eancom::Edifact::PRI.new(
-                price_amount: price.price_amount,
-                price_code_qualifier: structure.dictionary_lookup(:price_code_qualifier, price.price_code_qualifier),
-                price_specification_code: structure.dictionary_lookup(:price_specification_code, price.price_specification_code),
-                price_type_code: price.price_type_code
-              )
-            end
-          end
-
-          # Quantity
-          if minimum_production_batch = item.minimum_production_batch
-            body.segment Eancom::Edifact::QTY.new(
-              quantity_type_code_qualifier: '160',
-              quantity: minimum_production_batch.quantity,
-              measurement_unit_code: 'PCE'
-            )
-          end
         end
       end
 
-
       body.segment Eancom::Edifact::UNT.new(
-        number_of_segments_in_message: "#{document.total_segments + 2}",
-        message_reference_number: config.header.message_reference_number,
+        number_of_segments_in_message: (document.total_segments + 2).to_s,
+        message_reference_number: config.header.message_reference_number
       )
     end
+  end
 
-    document.footer do |footer|
-      footer.segment Eancom::Edifact::UNZ.new(
-        interchange_control_count: '1',
-        interchange_control_reference: "#{config.header.interchange_control_reference}"
-      )
-    end
+  document.footer do |footer|
+    messages = config.body.messages
+
+    footer.segment Eancom::Edifact::UNZ.new(
+      interchange_control_count: messages.size.to_s,
+      interchange_control_reference: config.header.interchange_control_reference.to_s
+    )
   end
 end

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