tufy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 673fb6de3058724fa7ade8921263bfbc8501777d
-  data.tar.gz: 55f6f30f18b8c0e7837e76fa183de304077e8fc4
+  metadata.gz: 8ebf4890dfa5545659b7b844ca375317c5b4f904
+  data.tar.gz: aea3aad28224881692d6873c2640b707490dfaea
 SHA512:
-  metadata.gz: 31e747d42e48a4764ffc7621b3c1b641622ee660d75c32c319a717cf27c72f55668a09050e14614a88aa45725e8332e391f74468020fade47264f75b95378c16
-  data.tar.gz: 4b9dd23a12cb12bec37f1e5543796f56eb171ab677605a95d3bc0b6e5159fdea6c0dddc05148ae986d1605d4fe523363836a340a230adf1298a2206a5a10a7c4
+  metadata.gz: 7f39976fc5d185576be115a4546b809d81a2cb185cdf1d1e10c8b21f7cd60eee289cb023e1a03f72fa13f4cd60e7640f86de09fdd57ed0f7241522e35d97f93d
+  data.tar.gz: f5a2c532844cc771dd10fe0d2cb819809bf00ea8bdbde9bbeb47a54aec7616f23de38309906d1d040f6c5460506ecb75858a886787d2158fd0ed502b7fa2698a

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v0.0.9
+
+- Fix Address segment tag
+- Fix Email Address segment tag
+- Add Contact number type field
+- Do not remove spaces from the address
+- Pad the `account_number` and `restructured_account_number` with leading zeros
+- Zero if outstanding_balance is negative
+- "0000000000" if `contact_number` is `.empty?`
+- Make the reported date field not required
+
 # v0.0.8
 
 - PARTIAL PAYMENT is now an optional field

data/lib/tufy.rb

@@ -17,6 +17,7 @@ require "tufy/build_record"
 require "tufy/transform_raw_data"
 require "tufy/transform_raw_data_array"
 require "tufy/build_field.rb"
+require "tufy/fields/account/build_segment_tag_field.rb"
 require "tufy/fields/account/build_account_number_field.rb"
 require "tufy/fields/account/build_account_status_field.rb"
 require "tufy/fields/account/build_account_type_field.rb"
@@ -48,6 +49,7 @@ require "tufy/fields/address/build_address_2_field.rb"
 require "tufy/fields/address/build_address_type_field.rb"
 require "tufy/fields/contact_number/build_contact_number_field.rb"
 require "tufy/fields/contact_number/build_contact_number_format_field.rb"
+require "tufy/fields/contact_number/build_contact_number_type_field.rb"
 require "tufy/fields/email_address/build_email_address_field.rb"
 require "tufy/fields/id/build_id_number_field.rb"
 require "tufy/fields/id/build_id_type_field.rb"

data/lib/tufy/build_account_segment.rb

@@ -11,7 +11,6 @@ module Tufy
       :currency_code,
       :opened_date,
       :payment_amount,
-      :closed_date,
       :credit_limit_or_loan_amount,
       :shared_by,
       :outstanding_balance,
@@ -28,7 +27,7 @@ module Tufy
 
     executed do |ctx|
       validate_presence_of_required_keys(ctx.raw_data, REQUIRED_KEYS)
-      ctx.transformed_data = ctx.transformed_data + transform(ctx).upcase
+      ctx.transformed_data = transform(ctx).upcase
     end
 
     def self.past_due_code(days_past_due)
@@ -45,7 +44,10 @@ module Tufy
     private
 
     def self.transform(ctx)
+      ctx[:segment_tag] = Constants::SEGMENT_TAG
+
       result = with(ctx).reduce(
+        Fields::BuildSegmentTagField,
         Fields::Account::BuildAccountNumberField,
         Fields::Account::BuildRestructuredAccountNumberField,
         Fields::Account::BuildUserIdField,
@@ -74,7 +76,7 @@ module Tufy
         Fields::Account::BuildFreshCashAdvanceField,
       )
 
-      Constants::SEGMENT_TAG + result[:transformed_data]
+      result[:transformed_data]
     end
 
     module Constants

data/lib/tufy/build_address_segment.rb

@@ -11,26 +11,27 @@ module Tufy
 
     executed do |ctx|
       validate_presence_of_required_keys(ctx.raw_data, REQUIRED_KEYS)
-      ctx.transformed_data = ctx.transformed_data + transform(ctx).upcase
+      ctx.transformed_data = transform(ctx).upcase
     end
 
     private
 
     def self.transform(ctx)
