Skip to content

Commit 5906693

Browse files
rootroot
root
authored and
root
committed
things
1 parent 36902c4 commit 5906693

File tree

155 files changed

+172
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+172
-159
lines changed

.gitignore

100644100755
File mode changed.

.rspec

100644100755
File mode changed.

.rvmrc

100644100755
File mode changed.

Gemfile

100644100755
+4-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
source 'http://rubygems.org'
22

33

4-
gem 'rails', '3.1.0.rc3'
4+
gem 'rails', '3.1.0'
55
gem 'haml-rails'
6-
gem "rake", "0.8.7"
7-
#gem 'pg', "0.11.0"
8-
gem 'sqlite3'
6+
gem 'pg', "0.11.0"
97
gem 'therubyracer', "0.9.0"
108
gem 'rabl'
11-
9+
gem 'heroku'
10+
gem 'taps'
1211
# Asset template engines
1312
gem 'sass'
1413
gem 'coffee-script'
@@ -21,7 +20,6 @@ group :development, :test do
2120
gem 'ffaker'
2221
gem 'cucumber-rails'
2322
gem 'rspec-rails'
24-
gem 'ruby-debug19', :require => 'ruby-debug'
2523
gem 'turn', :require => false
2624
gem "erb2haml"
2725
end

Gemfile.lock

