cashflow 0.0.6 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d210d93eb390fa23ea7f01df90370c205bc33d
-  data.tar.gz: ad8df9cff209c08540e4c9ac630ae5f35890e602
+  metadata.gz: 21cd2b9ecd6447a4baca231557a05e16520b3be9
+  data.tar.gz: cfacacd1b4925cf5a5af951b01b1d8d2782f5061
 SHA512:
-  metadata.gz: 54e603219f3177f595928136a92bd665d09a90044cd51059c4341459dddfee358f959a055d32cea4d56ffd9ab96f11b4166cc177d53c5533a88491641ef25e14
-  data.tar.gz: b1137ac647b1b4c02e5432146ecc4617a8a68c4df01ed7bb92a8322fad1302e99abcbda79cf592a3b9bbb665b344da596baeb1539dac4ceea68c092463c00076
+  metadata.gz: d48aa2900d9fa8213a83e0697f9d8e534050a3ef0e5cc04049ccedd0f633cf8311ccce172370a4b03708c5f3ff9767bb3e17c1dc1897beefafe978b98c38a607
+  data.tar.gz: 4271b448b3a7765e8d45e12876805526f8e283a11da3a78430cf5cdd929bd0b3864d97cd70d981069b0e4b5c8663d202556b8ffee7e67c266d483c51f10ee9d8

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-TODO
+TODO
+db/*.sqlite3

data/.ruby-gemset

@@ -0,0 +1 @@
+cashflow

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in cashflow.gemspec
 gemspec

data/README.md

@@ -5,7 +5,7 @@ Cashflow
 
 _Cashflow_ is a simple command-line application written in Ruby using [Thor](https://github.com/wycats/thor). It's purpose is simple: to analyse your bank transactions (collecting only the _date_ and _amount_) in order to build an average if your income and expenses over the last few months and compare these with the income and expenses for the current month.
 
-Only transactions up to the current day of the month are included, so the app gives you good insight into your financial position at this exact point in the month - extremely useful when you have regular monthly transactions such as rent and salary.
+Only transactions up to the current day of the month are included, so the app gives you good insight into your financial position at this exact point in the month -- extremely useful when you have regular monthly transactions such as rent and salary.
 
 By default, only transactions from 4 months prior are factored into the calculations (or as far back as the stored transactions go), but this is configurable.
 
@@ -26,8 +26,9 @@ cashflow help            # Show this help message
 cashflow help COMMAND    # Describe available commands or one specific command
 cashflow load PATH       # Loads the OFX file at the specified PATH
 cashflow report          # Analyses the stored transactions and prints a comparison report
-cashflow flush           # Flushes the database, removing all stored transactions
 cashflow version         # Prints the current version number
 ```
 
-`cashflow report` takes optional parameters. You can specify the date range for the transactions to compare against by passing `-s` or `--span` followed by a number repensenting the number of months to use. You can also specify the target day of the month to filter transactions against by passing `-d` or `--day` followed by a number representing the desired day of the month. 
+`cashflow load` may be used mutiple times -- duplicate transactions will not be imported. You may also load `ofx` exports for multiple accounts.
+
+`cashflow report` takes optional parameters. You can specify the date range for the transactions to compare against by passing `-s` or `--span` followed by a number repensenting the number of months to use. To print a report for a single account only, you may pass `-a` or `--account` followed by the account name or number (this is displayed when the file is imported).

data/Rakefile

@@ -1 +1 @@
-require 'bundler/gem_tasks'
+require 'bundler/gem_tasks'

data/cashflow.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cashflow/version'
@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "iconv", "~> 1.0.2"
-  spec.add_dependency "sqlite3", "~> 1.3.7"
+  spec.add_dependency "iconv", "~> 1.0.3"
+  spec.add_dependency "sqlite3", "~> 1.3.8"
+  spec.add_dependency "active_record_migrations", "~> 4.0.0"
   spec.add_dependency "thor", "~> 0.18.1"
-  spec.add_dependency "ofx", "~> 0.3.1"
-end
+  spec.add_dependency "ofx", "~> 0.3.2"
+end

data/db/migrate/20131110065134_create_transaction.rb

@@ -0,0 +1,11 @@
+class CreateTransaction < ActiveRecord::Migration
+  def change
+    create_table :transactions do |t|
+      t.string  :transaction_id,   null: false
+      t.string  :transaction_type, null: false
+      t.string  :account_number,   null: false
+      t.integer :amount,           null: false
+      t.date    :date,             null: false
+    end
+  end
+end

data/db/schema.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20131110065134) do
+
+  create_table "transactions", force: true do |t|
+    t.string  "transaction_id",   null: false
+    t.string  "transaction_type", null: false
+    t.string  "account_number",   null: false
+    t.integer "amount",           null: false
+    t.date    "date",             null: false
+  end
+
+end

data/lib/cashflow.rb

@@ -1,52 +1,48 @@
 # Ruby libs.
-require 'kconv' # For OFX gem fix.
-require 'logger'
+require 'rake'
 require 'sqlite3'
+require 'active_record'
+require 'active_record_migrations'
 require 'thor'
 require 'ofx'
 
 # App modules.
 require 'cashflow/version'
 require 'cashflow/patches'
+require 'cashflow/config'
 require 'cashflow/transaction'
 require 'cashflow/report'
 require 'cashflow/cli'
 
 module Cashflow
+  class << self
 
-  # Define the database table name.
-  def self.table_name
-    "activity"
-  end
-
-  # Define the root directory.
-  def self.root
-    @root ||= File.expand_path(File.join(__FILE__, '../../'))
-  end
+    def create_directory
+      FileUtils.mkdir_p(File.expand_path('~/.cashflow'))
+    end
 
-  # Set up & retrieve the logger.
-  def self.logger
-    @logger ||= Logger.new(File.join(root, 'log/cashflow.log'))
-  end
+    def create_database
+      unless File.exists?(File.expand_path(Config.db_config[Config.env]['database']))
+        Rake::Task['db:create'].invoke
+        Rake::Task['db:schema:load'].invoke
+      end
+    end
 
-  # Initialize & retrieve the database.
-  def self.db
-    @db ||= begin
-      # Initialize the database. Create the table if necessary.
-      db = SQLite3::Database.new(File.expand_path('~/.cashflow/cashflow.db'))
-      db.execute("CREATE TABLE IF NOT EXISTS #{table_name} (id string primary key, type varchar(6), amount integer, date date);")
-      # Return the database connection.
-      db
+    def establish_connection
+      ::ActiveRecord::Base.establish_connection(Config.db_config[Config.env])
     end
-  end
 
-  # Erase the database.
-  def self.flush
-    db.execute("DROP TABLE IF EXISTS #{table_name};")
-    @db = nil
   end
+end
 
+ActiveRecordMigrations.configure do |c|
+  c.environment = ENV['CASHFLOW_ENV'] || 'production'
+  c.database_configuration = Cashflow::Config.db_config
+  c.db_dir = File.join(Cashflow::Config.root_path, "db").to_s
 end
 
-# Ensure cashflow is in the home directory.
-FileUtils.mkdir_p(File.expand_path('~/.cashflow'))
+ActiveRecordMigrations.load_tasks
+
+Cashflow.create_directory
+Cashflow.create_database
+Cashflow.establish_connection

data/lib/cashflow/cli.rb

@@ -2,6 +2,9 @@ module Cashflow
   class Cli < ::Thor
     include Thor::Actions
 
+    # Commands
+    # ========
+
     desc "version", "Prints the current version number"
     def version
       say("Cashflow v#{Cashflow::VERSION}", :green)
@@ -9,96 +12,36 @@ module Cashflow
 
     desc "load PATH", "Loads the OFX file at the specified PATH"
     def load(ofx_file_path)
-      map_transactions(OFX(ofx_file_path).account.transactions).each(&:save)
-      say("Successfully loaded the transactions from '#{ofx_file_path}'", :green)
+      account = OFX(ofx_file_path).account
+      store_ofx_transactions(account.transactions, account.id)
+      say("Successfully loaded the transactions for #{account.id}", :green)
     end
 
-    # Option to factor only up to the day of the month.
     desc "report", "Analyses the stored transactions and prints a comparison report"
-    option :span, :type => :numeric, :aliases => "-s", :default => 4
-    option :day, :type => :numeric, :aliases => "-d"
+    option :span, :type => :numeric, :aliases => "-s", :default => 3
+    option :account, :type => :string, :aliases => "-a"
     def report
-      # Normalize the options.
-      months_span = options[:span] > 0 ? options[:span] : 4
-      if options[:day] && options[:day] <= Date.today.day && options[:day] > 0
-        day_of_month = options[:day]
-      elsif options[:day] && options[:day] <= 0
-        day_of_month = 1
-      else
-        day_of_month = Date.today.day
-      end
-
-      # Build report.
-      report = Report.new(months_span, day_of_month)
-      report.build_report!
-
-      # Define columns widths.
-      cols = "%-11s %-11s %-11s %-11s\n"
-
-      # Intro.
-      say("\n")
-      say("Using transactions up to and including the #{report.end_date.day.ordinalize} of the month")
-      say("Transactions begin #{report.start_date.strftime('%B')} #{report.start_date.day.ordinalize}, #{report.start_date.strftime('%Y')}")
-      say("\n")
-
-      # Table header.
-      printf(cols, "", "Average", "This month", "Difference")
-      
-      # Print the debits & credits comparison.
-      Transaction::TYPES.each do |type|
-        # Calculate comparison.
-        avg = report.send("#{type}_average")
-        current = report.send("#{type}_current_sum")
-        diff = report.send("#{type}_diff")
-        in_or_out = type == :debits ? 'out' : 'in'
-        is_good = diff <= 0
-        colour = is_good ? :green : :red
-
-        # Table row.
-        printf(cols, "Money #{in_or_out}:", currencify(avg), currencify(current), set_color(currencify(diff), colour))
-      end
-
-      # Calculate net position.
-      net_position = report.debits_diff + report.credits_diff
-      is_good = net_position <= 0
-      colour = is_good ? :green : :red
-      position = is_good ? 'improvement' : 'decline'
-
-      # Print the net position.
-      say("\n")
-      say("Comparison: #{set_color(currencify(net_position) + ' ' + position + ' on average', colour)}")
-      say("\n")
+      Report.new(options).print(self)
     end
 
-    desc "flush", "Flushes the database, removing all stored transactions"
-    def flush
-      Cashflow.flush
-      say("Successfully flushed database", :green)
-    end
+    # Instance methods
+    # ================
 
     private
 
-    def currencify(number)
-      is_neg = number < 0
-      number = number / 100.0
-      int, frac = ("%.2f" % number).split('.')
-      int.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
-      int = int.slice(1..-1) if is_neg
-      "$" + int + "." + frac
-    end
-
     # Takes a collection of OFX transactions and maps them to
     # Transaction instances, which are saved to the database.
-    def map_transactions(transactions)
-      transactions.map do |record|
-        Transaction.new({
-          :id     => record.fit_id.to_s,
-          :type   => record.type,
-          :amount => record.amount_in_pennies,
-          :date   => record.posted_at.to_date
+    def store_ofx_transactions(transactions, account_no)
+      transactions.each do |record|
+        Transaction.create({
+          transaction_id:   "#{account_no} #{record.fit_id}",
+          transaction_type: record.type.to_s,
+          account_number:   account_no,
+          amount:           record.amount_in_pennies,
+          date:             record.posted_at.to_date
         })
       end
     end
 
   end
-end
+end

data/lib/cashflow/config.rb

@@ -0,0 +1,29 @@
+module Cashflow
+  module Config
+    class << self
+
+      def env
+        ENV['CASHFLOW_ENV'] || 'production'
+      end
+
+      def root_path
+        @@root_path ||= File.expand_path('../../..', __FILE__)
+      end
+
+      def db_config
+        {
+          'production' => {
+            'adapter'  => 'sqlite3',
+            'database' => '~/.cashflow/cashflow.sqlite3'
+          },
+
+          'development' => {
+            'adapter'  => 'sqlite3',
+            'database' => File.join(Cashflow::Config.root_path, "db/#{env}.sqlite3").to_s
+          }
+        }
+      end
+
+    end
+  end
+end

data/lib/cashflow/patches.rb

@@ -1,4 +1,5 @@
 class String
+  # Assumes date represented as YYYY-MM-DD.
   def to_date
     year, month, day = self.split("-").map(&:to_i)
     Date.strptime("{ #{year}, #{month}, #{day} }", "{ %Y, %m, %d }")
@@ -18,4 +19,14 @@ class Fixnum
       end
     end
   end
-end
+
+  # Assumes integer representing amount in cents.
+  def to_currency(allow_neg=true)
+    is_neg = self < 0
+    number = self / 100.0
+    int, frac = ("%.2f" % number).split('.')
+    int.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
+    int.slice!(0) if is_neg
+    [ '$', int, '.', frac ].join.prepend(allow_neg && is_neg ? '-' : '')
+  end
+end

data/lib/cashflow/report.rb

@@ -1,128 +1,207 @@
 module Cashflow
   class Report
-    TYPES = Cashflow::Transaction::TYPES
-    attr_accessor *TYPES
-    attr_accessor *TYPES.map { |type| :"#{type}_sums" }
-    attr_accessor *TYPES.map { |type| :"#{type}_current" }
-    attr_accessor *TYPES.map { |type| :"#{type}_current_sum" }
-    attr_accessor *TYPES.map { |type| :"#{type}_average" }
-    attr_accessor *TYPES.map { |type| :"#{type}_diff" }
-    attr_accessor :start_date, :end_date
-
-    def initialize(months_span, day_of_month)
-      # Set the initial start date to the first of the month,
-      # however many months ago.
-      date = Date.today << months_span
-      date = Date.new(date.year, date.month, 1)
-      # Get the earliest transaction date since the start date (inclusive).
-      date = Transaction.all(date).first.date
-      # If the earliest transaction took place AFTER the target
-      # day of the month, then move to the following month.
-      date = date >> 1 if date.day > day_of_month
-      # Whatever the final date is, ensure it starts at the beginning of the month.
-      @start_date = Date.new(date.year, date.month, 1)
-
-      # Set the end date.
-      @end_date = Date.new(Date.today.year, Date.today.month, day_of_month)
-    end
 
-    def debits
-      @debits ||= Transaction.merged(Transaction.debits(start_date))
-    end
+    # Accessors
+    # =========
+
+    attr_accessor :summary
+
+    # Instance methods
+    # ================
+
+    def initialize(options)
+      if options
+        @options = options
+
+        # Get the start date.
+        start_date = get_start_date
+
+        # Retrieve all transactions since the start date,
+        # optionally scoped by a given account number.
+        transactions = get_transactions(start_date, options[:account])
+
+        # In prior months, discard any transactions past the
+        # current day of the month.
+        transactions = restrict_by_day_of_month(transactions, Date.today.day)
+
+        # Build a hash to contain the transactions grouped by month.
+        by_month = build_hash_by_month
+
+        # Organise the transactions by month and by type.
+        by_month = group_transactions_by_month_and_type(by_month, transactions)
+
+        # Sum the debits & credits for each month.
+        sums = sum_transactions(by_month)
 
-    def credits
-      @credits ||= Transaction.merged(Transaction.credits(start_date))
+        # Work out the averages.
+        averages = determine_averages(sums)
+
+        # Work out the difference between the current month and prior average.
+        diff = compare_current_to_average(sums[:current], averages)
+
+        # Build & expose a summary.
+        @summary = {
+          start_date: start_date,
+          sums:       sums,
+          averages:   averages,
+          diff:       diff
+        }
+      end
     end
 
-    def build_report!
-      filter_up_to_day_of_the_month!
-      separate_current_month!
-      group_priors_by_month!
-      sum_all_by_month!
-      calculate_averages!
-      calculate_differences!
+    # Set the initial start date to the first of the month, [n] months ago.
+    def get_start_date
+      date = Date.today << (@options[:span])
+      Date.new(date.year, date.month, 1)
     end
 
-    private
+    def get_transactions(start_date, account_number=nil)
+      transactions = Transaction.where("date >= ?", start_date)
+      transactions = transactions.where(account_number: account_number) if account_number
+      transactions
+    end
 
-    # Filters the credits and debits to only include the transactions
-    # that occurred up to the current day of the month.
-    def filter_up_to_day_of_the_month!
-      TYPES.each do |type|
-        filtered = send(type).select do |transaction|
-          transaction.date.day <= end_date.day
-        end
-        send("#{type}=", filtered)
+    def restrict_by_day_of_month(transactions, day_of_month)
+      transactions.select do |transaction|
+        transaction.date.day <= day_of_month
       end
     end
 
-    # Divide the credits & debits into those for the current month
-    # and all others prior.
-    def separate_current_month!
-      TYPES.each do |type|
-        this_month = send(type).select do |transaction|
-          transaction.date.year == Date.today.year &&
-          transaction.date.month == Date.today.month
-        end
-        send("#{type}_current=", this_month)
-        send("#{type}=", send(type) - this_month)
+    def build_hash_by_month
+      by_month = { current: { debits: [], credits: [] } }
+      today    = Date.today
+
+      @options[:span].times do |n|
+        date = today << (n+1)
+        key  = "#{date.year}-#{date.month}"
+        by_month[key] = { debits: [], credits: [] }
       end
+
+      # {
+      #   :current  => { debits: [], credits: [] },
+      #   '2013-10' => { debits: [], credits: [] },
+      #   '2013-9'  => { debits: [], credits: [] },
+      #   '2013-8'  => { debits: [], credits: [] }
+      # }
+
+      by_month
     end
 
-    # Group all prior transactions into months (as a hash).
-    def group_priors_by_month!
-      TYPES.each do |type|
-        by_month = send(type).inject({}) do |hash, transaction|
-          key = "#{transaction.date.year}-#{transaction.date.month}"
-          hash[key] ||= []
-          hash[key] << transaction
-          hash
-        end
-        send("#{type}=", by_month)
+    def group_transactions_by_month_and_type(by_month, transactions)
+      transactions.each do |transaction|
+        this, year, month = Date.today, transaction.date.year, transaction.date.month
+        type = "#{transaction.transaction_type}s".to_sym # pluralize by appending "s"
+        key  = "#{year}-#{month}"
+        key  = :current if year == this.year && month == this.month
+        by_month[key][type] << transaction
       end
+
+      by_month
     end
 
-    # Sum all transactions by month.
-    def sum_all_by_month!
-      TYPES.each do |type|
-        # Current month:
-        current_sum = send("#{type}_current").inject(0) do |sum, transaction|
-          sum += transaction.amount
-          sum
-        end
-        send("#{type}_current_sum=", current_sum)
+    def sum_transactions(by_month)
+      sums = {}
 
-        # Prior months:
-        prior_sums = {}
-        send("#{type}").each do |key, transactions|
-          prior_sums[key] = transactions.inject(0) do |sum, transaction|
+      by_month.each do |month, by_type|
+        by_type.each do |type, transactions|
+          sums[month] ||= {}
+          sums[month][type] = transactions.inject(0) do |sum, transaction|
             sum += transaction.amount
             sum
           end
         end
-        send("#{type}_sums=", prior_sums)
       end
+
+      # {
+      #   :current  => { debits: -100, credits: 100 },
+      #   '2013-10' => { debits: -100, credits: 100 },
+      #   '2013-9'  => { debits: -100, credits: 100 },
+      #   '2013-8'  => { debits: -100, credits: 100 }
+      # }
+
+      sums
     end
 
-    # Calculate the average debits & credits based on the prior transactions.
-    def calculate_averages!
-      TYPES.each do |type|
+    def determine_averages(sums)
+      averages = { debits: 0, credits: 0 }
+
+      sums.each do |month, by_type|
+        unless month == :current
+          by_type.each do |type, sum|
+            averages[type] += sum
+          end
+        end
+      end
+
+      averages.each do |type, sum|
         begin
-          average = send("#{type}_sums").values.inject(0, :+) / send("#{type}_sums").values.length
-        rescue
-          average = 0
+          averages[type] = sum / @options[:span]
+        rescue ZeroDivisionError
+          averages[type] = 0
         end
-        send("#{type}_average=", average)
       end
+
+      # {
+      #   debits: -100,
+      #   credits: 100
+      # }
+
+      averages
+    end
+
+    def compare_current_to_average(current, averages)
+      diffs = {}
+
+      averages.each do |type, average|
+        diffs[type] = current[type] - average
+      end
+
+      # {
+      #   debits: 0,
+      #   credits: 0
+      # }
+
+      diffs
     end
 
-    # Calculate the difference between the current month totals and the prior averages.
-    def calculate_differences!
-      TYPES.each do |type|
-        diff = send("#{type}_average") - send("#{type}_current_sum")
-        send("#{type}_diff=", diff)
+    # Summarise and print the analysis.
+    def print(cli)
+      # Define columns widths.
+      cols = "%-11s %-11s %-11s %-11s\n"
+
+      # Intro.
+      cli.say("\n")
+      cli.say("Using transactions up to and including the #{Date.today.day.ordinalize} of the month")
+      cli.say("Transactions begin #{summary[:start_date].strftime('%B')} #{summary[:start_date].day.ordinalize}, #{summary[:start_date].strftime('%Y')}")
+      cli.say("\n")
+
+      # Table header.
+      printf(cols, "", "Average", "This month", "Difference")
+
+      # Print the debits & credits comparison.
+      %i(debits credits).each do |type|
+        current   = summary[:sums][:current][type]
+        avg       = summary[:averages][type]
+        diff      = summary[:diff][type]
+        in_or_out = type == :debits ? 'out' : 'in'
+        is_good   = diff >= 0
+        colour    = is_good ? :green : :red
+
+        # Table row.
+        printf(cols, "Money #{in_or_out}:", avg.to_currency, current.to_currency, cli.set_color(diff.to_currency, colour))
       end
+
+      # Calculate net position.
+      net_position = summary[:diff][:debits] + summary[:diff][:credits]
+      is_good      = net_position >= 0
+      colour       = is_good ? :green : :red
+      position     = is_good ? 'improvement' : 'decline'
+
+      # Print the net position.
+      cli.say("\n")
+      cli.say("Comparison: #{cli.set_color(net_position.to_currency(false) + ' ' + position + ' compared to average', colour)}")
+      cli.say("\n")
     end
 
   end
-end
+end

data/lib/cashflow/transaction.rb

@@ -1,60 +1,11 @@
 module Cashflow
-  class Transaction
-    attr_accessor :id, :type, :amount, :date
+  class Transaction < ActiveRecord::Base
 
-    TYPES = %i(debits credits)
+    # Validations
+    # ===========
 
-    class << self
+    validates :transaction_id, uniqueness: true
+    validates_presence_of :transaction_type, :account_number, :amount, :date
 
-      def select_from_sql(sql)
-        Cashflow.db.execute(sql).map do |(id, type, amount, date)|
-          Transaction.new({
-            :id     => id,
-            :type   => type.to_sym,
-            :amount => amount,
-            :date   => date.to_date
-          })
-        end
-      end
-
-      def all(since)
-        select_from_sql("SELECT * FROM #{Cashflow.table_name} WHERE date >= '#{since.to_s}' ORDER BY date ASC")
-      end
-
-      def debits(since)
-        select_from_sql("SELECT * FROM #{Cashflow.table_name} WHERE date >= '#{since.to_s}' AND type = 'debit' ORDER BY date ASC")
-      end
-
-      def credits(since)
-        select_from_sql("SELECT * FROM #{Cashflow.table_name} WHERE date >= '#{since.to_s}' AND type = 'credit' ORDER BY date ASC")
-      end
-
-      def merged(transactions)
-        by_date = {}
-        transactions.each do |transaction|
-          key = "#{transaction.date.to_s}-#{transaction.type.to_s}"
-          # If a transaction already exists for this date and type, combine them.
-          transaction.amount += by_date[key].amount if by_date[key]
-          by_date[key] = transaction
-        end
-        # Return the combined transactions, sorted by date.
-        by_date.values.sort_by { |transaction| transaction.date }
-      end
-    end
-
-    def initialize(attrs)
-      attrs.each do |(attribute, value)|
-        send("#{attribute}=", value)
-      end
-    end
-
-    def save
-      begin
-        Cashflow.db.execute("INSERT INTO activity (id, type, amount, date) VALUES (?, ?, ?, ?)", [ id, type.to_s, amount, date.to_s ])
-        true
-      rescue Exception => e
-        false
-      end
-    end
   end
-end
+end

data/lib/cashflow/version.rb

@@ -1,3 +1,3 @@
 module Cashflow
-  VERSION = "0.0.6".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cashflow
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Fulcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.3.8
+- !ruby/object:Gem::Dependency
+  name: active_record_migrations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 description: Compares your latest income & expense to your average, giving you a quick
   at-a-glance view of your financial position.
 email:
@@ -104,20 +118,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/cashflow
 - cashflow.gemspec
+- db/migrate/20131110065134_create_transaction.rb
+- db/schema.rb
 - lib/cashflow.rb
 - lib/cashflow/cli.rb
+- lib/cashflow/config.rb
 - lib/cashflow/patches.rb
 - lib/cashflow/report.rb
 - lib/cashflow/transaction.rb
 - lib/cashflow/version.rb
-- log/cashflow.log
 - screenshot.png
 homepage: http://drawingablank.me/blog/cashflow-a-ruby-gem-for-your-financial-position.html
 licenses:
@@ -139,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Compares your latest income & expense to your average.

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 2.0.0@cashflow --create