eancom 1.5.7 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6528d1683b7871c94ada34d8b29f46827c1fcc9c970855e81190d020cfe435e
-  data.tar.gz: c3a8326ce9be33cd202b315fedc82235fff74e9ee1238b05e13008a40ece8f7d
+  metadata.gz: 10b8633addd1b19df008fcfbf0b33b75c2639cac939e2f2923d6518515c1e670
+  data.tar.gz: 26a096e4e9afa9c39a0e2184dc2bd60fdf7f2f95140e70dfc19a31d59262cd27
 SHA512:
-  metadata.gz: 719ec7a34fe12a4fc3738d97bb732dd36bc793e965b3e21b85bce5007c0e1f2ee6a4694901faf2a55721980da3058c0374a4be4bd2cd81098968e66be6070902
-  data.tar.gz: 2935634f2d295dfbe11b213eee756d7ed6268cd266afebd2717f35b5d29b145cfeacc250745763f185e0d346fe538fe28eddbfd11b36c7db28cb72692b05c868
+  metadata.gz: 34f0152b2721cf4effa65f159642077d52a1e79653e22461a9deb558894c628687775265c1f0b1ced37dfc1a41e87b47af0e6239b53325bee11190845221dd26
+  data.tar.gz: 52974b80bc2d5bfb9b429c58f2ac01e3c1029e655c8cce924e7115c5ed4af483b56727ec18292871509f2961134683c1f7408e994fbcb7b811360820b1d1461a

data/definitions/slsrpt/d01b.rb

@@ -109,78 +109,78 @@ Eancom::Definition.create(name: 'D01B', type: :slsrpt) do |document, config|
         )
       end
 
-      # Location
-      if location = message.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: '162',
-          location_name_code: location.location_name_code
-        )
-      end
+      item_counter = 0
 
-      # Sales Date
-      if date_time = message.sales_date_and_or_time_and_or_period.date_time
-        body.segment Eancom::Edifact::DTM.new(
-          type: '356',
-          date_time: date_time,
-          format: '102'
-        )
-      end
-
-      # Items
-      total_quantity = 0
+      message.locations.each do |location_group|
+        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
 
-      items = message.items
+          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: '162',
+            location_name_code: location.location_name_code
+          )
+        end
 
-      items.each_with_index do |item, index|
-        total_quantity += item.quantity.to_i
+        # 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: '102'
+          )
+        end
 
-        body.segment Eancom::Edifact::LIN.new(
-          line_item_identifier_1: "#{index + 1}",
-          item_identifier: item.ean,
-          item_type_identification_code: 'SRV'
-        )
+        # Items
+        location_group.items.each do |item|
+          item_counter += 1
 
-        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
+          body.segment Eancom::Edifact::LIN.new(
+            line_item_identifier_1: item_counter.to_s,
+            item_identifier: item.ean,
+            item_type_identification_code: 'SRV'
           )
-        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
+          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
-        end
 
-        # Quantity
-        if statistical_sales_quantitiy = item.statistical_sales_quantitiy
-          body.segment Eancom::Edifact::QTY.new(
-            quantity_type_code_qualifier: '153',
-            quantity: statistical_sales_quantitiy.quantity
-          )
+          prices = item.prices
+          prices.each do |price_group|
+            if price = price_group.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 statistical_sales_quantitiy = item.statistical_sales_quantitiy
+            body.segment Eancom::Edifact::QTY.new(
+              quantity_type_code_qualifier: '153',
+              quantity: statistical_sales_quantitiy.quantity
+            )
+          end
         end
       end
 
+
       body.segment Eancom::Edifact::UNS.new(
         section_identification: 'S'
       )

data/definitions/slsrpt/d96a.rb

@@ -106,78 +106,80 @@ Eancom::Definition.create(name: 'D96A', type: :slsrpt) do |document, config|
         )
       end
 
-      # Location
-      if location = message.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
-        )
-      end
-
-      # Sales Date
-      if date_time = message.sales_date_and_or_time_and_or_period.date_time
-        body.segment Eancom::Edifact::DTM.new(
-          type: '356',
-          date_time: date_time,
-          format: '203'
-        )
-      end
+      item_counter = 0
 
-      # Items
-      total_quantity = 0
+      message.locations.each do |location_group|
 
-      items = message.items
+        # 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
+          )
+        end
 
-      items.each_with_index do |item, index|
-        total_quantity += item.quantity.to_i
+        # 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'
+          )
+        end
 
-        body.segment Eancom::Edifact::LIN.new(
-          line_item_identifier_1: "#{index + 1}",
-          item_identifier: item.ean,
-          item_type_identification_code: 'EN'
-        )
+        # Items
+        location_group.items.each do |item|
+          item_counter += 1
 