100644100755
+136-124
Original file line numberDiff line numberDiff line change
@@ -1,182 +1,194 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
actionmailer (3.1.0.rc3)
5-
actionpack (= 3.1.0.rc3)
4+
actionmailer (3.1.0)
5+
actionpack (= 3.1.0)
66
mail (~> 2.3.0)
7-
actionpack (3.1.0.rc3)
8-
activemodel (= 3.1.0.rc3)
9-
activesupport (= 3.1.0.rc3)
7+
actionpack (3.1.0)
8+
activemodel (= 3.1.0)
9+
activesupport (= 3.1.0)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
i18n (~> 0.6)
13-
rack (~> 1.3.0)
14-
rack-cache (~> 1.0.1)
15-
rack-mount (~> 0.8.1)
16-
rack-test (~> 0.6.0)
17-
sprockets (~> 2.0.0.beta.10)
18-
tzinfo (~> 0.3.27)
19-
activemodel (3.1.0.rc3)
20-
activesupport (= 3.1.0.rc3)
21-
bcrypt-ruby (~> 2.1.4)
13+
rack (~> 1.3.2)
14+
rack-cache (~> 1.0.3)
15+
rack-mount (~> 0.8.2)
16+
rack-test (~> 0.6.1)
17+
sprockets (~> 2.0.0)
18+
activemodel (3.1.0)
19+
activesupport (= 3.1.0)
20+
bcrypt-ruby (~> 3.0.0)
2221
builder (~> 3.0.0)
2322
i18n (~> 0.6)
24-
activerecord (3.1.0.rc3)
25-
activemodel (= 3.1.0.rc3)
26-
activesupport (= 3.1.0.rc3)
27-
arel (~> 2.1.1)
28-
tzinfo (~> 0.3.27)
29-
activeresource (3.1.0.rc3)
30-
activemodel (= 3.1.0.rc3)
31-
activesupport (= 3.1.0.rc3)
32-
activesupport (3.1.0.rc3)
23+
activerecord (3.1.0)
24+
activemodel (= 3.1.0)
25+
activesupport (= 3.1.0)
26+
arel (~> 2.2.1)
27+
tzinfo (~> 0.3.29)
28+
activeresource (3.1.0)
29+
activemodel (= 3.1.0)
30+
activesupport (= 3.1.0)
31+
activesupport (3.1.0)
3332
multi_json (~> 1.0)
34-
ansi (1.2.5)
35-
archive-tar-minitar (0.5.2)
36-
arel (2.1.1)
37-
bcrypt-ruby (2.1.4)
33+
addressable (2.2.7)
34+
ansi (1.4.2)
35+
arel (2.2.3)
36+
bcrypt-ruby (3.0.1)
3837
builder (3.0.0)
39-
capybara (1.0.0.rc1)
38+
capybara (1.1.2)
4039
mime-types (>= 1.16)
4140
nokogiri (>= 1.3.3)
4241
rack (>= 1.0.0)
4342
rack-test (>= 0.5.4)
44-
selenium-webdriver (~> 0.2.0)
43+
selenium-webdriver (~> 2.0)
4544
xpath (~> 0.1.4)
46-
childprocess (0.1.9)
45+
childprocess (0.3.1)
4746
ffi (~> 1.0.6)
4847
coffee-script (2.2.0)
4948
coffee-script-source
5049
execjs
51-
coffee-script-source (1.1.1)
52-
columnize (0.3.3)
53-
cucumber (0.10.6)
50+
coffee-script-source (1.2.0)
51+
cucumber (1.1.9)
5452
builder (>= 2.1.2)
5553
diff-lcs (>= 1.1.2)
56-
gherkin (~> 2.4.0)
54+
gherkin (~> 2.9.0)
5755
json (>= 1.4.6)
58-
term-ansicolor (>= 1.0.5)
59-
cucumber-rails (0.5.2)
60-
capybara (>= 1.0.0.rc1)
61-
cucumber (>= 0.10.5)
62-
nokogiri (>= 1.4.4)
63-
rack-test (>= 0.5.7)
64-
diff-lcs (1.1.2)
56+
term-ansicolor (>= 1.0.6)
57+
cucumber-rails (1.3.0)
58+
capybara (>= 1.1.2)
59+
cucumber (>= 1.1.8)
60+
nokogiri (>= 1.5.0)
61+
diff-lcs (1.1.3)
6562
erb2haml (0.1.2)
6663
haml
6764
hpricot
6865
ruby_parser
6966
erubis (2.7.0)
70-
execjs (1.1.3)
67+
execjs (1.3.0)
7168
multi_json (~> 1.0)
72-
factory_girl (2.0.1)
73-
factory_girl_rails (1.1.0)
74-
factory_girl (~> 2.0.0)
69+
factory_girl (2.6.4)
70+
activesupport (>= 2.3.9)
71+
factory_girl_rails (1.7.0)
72+
factory_girl (~> 2.6.0)
7573
railties (>= 3.0.0)
76-
ffaker (1.8.0)
77-
ffi (1.0.9)
78-
gherkin (2.4.0)
74+
ffaker (1.13.0)
75+
ffi (1.0.11)
76+
gherkin (2.9.1)
7977
json (>= 1.4.6)
80-
haml (3.1.2)
78+
haml (3.1.4)
8179
haml-rails (0.3.4)
8280
actionpack (~> 3.0)
8381
activesupport (~> 3.0)
8482
haml (~> 3.0)
8583
railties (~> 3.0)
86-
hike (1.0.0)
87-
hpricot (0.8.4)
84+
heroku (2.21.3)
85+
launchy (>= 0.3.2)
86+
netrc (~> 0.7.1)
87+
rest-client (~> 1.6.1)
88+
rubyzip
89+
hike (1.2.1)
90+
hpricot (0.8.6)
8891
i18n (0.6.0)
89-
jquery-rails (1.0.10)
92+
jquery-rails (1.0.19)
9093
railties (~> 3.0)
9194
thor (~> 0.14)
92-
json (1.5.1)
93-
json_pure (1.5.1)
94-
libv8 (3.3.10.2)
95-
linecache19 (0.5.12)
96-
ruby_core_source (>= 0.1.4)
97-
mail (2.3.0)
95+
json (1.6.5)
96+
launchy (2.1.0)
97+
addressable (~> 2.2.6)
98+
libv8 (3.3.10.4)
99+
mail (2.3.3)
98100
i18n (>= 0.4.0)
99101
mime-types (~> 1.16)
100102
treetop (~> 1.4.8)
101-
mime-types (1.16)
102-
multi_json (1.0.3)
103-
nokogiri (1.4.4)
104-
polyglot (0.3.1)
105-
rabl (0.3.0)
106-
multi_json (~> 1.0.3)
107-
rack (1.3.0)
108-
rack-cache (1.0.2)
103+
mime-types (1.18)
104+
multi_json (1.1.0)
105+
netrc (0.7.1)
106+
nokogiri (1.5.2)
107+
pg (0.11.0)
108+
polyglot (0.3.3)
109+
rabl (0.6.2)
110+
activesupport (>= 2.3.14)
111+
multi_json (~> 1.1.0)
112+
rack (1.3.6)
113+
rack-cache (1.0.3)
109114
rack (>= 0.4)
110-
rack-mount (0.8.1)
115+
rack-mount (0.8.3)
111116
rack (>= 1.0.0)
112117
rack-ssl (1.3.2)
113118
rack
114-
rack-test (0.6.0)
119+
rack-test (0.6.1)
115120
rack (>= 1.0)
116-
rails (3.1.0.rc3)
117-
actionmailer (= 3.1.0.rc3)
118-
actionpack (= 3.1.0.rc3)
119-
activerecord (= 3.1.0.rc3)
120-
activeresource (= 3.1.0.rc3)
121-
activesupport (= 3.1.0.rc3)
121+
rails (3.1.0)
122+
actionmailer (= 3.1.0)
123+
actionpack (= 3.1.0)
124+
activerecord (= 3.1.0)
125+
activeresource (= 3.1.0)
126+
activesupport (= 3.1.0)
122127
bundler (~> 1.0)
123-
railties (= 3.1.0.rc3)
124-
railties (3.1.0.rc3)
125-
actionpack (= 3.1.0.rc3)
126-
activesupport (= 3.1.0.rc3)
128+
railties (= 3.1.0)
129+
railties (3.1.0)
130+
actionpack (= 3.1.0)
131+
activesupport (= 3.1.0)
127132
rack-ssl (~> 1.3.2)
128133
rake (>= 0.8.7)
134+
rdoc (~> 3.4)
129135
thor (~> 0.14.6)
130-
rake (0.8.7)
131-
rspec (2.6.0)
132-
rspec-core (~> 2.6.0)
133-
rspec-expectations (~> 2.6.0)
134-
rspec-mocks (~> 2.6.0)
135-
rspec-core (2.6.4)
136-
rspec-expectations (2.6.0)
137-
diff-lcs (~> 1.1.2)
138-
rspec-mocks (2.6.0)
139-
rspec-rails (2.6.1)
140-
actionpack (~> 3.0)
141-
activesupport (~> 3.0)
142-
railties (~> 3.0)
143-
rspec (~> 2.6.0)
144-
ruby-debug-base19 (0.11.25)
145-
columnize (>= 0.3.1)
146-
linecache19 (>= 0.5.11)
147-
ruby_core_source (>= 0.1.4)
148-
ruby-debug19 (0.11.6)
149-
columnize (>= 0.3.1)
150-
linecache19 (>= 0.5.11)
151-
ruby-debug-base19 (>= 0.11.19)
152-
ruby_core_source (0.1.5)
153-
archive-tar-minitar (>= 0.5.2)
154-
ruby_parser (2.0.6)
136+
rake (0.9.2.2)
137+
rdoc (3.12)
138+
json (~> 1.4)
139+
rest-client (1.6.7)
140+
mime-types (>= 1.16)
141+
rspec (2.9.0)
142+
rspec-core (~> 2.9.0)
143+
rspec-expectations (~> 2.9.0)
144+
rspec-mocks (~> 2.9.0)
145+
rspec-core (2.9.0)
146+
rspec-expectations (2.9.0)
147+
diff-lcs (~> 1.1.3)
148+
rspec-mocks (2.9.0)
149+
rspec-rails (2.9.0)
150+
actionpack (>= 3.0)
151+
activesupport (>= 3.0)
152+
railties (>= 3.0)
153+
rspec (~> 2.9.0)
154+
ruby_parser (2.3.1)
155155
sexp_processor (~> 3.0)
156-
rubyzip (0.9.4)
157-
sass (3.1.2)
158-
selenium-webdriver (0.2.1)
159-
childprocess (>= 0.1.7)
160-
ffi (>= 1.0.7)
161-
json_pure
156+
rubyzip (0.9.6.1)
157+
sass (3.1.15)
158+
selenium-webdriver (2.20.0)
159+
childprocess (>= 0.2.5)
160+
ffi (~> 1.0)
161+
multi_json (~> 1.0)
162162
rubyzip
163-
sexp_processor (3.0.5)
164-
sprockets (2.0.0.beta.10)
165-
hike (~> 1.0)
163+
sequel (3.20.0)
164+
sexp_processor (3.1.0)
165+
sinatra (1.0)
166+
rack (>= 1.0)
167+
sprockets (2.0.3)
168+
hike (~> 1.2)
166169
rack (~> 1.0)
167170
tilt (~> 1.1, != 1.3.0)
168-
sqlite3 (1.3.3)
169-
term-ansicolor (1.0.5)
171+
sqlite3 (1.3.5)
172+
sqlite3-ruby (1.3.3)
173+
sqlite3 (>= 1.3.3)
174+
taps (0.3.23)
175+
rack (>= 1.0.1)
176+
rest-client (>= 1.4.0, < 1.7.0)
177+
sequel (~> 3.20.0)
178+
sinatra (~> 1.0.0)
179+
sqlite3-ruby (~> 1.2)
180+
term-ansicolor (1.0.7)
170181
therubyracer (0.9.0)
171182
libv8 (~> 3.3.10)
172183
thor (0.14.6)
173-
tilt (1.3.2)
174-
treetop (1.4.9)
184+
tilt (1.3.3)
185+
treetop (1.4.10)
186+
polyglot
175187
polyglot (>= 0.3.1)
176-
turn (0.8.2)
177-
ansi (>= 1.2.2)
178-
tzinfo (0.3.28)
179-
uglifier (0.5.4)
188+
turn (0.9.4)
189+
ansi
190+
tzinfo (0.3.32)
191+
uglifier (1.2.3)
180192
execjs (>= 0.3.0)
181193
multi_json (>= 1.0.2)
182194
xpath (0.1.4)
@@ -192,14 +204,14 @@ DEPENDENCIES
192204
factory_girl_rails
193205
ffaker
194206
haml-rails
207+
heroku
195208
jquery-rails
209+
pg (= 0.11.0)
196210
rabl
197-
rails (= 3.1.0.rc3)
198-
rake (= 0.8.7)
211+
rails (= 3.1.0)
199212
rspec-rails
200-
ruby-debug19
201213
sass
202-
sqlite3
214+
taps
203215
therubyracer (= 0.9.0)
204216
turn
205217
uglifier

