eancom 1.6.2 → 2.0.0

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

@@ -2,43 +2,32 @@ module Eancom
   module Edifact
     class PCD < Segment
       TAG = 'PCD'.freeze
-      TYPE = :body.freeze
+      TYPE = :header
 
       attr_reader :segment_type
 
       def initialize(
         tag: nil,
-        percentage_type_code_qualifier:,
         percentage:,
-        code_list_identification_code: nil,
-        code_list_responsibility_agency_code: nil
+        percentage_type_code_qualifier: nil
       )
         @tag = tag
         @percentage_type_code_qualifier = percentage_type_code_qualifier
         @percentage = percentage
-        @code_list_identification_code = code_list_identification_code
-        @code_list_responsibility_agency_code = code_list_responsibility_agency_code
 
         super(tag: tag || TAG)
       end
 
       def to_json_hash
-        hash = {
-          'percentage_type_code_qualifier': percentage_type,
-          'percentage': percentage
-        }
+        hash = {}
+        hash.merge!(percentage_type_code_qualifier: find_identifier(:percentage_type_code_qualifier)) if @percentage_type_code_qualifier
+        hash.merge!(percentage: @percentage) if @percentage
+        hash
       end
 
       def segment_type
         TYPE
       end
-
-      private
-
-      def percentage_type
-        @percentage_type ||= find_identifier(:percentage_type_code_qualifier)
-      end
-
     end
   end
 end

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

@@ -0,0 +1,40 @@
+module Eancom
+  module Edifact
+    class PCI < Segment
+      TAG = 'PCI'.freeze
+      TYPE = :body
+
+      attr_reader :segment_type
+
+      def initialize(
+        tag: nil,
+        marking_instructions_code:,
+        marks_and_labels_code: nil,
+        container_or_package_contents_indicator_mode: nil
+      )
+
+        @tag = tag
+        @marking_instructions_code = marking_instructions_code
+        @marks_and_labels_code = marks_and_labels_code
+        @container_or_package_contents_indicator_mode = container_or_package_contents_indicator_mode
+        super(tag: tag || TAG)
+      end
+
+      def to_json_hash
+        hash = {}
+        hash.merge!(marking_instructions_code: find_identifier(:marking_instructions_code)) if @marking_instructions_code
+        hash.merge!(marks_and_labels_code: @marks_and_labels_code) if @marks_and_labels_code
+        hash.merge!(container_or_package_contents_indicator_mode: @container_or_package_contents_indicator_mode) if @container_or_package_contents_indicator_mode
+        hash
+      end
+
+      def group_name
+        'package_identification'
+      end
+
+      def segment_type
+        TYPE
+      end
+    end
+  end
+end

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

@@ -61,6 +61,7 @@ module Eancom
 
       def to_json_hash
         hash = {}
+        hash.merge!(product_identifier_code_qualifier: find_identifier(:product_identifier_code_qualifier)) if @product_identifier_code_qualifier
         hash.merge!(item_identifier_1: @item_identifier_1) if @item_identifier_1
         hash.merge!(item_type_identification_code_1: find_identifier(:item_type_identification_code_1)) if @item_type_identification_code_1
         hash.merge!(code_list_identification_code_1: @code_list_identification_code_1) if @code_list_identification_code_1

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

@@ -8,7 +8,6 @@ module Eancom
 
       def initialize(
         tag: nil,
-
         price_code_qualifier:,
         price_amount:,
         price_type_code: nil,

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

@@ -19,11 +19,15 @@ module Eancom
       end
 
       def to_json_hash
-        {
-          identifier => {
-              quantity: @quantity
-            }
-        }
+        hash = { identifier => {} }
+        hash[identifier].merge!({ quantity: @quantity }) if @quantity
+        hash.merge!(measurement_unit_code: find_identifier(:measurement_unit_code)) if @measurement_unit_code
+        hash.merge!(identifier: @identifier) if @identifier
+        hash
+      end
+
+      def group_name
+        'quantities'
       end
 
       def segment_type

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

@@ -21,11 +21,17 @@ module Eancom
       def to_json_hash
         {
           identifier => {
-            reference_identifier: @reference_identifier
-          }
+            reference_identifier: @reference_identifier,
+            document_line_identifier: @document_line_identifier
+          },
+          identifier: @identifier
         }
       end
 
+      def group_name
+        'references'
+      end
+
       def segment_type
         TYPE
       end

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

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

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

