Skip to content

Commit 6a2a23b

Browse files
author
Mike Dvorkin
committed
Fixed link_to_edit helper; upgraded haml, mysql2, and rspec gems
1 parent daf7eba commit 6a2a23b

File tree

3 files changed

+29
-53
lines changed

3 files changed

+29
-53
lines changed

Gemfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ gem 'rails', '3.0.0'
77

88
gem 'acts_as_commentable', '>= 3.0.0'
99
gem 'authlogic', '>= 2.1.6', :path => File.join(File.dirname(__FILE__), 'vendor', 'gems', 'authlogic')
10-
gem 'haml', '>= 3.0.18'
11-
gem 'mysql2', '>= 0.2.3'
10+
gem 'haml', '>= 3.0.21'
11+
gem 'mysql2', '>= 0.2.4'
1212
gem 'paperclip', '>= 2.3.3', :git => "git://github.com/thoughtbot/paperclip.git"
1313
gem 'simple_column_search', '>= 1.1.0'
1414
gem 'will_paginate', '>= 3.0.pre2'
@@ -23,11 +23,11 @@ group :test do
2323
gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
2424
gem 'factory_girl', '>= 1.3.2'
2525
gem 'ffaker', '>= 0.4.0'
26-
gem "rspec-rails", '>=2.0.0.beta.22', :git => "git://github.com/rspec/rspec-rails.git"
27-
gem "rspec", '>=2.0.0.beta.22', :git => "git://github.com/rspec/rspec.git"
28-
gem "rspec-core", '>=2.0.0.beta.22', :git => "git://github.com/rspec/rspec-core.git"
29-
gem "rspec-expectations", '>=2.0.0.beta.22', :git => "git://github.com/rspec/rspec-expectations.git"
30-
gem "rspec-mocks", '>=2.0.0.beta.22', :git => "git://github.com/rspec/rspec-mocks.git"
26+
gem "rspec-rails", '>= 2.0.0'
27+
gem "rspec", '>= 2.0.0'
28+
gem "rspec-core", '>= 2.0.0'
29+
gem "rspec-expectations", '>= 2.0.0'
30+
gem "rspec-mocks", '>= 2.0.0'
3131
end
3232

3333
# Gem watch list:

Gemfile.lock

+21-46
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,3 @@
1-
GIT
2-
remote: git://github.com/rspec/rspec-core.git
3-
revision: e063045
4-
specs:
5-
rspec-core (2.0.0.beta.22)
6-
7-
GIT
8-
remote: git://github.com/rspec/rspec-expectations.git
9-
revision: 311ba91
10-
specs:
11-
rspec-expectations (2.0.0.beta.22)
12-
diff-lcs (>= 1.1.2)
13-
14-
GIT
15-
remote: git://github.com/rspec/rspec-mocks.git
16-
revision: 07bc53f
17-
specs:
18-
rspec-mocks (2.0.0.beta.22)
19-
rspec-core (= 2.0.0.beta.22)
20-
rspec-expectations (= 2.0.0.beta.22)
21-
22-
GIT
23-
remote: git://github.com/rspec/rspec-rails.git
24-
revision: 4321f81
25-
specs:
26-
rspec-rails (2.0.0.beta.22)
27-
rspec (= 2.0.0.beta.22)
28-
29-
GIT
30-
remote: git://github.com/rspec/rspec.git
31-
revision: 3df49f5
32-
specs:
33-
rspec (2.0.0.beta.22)
34-
rspec-core (= 2.0.0.beta.22)
35-
rspec-expectations (= 2.0.0.beta.22)
36-
rspec-mocks (= 2.0.0.beta.22)
37-
381
GIT
392
remote: git://github.com/thoughtbot/paperclip.git
403
revision: 9e6afe4ff5b6b07bb1d50a4cb4bdd85feb1c9bbf
@@ -90,7 +53,7 @@ GEM
9053
abstract (>= 1.0.0)
9154
factory_girl (1.3.2)
9255
ffaker (0.4.0)
93-
haml (3.0.18)
56+
haml (3.0.21)
9457
hoe (2.6.2)
9558
rake (>= 0.8.7)
9659
rubyforge (>= 2.0.4)
@@ -101,7 +64,7 @@ GEM
10164
mime-types
10265
treetop (>= 1.4.5)
10366
mime-types (1.16)
104-
mysql2 (0.2.3)
67+
mysql2 (0.2.4)
10568
polyglot (0.3.1)
10669
rack (1.2.1)
10770
rack-mount (0.6.13)
@@ -122,6 +85,18 @@ GEM
12285
rake (>= 0.8.4)
12386
thor (~> 0.14.0)
12487
rake (0.8.7)
88+
rspec (2.0.0)
89+
rspec-core (= 2.0.0)
90+
rspec-expectations (= 2.0.0)
91+
rspec-mocks (= 2.0.0)
92+
rspec-core (2.0.0)
93+
rspec-expectations (2.0.0)
94+
diff-lcs (>= 1.1.2)
95+
rspec-mocks (2.0.0)
96+
rspec-core (= 2.0.0)
97+
rspec-expectations (= 2.0.0)
98+
rspec-rails (2.0.0)
99+
rspec (= 2.0.0)
125100
rubyforge (2.0.4)
126101
json_pure (>= 1.1.7)
127102
simple_column_search (1.1.0)
@@ -143,15 +118,15 @@ DEPENDENCIES
143118
awesome_print (>= 0.2.1)
144119
factory_girl (>= 1.3.2)
145120
ffaker (>= 0.4.0)
146-
haml (>= 3.0.18)
147-
mysql2 (>= 0.2.3)
121+
haml (>= 3.0.21)
122+
mysql2 (>= 0.2.4)
148123
paperclip (>= 2.3.3)!
149124
rails (= 3.0.0)
150-
rspec (>= 2.0.0.beta.22)!
151-
rspec-core (>= 2.0.0.beta.22)!
152-
rspec-expectations (>= 2.0.0.beta.22)!
153-
rspec-mocks (>= 2.0.0.beta.22)!
154-
rspec-rails (>= 2.0.0.beta.22)!
125+
rspec (>= 2.0.0)
126+
rspec-core (>= 2.0.0)
127+
rspec-expectations (>= 2.0.0)
128+
rspec-mocks (>= 2.0.0)
129+
rspec-rails (>= 2.0.0)
155130
simple_column_search (>= 1.1.0)
156131
test-unit (= 1.2.3)
157132
will_paginate (>= 3.0.pre2)

app/helpers/application_helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ def arrow_for(id)
100100

101101
#----------------------------------------------------------------------------
102102
def link_to_edit(model, params = {})
103+
name = model.class.name.underscore.downcase
103104
link_to_remote(t(:edit),
104105
:url => params[:url] || send(:"edit_#{name}_path", model),
105106
:method => :get,

0 commit comments

Comments
 (0)