README

100644100755
File mode changed.

Rakefile

100644100755
File mode changed.

app/assets/images/ajax-loader.png

100644100755
File mode changed.

app/assets/images/icon-search-black.png

100644100755
File mode changed.

app/assets/images/icons-18-black.png

100644100755
File mode changed.

app/assets/images/icons-18-white.png

100644100755
File mode changed.

app/assets/images/icons-36-black.png

100644100755
File mode changed.

app/assets/images/icons-36-white.png

100644100755
File mode changed.

app/assets/images/rails.png

100644100755
File mode changed.

app/assets/javascripts/accounts.js.coffee

100644100755
File mode changed.

app/assets/javascripts/application.js

100644100755
File mode changed.

app/assets/javascripts/budgets.js.coffee

100644100755
File mode changed.

app/assets/javascripts/envelopes.js.coffee

100644100755
File mode changed.

app/assets/javascripts/jquery.mobile-1.0a4.1.min.js

100644100755
File mode changed.

app/assets/javascripts/sessions.js.coffee

100644100755
File mode changed.

app/assets/javascripts/transactions.js.coffee

100644100755
File mode changed.

app/assets/stylesheets/accounts.css.scss

100644100755
File mode changed.

app/assets/stylesheets/application.css

100644100755
File mode changed.