-      raw_data = ctx[:raw_data]
+      ctx[:segment_tag] = Constants::SEGMENT_TAG
 
       result = with(ctx).reduce(
+        Fields::BuildSegmentTagField,
         Fields::Address::BuildAddress1Field,
         Fields::Address::BuildAddress2Field,
         Fields::Address::BuildAddressTypeField,
       )
 
-      Constants::SEGMENT_TAG + result[:transformed_data]
+      result[:transformed_data]
     end
 
     module Constants
       # tags
-      SEGMENT_TAG = "AL03A01"
+      SEGMENT_TAG = "PA03A01"
       ADDRESS_LINE_1_TAG = "01"
       ADDRESS_LINE_2_TAG = "02"
       ADDRESS_TYPE_TAG = "07"

data/lib/tufy/build_contact_number_segment.rb

@@ -6,24 +6,27 @@ module Tufy
     REQUIRED_KEYS = [
       :contact_number,
       :contact_number_format,
+      :contact_number_type,
     ]
 
     executed do |ctx|
       validate_presence_of_required_keys(ctx.raw_data, REQUIRED_KEYS)
-      ctx.transformed_data = ctx.transformed_data + transform(ctx).upcase
+      ctx.transformed_data = transform(ctx).upcase
     end
 
     private
 
     def self.transform(ctx)
-      raw_data = ctx[:raw_data]
+      ctx[:segment_tag] = Constants::SEGMENT_TAG
 
       result = with(ctx).reduce(
+        Fields::BuildSegmentTagField,
         Fields::ContactNumber::BuildContactNumberField,
         Fields::ContactNumber::BuildContactNumberFormatField,
+        Fields::ContactNumber::BuildContactNumberTypeField,
       )
 
-      Constants::SEGMENT_TAG + result[:transformed_data]
+      result[:transformed_data]
     end
 
     module Constants
@@ -31,10 +34,17 @@ module Tufy
       SEGMENT_TAG = "PH03P01"
       CONTACT_NUMBER_TAG = "03"
       CONTACT_NUMBER_FORMAT_TAG = "05"
+      CONTACT_NUMBER_TYPE_TAG = "06"
 
       # contact number format constants
       FREE_FORMAT = "F"
       STRUCTURED_FORMAT = "S"
+
+      RESIDENTIAL = "R"
+      OFFICE = "O"
+      MOBILE = "M"
+      CORRESPONDENCE_OR_CONTACT = "C"
+      UNKNOWN = "U"
     end
   end
 end

data/lib/tufy/build_email_address_segment.rb

@@ -9,22 +9,25 @@ module Tufy
 
     executed do |ctx|
       validate_presence_of_required_keys(ctx.raw_data, REQUIRED_KEYS)
-      ctx.transformed_data = ctx.transformed_data + transform(ctx).upcase
+      ctx.transformed_data = transform(ctx).upcase
     end
 
     private
 
     def self.transform(ctx)
-      raw_data = ctx[:raw_data]
+      ctx[:segment_tag] = Constants::SEGMENT_TAG
 
-      result = Fields::EmailAddress::BuildEmailAddressField.execute(ctx)
+      result = with(ctx).reduce(
+        Fields::BuildSegmentTagField,
+        Fields::EmailAddress::BuildEmailAddressField,
+      )
 
-      Constants::SEGMENT_TAG + result[:transformed_data]
+      result[:transformed_data]
     end
 
     module Constants
       # tags
-      SEGMENT_TAG = "ID03I01"
+      SEGMENT_TAG = "EA03E01"
       EMAIL_ADDRESS_TAG = "01"
     end
   end

data/lib/tufy/build_field.rb

@@ -14,5 +14,9 @@ module Tufy
     def self.remove_special_characters(string)
       string.gsub(/[^0-9A-Za-z]/, '')
     end
+
+    def self.remove_special_characters_except_space(string)
+      string.gsub(/[^0-9A-Za-z. ]/, '')
+    end
   end
 end

data/lib/tufy/build_id_segment.rb

@@ -15,21 +15,22 @@ module Tufy
       # TODO: Testing
       validate_presence_of_required_keys(ctx.raw_data, REQUIRED_KEYS)
       if id_type_exists?(ctx.raw_data[:id_type])
-        ctx.transformed_data = ctx.transformed_data + transform(ctx).upcase
+        ctx.transformed_data = transform(ctx).upcase
       end
     end
 
     private
 
     def self.transform(ctx)
-      raw_data = ctx[:raw_data]
+      ctx[:segment_tag] = Constants::SEGMENT_TAG
 
       result = with(ctx).reduce(
+        Fields::BuildSegmentTagField,
         Fields::Id::BuildIdNumberField,
         Fields::Id::BuildIdTypeField,
       )
 
