thefox-wallet 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9713252a1691a28593f5c89b3887354e7dc4631
-  data.tar.gz: cc27b45c78c4e23026d7160d3cfacb22c02e9257
+  metadata.gz: 9d1f5a83951ef2ecb169b980fb3d61db0c3e0ac8
+  data.tar.gz: a52d9f6d5e620ee048fba9ad7274267d720a11a1
 SHA512:
-  metadata.gz: 5aa8ad5578b284871b2a779fc1ee4967f64064a73865a999b5ba6d12bcc5b7478c940800a5949323ff49401c60cd4224875f3b00620278420c6e33a32d447706
-  data.tar.gz: 7e9e34b12d26a202cb9091b4b8a6aabcf15be078ba268692829a1fc5c6739eb37b9972cfaa1285372ea8f8d55c0ce1c76376b264e7ed86044c1db8e06fb28f65
+  metadata.gz: b8e936c75fdf1e4bd126248f7269522b273809a5b1e08e15f1212a7f1a5f5d8c6e7f3d910b72bedc04c17f683602d8efdbc7bae3803163ebeb1a20e71cb0d730
+  data.tar.gz: 455e2ab933be930e0d4e17a4266dc2427f7360a8a9f9e4fe97a2c056f6d1fe42cb5c1c4f6ad2a90791408040c9e79f63ef73c54ba9b51a69b110a22ecf5fdb54

data/.editorconfig

@@ -0,0 +1,14 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = true
+
+[*.yml]
+indent_style = space

data/.travis.yml

@@ -3,6 +3,8 @@ rvm:
     - 2.0
     - 2.1
     - 2.2
+    - 2.3
+    - ruby-head
 sudo: required
 before_install:
     - gem update --system
@@ -16,4 +18,4 @@ install:
 script:
     - make test
     - cd
-    - which -a wallet
+    - which -a wallet

data/README.md

@@ -24,7 +24,7 @@ The preferred method of installation is via RubyGems.org:
 
 or via `Gemfile`:
 
-	gem 'thefox-wallet', '~>0.9'
+	gem 'thefox-wallet', '~>0.10'
 
 Use it in your sources:
 

data/bin/.gitignore

@@ -0,0 +1 @@
+dev

data/bin/wallet

@@ -22,6 +22,10 @@ opts = OptionParser.new do |o|
 		options[:wallet_path] = path
 	end
 	
+	o.on('--id <id>', 'ID used for the entry.') do |id|
+		options[:entry_id] = id
+	end
+	
 	o.on('-t', '--title <title>', 'Title used for the entry.') do |title|
 		options[:entry_title] = title
 	end
@@ -63,10 +67,14 @@ opts = OptionParser.new do |o|
 		options[:path] = path
 	end
 	
-	o.on('-i', 'Use some commands interactively.') do
+	o.on('-i', '--interactive', 'Use some commands interactively.') do
 		options[:is_interactively] = true
 	end
 	
+	o.on('-f', '--force', 'Force add command.') do
+		options[:force] = true
+	end
+	
 	o.on_tail('-V', '--version', 'Show version.') do
 		puts "#{::TheFox::Wallet::NAME} #{::TheFox::Wallet::VERSION} (#{::TheFox::Wallet::DATE})"
 		puts TheFox::Wallet::HOMEPAGE
@@ -83,10 +91,14 @@ ARGV << '-h' if ARGV.count == 0
 commands = opts.parse(ARGV)
 command_name = commands.shift
 
-begin
-	command = TheFox::Wallet::Command.create_by_name(command_name, options)
-	command.run
-rescue Exception => e
-	puts "ERROR: #{e}"
-	exit 1
+if command_name
+	begin
+		command = TheFox::Wallet::Command.create_by_name(command_name, options)
+		command.run
+	rescue Exception => e
+		puts "ERROR: #{e}"
+		exit 1
+	end
+else
+	opts.parse(['-h'])
 end

data/lib/wallet/command.rb

@@ -11,6 +11,7 @@ module TheFox::Wallet
 		def initialize(options = {})
 			@options = options || {}
 			@options[:wallet_path] ||= 'wallet'
+			@options[:entry_id] ||= nil
 			@options[:entry_title] ||= nil
 			@options[:entry_date] ||= Date.today.to_s
 			@options[:entry_revenue] ||= 0.0