@@ -9,7 +9,7 @@ module Eancom
       def initialize(
         tag: nil,
         duty_or_tax_or_fee_function_code_qualifier:,
-        duty_or_tax_or_fee_name_code:,
+        duty_or_tax_or_fee_name_code: nil,
         code_list_identification_code_1: nil,
         code_list_responsibility_agency_code_1: nil,
         duty_or_tax_or_fee_type_name: nil,
@@ -50,8 +50,14 @@ module Eancom
 
       def to_json_hash
         hash = {}
+        hash.merge!(duty_or_tax_or_fee_function_code_qualifier: find_identifier(:duty_or_tax_or_fee_function_code_qualifier)) if @duty_or_tax_or_fee_function_code_qualifier
         hash.merge!(duty_or_tax_or_fee_name_code: find_identifier(:duty_or_tax_or_fee_name_code)) if @duty_or_tax_or_fee_name_code
+        hash.merge!(duty_or_tax_or_fee_account_code: @duty_or_tax_or_fee_account_code) if @duty_or_tax_or_fee_account_code
+        hash.merge!(duty_tax_fee_rate_code: @duty_tax_fee_rate_code) if @duty_tax_fee_rate_code
         hash.merge!(duty_or_tax_or_fee_rate: @duty_or_tax_or_fee_rate) if @duty_or_tax_or_fee_rate
+        hash.merge!(code_list_identification_code_3: @code_list_identification_code_3) if @code_list_identification_code_3
+        hash.merge!(code_list_responsibility_agency_code_3: @code_list_responsibility_agency_code_3) if @code_list_responsibility_agency_code_3
+        hash.merge!(code_list_responsibility_agency_code_4: @code_list_responsibility_agency_code_4) if @code_list_responsibility_agency_code_4
         hash.merge!(duty_or_tax_or_fee_category_code: find_identifier(:duty_or_tax_or_fee_category_code)) if @duty_or_tax_or_fee_category_code
         outer_hash = {}
         identifier = find_identifier(:duty_or_tax_or_fee_function_code_qualifier)

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

@@ -43,7 +43,10 @@ module Eancom
       end
 
       def to_json_hash
-        {}
+        hash = {}
+        hash.merge!(transport_stage_code_qualifier: find_identifier(:transport_stage_code_qualifier)) if @transport_stage_code_qualifier
+        hash.merge!(transport_mode_name_code: find_identifier(:transport_mode_name_code)) if @transport_mode_name_code
+        hash
       end
 
       def segment_type

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

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

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

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

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

@@ -12,7 +12,8 @@ module Eancom
                      una3: '.',
                      una4: '?',
                      una5: ' ',
-                     una6: '\''
+                     una6: '\'',
+                     **kwargs
                     )
         @tag = tag
         @una1 = una1

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

@@ -47,16 +47,15 @@ module Eancom
       end
 
       def to_json_hash
-        hash = {
+        {
           interchange_sender_identification: @interchange_sender_identification,
           interchange_recipient_identification: @interchange_recipient_identification,
           date: @date,
           time: @time,
-          interchange_control_reference: @interchange_control_reference
+          interchange_control_reference: @interchange_control_reference,
+          application_reference: @application_reference,
+          interchange_agreement_identifier: @interchange_agreement_identifier
         }
-
-        hash.merge!(sender_identifiction_code_qualifier: @sender_identifiction_code_qualifier) if @sender_identifiction_code_qualifier
-        hash.merge!(recipient_identifiction_code_qualifier: @recipient_identifiction_code_qualifier) if @recipient_identifiction_code_qualifier
       end
 
       def segment_type

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

@@ -11,7 +11,7 @@ module Eancom
         message_version_number:,
         message_release_number:,
         controlling_agency:,
-        association_assigned_code: nil,
+        association_assigned_code:,
         code_list_directory_version_number: nil
       )
 
@@ -26,6 +26,10 @@ module Eancom
         super(tag: tag || TAG)
       end
 
+      '''
+      Changing this to_json_hash function throws unusualy many errors.
+      Discuss whether or not this hash function needs to be changed.
+      '''
       def to_json_hash
         hash = {
           message_reference_number: @message_reference_number,
@@ -33,10 +37,8 @@ module Eancom
           message_version_number: @message_version_number,
           message_release_number: @message_release_number,
           controlling_agency: @controlling_agency,
+          association_assigned_code: @association_assigned_code
         }
-        hash[:association_assigned_code] = @association_assigned_code if @association_assigned_code
-        hash[:code_list_directory_version_number] = @code_list_directory_version_number if @code_list_directory_version_number
-        hash
       end
 
       def segment_type

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

@@ -2,7 +2,7 @@ module Eancom
   module Edifact
     class UNS < Segment
       TAG = 'UNS'.freeze
