Skip to content

Commit 0198821

Browse files
author
Mike Dvorkin
committed
Upgraded to Rails 3.0.7; updated gems; replaced ffaker gem with faker; updated stylesheets to use new SASS syntax
1 parent 8c7b87b commit 0198821

23 files changed

+748
-915
lines changed

‎Gemfile

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
source 'http://rubygems.org'
22

3-
gem 'rails', '3.0.3'
3+
gem 'rails', '3.0.7'
44

55
# Loads the database adapter gem based on config/database.yml (Default: mysql2)
66
# -----------------------------------------------------------------------------
7-
db_gems = {"mysql2" => ["mysql2", ">= 0.2.6"],
8-
"mysql" => ["mysql"],
9-
"postgresql" => ["pg", ">= 0.9.0"],
10-
"sqlite3" => ["sqlite3"]}
7+
db_gems = {
8+
"mysql2" => [ "mysql2", "0.2.7" ], # The latest 0.3.2 doesn't ship with ActiveRecord adapter as it's now part of Rails 3.1.
9+
"mysql" => [ "mysql" ], # With Rails 3.0.x we're supposed to use mysql2 0.2.x release.
10+
"postgresql" => [ "pg", ">= 0.9.0" ],
11+
"sqlite3" => [ "sqlite3" ]
12+
}
1113
adapter = if File.exists?(db_config = File.join(File.dirname(__FILE__),"config","database.yml"))
1214
db = YAML.load_file(db_config)
1315
# Fetch the first configured adapter from config/database.yml
@@ -23,9 +25,10 @@ end
2325
# -----------------------------------------------------------------------------
2426

2527
gem 'acts_as_commentable', '>= 3.0.1'
26-
gem 'acts-as-taggable-on', '>= 2.0.6'
28+
# gem 'acts-as-taggable-on', '>= 2.0.6'
2729
gem 'authlogic', :git => 'git://github.com/crossroads/authlogic.git', :branch => 'rails3'
28-
gem 'haml', '>= 3.0.24'
30+
gem 'haml', '>= 3.1.1'
31+
gem 'sass', '>= 3.1.1'
2932
gem 'is_paranoid', :git => 'git://github.com/crossroads/is_paranoid.git', :branch => 'rails3'
3033
gem 'paperclip', :git => 'git://github.com/crossroads/paperclip.git'
3134
gem 'will_paginate', '>= 3.0.pre2'
@@ -40,9 +43,9 @@ group :development, :test do
4043
gem 'awesome_print', '>= 0.3.1'
4144

4245
gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
43-
gem "rspec-rails", '>= 2.4.1'
44-
gem 'ffaker', '>= 1.0.0'
45-
gem 'factory_girl', '>= 1.3.2'
46+
gem "rspec-rails", '>= 2.5.0'
47+
gem 'faker', '>= 0.9.5'
48+
gem 'factory_girl', '>= 1.3.3'
4649
end
4750

4851

‎Gemfile.lock