app/assets/stylesheets/budgets.css.scss

100644100755
File mode changed.

app/assets/stylesheets/envelopes.css.scss

100644100755
File mode changed.

app/assets/stylesheets/jquery.mobile-1.0a4.1.min.css

100644100755
File mode changed.

app/assets/stylesheets/sessions.css.scss

100644100755
File mode changed.

app/assets/stylesheets/transactions.css.scss

100644100755
File mode changed.

app/controllers/accounts_controller.rb

100644100755
File mode changed.

app/controllers/api/v1/accounts_controller.rb

100644100755
File mode changed.

app/controllers/api/v1/base_controller.rb

100644100755
File mode changed.

app/controllers/api/v1/envelopes_controller.rb

100644100755
File mode changed.

app/controllers/api/v1/transactions_controller.rb

100644100755
File mode changed.

app/controllers/application_controller.rb

100644100755
File mode changed.

app/controllers/budgets_controller.rb

100644100755
File mode changed.

app/controllers/envelopes_controller.rb

100644100755
File mode changed.

app/controllers/sessions_controller.rb

100644100755
File mode changed.

app/controllers/transactions_controller.rb

100644100755
File mode changed.

app/helpers/accounts_helper.rb

100644100755
File mode changed.

app/helpers/api/v1/accounts_helper.rb