-      Constants::SEGMENT_TAG + result[:transformed_data]
+      result[:transformed_data]
     end
 
     def self.id_type_exists?(id_type)

data/lib/tufy/build_name_segment.rb

@@ -14,15 +14,16 @@ module Tufy
 
     executed do |ctx|
       validate_presence_of_required_keys(ctx.raw_data, REQUIRED_KEYS)
-      ctx.transformed_data = ctx.transformed_data + transform(ctx).upcase
+      ctx.transformed_data = transform(ctx).upcase
     end
 
     private
 
     def self.transform(ctx)
-      raw_data = ctx[:raw_data]
+      ctx[:segment_tag] = Constants::SEGMENT_TAG
 
       result = with(ctx).reduce(
+        Fields::BuildSegmentTagField,
         Fields::Name::BuildFirstNameField,
         Fields::Name::BuildLastNameField,
         Fields::Name::BuildCivilStatusField,
@@ -31,7 +32,7 @@ module Tufy
         Fields::Name::BuildAcHolderTypeField,
       )
 
-      Constants::SEGMENT_TAG + result[:transformed_data]
+      result[:transformed_data]
     end
 
     module Constants

data/lib/tufy/fields/account/build_account_number_field.rb

@@ -17,8 +17,8 @@ module Tufy
           raw_data = ctx.raw_data
 
           BuildAccountSegment::Constants::ACCOUNT_NUMBER_TAG +
-            FormatStrings::F2TS % raw_data[:account_number].to_s.size +
-            raw_data[:account_number].to_s
+            FormatStrings::F2TS % (FormatStrings::F20TS % raw_data[:account_number]).to_s.size +
+              FormatStrings::F20TS % raw_data[:account_number].to_s
         end
       end
     end

data/lib/tufy/fields/account/build_closed_date_field.rb

@@ -6,9 +6,11 @@ module Tufy
         promises :transformed_data
 
         executed do |ctx|
-          ctx.transformed_data =
-            ctx.transformed_data +
-            transform(ctx).upcase
+          if ctx.raw_data[:closed_date]
+            ctx.transformed_data =
+              ctx.transformed_data +
+              transform(ctx).upcase
+          end
         end
 
         private

data/lib/tufy/fields/account/build_outstanding_balance_field.rb

@@ -16,9 +16,12 @@ module Tufy
         def self.transform(ctx)
           raw_data = ctx.raw_data
 
+          outstanding_balance = raw_data[:outstanding_balance].to_i
+          outstanding_balance = outstanding_balance < 0 ? 0 : outstanding_balance
+
           BuildAccountSegment::Constants::OUTSTANDING_BALANCE_TAG +
-            FormatStrings::F2TS % raw_data[:outstanding_balance].to_i.to_s.size +
-            raw_data[:outstanding_balance].to_i.to_s
+            FormatStrings::F2TS % outstanding_balance.to_s.size +
+              outstanding_balance.to_s
         end
       end
     end

data/lib/tufy/fields/account/build_reported_date_field.rb

@@ -6,9 +6,11 @@ module Tufy
         promises :transformed_data
 
         executed do |ctx|
-          ctx.transformed_data =
-            ctx.transformed_data +
-            transform(ctx).upcase
+          if ctx.raw_data[:reported_date]
+            ctx.transformed_data =
+              ctx.transformed_data +
+              transform(ctx).upcase
+          end
         end
 
         private
@@ -18,7 +20,7 @@ module Tufy
 
           BuildAccountSegment::Constants::REPORTED_DATE_TAG +
             FormatStrings::F2TS % transform_date(DateTime.now).size +
-            transform_date(DateTime.now)
+              transform_date(DateTime.now)
         end
       end
     end

data/lib/tufy/fields/account/build_restructured_account_number_field.rb

@@ -17,8 +17,8 @@ module Tufy
           raw_data = ctx.raw_data
 
           BuildAccountSegment::Constants::RESTRUCTURED_ACCOUNT_NUMBER_TAG +
-            FormatStrings::F2TS % raw_data[:restructured_account_number].to_s.size +
-            raw_data[:restructured_account_number].to_s
+            FormatStrings::F2TS % (FormatStrings::F20TS % raw_data[:restructured_account_number]).to_s.size +
+              FormatStrings::F20TS % raw_data[:restructured_account_number].to_s
         end
       end
     end

data/lib/tufy/fields/account/build_segment_tag_field.rb

@@ -0,0 +1,14 @@
+module Tufy
+  module Fields
+    class BuildSegmentTagField < BuildField
+      expects :segment_tag
+      promises :transformed_data
+
+      executed do |ctx|
+        ctx.transformed_data =
+          ctx.transformed_data +
+          ctx.segment_tag
+      end
+    end
+  end
+end