@@ -21,6 +22,7 @@ module TheFox::Wallet
 			@options[:is_export] ||= false
 			@options[:path] ||= nil
 			@options[:is_interactively] ||= false
+			@options[:force] ||= false
 		end
 		
 		def run

data/lib/wallet/command_add.rb

@@ -52,6 +52,7 @@ module TheFox::Wallet
 				raise "Option --title is required for command '#{NAME}'"
 			end
 			
+			puts "id:       '#{@options[:entry_id]}'"
 			puts "title:    '#{@options[:entry_title]}'"
 			puts "date:      " + Date.parse(@options[:entry_date]).to_s
 			puts "revenue:   " + NUMBER_FORMAT % @options[:entry_revenue]
@@ -59,10 +60,13 @@ module TheFox::Wallet
 			puts "balance:   " + NUMBER_FORMAT % [@options[:entry_revenue] + @options[:entry_expense]]
 			puts "category:  #{@options[:entry_category]}"
 			puts "comment:  '#{@options[:entry_comment]}'"
+			puts "force:    #{@options[:force] ? 'YES' : 'NO'}"
 			
-			entry = Entry.new(@options[:entry_title], @options[:entry_date], @options[:entry_revenue], @options[:entry_expense], @options[:entry_category], @options[:entry_comment])
+			entry = Entry.new(@options[:entry_id], @options[:entry_title], @options[:entry_date], @options[:entry_revenue], @options[:entry_expense], @options[:entry_category], @options[:entry_comment])
 			wallet = Wallet.new(@options[:wallet_path])
-			wallet.add(entry)
+			added = wallet.add(entry, !@options[:force])
+			
+			puts "added:    #{added ? 'YES' : 'NO'}"
 		end
 		
 		def revenue(revenue_s)

data/lib/wallet/command_list.rb

@@ -118,7 +118,7 @@ module TheFox::Wallet
 					balance_total += entry['balance']
 					
 					category = entry['category'] == 'default' ? '' : entry['category']
-					has_category = category != ''
+					# has_category = category != ''
 					
 					comment = entry['comment']
 					comment = comment[0, 22] + '...' if comment.length >= 25

data/lib/wallet/entry.rb

@@ -1,9 +1,12 @@
 
+require 'uuid'
+
 module TheFox
 	module Wallet
 		
 		class Entry
 			
+			attr_reader :id
 			attr_reader :title
 			attr_reader :date
 			attr_reader :revenue
@@ -12,10 +15,17 @@ module TheFox
 			attr_reader :category
 			attr_reader :comment
 			
-			def initialize(title = '', date = Date.today, revenue = 0.0, expense = 0.0, category = 'default', comment = '')
-				revenue_t = revenue.to_f
-				expense_t = expense.to_f
+			def initialize(id = nil, title = nil, date = nil, revenue = nil, expense = nil, category = nil, comment = nil)
+				if !id
+					uuid = UUID.new
+					id = uuid.generate
+				end
+				date ||= Date.today
+				revenue ||= 0.0
+				expense ||= 0.0
+				category ||= 'default'
 				
+				self.id = id
 				self.title = title
 				self.date = date
 				
@@ -23,6 +33,8 @@ module TheFox
 				@expense = 0.0
 				@balance = 0.0
 				
+				revenue_t = revenue.to_f
+				expense_t = expense.to_f
 				if revenue_t < 0 && expense_t == 0
 					self.revenue = 0.0
 					self.expense = revenue_t
@@ -35,12 +47,17 @@ module TheFox
 				self.comment = comment
 			end
 			
+			def id=(id)
+				@id = id
+			end
+			
 			def title=(title)
 				@title = title.to_s
 			end
 			
 			def date=(date)
 				if date.is_a?(String)
+					# puts "date parse: '#{date}'"
 					@date = Date.parse(date)
 				elsif date.is_a?(Date)
 					@date = date
@@ -57,7 +74,7 @@ module TheFox
 				end
 				
 				@revenue = revenue_t
-				calc_balance()
+				calc_balance
 			end
 			
 			def expense=(expense)
@@ -68,7 +85,7 @@ module TheFox
 				end
 				
 				@expense = expense_t
-				calc_balance()
+				calc_balance
 			end
 			
 			def category=(category)
@@ -81,6 +98,7 @@ module TheFox
 			
 			def to_h
 				{
+					'id' => @id,
 					'title' => @title,
 					'date' => @date.to_s,
 					'revenue' => @revenue,
@@ -91,11 +109,25 @@ module TheFox
 				}
 			end
 			
