Merge pull request #24 from cloudlogistics/bugs/BUGS-6527_revise_310_…

…end_struct BUGS-6527 Correct ending L1 structure.
cloudlogistics · Mar 2, 2018 · 03f9603 · 03f9603
2 parents 42ca922 + 899642a
commit 03f9603
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    baldr (0.10.4)
+    baldr (0.10.5)
       activesupport
 
 GEM
@@ -15,10 +15,10 @@ GEM
     coderay (1.1.0)
     concurrent-ruby (1.0.5)
     diff-lcs (1.1.3)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     method_source (0.8.2)
-    minitest (5.10.3)
+    minitest (5.11.3)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -34,7 +34,7 @@ GEM
     rspec-mocks (2.12.2)
     slop (3.6.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS

diff --git a/lib/baldr/grammar/version4010/set310.rb b/lib/baldr/grammar/version4010/set310.rb
@@ -39,8 +39,9 @@ def record_defs
        ]},
       ]},
       {id: 'L3', min: 1, max: 1},
-      {id: 'L1', min: 0, max: 20},
-      {id: 'C3', min: 0, max: 1},
+      {id: 'L1', min: 0, max: 20, level: [
+        {id: 'C3', min: 0, max: 1}
+      ]},
       {id: 'SE', min: 1, max: 1},
     ]
   }.freeze