data/lib/tufy/fields/address/build_address_1_field.rb

@@ -17,8 +17,8 @@ module Tufy
           raw_data = ctx.raw_data
 
           BuildAddressSegment::Constants::ADDRESS_LINE_1_TAG +
-            FormatStrings::F2TS % remove_special_characters(raw_data[:address_line_1]).size +
-              remove_special_characters(raw_data[:address_line_1])
+            FormatStrings::F2TS % remove_special_characters_except_space(raw_data[:address_line_1]).size +
+              remove_special_characters_except_space(raw_data[:address_line_1])
         end
       end
     end

data/lib/tufy/fields/address/build_address_2_field.rb

@@ -17,8 +17,8 @@ module Tufy
           raw_data = ctx.raw_data
 
           BuildAddressSegment::Constants::ADDRESS_LINE_2_TAG +
-            FormatStrings::F2TS % remove_special_characters(raw_data[:address_line_2]).size +
-              remove_special_characters(raw_data[:address_line_2])
+            FormatStrings::F2TS % remove_special_characters_except_space(raw_data[:address_line_2]).size +
+              remove_special_characters_except_space(raw_data[:address_line_2])
         end
       end
     end

data/lib/tufy/fields/contact_number/build_contact_number_field.rb

@@ -2,6 +2,10 @@ module Tufy
   module Fields
     module ContactNumber
       class BuildContactNumberField < BuildField
+        # When raw_data[:contact_number].blank?
+        # we use NULL_CONTACT_NUMBER instead
+        NULL_CONTACT_NUMBER = "0000000000"
+
         expects :raw_data
         promises :transformed_data
 
@@ -16,9 +20,15 @@ module Tufy
         def self.transform(ctx)
           raw_data = ctx.raw_data
 
+          contact_number = if raw_data[:contact_number].empty?
+                             NULL_CONTACT_NUMBER
+                           else
+                            raw_data[:contact_number]
+                           end
+
           BuildContactNumberSegment::Constants::CONTACT_NUMBER_TAG +
-            FormatStrings::F2TS % remove_special_characters(raw_data[:contact_number]).size +
-              remove_special_characters(raw_data[:contact_number])
+            FormatStrings::F2TS % remove_special_characters(contact_number).size +
+              remove_special_characters(contact_number)
         end
       end
     end

data/lib/tufy/fields/contact_number/build_contact_number_type_field.rb

@@ -0,0 +1,26 @@
+module Tufy
+  module Fields
+    module ContactNumber
+      class BuildContactNumberTypeField < BuildField
+        expects :raw_data
+        promises :transformed_data
+
+        executed do |ctx|
+          ctx.transformed_data =
+            ctx.transformed_data +
+            transform(ctx).upcase
+        end
+
+        private
+
+        def self.transform(ctx)
+          raw_data = ctx.raw_data
+
+          BuildContactNumberSegment::Constants::CONTACT_NUMBER_TYPE_TAG +
+            FormatStrings::F2TS % raw_data[:contact_number_type].size +
+              raw_data[:contact_number_type]
+        end
+      end
+    end
+  end
+end

data/lib/tufy/format_strings.rb

@@ -6,5 +6,6 @@ module Tufy
 
     F2TS = "%02d" # Fixed 2-character String with Leading Zeroes
     F3TS = "%03d" # Fixed 3-character String with Leading Zeroes
+    F20TS = "%020d" # Fixed 3-character String with Leading Zeroes
   end
 end

data/lib/tufy/version.rb

@@ -1,3 +1,3 @@
 module Tufy
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tufy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Neil Marion dela Cruz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: light-service
@@ -135,6 +135,7 @@ files:
 - lib/tufy/fields/account/build_payment_frequency_field.rb
 - lib/tufy/fields/account/build_reported_date_field.rb
 - lib/tufy/fields/account/build_restructured_account_number_field.rb
+- lib/tufy/fields/account/build_segment_tag_field.rb
 - lib/tufy/fields/account/build_shared_by_field.rb
 - lib/tufy/fields/account/build_unbilled_balance_field.rb
 - lib/tufy/fields/account/build_user_id_field.rb
@@ -143,6 +144,7 @@ files:
 - lib/tufy/fields/address/build_address_type_field.rb
 - lib/tufy/fields/contact_number/build_contact_number_field.rb
 - lib/tufy/fields/contact_number/build_contact_number_format_field.rb
+- lib/tufy/fields/contact_number/build_contact_number_type_field.rb
 - lib/tufy/fields/email_address/build_email_address_field.rb
 - lib/tufy/fields/id/build_id_number_field.rb
 - lib/tufy/fields/id/build_id_type_field.rb