+			def self.from_h(h)
+				id = h['id']
+				title = h['title']
+				date = h['date']
+				revenue = h['revenue']
+				expense = h['expense']
+				# balance = h['balance']
+				category = h['category']
+				comment = h['comment']
+				
+				self.new(id, title, date, revenue, expense, category, comment)
+			end
+			
 			private
 			
 			def calc_balance
 				@balance = (@revenue.round(NUMBER_ROUND) + @expense.round(NUMBER_ROUND)).to_f.round(NUMBER_ROUND)
 			end
+			
 		end
 		
 	end

data/lib/wallet/version.rb

@@ -2,8 +2,8 @@
 module TheFox
 	module Wallet
 		NAME = 'Wallet'
-		VERSION = '0.10.2'
-		DATE = '2016-07-07'
+		VERSION = '0.11.0'
+		DATE = '2016-09-10'
 		HOMEPAGE = 'https://github.com/TheFox/wallet'
 		NUMBER_FORMAT = '%.2f'
 		NUMBER_ROUND = 5

data/lib/wallet/wallet.rb

@@ -4,7 +4,8 @@
 require 'yaml'
 require 'yaml/store'
 require 'csv'
-require 'ostruct'
+# require 'ostruct'
+# require 'pp'
 
 
 module TheFox
@@ -24,6 +25,8 @@ module TheFox
 				@has_transaction = false
 				@transaction_files = {}
 				
+				@entries_by_ids = nil
+				
 				Signal.trap('SIGINT') do
 					puts
 					puts 'received SIGINT. break ...'
@@ -31,11 +34,19 @@ module TheFox
 				end
 			end
 			
-			def add(entry)
-				if !entry.is_a? Entry
+			def add(entry, is_unique = false)
+				if !entry.is_a?(Entry)
 					raise ArgumentError, 'variable must be a Entry instance'
 				end
 				
+				# puts "add, id #{entry.id}"
+				# puts "add, is_unique    #{is_unique}"
+				# puts "add, entry_exist? #{entry_exist?(entry)}"
+				# puts
+				if is_unique && entry_exist?(entry)
+					return false
+				end
+				
 				date = entry.date
 				date_s = date.to_s
 				dbfile_basename = 'month_' + date.strftime('%Y_%m') + '.yml'
@@ -56,10 +67,10 @@ module TheFox
 				# puts
 				
 				if @has_transaction
-					if @transaction_files.has_key? dbfile_basename
+					if @transaction_files.has_key?(dbfile_basename)
 						file = @transaction_files[dbfile_basename]['file']
 					else
-						if File.exist? dbfile_path
+						if File.exist?(dbfile_path)
 							file = YAML.load_file(dbfile_path)
 							file['meta']['updated_at'] = DateTime.now.to_s
 						end
@@ -72,65 +83,74 @@ module TheFox
 						}
 					end
 					
-					if !file['days'].has_key? date_s
+					if !file['days'].has_key?(date_s)
 						file['days'][date_s] = []
 					end
 					
-					file['days'][date_s].push entry.to_h
+					file['days'][date_s].push(entry.to_h)
 					
 					@transaction_files[dbfile_basename]['file'] = file
 				else
-					create_dirs()
+					create_dirs
 					
-					if File.exist? dbfile_path
+					if File.exist?(dbfile_path)
 						file = YAML.load_file(dbfile_path)
 						file['meta']['updated_at'] = DateTime.now.to_s
 					end
 					
-					if !file['days'].has_key? date_s
+					if !file['days'].has_key?(date_s)
 						file['days'][date_s] = []
 					end
 					
-					file['days'][date_s].push entry.to_h
+					file['days'][date_s].push(entry.to_h)
 					
-					store = YAML::Store.new tmpfile_path
+					store = YAML::Store.new(tmpfile_path)
 					store.transaction do
 						store['meta'] = file['meta']
 						store['days'] = file['days']
 					end
 					
-					if File.exist? tmpfile_path
-						File.rename tmpfile_path, dbfile_path
+					if File.exist?(tmpfile_path)
+						File.rename(tmpfile_path, dbfile_path)
 					end
 				end
+				
+				if @entries_by_ids.nil?
+					@entries_by_ids = {}
+				end
+				@entries_by_ids[entry.id] = entry
+				
+				true
 			end
 			
 			def transaction_start
 				@has_transaction = true
 				@transaction_files = {}
 				