100644100755
File mode changed.

app/helpers/api/v1/base_helper.rb

100644100755
File mode changed.

app/helpers/api/v1/envelopes_helper.rb

100644100755
File mode changed.

app/helpers/api/v1/transactions_helper.rb

100644100755
File mode changed.

app/helpers/application_helper.rb

100644100755
File mode changed.

app/helpers/budgets_helper.rb

100644100755
File mode changed.

app/helpers/envelopes_helper.rb

100644100755
File mode changed.

app/helpers/sessions_helper.rb

100644100755
File mode changed.

app/helpers/transactions_helper.rb

100644100755
File mode changed.

app/mailers/.gitkeep

100644100755
File mode changed.

app/models/.gitkeep

100644100755
File mode changed.

app/models/account.rb

100644100755
File mode changed.

app/models/budget.rb

100644100755
File mode changed.

app/models/envelope.rb

100644100755
File mode changed.

app/models/transaction.rb

100644100755
File mode changed.

app/models/user.rb

100644100755
File mode changed.

app/views/accounts/index.html.haml

100644100755
File mode changed.

app/views/accounts/index.json.rabl

100644100755
File mode changed.

app/views/accounts/show.html.haml

100644100755
File mode changed.

app/views/accounts/show.json.rabl

100644100755
File mode changed.

app/views/api/v1/accounts/create.rabl

100644100755
File mode changed.

app/views/api/v1/accounts/index.rabl

100644100755
File mode changed.

app/views/api/v1/accounts/show.rabl

100644100755
File mode changed.

app/views/api/v1/envelopes/create.rabl

100644100755
File mode changed.

app/views/api/v1/envelopes/index.rabl

100644100755
File mode changed.

app/views/api/v1/envelopes/show.rabl

100644100755
File mode changed.

app/views/api/v1/transactions/create.rabl

100644100755
File mode changed.

app/views/budgets/index.html.haml

100644100755
File mode changed.

app/views/envelopes/show.html.haml

100644100755
File mode changed.

app/views/layouts/application.html.haml

100644100755
File mode changed.

app/views/sessions/new.html.haml

100644100755
File mode changed.

config.ru

100644100755
File mode changed.

config/application.rb

100644100755
File mode changed.

config/boot.rb

100644100755
File mode changed.

config/cucumber.yml

100644100755
File mode changed.

config/database.yml

100644100755
+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
development:
2-
adapter: sqlite3
3-
database: db/development.sqlite3
4-
pool: 5
5-
timeout: 5000
1+
production:
2+
adapter: postgresql
3+
database: schooka_production
4+
username: postgres
5+
password: 14931493
6+
host: localhost
7+
encoding: UTF8

config/environment.rb

100644100755
File mode changed.

config/environments/development.rb

100644100755
File mode changed.

config/environments/production.rb

100644100755
File mode changed.

config/environments/test.rb

100644100755
File mode changed.

config/initializers/backtrace_silencers.rb

100644100755
File mode changed.

config/initializers/inflections.rb

100644100755
File mode changed.

config/initializers/mime_types.rb

100644100755
File mode changed.

config/initializers/secret_token.rb

100644100755
File mode changed.

config/initializers/session_store.rb

100644100755
File mode changed.

config/initializers/wrap_parameters.rb

100644100755
File mode changed.

config/locales/en.yml

100644100755
File mode changed.

config/routes.rb

100644100755
File mode changed.

db/migrate/20110528055210_create_users.rb

100644100755
File mode changed.

db/migrate/20110528061836_create_accounts.rb

100644100755
File mode changed.

db/migrate/20110528061848_create_budgets.rb

100644100755
File mode changed.

db/migrate/20110528063816_create_envelopes.rb

100644100755
File mode changed.

db/migrate/20110528064816_create_transactions.rb

100644100755
File mode changed.

db/migrate/20110530211541_change_user_last_login_to_date_time.rb

100644100755
File mode changed.

db/migrate/20110530212244_add_previous_last_login_to_user.rb

100644100755
File mode changed.

0 commit comments

Comments
 (0)