Jose romero

.gitignore

@@ -18,5 +18,5 @@
 config/database.yml
 config/config.yml
 
-
+PocketMoneyDB.sql
 **/.DS_Store

.rspec

@@ -0,0 +1 @@
+--color

Gemfile

@@ -33,6 +33,7 @@ gem 'haml'
 gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git'
 gem 'less-rails'
 gem "therubyracer"
+gem "faker"
 
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
@@ -46,6 +47,14 @@ gem 'pry-rails'
 
 gem 'ruby-progressbar'
 
+group :test do
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'capybara'
+  gem 'factory_girl'
+  gem 'factory_girl_rails'
+end
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
 

Gemfile.lock

@@ -38,6 +38,12 @@ GEM
     arel (4.0.0)
     atomic (1.1.9)
     builder (3.1.4)
+    capybara (2.1.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     coderay (1.0.9)
     coffee-rails (4.0.0)
       coffee-script (>= 2.2.0)
@@ -47,9 +53,17 @@ GEM
       execjs
     coffee-script-source (1.6.2)
     commonjs (0.2.6)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
+      railties (>= 3.0.0)
+    faker (1.2.0)
+      i18n (~> 0.5)
     haml (4.0.3)
       tilt
     hike (1.2.2)
@@ -71,8 +85,11 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.23)
+    mini_portile (0.5.1)
     minitest (4.7.4)
     multi_json (1.7.4)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     pg (0.15.1)
     polyglot (0.3.3)
     pry (0.9.12.2)
@@ -104,6 +121,21 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     ruby-progressbar (1.1.1)
     sass (3.2.9)
     sass-rails (4.0.0.rc1)
@@ -141,13 +173,19 @@ GEM
     uglifier (2.1.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
     yard (0.8.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara
   coffee-rails (~> 4.0.0)
+  factory_girl
+  factory_girl_rails
+  faker
   haml
   jbuilder (~> 1.0.1)
   jquery-rails
@@ -157,6 +195,8 @@ DEPENDENCIES
   pry-doc
   pry-rails
   rails (= 4.0.0.rc1)
+  rspec
+  rspec-rails
   ruby-progressbar
   sass-rails (~> 4.0.0.rc1)
   sdoc

app/controllers/accounts_controller.rb

@@ -6,5 +6,6 @@ def index
 
   def show
     @account = Account.find(params[:id])
+    @transactions = @account.active_transactions
   end
 end

app/models/account.rb

@@ -22,7 +22,7 @@ def type_name
 
 
   def active_transactions
-    transactions.active.balance
+    transactions.transaction_includes.active.balance
   end
 
   def basic_balance

app/models/transaction.rb

@@ -23,7 +23,8 @@ class Transaction < ActiveRecord::Base
 
   belongs_to :account
   has_many :splits
-
+  validates :account_id, presence: true
+  validates :amount, presence: true
 
   def split?
     @split ||= splits.size > 1
@@ -154,7 +155,7 @@ def transaction_query
       t = transaction_interval
       t = t.where(pm_type: pm_type) if pm_type
       t = t.where(account_id: account_id) if account_id
-      t = t.where('categories.id = ?', category_id) if category_id
+      #t = t.where('categories.id = ?', category_id) if category_id
       t
     end
 

app/views/accounts/show.haml

@@ -7,5 +7,5 @@
   = ['(',@account.transactions.count, ')'].join
 
 
-= render_transactions @account.active_transactions, show_balance: true
+= render_transactions @transactions.group_by {|t| t.date.to_s(:short_date) } , show_balance: true
 

app/views/transactions/_form.html.erb

@@ -31,14 +31,14 @@
     <%= f.label :category_id %><br>
     <%= f.number_field :category_id %>
   </div>
-  <div class="field">
-    <%= f.label :class_id %><br>
-    <%= f.number_field :class_id %>
-  </div>
-  <div class="field">
-    <%= f.label :memo %><br>
-    <%= f.text_area :memo %>
-  </div>
+  <%#<div class="field">%>
+    <%#<%= f.label :class_id %><br>%>
+    <%#<%= f.number_field :class_id %>%>
+  <%#</div>%>
+  <%#<div class="field">%>
+    <%#<%= f.label :memo %><br>%>
+    <%#<%= f.text_area :memo %>%>
+  <%#</div>%>
   <div class="field">
     <%= f.label :amount %><br>
     <%= f.text_field :amount %>
@@ -47,18 +47,18 @@
     <%= f.label :cleared %><br>
     <%= f.check_box :cleared %>
   </div>
-  <div class="field">
-    <%= f.label :currency_id %><br>
-    <%= f.text_field :currency_id %>
-  </div>
-  <div class="field">
-    <%= f.label :currency_exchange_rate %><br>
-    <%= f.text_field :currency_exchange_rate %>
-  </div>
-  <div class="field">
-    <%= f.label :balance %><br>
-    <%= f.text_field :balance %>
-  </div>
+  <%#<div class="field">%>
+    <%#<%= f.label :currency_id %><br>%>
+    <%#<%= f.text_field :currency_id %>%>
+  <%#</div>%>
+  <%#<div class="field">%>
+    <%#<%= f.label :currency_exchange_rate %><br>%>
+    <%#<%= f.text_field :currency_exchange_rate %>%>
+  <%#</div>%>
+  <%#<div class="field">%>
+    <%#<%= f.label :balance %><br>%>
+    <%#<%= f.text_field :balance %>%>
+  <%#</div>%>
   <div class="actions">
     <%= f.submit %>
   </div>

app/views/transactions/_transaction.haml

@@ -3,7 +3,7 @@
   %td= link_to transaction.date.to_s(:short_date), transaction
   %td= transaction.account.name
   %td= transaction.payee_name
-  %td= transaction.category_name 
+  %td= transaction.category_name
   %td.currency= money transaction.amount
 
   - if show_balance

app/views/transactions/_transactions.haml

@@ -11,7 +11,7 @@
         %th Balance
 
   %tbody
-    - @filter.grouped_transactions.each do |header, transactions|
+    - transactions.each do |header, transactions|
       %tr
         %td.split(colspan=5)
           = header

app/views/transactions/index.haml

@@ -5,7 +5,7 @@
     = render partial: 'filters'
   .span9
     = render partial: 'header'
-    = render_transactions @filter.transactions, show_balance: false
+    = render_transactions @filter.grouped_transactions, show_balance: false
 
 %br
 

config/initializers/pocket_money.rb

@@ -1 +1 @@
-require 'pocket_money'
+require 'pocket_money' if ENV["RAILS_ENV"] != 'test'

db/migrate/20130531005809_create_transactions.rb

@@ -19,7 +19,7 @@ def change
       t.integer :payee_id
       t.integer :category_id
       t.integer :department_id
-      t.decimal :amount
+      t.decimal :amount,       :precision => 10, :scale => 2
       t.boolean :cleared
       t.string    :uuid
 

db/schema.rb

@@ -13,9 +13,6 @@
 
 ActiveRecord::Schema.define(version: 20130718222102) do
 
-  # These are extensions that must be enabled in order to support this database
-  enable_extension "plpgsql"
-
   create_table "accounts", force: true do |t|
     t.boolean  "deleted"
     t.datetime "updated_at"
@@ -134,7 +131,7 @@
     t.integer  "payee_id"
     t.integer  "category_id"
     t.integer  "department_id"
-    t.decimal  "amount"
+    t.decimal  "amount",          precision: 10, scale: 2
     t.boolean  "cleared"
     t.string   "uuid"
     t.datetime "created_at"