BillNye 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3de6dd9e9afa2ebc5f350f1a8329f7992a2ddf47
-  data.tar.gz: c104e7ba8656b3927ee5ec3c36a2f19f5edf4a67
+  metadata.gz: ea130051418a947fce86645ecb78c89e07091d07
+  data.tar.gz: 5f22a2ffde0b3e8715ca897f6fa41f30ff243415
 SHA512:
-  metadata.gz: d999246d438adbac9831056adf0065e8eb9b1963132b06b5892640101f36ea2c1e4e7ca6b2565a260924cd08a2b4798232d4bb3d3fe70aab2cdf689d9e109d25
-  data.tar.gz: f0ab16c7bfe0d3d82743445c00040f85a9e1aef5b28742c6b188dc18160073b19a0f3b6e923da9d9f7d62d84712418cc56c2d8b1004efaf070ccfd77f2cf1ac2
+  metadata.gz: e4cd1818a68363793c78c2d9810afe09b580e19bdb1dac4fbb6edfceee2766fd81a95c7aa658cf5b5defbe31368d369909fb8bae9219d70c6ea68a7afd0ffc52
+  data.tar.gz: c6054296767bd1345d3296fdd23e190591f67baed738ad5e7ed921ef3e15f9a721f7965790cc7989327c719b80a562dfff27a7a81c35abd8265fe8a333d3692e

data/lib/bill-nye.rb

@@ -17,7 +17,7 @@ module BillNye
 		@REX_PUR_RETURN = / *(?<process_date>[0-9]{2}\/[0-9]{2}) +(?<type>Purchase Return) +(?<usage_date>[0-9]{2}\/[0-9]{2}) (?<source>.+)  (?<amount>[-,0-9]*.[0-9]{2}) +(?<balance>[-,0-9]+\.[0-9]{2})/
 		@REX_ATM_WITH 	= / *(?<process_date>[0-9]{2}\/[0-9]{2}) +(?<type>Non-Chase ATM Withdraw) +(?<usage_date>[0-9]{2}\/[0-9]{2}) (?<source>.+)  (?<amount>[-,0-9]+.[0-9]{2}) +(?<balance>[-,0-9]+.[0-9]{2})/
 		@REX_ATM_FEE 	= / *(?<process_date>[0-9]{2}\/[0-9]{2}) +(?<type>.*Fee.*) +(?<amount>[-,0-9]*.[0-9]{2}) +(?<balance>[-,0-9,]*.[0-9]{2})/
-		@REX_CREDIT 	= / *(?<process_date>[0-9]{2}\/[0-9]{2}) + (?<source>.+ )(?<amount>[-,0-9]+.[0-9]{2})/
+		@REX_CREDIT 	= / *(?<process_date>[0-9]{2}\/[0-9]{2}) + (?<source>.+ )(?<amount>[-,0-9]+\.[0-9]{2})/
 		@REX_SAVINGS 	= / +SAVINGS SUMMARY/
 
 		@log = BNLogger.log
@@ -50,13 +50,13 @@ module BillNye
 			file_handle.each_line do |line|
 				case type
 				when 1
-					_debit = parse_debit(line)
+					_xaction = parse_debit(line)
 				when 2
-					_debit = parse_credit
+					_xaction = parse_credit(line)
 				end
 
-				if !_debit.nil?
-					_xactions << _debit
+				if !_xaction.nil?
+					_xactions << _xaction
 				end
 			end
 		end
@@ -65,7 +65,16 @@ module BillNye
   	end
 
 	def parse_credit(line)
-		match		= @REX_CREDIT.match(line)
+		_credit = nil
+		if !@REX_CREDIT.match(line).nil?
+			_match 	= @REX_CREDIT.match(line)
+			_credit = credit_default(_match)
+			@log.info{ "Match CREDIT: #{_credit}" }
+		end
+		return _credit
+	end
+
+	def credit_default(match)
 		processDate = match[:process_date].strip
 		type 		= "Credit"
 		source 		= match[:source].strip
@@ -78,27 +87,27 @@ module BillNye
   		begin
 	  		if !@REGEX_PURCHASE.match(line).nil?
 	  			_match 	= @REGEX_PURCHASE.match(line)
-	  			_debit = parse_default(_match)
+	  			_debit = debit_default(_match)
 		  		@log.info{ "Match PURCHASE: #{_debit}" }
 	 		elsif !@REX_PUR_RECUR.match(line).nil?
 	  			_match	= @REX_PUR_RECUR.match(line)
-	  			_debit = parse_default(_match)
+	  			_debit = debit_default(_match)
 		  		@log.info{ "Match PURCHASE RECURRING: #{_debit}" }
 	  		elsif !@REX_PUR_RETURN.match(line).nil?
 	  			_match	= @REX_PUR_RETURN.match(line)
-	  			_debit = parse_default(_match)
+	  			_debit = debit_default(_match)
 		  		@log.info{ "Match PURCHASE RETURN: #{_debit}" }
 	  		elsif !@REX_ATM_WITH.match(line).nil?
 	  			_match	= @REX_ATM_WITH.match(line)
-	  			_debit = parse_atm_with(_match)
+	  			_debit = debit_atm_with(_match)
 		  		@log.info{ "Match ATM WITH: #{_debit}" }
 	  		elsif !@REX_ATM_FEE.match(line).nil?
 	  			_match	= @REX_ATM_FEE.match(line)
-	  			_debit = parse_transfer_or_fee(_match)
+	  			_debit = debit_transfer_or_fee(_match)
 		  		@log.info{ "ATM FEE: #{_debit}" }
 	  		elsif !@REX_TRANSFER.match(line).nil?
 	  			_match	= @REX_TRANSFER.match(line)
-	   			_debit = parse_transfer_or_fee(_match)
+	   			_debit = debit_transfer_or_fee(_match)
 		  		@log.info{ "Match TRANSFER: #{_debit}" }
 		  	else
 		  		@log.error{ "NO-MATCH on: #{_debit}" }
@@ -109,7 +118,7 @@ module BillNye
 	  	return _debit
   	end
 
-	def parse_default(match)
+	def debit_default(match)
 		processDate = match[:process_date].strip
 		source 		= match[:source].strip
 		amount 		= match[:amount].strip
@@ -119,7 +128,7 @@ module BillNye
 		return Debit.new(processDate, type, usageDate, source, amount, balance)
 	end
 
-	def parse_transfer_or_fee(match)
+	def debit_transfer_or_fee(match)
 		processDate = match[:process_date].strip
 		type 		= match[:type].strip
 		usageDate 	= processDate
@@ -129,7 +138,7 @@ module BillNye
 		return Debit.new(processDate, type, usageDate, source, amount, balance)
 	end
 
-	def parse_atm_with(match)
+	def debit_atm_with(match)
 		processDate = match[:process_date].strip
 		source 		= match[:type].strip
 		amount 		= match[:amount].strip

data/lib/bill-nye/credit.rb

@@ -4,7 +4,7 @@ class Credit
 	def initialize(_pDate, _type, _source, _amount)
 		@pDate 	 = _pDate
 		@type  	 = _type
-		@uDate 	 = _uDate
+		@uDate 	 = _pDate
 		@source  = _source
 		@amount  = _amount
 	end

data/lib/bill-nye/version.rb

@@ -1,3 +1,3 @@
 module BillNye
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: BillNye
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Keenin Vye