-      TYPE = :body.freeze
+      TYPE = :header.freeze
 
       def initialize(
         tag: nil,
@@ -14,6 +14,9 @@ module Eancom
         super(tag: tag || TAG)
       end
 
+      '''
+      Why is line 22 commented?
+      '''
       def to_json_hash
         hash = {}
         # hash.merge!(section_identification: find_identifier(:section_identification)) if @section_identification

data/lib/eancom/edifact/structure.rb

@@ -68,7 +68,6 @@ module Eancom
               return k
             end
           end
-          value
         else
           value
         end

data/lib/eancom/edifact.rb

@@ -3,7 +3,6 @@ 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'
@@ -22,6 +21,18 @@ require 'eancom/edifact/segments/unt'
 require 'eancom/edifact/segments/unz'
 
 require 'eancom/edifact/segments/alc'
+require 'eancom/edifact/segments/ajt'
+require 'eancom/edifact/segments/dgs'
+require 'eancom/edifact/segments/efi'
+require 'eancom/edifact/segments/tru'
+require 'eancom/edifact/segments/cdi'
+require 'eancom/edifact/segments/gin'
+require 'eancom/edifact/segments/rte'
+require 'eancom/edifact/segments/pcd'
+require 'eancom/edifact/segments/eqd'
+require 'eancom/edifact/segments/tod'
+require 'eancom/edifact/segments/pat'
+require 'eancom/edifact/segments/doc'
 require 'eancom/edifact/segments/ali'
 require 'eancom/edifact/segments/bgm'
 require 'eancom/edifact/segments/cav'
@@ -29,21 +40,22 @@ require 'eancom/edifact/segments/cci'
 require 'eancom/edifact/segments/cnt'
 require 'eancom/edifact/segments/cps'
 require 'eancom/edifact/segments/cux'
+require 'eancom/edifact/segments/cta'
 require 'eancom/edifact/segments/dtm'
 require 'eancom/edifact/segments/ftx'
 require 'eancom/edifact/segments/imd'
+require 'eancom/edifact/segments/inv'
 require 'eancom/edifact/segments/lin'
 require 'eancom/edifact/segments/loc'
 require 'eancom/edifact/segments/mea'
 require 'eancom/edifact/segments/moa'
 require 'eancom/edifact/segments/nad'
 require 'eancom/edifact/segments/pac'
+require 'eancom/edifact/segments/pci'
 require 'eancom/edifact/segments/pgi'
-require 'eancom/edifact/segments/pcd'
 require 'eancom/edifact/segments/pia'
 require 'eancom/edifact/segments/pri'
 require 'eancom/edifact/segments/qty'
-require 'eancom/edifact/segments/qvr'
 require 'eancom/edifact/segments/rff'
 require 'eancom/edifact/segments/tax'
 require 'eancom/edifact/segments/tdt'
@@ -52,4 +64,3 @@ module Eancom
   module Edifact
   end
 end
-

data/lib/eancom/factory.rb

@@ -36,4 +36,4 @@ module Eancom
     end
 
   end
-end
+end

data/lib/eancom/parser/document.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Eancom
   module Parser
     class Document
@@ -12,14 +10,9 @@ module Eancom
         @document = Eancom::Edifact::Document.new
       end
 
-      def parse(header_only: false)
+      def parse
         content.split(segment_delimiter).each do |segment_string|
           segment = Parser::Segment.new(segment_string)
-
-          if header_only && segment.segment_class::TYPE != :header
-            next
-          end
-
           segment = segment.parse
           add(segment)
         end
@@ -34,7 +27,7 @@ module Eancom
         elsif segment.is_body?
           @document.add_to_body(segment)
         elsif segment.is_footer?
-          @document.add_to_footer(segment)
+          @document.add_to_body(segment)
         else
           raise SegmentTypeNotDefined
         end
@@ -60,13 +53,7 @@ module Eancom
       end
 
       def convert(string)
-        string.encode(
-          'UTF-8',
-          'binary',
-          invalid: :replace,
-          undef: :replace,
-          replace: ''
-        )
+        string.encode('UTF-8')
       end
     end
   end

data/lib/eancom/parser/segment.rb

@@ -2,13 +2,11 @@ module Eancom
   module Parser
     class Segment
 
-      attr_accessor :tag, :string, :components, :segment_class
+      attr_accessor :tag, :components, :string
 
       def initialize(string)
         @string = string
         @components = []
-        @tag = una? ? 'UNA' : string.split(data_delimiter)[0]
-        @segment_class = find_segment_class
       end
 
       def parse
@@ -21,13 +19,13 @@ module Eancom
       private
 
       def parse_component
-        if una?
-          parse_una
-        else
+       if string =~ /^UNA/
+         parse_una
+       else
           string.split(data_delimiter).each do |data|
             components << parse_data(data)
           end
-        end
+       end
       end
 
       def parse_data(data)
@@ -48,6 +46,10 @@ module Eancom
         components << [DELIMITERS[:segment]]
       end
 
+      def tag
+        components.first.first
+      end
+
       def find_segment_class
         Eancom.find_segment(tag: tag)
       end
@@ -64,9 +66,6 @@ module Eancom
         DELIMITERS[:component]
       end
 
-      def una?
-        string =~ /^UNA/
-      end
     end
   end
 end

data/lib/eancom/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Eancom
-  VERSION = '1.6.2'
+  VERSION = "2.0.0"
 end

data/lib/eancom.rb

@@ -10,8 +10,10 @@ module Eancom
     pricat
     ordrsp
     slsrpt
-    invrp
+    invrpt
     orders
+    invoic
+    retann
   ].freeze
 
   DELIMITERS = {

data/pricat.json

@@ -0,0 +1 @@
+"#<File:0x00007ff38589ba40>"