-				create_dirs()
+				create_dirs
 			end
 			
 			def transaction_end
 				catch(:done) do
 					@transaction_files.each do |tr_file_key, tr_file_data|
-						throw :done if @exit
+						if @exit
+							throw :done
+						end
 						# puts 'keys left: ' + @transaction_files.keys.count.to_s
 						# puts 'tr_file_key: ' + tr_file_key
 						# puts 'path:        ' + tr_file_data['path']
 						# puts 'tmp_path:    ' + tr_file_data['tmp_path']
 						# puts
 						
-						store = YAML::Store.new tr_file_data['tmp_path']
+						store = YAML::Store.new(tr_file_data['tmp_path'])
 						store.transaction do
 							store['meta'] = tr_file_data['file']['meta']
 							store['days'] = tr_file_data['file']['days']
 						end
-						@transaction_files.delete tr_file_key
+						@transaction_files.delete(tr_file_key)
 						
-						if File.exist? tr_file_data['tmp_path']
-							File.rename tr_file_data['tmp_path'], tr_file_data['path']
+						if File.exist?(tr_file_data['tmp_path'])
+							File.rename(tr_file_data['tmp_path'], tr_file_data['path'])
 						end
 					end
 				end
@@ -199,7 +219,6 @@ module TheFox
 			end
 			
 			def entries(begin_date, category = nil)
-			#def entries(year = nil, month = nil, day = nil, category = nil)
 				begin_year, begin_month, begin_day = begin_date.split('-').map{ |n| n.to_i }
 				
 				begin_year_s = begin_year.to_i.to_s
@@ -287,7 +306,7 @@ module TheFox
 			end
 			
 			def gen_html
-				create_dirs()
+				create_dirs
 				
 				html_options_path = "#{@html_path}/options.yml"
 				html_options = {
@@ -298,8 +317,8 @@ module TheFox
 					},
 					'changes' => {},
 				}
-				if Dir.exist? @html_path
-					if File.exist? html_options_path
+				if Dir.exist?(@html_path)
+					if File.exist?(html_options_path)
 						html_options = YAML.load_file(html_options_path)
 						html_options['meta']['updated_at'] = DateTime.now.to_s
 					end
@@ -416,7 +435,7 @@ module TheFox
 						data = YAML.load_file(file_path)
 						
 						generate_html = false
-						if html_options['changes'].has_key? file_name
+						if html_options['changes'].has_key?(file_name)
 							if html_options['changes'][file_name]['updated_at'] != data['meta']['updated_at']
 								html_options['changes'][file_name]['updated_at'] = data['meta']['updated_at']
 								generate_html = true
@@ -683,14 +702,16 @@ module TheFox
 				')
 				index_file.close
 				
-				store = YAML::Store.new html_options_path
+				store = YAML::Store.new(html_options_path)
 				store.transaction do
 					store['meta'] = html_options['meta']
 					store['changes'] = html_options['changes']
 				end
 				
 				totaldat_file_c = years_total.map{ |k, y| "#{y.year} #{y.revenue} #{y.expense} #{y.balance} #{y.balance_total}" }
-				totaldat_file_c = totaldat_file_c.slice(-6, 6) if totaldat_file_c.count > 6
+				if totaldat_file_c.count > 6
+					totaldat_file_c = totaldat_file_c.slice(-6, 6)
+				end
 				totaldat_file_c = totaldat_file_c.join("\n")
 				
 				totaldat_file_path = "#{@tmp_path}/total.dat"
@@ -724,86 +745,118 @@ module TheFox
 			end
 			
 			def import_csv_file(file_path)
-				transaction_start()
+				transaction_start
+				
+				row_n = 0
+				csv_options = {
+					:col_sep => ',',
+					#:row_sep => "\n",
+					:headers => true,
+					:return_headers => false,
+					:skip_blanks => true,
+					# :encoding => 'UTF-8',
+				}
+				CSV.foreach(file_path, csv_options) do |row|
+					if @exit
+						break
+					end
+					row_n += 1
+					
+					id = row.field('id')
+					date = row.field('date')
+					title = row.field('title')
+					revenue = row.field('revenue')
+					expense = row.field('expense')
+					# balance = row.field('balance')
+					category = row.field('category')
+					comment = row.field('comment')
+					
+					added = add(Entry.new(id, title, date, revenue, expense, category, comment), true)
+					
+					puts "import row '#{id}' -- #{added ? 'YES' : 'NO'}"
+				end
 				