-        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
+          body.segment Eancom::Edifact::LIN.new(
+            line_item_identifier_1: item_counter.to_s,
+            item_identifier: item.ean,
+            item_type_identification_code: 'EN'
           )
-        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
+          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
-        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'
-          )
+          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,

data/lib/eancom/edifact/body.rb

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

data/lib/eancom/edifact/document.rb

@@ -1,25 +1,25 @@
+# frozen_string_literal: true
+
 module Eancom
   module Edifact
     class Document
-
-      attr_accessor :header_element,
-        :body_element, :footer_element
+      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(&block)
+      def header
         yield(@header_element)
       end
 
-      def body(&block)
+      def body
         yield(@body_element)
       end
 
-      def footer(&block)
+      def footer
         yield(@footer_element)
       end
 
@@ -42,18 +42,14 @@ module Eancom
       end
 
       def to_s(debug: false)
-        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
+        "#{@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
       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/location.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Eancom
+  module Edifact
+    class Location
+      attr_accessor :items, :hash
+
+      def initialize
+        @items = []
+        @hash = {}
+      end
+
+      def add_item(item)
+        @items << item
+      end
+
+      def <<(segment)
+        start_item if segment.starts_item?
+
+        if @item
+          @item << segment
+        elsif name = group_name(segment)
+          @hash[name] = [] if @hash[name].nil?
+          @hash[name] << segment.to_json_hash
+        else
+          @hash.merge!(segment.to_json_hash)
+        end
+      end
+
+      def to_json_hash
+        if @item && !@item.empty?
+          add_item(@item.to_json_hash)
+        end
+
+        @hash.merge({ items: @items })
+      end
+
+      def empty?
+        @hash.empty?
+      end
+
+      def start_item
+        if @item && !@item.empty?
+          add_item(@item.to_json_hash)
+        end
+        @item = Eancom::Edifact::Item.new
+      end
+
+      private
+
+      def group_name(segment)
+        segment.item_group_name || segment.group_name
+      end
+    end
+  end
+end

data/lib/eancom/edifact/message.rb

@@ -1,20 +1,33 @@
+# frozen_string_literal: true
+
 module Eancom
   module Edifact
     class Message
+      attr_accessor :locations, :items, :hash
 
-      attr_accessor :items, :hash
-
-      def initialize()
+      def initialize
+        @locations = []
         @items = []
         @hash = {}
       end
 
+      def add_location(location)
+        @locations << location
+      end
+
       def add_item(item)
         @items << item
       end
 
-      def << (segment)
-        if name = group_name(segment)
+      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)
           @hash[name] = [] if @hash[name].nil?
           @hash[name] << segment.to_json_hash
         else
@@ -23,10 +36,16 @@ 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!(items_hash)
+        message_hash.merge!({ locations: @locations }) if !@locations.empty?
+        message_hash.merge!({ items: @items }) if !@items.empty?
         message_hash
       end
 
@@ -36,6 +55,19 @@ 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

@@ -83,6 +83,10 @@ module Eancom
         false
       end
 
+      def starts_location?
+        false
+      end
+
       def starts_item?
         false
       end

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

@@ -34,6 +34,10 @@ module Eancom
         outer_hash
       end
 
+      def starts_location?
+        true
+      end
+
       def segment_type
         TYPE
       end

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

@@ -2,7 +2,7 @@ module Eancom
   module Edifact
     class UNS < Segment
       TAG = 'UNS'.freeze
-      TYPE = :header.freeze
+      TYPE = :body.freeze
 
       def initialize(
         tag: nil,

data/lib/eancom/edifact.rb

@@ -3,6 +3,7 @@ require 'eancom/edifact/segment'
 require 'eancom/edifact/document_element'
 require 'eancom/edifact/header'
 require 'eancom/edifact/message'
+require 'eancom/edifact/location'
 require 'eancom/edifact/item'
 require 'eancom/edifact/body'
 require 'eancom/edifact/footer'

data/lib/eancom/parser/document.rb

@@ -27,7 +27,7 @@ module Eancom
         elsif segment.is_body?
           @document.add_to_body(segment)
         elsif segment.is_footer?
-          @document.add_to_body(segment)
+          @document.add_to_footer(segment)
         else
           raise SegmentTypeNotDefined.new
         end

data/lib/eancom/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eancom
-  VERSION = '1.5.7'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eancom
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.6.0
 platform: ruby
 authors:
 - Fadendaten GmbH
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -190,6 +190,7 @@ files:
 - lib/eancom/edifact/footer.rb
 - lib/eancom/edifact/header.rb
 - lib/eancom/edifact/item.rb
+- lib/eancom/edifact/location.rb
 - lib/eancom/edifact/message.rb
 - lib/eancom/edifact/segment.rb
 - lib/eancom/edifact/segments/alc.rb