thefox-wallet 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5ea869e14eae3be3cbab943cf67509350237a2
-  data.tar.gz: e21e861a5c49337b1f383cb776c0e1732fb90ebd
+  metadata.gz: 5aa512dc7e1d1c4b47e56a6a17b54c49261be834
+  data.tar.gz: 0f3dafbb310164d06dde21a0d62ff5d7f5ee0fd0
 SHA512:
-  metadata.gz: 8250d333120eea0261af00cc3d84c58f62334b354be89de4d8e2e6209f95cbb97581b8b760d3d230f8f8c574d2201519e31c3e8f62df376b8b9bdc1872fe6635
-  data.tar.gz: 28a6c2edca9e17e80dc4c63f562b9495f8bcf3919b7e4f1b2acd3f74a2677164878fd6486e2279f9ceca798f0ce333a476bd88e9e041bf8b8b6b3651f9ad0380
+  metadata.gz: 0232f070dd469143833763373f6048b856e83515485a7d95cae910f48f16ec060db70efdc53dee3f209a66d374a88deca1089a16029eb7170ef50f1acdd7609c
+  data.tar.gz: b3fe40a5230bb5e313cf67ebdc3682ff1b89c7f2b865b008c21237fa38497e6650bf3de8d4bb1f4234d7f29dcd1efc2e63e466673ac534ec365f70540f2e2a3c

data/lib/wallet/command_add.rb

@@ -22,16 +22,10 @@ module TheFox::Wallet
 				end
 				
 				print "revenue: [#{@options[:entry_revenue]}] "
-				revenue_t = STDIN.gets.strip
-				if revenue_t.length > 0
-					@options[:entry_revenue] = eval(revenue_t).to_s.sub(/,/, '.').to_f.round(NUMBER_ROUND).abs
-				end
+				@options[:entry_revenue] = revenue(STDIN.gets.strip)
 				
 				print "expense: [#{@options[:entry_expense]}] "
-				expense_t = STDIN.gets.strip
-				if expense_t.length > 0
-					@options[:entry_expense] = -eval(expense_t).to_s.sub(/,/, '.').to_f.round(NUMBER_ROUND).abs
-				end
+				@options[:entry_expense] = expense(STDIN.gets.strip)
 				
 				print "category: [#{@options[:entry_category]}] "
 				category_t = STDIN.gets.strip
@@ -65,6 +59,22 @@ module TheFox::Wallet
 			wallet.add(entry)
 		end
 		
+		def revenue(revenue_s)
+			rv = 0.0
+			if !revenue_s.nil? && revenue_s.length > 0
+				rv = eval(revenue_s.to_s.gsub(/,/, '.')).to_f.round(NUMBER_ROUND).abs
+			end
+			rv
+		end
+		
+		def expense(expense_s)
+			rv = 0.0
+			if !expense_s.nil? && expense_s.length > 0
+				rv = -eval(expense_s.to_s.gsub(/,/, '.')).to_f.round(NUMBER_ROUND).abs
+			end
+			rv
+		end
+		
 	end
 	
 end

data/lib/wallet/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Wallet
 		NAME = 'Wallet'
-		VERSION = '0.10.0'
-		DATE = '2016-07-03'
+		VERSION = '0.10.1'
+		DATE = '2016-07-04'
 		HOMEPAGE = 'https://github.com/TheFox/wallet'
 		NUMBER_FORMAT = '%.2f'
 		NUMBER_ROUND = 5

data/tests/tc_command_add.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+require 'minitest/autorun'
+require 'wallet'
+
+
+class TestAddCommand < MiniTest::Test
+	def test_revenue
+		cmd = TheFox::Wallet::AddCommand.new
+		
+		# String
+		assert_equal(0.0, cmd.revenue(nil))
+		assert_equal(0.0, cmd.revenue(''))
+		assert_equal(21.0, cmd.revenue('21'))
+		assert_equal(21.0, cmd.revenue(' 21 '))
+		
+		# Negative
+		assert_equal(21.0, cmd.revenue('-21'))
+		
+		# Float
+		assert_equal(21.2, cmd.revenue('21.2'))
+		assert_equal(21.2, cmd.revenue('21.20'))
+		assert_equal(21.87, cmd.revenue('21.87'))
+		
+		# Calc
+		assert_equal(16, cmd.revenue('21-5'))
+		assert_equal(15.8, cmd.revenue('21.7-5.9'))
+		assert_equal(14.8, cmd.revenue('22,7-7,9'))
+		assert_equal(29, cmd.revenue('21-50'))
+		assert_equal(0.1, cmd.revenue('0,1-0,2'))
+		assert_equal(0.0, cmd.revenue('0,1-0,1'))
+	end
+	
+	def test_expense
+		cmd = TheFox::Wallet::AddCommand.new
+		
+		# String
+		assert_equal(0.0, cmd.expense(nil))
+		assert_equal(0.0, cmd.expense(''))
+		assert_equal(-21.0, cmd.expense('21'))
+		assert_equal(-21.0, cmd.expense(' 21 '))
+		
+		# Positive
+		assert_equal(-21.0, cmd.expense('-21'))
+		assert_equal(-21.0, cmd.expense('21'))
+		
+		# Float
+		assert_equal(-21.2, cmd.expense('21.2'))
+		assert_equal(-21.2, cmd.expense('21.20'))
+		assert_equal(-21.87, cmd.expense('21.87'))
+		
+		# Calc
+		assert_equal(-16, cmd.expense('21-5'))
+		assert_equal(-15.8, cmd.expense('21.7-5.9'))
+		assert_equal(-14.8, cmd.expense('22,7-7,9'))
+		assert_equal(-29, cmd.expense('21-50'))
+		assert_equal(-0.1, cmd.expense('0,1-0,2'))
+		assert_equal(0.0, cmd.expense('0,1-0,1'))
+	end
+end

data/tests/ts_all.rb

@@ -2,3 +2,4 @@
 
 require_relative 'tc_wallet'
 require_relative 'tc_entry'
+require_relative 'tc_command_add'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -48,6 +48,7 @@ files:
 - lib/wallet/entry.rb
 - lib/wallet/version.rb
 - lib/wallet/wallet.rb
+- tests/tc_command_add.rb
 - tests/tc_entry.rb
 - tests/tc_wallet.rb
 - tests/ts_all.rb