-				catch(:done) do
-					row_n = 0
-					CSV.foreach(file_path) do |row|
-						throw :done if @exit
-						row_n += 1
-						
-						date = ''
-						title = ''
-						revenue = 0.0
-						expense = 0.0
-						category = ''
-						comment = ''
+				puts
+				puts 'save data ...'
+				
+				transaction_end
+			end
+			
+			def export_csv_file(file_path)
+				csv_options = {
+					:col_sep => ',',
+					:row_sep => "\n",
+					:headers => [
+						'id', 'date', 'title', 'revenue', 'expense', 'balance', 'category', 'comment',
+					],
+					:write_headers => true,
+					# :encoding => 'ISO-8859-1',
+				}
+				CSV.open(file_path, 'wb', csv_options) do |csv|
+					Dir[@data_path + '/month_*.yml'].each do |yaml_file_path|
+						puts 'export ' + File.basename(yaml_file_path)
 						
-						print 'import row ' + row_n.to_s + "\r"
+						data = YAML.load_file(yaml_file_path)
 						
-						if row.count < 2
-							raise IndexError, 'invalid row ' + row_n.to_s + ': "' + row.join(',') + '"'
-						elsif row.count >= 2
-							date, title, revenue, expense, category, comment = row
-							revenue = revenue.to_f
-							if revenue < 0
-								expense = revenue
-								revenue = 0.0
+						data['days'].each do |day_name, day_items|
+							day_items.each do |entry|
+								csv << [
+									entry['id'],
+									entry['date'],
+									entry['title'],
+									::TheFox::Wallet::NUMBER_FORMAT % entry['revenue'],
+									::TheFox::Wallet::NUMBER_FORMAT % entry['expense'],
+									::TheFox::Wallet::NUMBER_FORMAT % entry['balance'],
+									entry['category'],
+									entry['comment'],
+								]
 							end
 						end
-						
-						add Entry.new(title, date, revenue, expense, category, comment)
-						
 					end
-					
-					puts
-					puts 'save data ...'
 				end
-				
-				transaction_end()
 			end
 			
-			def export_csv_file(file_path)
-				csv_file = File.open(file_path, 'w')
-				csv_file.puts 'Date,Title,Revenue,Expense,Balance,Category,Comment'
+			def entry_exist?(entry)
+				if !entry.is_a?(Entry)
+					raise ArgumentError, 'variable must be a Entry instance'
+				end
 				
-				Dir[@data_path + '/month_*.yml'].each do |yaml_file_path|
-					puts 'export ' + File.basename(yaml_file_path)
+				!find_entry_by_id(entry.id).nil?
+			end
+			
+			def find_entry_by_id(id)
+				if @entries_by_ids.nil?
+					glob = File.expand_path('month_*.yml', @data_path)
 					
-					data = YAML.load_file(yaml_file_path)
+					@entries_by_ids = Dir[glob].map { |file_path|
+						data = YAML.load_file(file_path)
+						data['days'].map{ |day_name, day_items|
+							day_items.map{ |entry|
+								Entry.from_h(entry)
+							}
+						}
+					}.flatten.map{ |entry|
+						[entry.id, entry]
+					}.to_h
 					
-					data['days'].each do |day_name, day_items|
-						day_items.each do |entry|
-							out = [
-								entry['date'],
-								'"'+entry['title']+'"',
-								::TheFox::Wallet::NUMBER_FORMAT % entry['revenue'],
-								::TheFox::Wallet::NUMBER_FORMAT % entry['expense'],
-								::TheFox::Wallet::NUMBER_FORMAT % entry['balance'],
-								'"'+entry['category']+'"',
-								'"'+entry['comment']+'"',
-							].join(',')
-							
-							csv_file.puts out
-						end
-					end
+					# pp @entries_by_ids
 				end
 				
-				csv_file.close
+				@entries_by_ids[id]
 			end
 			
 			private
 			
 			def create_dirs
-				if !Dir.exist? @dir_path
+				if !Dir.exist?(@dir_path)
 					Dir.mkdir(@dir_path)
 				end
 				
-				if !Dir.exist? @data_path
+				if !Dir.exist?(@data_path)
 					Dir.mkdir(@data_path)
 				end
 				