diff --git a/lib/baldr/version.rb b/lib/baldr/version.rb
@@ -1,3 +1,3 @@
 module Baldr
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end
diff --git a/spec/support/edi_files/valid/310/PUT_310_20180228070731227.EDI b/spec/support/edi_files/valid/310/PUT_310_20180228070731227.EDI
@@ -0,0 +1 @@
+ISA*00*          *00*          *02*IILU           *ZZ*3165262468     *180228*0707*U*00401*000000010*0*P*:~GS*IO*IILU*3165262468*20180228*0707*10*X*004010~ST*310*0010~B3*B*7102310000*71023100*PP**20180223*2634300**20180309**IILU*20180223~N9*BN*71023100~N9*BM*71023100~N9*CT*3001~V1*9481532*Independent Voyager*LR*0621EB*IILU****S~C3*USD~N1*SE*Independent Container Line*2*IILU~N1*BY*Spirit AeroSystems Inc*92*340589~N1*SH*Spirit AeroSystems Inc*FA*USILM~N3*2600 Aerosystems Boulevard~N4*Kinston*NC*28504*US~N1*CN*Spirit AeroSystems Inc*FA*GBLIV~N3*A350, Building 38*Glasgow Prestwick Airport~N4*PRESTWICK AIRPORT***GB~R4*R*UN*USISO*Kinston*US***NC~R4*L*UN*USILM*Wilmington*US***NC~DTM*140*20180223~R4*D*UN*GBLIV*LIVERPOOL*GB~DTM*139*20180309~R4*E*UN**PRESTWICK*GB~LX*1~N7*XSCU*701065*4650.23*G*************K*1****L5G1~M7*138479~L0*1*1*NR*10252*G***2*PCS**L~L5*1*AIRCRAFT WINGS SPAR****1742252 1742281 1742881 PO# 5500000860-00130 550*L~LX*2~N7*ICUU*457856*4717.36*G*************K*9****L5G1~M7*138483~L0*1*1*NR*10400*G***2*PCS**L~L5*1*AIRCRAFT WINGS SPAR****1742252 1742281 1742881 PO# 5500000860-00130 550*L~LX*3~N7*ICUU*457805*4717.36*G*************K*0****L5G1~M7*138493~L0*1*1*NR*10400*G***2*PCS**L~L5*1*AIRCRAFT WINGS SPAR****1742252 1742281 1742881 PO# 5500000860-00130 550*L~L3*31052*G*****2634300*****L~L1*1*2274.00*FR*227400****BSC****Floating Bunker Recovery********USD~C3*USD~L1*2*23595.00*FR*2359500****COF****Ocean Freight Charge********USD~C3*USD~L1*3*474.00*FR*47400****405****Low Sulfur Fuel Charge********USD~C3*USD~SE*44*0010~GE*1*10~IEA*1*000000010~
diff --git a/spec/support/edi_files/valid/310/PUT_310_20180228103915093.EDI b/spec/support/edi_files/valid/310/PUT_310_20180228103915093.EDI
@@ -0,0 +1 @@
+ISA*00*          *00*          *02*IILU           *ZZ*3165262468     *180228*1039*U*00401*000000011*0*P*:~GS*IO*IILU*3165262468*20180228*1039*11*X*004010~ST*310*0011~B3*B*7102310000*71023100*PP**20180223*2634300**20180309*017*IILU*20180223~N9*BN*71023100~N9*BM*71023100~N9*CT*3001~V1*9481532*Independent Voyager*LR*0621EB*IILU****S~C3*USD~N1*SE*Independent Container Line*2*IILU~N1*BY*Spirit AeroSystems Inc*92*340589~N1*SH*Spirit AeroSystems Inc*FA*USILM~N3*2600 Aerosystems Boulevard~N4*Kinston*NC*28504*US~N1*CN*Spirit AeroSystems Inc*FA*GBLIV~N3*A350, Building 38*Glasgow Prestwick Airport~N4*PRESTWICK AIRPORT***GB~R4*R*UN*USISO*Kinston*US***NC~R4*L*UN*USILM*Wilmington*US***NC~DTM*140*20180223~R4*D*UN*GBLIV*LIVERPOOL*GB~DTM*139*20180309~R4*E*UN*GBPIK*PRESTWICK*GB~LX*1~N7*XSCU*701065*4650.23*G*************K*1****L5G1~M7*138479~L0*1*1*NR*10252*G***2*PCS**L~L5*1*AIRCRAFT WINGS SPAR****1742252 1742281 1742881 PO# 5500000860-00130 550*L~LX*2~N7*ICUU*457856*4717.36*G*************K*9****L5G1~M7*138483~L0*1*1*NR*10400*G***2*PCS**L~L5*1*AIRCRAFT WINGS SPAR****1742252 1742281 1742881 PO# 5500000860-00130 550*L~LX*3~N7*ICUU*457805*4717.36*G*************K*0****L5G1~M7*138493~L0*1*1*NR*10400*G***2*PCS**L~L5*1*AIRCRAFT WINGS SPAR****1742252 1742281 1742881 PO# 5500000860-00130 550*L~L3*31052*G*****2634300*****L~L1*1*2274.00*FR*227400****BSC****Floating Bunker Recovery********USD~C3*USD~L1*2*23595.00*FR*2359500****COF****Ocean Freight Charge********USD~C3*USD~L1*3*474.00*FR*47400****405****Low Sulfur Fuel Charge********USD~C3*USD~SE*44*0011~GE*1*11~IEA*1*000000011~
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ISA00 00 02IILU ZZ3165262468 1802280707U004010000000100P:~GSIOIILU316526246820180228070710X004010~ST3100010~B3B710231000071023100PP*20180223263430020180309IILU20180223~N9BN71023100~N9BM71023100~N9CT3001~V19481532Independent VoyagerLR0621EBIILU***S~C3USD~N1SEIndependent Container Line2IILU~N1BYSpirit AeroSystems Inc92340589~N1SHSpirit AeroSystems IncFAUSILM~N32600 Aerosystems Boulevard~N4KinstonNC28504US~N1CNSpirit AeroSystems IncFAGBLIV~N3A350, Building 38Glasgow Prestwick Airport~N4PRESTWICK AIRPORT**GB~R4RUNUSISOKinstonUS**NC~R4LUNUSILMWilmingtonUS**NC~DTM14020180223~R4DUNGBLIVLIVERPOOLGB~DTM13920180309~R4EUN*PRESTWICKGB~LX1~N7XSCU7010654650.23G***********K1***L5G1~M7138479~L011NR10252G*2PCS*L~L51AIRCRAFT WINGS SPAR**1742252 1742281 1742881 PO# 5500000860-00130 550L~LX2~N7ICUU4578564717.36G***********K9***L5G1~M7138483~L011NR10400G*2PCS*L~L51AIRCRAFT WINGS SPAR**1742252 1742281 1742881 PO# 5500000860-00130 550L~LX3~N7ICUU4578054717.36G***********K0***L5G1~M7138493~L011NR10400G*2PCS*L~L51AIRCRAFT WINGS SPAR**1742252 1742281 1742881 PO# 5500000860-00130 550L~L331052G***2634300**L~L112274.00FR227400*BSCFloating Bunker Recovery*****USD~C3USD~L1223595.00FR2359500**COFOcean Freight Charge*****USD~C3USD~L13474.00FR47400**405Low Sulfur Fuel Charge*****USD~C3USD~SE440010~GE110~IEA1000000010~