+48-47
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,32 @@ GEM
2525
remote: http://rubygems.org/
2626
specs:
2727
abstract (1.0.0)
28-
actionmailer (3.0.3)
29-
actionpack (= 3.0.3)
30-
mail (~> 2.2.9)
31-
actionpack (3.0.3)
32-
activemodel (= 3.0.3)
33-
activesupport (= 3.0.3)
28+
actionmailer (3.0.7)
29+
actionpack (= 3.0.7)
30+
mail (~> 2.2.15)
31+
actionpack (3.0.7)
32+
activemodel (= 3.0.7)
33+
activesupport (= 3.0.7)
3434
builder (~> 2.1.2)
3535
erubis (~> 2.6.6)
36-
i18n (~> 0.4)
36+
i18n (~> 0.5.0)
3737
rack (~> 1.2.1)
38-
rack-mount (~> 0.6.13)
39-
rack-test (~> 0.5.6)
38+
rack-mount (~> 0.6.14)
39+
rack-test (~> 0.5.7)
4040
tzinfo (~> 0.3.23)
41-
activemodel (3.0.3)
42-
activesupport (= 3.0.3)
41+
activemodel (3.0.7)
42+
activesupport (= 3.0.7)
4343
builder (~> 2.1.2)
44-
i18n (~> 0.4)
45-
activerecord (3.0.3)
46-
activemodel (= 3.0.3)
47-
activesupport (= 3.0.3)
44+
i18n (~> 0.5.0)
45+
activerecord (3.0.7)
46+
activemodel (= 3.0.7)
47+
activesupport (= 3.0.7)
4848
arel (~> 2.0.2)
4949
tzinfo (~> 0.3.23)
50-
activeresource (3.0.3)
51-
activemodel (= 3.0.3)
52-
activesupport (= 3.0.3)
53-
activesupport (3.0.3)
54-
acts-as-taggable-on (2.0.6)
50+
activeresource (3.0.7)
51+
activemodel (= 3.0.7)
52+
activesupport (= 3.0.7)
53+
activesupport (3.0.7)
5554
acts_as_commentable (3.0.1)
5655
annotate (2.4.0)
5756
archive-tar-minitar (0.5.2)
@@ -63,37 +62,38 @@ GEM
6362
erubis (2.6.6)
6463
abstract (>= 1.0.0)
6564
factory_girl (1.3.3)
66-
ffaker (1.4.0)
67-
haml (3.0.25)
68-
hoe (2.9.1)
65+
faker (0.9.5)
66+
i18n (~> 0.4)
67+
haml (3.1.1)
68+
hoe (2.9.4)
6969
rake (>= 0.8.7)
7070
i18n (0.5.0)
71-
linecache19 (0.5.11)
71+
linecache19 (0.5.12)
7272
ruby_core_source (>= 0.1.4)
73-
mail (2.2.15)
73+
mail (2.2.19)
7474
activesupport (>= 2.3.6)
7575
i18n (>= 0.4.0)
7676
mime-types (~> 1.16)
7777
treetop (~> 1.4.8)
7878
mime-types (1.16)
79-
mysql2 (0.2.6)
79+
mysql2 (0.2.7)
8080
polyglot (0.3.1)
8181
rack (1.2.2)
82-
rack-mount (0.6.13)
82+
rack-mount (0.6.14)
8383
rack (>= 1.0.0)
8484
rack-test (0.5.7)
8585
rack (>= 1.0)
86-
rails (3.0.3)
87-
actionmailer (= 3.0.3)
88-
actionpack (= 3.0.3)
89-
activerecord (= 3.0.3)
90-
activeresource (= 3.0.3)
91-
activesupport (= 3.0.3)
86+
rails (3.0.7)
87+
actionmailer (= 3.0.7)
88+
actionpack (= 3.0.7)
89+
activerecord (= 3.0.7)
90+
activeresource (= 3.0.7)
91+
activesupport (= 3.0.7)
9292
bundler (~> 1.0)
93-
railties (= 3.0.3)
94-
railties (3.0.3)
95-
actionpack (= 3.0.3)
96-
activesupport (= 3.0.3)
93+
railties (= 3.0.7)
94+
railties (3.0.7)
95+
actionpack (= 3.0.7)
96+
activesupport (= 3.0.7)
9797
rake (>= 0.8.7)
9898
thor (~> 0.14.4)
9999
rake (0.8.7)
@@ -110,41 +110,42 @@ GEM
110110
activesupport (~> 3.0)
111111
railties (~> 3.0)
112112
rspec (~> 2.5.0)
113-
ruby-debug-base19 (0.11.24)
113+
ruby-debug-base19 (0.11.25)
114114
columnize (>= 0.3.1)
115115
linecache19 (>= 0.5.11)
116116
ruby_core_source (>= 0.1.4)
117117
ruby-debug19 (0.11.6)
118118
columnize (>= 0.3.1)
119119
linecache19 (>= 0.5.11)
120120
ruby-debug-base19 (>= 0.11.19)
121-
ruby_core_source (0.1.4)
121+
ruby_core_source (0.1.5)
122122
archive-tar-minitar (>= 0.5.2)
123+
sass (3.1.1)
123124
test-unit (1.2.3)
124125
hoe (>= 1.5.1)
125126
thor (0.14.6)
126127
treetop (1.4.9)
127128
polyglot (>= 0.3.1)
128-
tzinfo (0.3.25)
129+
tzinfo (0.3.27)
129130
will_paginate (3.0.pre2)
130131

131132
PLATFORMS
132133
ruby
133134