-				if !Dir.exist? @tmp_path
+				if !Dir.exist?(@tmp_path)
 					Dir.mkdir(@tmp_path)
 				end
 				
@@ -815,14 +868,14 @@ module TheFox
 				end
 			end
 			
-			def calc_day(day_a, category = nil)
+			def calc_day(day, category = nil)
 				revenue = 0
 				expense = 0
 				balance = 0
 				if category
 					category.to_s.downcase!
 					
-					day_a.each do |entry|
+					day.each do |entry|
 						if entry['category'] == category
 							revenue += entry['revenue']
 							expense += entry['expense']
@@ -830,7 +883,7 @@ module TheFox
 						end
 					end
 				else
-					day_a.each do |entry|
+					day.each do |entry|
 						revenue += entry['revenue']
 						expense += entry['expense']
 						balance += entry['balance']

data/tests/tc_command_add.rb

@@ -5,8 +5,11 @@ require 'wallet'
 
 
 class TestAddCommand < MiniTest::Test
+	
+	include TheFox::Wallet
+	
 	def test_revenue
-		cmd = TheFox::Wallet::AddCommand.new
+		cmd = AddCommand.new
 		
 		# String
 		assert_equal(nil, cmd.revenue(nil))
@@ -32,7 +35,7 @@ class TestAddCommand < MiniTest::Test
 	end
 	
 	def test_expense
-		cmd = TheFox::Wallet::AddCommand.new
+		cmd = AddCommand.new
 		
 		# String
 		assert_equal(nil, cmd.expense(nil))

data/tests/tc_entry.rb

@@ -5,14 +5,17 @@ require 'wallet'
 
 
 class TestEntry < MiniTest::Test
+	
+	include TheFox::Wallet
+	
 	def test_base
-		entry = TheFox::Wallet::Entry.new
+		entry = Entry.new
 		
 		assert_equal('TheFox::Wallet::Entry', entry.class.to_s)
 	end
 	
 	def test_set_title
-		entry = TheFox::Wallet::Entry.new('test1')
+		entry = Entry.new(nil, 'test1')
 		assert_equal('test1', entry.title)
 		
 		entry.title = 'test2'
@@ -22,27 +25,27 @@ class TestEntry < MiniTest::Test
 	def test_set_date
 		now = Date.today
 		
-		entry = TheFox::Wallet::Entry.new
+		entry = Entry.new
 		assert_equal('Date', entry.date.class.to_s)
 		assert_equal(now.to_s, entry.date.to_s)
 		
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21')
+		entry = Entry.new(nil, 'test', '2015-02-21')
 		assert_equal('Date', entry.date.class.to_s)
 		assert_equal('2015-02-21', entry.date.to_s)
 		
 		entry.date = '2015-01-01'
 		assert_equal('2015-01-01', entry.date.to_s)
 		
-		entry = TheFox::Wallet::Entry.new('test', '2014-2-21')
+		entry = Entry.new(nil, 'test', '2014-2-21')
 		assert_equal('2014-02-21', entry.date.to_s)
 		
 		entry.date = '2013-1-1'
 		assert_equal('2013-01-01', entry.date.to_s)
 		
-		entry = TheFox::Wallet::Entry.new('test', Date.parse('2015-01-02'))
+		entry = Entry.new(nil, 'test', Date.parse('2015-01-02'))
 		assert_equal('2015-01-02', entry.date.to_s)
 		
-		entry = TheFox::Wallet::Entry.new
+		entry = Entry.new
 		entry.date = Date.today
 		assert_equal(now.to_s, entry.date.to_s)
 		
@@ -51,16 +54,16 @@ class TestEntry < MiniTest::Test
 	end
 	
 	def test_set_revenue_expense
-		entry = TheFox::Wallet::Entry.new
+		entry = Entry.new
 		assert_equal(0, entry.revenue)
 		assert_equal(0, entry.expense)
 		
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', 20)
+		entry = Entry.new(nil, 'test', '2015-02-21', 20)
 		assert_equal(20, entry.revenue)
 		assert_equal(0, entry.expense)
 		assert_equal(20, entry.balance)
 		
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', '20', '-21')
+		entry = Entry.new(nil, 'test', '2015-02-21', '20', '-21')
 		assert_equal(20, entry.revenue)
 		assert_equal(-21, entry.expense)
 		assert_equal(-1, entry.balance)
