Permalink
Browse files

Merge pull request #11347 from ankit8898/refactoring-sp

Refactored strong parameters usage and updated Gemfile.lock with Rails 4
  • Loading branch information...
rafaelfranca committed Jul 7, 2013
2 parents 3e953d4 + 53f12b0 commit a67cc28311b0ecb4282ca7d80b5ece959d22628f
@@ -1,150 +1,120 @@
-GIT
- remote: git://github.com/rails/activerecord-deprecated_finders.git
- revision: 2e7b35d7948cefb2bba96438873d7f7bb1961a03
- specs:
- activerecord-deprecated_finders (0.0.2)
-
-GIT
- remote: git://github.com/rails/arel.git
- revision: 38d0a222e275d917a2c1d093b24457bafb600a00
- specs:
- arel (3.0.2.20120819075748)
-
-GIT
- remote: git://github.com/rails/coffee-rails.git
- revision: 052634e6d02d4800d7b021201cc8d5829775b3cd
- specs:
- coffee-rails (4.0.0.beta)
- coffee-script (>= 2.2.0)
- railties (>= 4.0.0.beta, < 5.0)
-
-GIT
- remote: git://github.com/rails/sass-rails.git
- revision: ae8138a89cac397c0df903dd533e2862902ce8f5
- specs:
- sass-rails (4.0.0.beta)
- railties (>= 4.0.0.beta, < 5.0)
- sass (>= 3.1.10)
- sprockets-rails (~> 2.0.0.rc0)
- tilt (~> 1.3)
-
-GIT
- remote: git://github.com/rails/sprockets-rails.git
- revision: 09917104fdb42245fe369612a7b0e3d77e1ba763
- specs:
- sprockets-rails (2.0.0.rc1)
- actionpack (>= 3.0)
- activesupport (>= 3.0)
- sprockets (~> 2.8)
-
-PATH
- remote: /Users/steve/src/rails
+GEM
+ remote: https://rubygems.org/
specs:
- actionmailer (4.0.0.beta)
- actionpack (= 4.0.0.beta)
+ actionmailer (4.0.0)
+ actionpack (= 4.0.0)
mail (~> 2.5.3)
- actionpack (4.0.0.beta)
- activesupport (= 4.0.0.beta)
+ actionpack (4.0.0)
+ activesupport (= 4.0.0)
builder (~> 3.1.0)
erubis (~> 2.7.0)
- rack (~> 1.4.3)
- rack-test (~> 0.6.1)
- activemodel (4.0.0.beta)
- activesupport (= 4.0.0.beta)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.0)
+ activesupport (= 4.0.0)
builder (~> 3.1.0)
- activerecord (4.0.0.beta)
- activemodel (= 4.0.0.beta)
- activerecord-deprecated_finders (= 0.0.2)
- activesupport (= 4.0.0.beta)
- arel (~> 3.0.2)
- activesupport (4.0.0.beta)
- i18n (~> 0.6)
- minitest (~> 4.1)
+ activerecord (4.0.0)
+ activemodel (= 4.0.0)
+ activerecord-deprecated_finders (~> 1.0.2)
+ activesupport (= 4.0.0)
+ arel (~> 4.0.0)
+ activerecord-deprecated_finders (1.0.3)
+ activesupport (4.0.0)
+ i18n (~> 0.6, >= 0.6.4)
+ minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
- tzinfo (~> 0.3.33)
- rails (4.0.0.beta)
- actionmailer (= 4.0.0.beta)
- actionpack (= 4.0.0.beta)
- activerecord (= 4.0.0.beta)
- activesupport (= 4.0.0.beta)
- bundler (>= 1.2.2, < 2.0)
- railties (= 4.0.0.beta)
- sprockets-rails (~> 2.0.0.rc1)
- railties (4.0.0.beta)
- actionpack (= 4.0.0.beta)
- activesupport (= 4.0.0.beta)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (>= 0.15.4, < 2.0)
-
-GEM
- remote: https://rubygems.org/
- specs:
- atomic (1.0.1)
+ tzinfo (~> 0.3.37)
+ arel (4.0.0)
+ atomic (1.1.10)
builder (3.1.4)
+ coffee-rails (4.0.0)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0.beta, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.4.0)
+ coffee-script-source (1.6.3)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
- hike (1.2.1)
- i18n (0.6.1)
- jbuilder (1.3.0)
+ hike (1.2.3)
+ i18n (0.6.4)
+ jbuilder (1.4.2)
activesupport (>= 3.0.0)
- jquery-rails (2.2.0)
+ multi_json (>= 1.2.0)
+ jquery-rails (3.0.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.6)
- mail (2.5.3)
- i18n (>= 0.4.0)
+ json (1.8.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- minitest (4.4.0)
- multi_json (1.5.0)
+ mime-types (1.23)
+ minitest (4.7.5)
+ multi_json (1.7.7)
polyglot (0.3.3)
- rack (1.4.4)
+ rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rake (10.0.3)
- rdoc (3.12)
+ rails (4.0.0)
+ actionmailer (= 4.0.0)
+ actionpack (= 4.0.0)
+ activerecord (= 4.0.0)
+ activesupport (= 4.0.0)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.0)
+ sprockets-rails (~> 2.0.0)
+ railties (4.0.0)
+ actionpack (= 4.0.0)
+ activesupport (= 4.0.0)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (10.1.0)
+ rdoc (3.12.2)
json (~> 1.4)
- sass (3.2.5)
- sprockets (2.8.2)
+ sass (3.2.9)
+ sass-rails (4.0.0)
+ railties (>= 4.0.0.beta, < 5.0)
+ sass (>= 3.1.10)
+ sprockets-rails (~> 2.0.0)
+ sdoc (0.3.20)
+ json (>= 1.1.3)
+ rdoc (~> 3.10)
+ sprockets (2.10.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sprockets-rails (2.0.0)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (~> 2.8)
sqlite3 (1.3.7)
- thor (0.16.0)
+ thor (0.18.1)
thread_safe (0.1.0)
atomic
- tilt (1.3.3)
- treetop (1.4.12)
+ tilt (1.4.1)
+ treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
- turbolinks (1.0.0)
+ turbolinks (1.2.0)
coffee-rails
- tzinfo (0.3.35)
- uglifier (1.3.0)
+ tzinfo (0.3.37)
+ uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
PLATFORMS
ruby
DEPENDENCIES
- activerecord-deprecated_finders!
- arel!
- coffee-rails!
- jbuilder (~> 1.0.1)
+ coffee-rails
+ jbuilder (~> 1.2)
jquery-rails
- rails!
- sass-rails!
- sprockets-rails!
+ rails (= 4.0.0)
+ sass-rails
+ sdoc
sqlite3
turbolinks
uglifier (>= 1.0.3)
@@ -4,7 +4,7 @@ class CommentsController < ApplicationController
def create
@post = Post.find(params[:post_id])
- @comment = @post.comments.create(params[:comment].permit(:commenter, :body))
+ @comment = @post.comments.create(comment_params)
redirect_to post_path(@post)
end
@@ -14,4 +14,10 @@ def destroy
@comment.destroy
redirect_to post_path(@post)
end
+
+ private
+
+ def comment_params
+ params.require(:comment).permit(:commenter, :body)
+ end
end
@@ -17,7 +17,7 @@ def edit
def update
@post = Post.find(params[:id])
- if @post.update(params[:post].permit(:title, :text))
+ if @post.update(post_params)
redirect_to action: :show, id: @post.id
else
render 'edit'
@@ -29,7 +29,7 @@ def new
end
def create
- @post = Post.new(params[:post].permit(:title, :text))
+ @post = Post.new(post_params)
if @post.save
redirect_to action: :show, id: @post.id
@@ -44,4 +44,10 @@ def destroy
redirect_to action: :index
end
+
+ private
+
+ def post_params
+ params.require(:post).permit(:title, :text)
+ end
end
@@ -1,3 +1,4 @@
<h1>Hello, Rails!</h1>
<%= link_to "My Blog", controller: "posts" %>
+<%= link_to "New Post", new_post_path %>

0 comments on commit a67cc28

Please sign in to comment.