134135
DEPENDENCIES
135-
acts-as-taggable-on (>= 2.0.6)
136136
acts_as_commentable (>= 3.0.1)
137137
annotate (>= 2.4.0)
138138
authlogic!
139139
awesome_print (>= 0.3.1)
140-
factory_girl (>= 1.3.2)
141-
ffaker (>= 1.0.0)
142-
haml (>= 3.0.24)
140+
factory_girl (>= 1.3.3)
141+
faker (>= 0.9.5)
142+
haml (>= 3.1.1)
143143
is_paranoid!
144-
mysql2 (>= 0.2.6)
144+
mysql2 (= 0.2.7)
145145
paperclip!
146-
rails (= 3.0.3)
147-
rspec-rails (>= 2.4.1)
146+
rails (= 3.0.7)
147+
rspec-rails (>= 2.5.0)
148148
ruby-debug19
149+
sass (>= 3.1.1)
149150
test-unit (= 1.2.3)
150151
will_paginate (>= 3.0.pre2)

‎app/stylesheets/base.sass

+43-43
Original file line numberDiff line numberDiff line change
@@ -15,77 +15,77 @@
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
//------------------------------------------------------------------------------
1717
18-
!color_body = #e5e5e5
19-
!color_link = #0033cc
20-
!color_link_hover = "white"
21-
!color_link_hover_background = #0033cc
22-
!color_link_image = "white"
23-
!color_link_image_background = "white"
18+
$color_body: #e5e5e5
19+
$color_link: #0033cc
20+
$color_link_hover: white
21+
$color_link_hover_background: #0033cc
22+
$color_link_image: white
23+
$color_link_image_background: white
2424

2525
// Standard HTML tags.
2626
//------------------------------------------------------------------------------
2727
html, body
28-
:background = !color_body
29-
:font
30-
:size-adjust none
31-
:stretch normal
32-
:style normal
33-
:variant normal
34-
:weight normal
35-
:height 100%
36-
:line-height normal
28+
background: $color_body
29+
font:
30+
size-adjust: none
31+
stretch: normal
32+
style: normal
33+
variant: normal
34+
weight: normal
35+
height: 100%
36+
line-height: normal
3737

3838
body, ol, ul, li, dt, tt, label, input, select, textarea
39-
:font
40-
:size 12px
41-
:family "Lucida Grande", Geneva, Arial, Helvetica, sans-serif
39+
font:
40+
size: 12px
41+
family: "Lucida Grande", Geneva, Arial, Helvetica, sans-serif
4242

4343
body, h1, h2, h3, h4, h5, h6, ol, ul, li
44-
:margin 0px
45-
:padding 0px
44+
margin: 0px
45+
padding: 0px
4646

4747
form
48-
:margin 0px
48+
margin: 0px
4949

5050
ul li
51-
:list-style-type none
51+
list-style-type: none
5252

5353
// Links.
5454
//------------------------------------------------------------------------------
5555
a
56-
:text-decoration none
57-
&:link, &:visited
58-
:color = !color_link
59-
&:hover
60-
:background = !color_link_hover_background
61-
:color = !color_link_hover
56+
text-decoration: none
57+
&link, &visited
58+
color: $color_link
59+
&hover
60+
background: $color_link_hover_background
61+
color: $color_link_hover
6262

6363
img
64-
:background-color = !color_link_image_background
65-
:border none
66-
:color = !color_link_image
67-
:text-decoration none
64+
background-color: $color_link_image_background
65+
border: none
66+
color: $color_link_image
67+
text-decoration: none
6868

6969
#options
7070
a
71-
:border-bottom 1px dotted darkcyan
72-
:color darkcyan
73-
:text-decoration none
74-
&:hover
75-
:background = !color_body
76-
:border-bottom 1px dotted darkblue
77-
:color darkblue
71+
border-bottom: 1px dotted darkcyan
72+
color: darkcyan
73+
text-decoration: none
74+
&hover
75+
background: $color_body
76+
border-bottom: 1px dotted darkblue
77+
color: darkblue
7878

7979
// Smaller fonts.
8080
//------------------------------------------------------------------------------
8181
abbr
82-
:font-size 9px
82+
font-size: 9px
8383

8484
small
85-
:font-size 10px
85+
font-size: 10px
8686

8787
dt
88-
:font-size 11px
88+
font-size: 11px
8989

9090
tt
91-
:font-size 12px
91+
font-size: 12px

0 commit comments

Comments
 (0)