@@ -83,12 +86,12 @@ class TestEntry < MiniTest::Test
 		assert_equal(-2.02, entry.expense)
 		assert_equal(-1.02, entry.balance)
 		
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', -42)
+		entry = Entry.new(nil, 'test', '2015-02-21', -42)
 		assert_equal(0, entry.revenue)
 		assert_equal(-42, entry.expense)
 		assert_equal(-42, entry.balance)
 		
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', -30.03)
+		entry = Entry.new(nil, 'test', '2015-02-21', -30.03)
 		assert_equal(0, entry.revenue)
 		assert_equal(-30.03, entry.expense)
 		assert_equal(-30.03, entry.balance)
@@ -104,7 +107,7 @@ class TestEntry < MiniTest::Test
 	end
 	
 	def test_set_category
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', 20, 0, 'c1')
+		entry = Entry.new(nil, 'test', '2015-02-21', 20, 0, 'c1')
 		assert_equal('c1', entry.category)
 		
 		entry.category = 'c2'
@@ -115,7 +118,7 @@ class TestEntry < MiniTest::Test
 	end
 	
 	def test_set_comment
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', 20, 0, 'c1', 'co1')
+		entry = Entry.new(nil, 'test', '2015-02-21', 20, 0, 'c1', 'co1')
 		assert_equal('co1', entry.comment)
 		
 		entry.comment = 'co2'
@@ -126,7 +129,7 @@ class TestEntry < MiniTest::Test
 	end
 	
 	def test_to_hash
-		entry = TheFox::Wallet::Entry.new('test', '2015-02-21', 20, -12.34, 'c3')
+		entry = Entry.new(nil, 'test', '2015-02-21', 20, -12.34, 'c3')
 		
 		assert_equal('2015-02-21', entry.to_h['date'].to_s)
 		assert_equal(20, entry.to_h['revenue'])

data/tests/tc_wallet.rb

@@ -1,36 +1,40 @@
 #!/usr/bin/env ruby
 
 require 'minitest/autorun'
+require 'fileutils'
 require 'wallet'
 
 
 class TestWallet < MiniTest::Test
+	
+	include TheFox::Wallet
+	
 	def test_that_it_has_a_version_number
-		refute_nil ::TheFox::Wallet::VERSION
+		refute_nil(::TheFox::Wallet::VERSION)
 	end
 	
 	def test_base
-		wallet = TheFox::Wallet::Wallet.new('wallet_test')
+		wallet = Wallet.new('wallet_test')
 		
 		assert_equal('TheFox::Wallet::Wallet', wallet.class.to_s)
 		assert_equal(true, !Dir.exist?('wallet_test'))
 	end
 	
-	def test_add
-		wallet = TheFox::Wallet::Wallet.new('wallet_test')
-		
-		wallet.add TheFox::Wallet::Entry.new('test', '2014-01-01', 100)
-		wallet.add TheFox::Wallet::Entry.new('test', '2014-01-01', 50)
-		wallet.add TheFox::Wallet::Entry.new('test', '2014-01-01', -10)
-		wallet.add TheFox::Wallet::Entry.new('test', '2014-01-02', -10)
-		wallet.add TheFox::Wallet::Entry.new('test', '2015-01-01', 100, 0, 'c1')
-		wallet.add TheFox::Wallet::Entry.new('test', '2015-01-02', 0, -10, 'c2')
-		wallet.add TheFox::Wallet::Entry.new('test', '2015-02-21', 20)
-		wallet.add TheFox::Wallet::Entry.new('test', '2015-02-21', 0, -5, 'c1')
-		wallet.add TheFox::Wallet::Entry.new('test', '2015-02-21', 0, -1.5, 'c2')
-		wallet.add TheFox::Wallet::Entry.new('test', '2015-02-22', 10)
-		
-		sum = wallet.sum()
+	def test_add1
+		wallet = Wallet.new('wallet_test')
+		
+		wallet.add(Entry.new(nil, 'test', '2014-01-01', 100))
+		wallet.add(Entry.new(nil, 'test', '2014-01-01', 50))
+		wallet.add(Entry.new(nil, 'test', '2014-01-01', -10))
+		wallet.add(Entry.new(nil, 'test', '2014-01-02', -10))
+		wallet.add(Entry.new(nil, 'test', '2015-01-01', 100, 0, 'c1'))
+		wallet.add(Entry.new(nil, 'test', '2015-01-02', 0, -10, 'c2'))
+		wallet.add(Entry.new(nil, 'test', '2015-02-21', 20))
+		wallet.add(Entry.new(nil, 'test', '2015-02-21', 0, -5, 'c1'))
+		wallet.add(Entry.new(nil, 'test', '2015-02-21', 0, -1.5, 'c2'))
+		wallet.add(Entry.new(nil, 'test', '2015-02-22', 10))
+		
+		sum = wallet.sum
 		assert_equal(280, sum[:revenue])
 		assert_equal(-36.5, sum[:expense])
 		assert_equal(243.5, sum[:balance])
@@ -176,23 +180,57 @@ class TestWallet < MiniTest::Test
 		assert_equal(-1.5, sum[:balance])
 		
 		assert_equal(['default', 'c1', 'c2'], wallet.categories)
+	end
+	
+	def test_add2
+		wallet = Wallet.new('wallet_test')
 		
-		assert_equal(true, File.exist?('wallet_test/data/month_2014_01.yml'))
-		assert_equal(true, File.exist?('wallet_test/data/month_2015_01.yml'))
-		assert_equal(true, File.exist?('wallet_test/data/month_2015_02.yml'))
-		
-		File.unlink 'wallet_test/data/month_2014_01.yml'
-		File.unlink 'wallet_test/data/month_2015_01.yml'
-		File.unlink 'wallet_test/data/month_2015_02.yml'
-		Dir.unlink 'wallet_test/data'
-		File.unlink 'wallet_test/tmp/.gitignore'
-		Dir.unlink 'wallet_test/tmp'
-		Dir.unlink 'wallet_test'
+		assert_equal(true, wallet.add(Entry.new(nil, 'test', '2014-01-01', 1)))
+		assert_equal(true, wallet.add(Entry.new(nil, 'test', '2014-01-01', 1), true))
+		
+		assert_equal(true, wallet.add(Entry.new(1, 'test', '2014-01-01', 1), true))
+		assert_equal(false, wallet.add(Entry.new(1, 'test', '2014-01-01', 1), true))
+		
+		assert_equal(true, wallet.add(Entry.new('my_id', 'test', '2014-01-01', 1), true))
+		assert_equal(false, wallet.add(Entry.new('my_id', 'test', '2014-01-01', 1), true))
+		assert_equal(true, wallet.add(Entry.new('my_id', 'test', '2014-01-01', 1), false))
 	end
 	
 	def test_exceptions
-		wallet = TheFox::Wallet::Wallet.new('wallet_test')
+		wallet = Wallet.new('wallet_test')
+		
+		assert_raises(ArgumentError) do
+			wallet.add(12)
+		end
+	end
+	
+	def test_find_entry_by_id
+		wallet = Wallet.new('wallet_test')
+		
+		wallet.add(Entry.new(nil, 'test', '2014-01-01', -1))
+		wallet.add(Entry.new(1, 'test', '2014-01-01', 1))
+		wallet.add(Entry.new(2, 'test', '2014-01-02', 2))
+		wallet.add(Entry.new(3, 'test', '2015-03-04', 3))
+		
+		found_entry = wallet.find_entry_by_id(1)
+		assert_instance_of(Entry, found_entry)
+		assert_equal(1, found_entry.id)
+		
+		found_entry = wallet.find_entry_by_id(2)
+		assert_instance_of(Entry, found_entry)
+		assert_equal(2, found_entry.id)
 		
-		assert_raises(ArgumentError){ wallet.add 12 }
+		found_entry = wallet.find_entry_by_id(3)
+		assert_instance_of(Entry, found_entry)
+		assert_equal(3, found_entry.id)
+		
+		assert_nil(wallet.find_entry_by_id(4))
+		assert_nil(wallet.find_entry_by_id(5))
+		assert_nil(wallet.find_entry_by_id(6))
+	end
+	
+	def teardown
+		FileUtils.rm_r('wallet_test', {:force => true})
 	end
+	
 end

data/thefox-wallet.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
 	spec.required_ruby_version = '>=2.0.0'
 	
 	spec.add_development_dependency 'minitest', '~>5.7'
+	
+	spec.add_dependency 'uuid', '~>2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thefox-wallet
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Christian Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.7'
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: A Ruby library for tracking your finances.
 email: christian@fox21.at
 executables:
@@ -31,12 +45,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
 - Makefile
 - Makefile.common
 - README.md
+- bin/.gitignore
 - bin/wallet
 - lib/wallet.rb
 - lib/wallet/command.rb