enju_question 0.1.0.pre13 → 0.1.0.pre14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ecc1065776585a67c92f3f44b8b16ab961eb0f
-  data.tar.gz: d70e615307eaeb402b0f6d02f80ccf45a55de491
+  metadata.gz: 101535f4eb4968f929c27c8a7069d5c02f29a0eb
+  data.tar.gz: 6125d6da856d612f25fec130cb5a26df86da7239
 SHA512:
-  metadata.gz: 2fcef2da47cd00ea941882ec3a383726af4e93cd12f6722896b632436e01d0faef6911c2d7179e0527b13a42cde138d4a4722142be15ae870ab27dcfa4ba0c4c
-  data.tar.gz: d160eb04967edc55516b8735ed7bd64d2a7f02b6564126575a7ddb207c45987ad5aacc1a7b8e2be0b1ae09a4daa9e57d08106256bb4741717d297f3fb1481c5e
+  metadata.gz: f5cf4a94f2bd3c0d91913d093c936a9625309a42a1ad33f8b3bdc3a7908c969c73462c490b1ee3592210d24d40869d8a3a3b5642afa1b3f8d3baa0950dad806b
+  data.tar.gz: f323e652656e605b677d4f7b0716f61a14f4db15401ae36453f1acba56a571b8f751f8f724793d810f5a6c3a87595934681ab5318049fcfce2e1a425257703b0

data/README.rdoc

@@ -1,3 +1,10 @@
 = EnjuQuestion
+{<img src="https://secure.travis-ci.org/next-l/enju_question.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_question]
+{<img src="https://coveralls.io/repos/next-l/enju_question/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_question?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_question/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_question/1.1]
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/answers_controller.rb

@@ -91,7 +91,7 @@ class AnswersController < ApplicationController
   # POST /answers
   # POST /answers.json
   def create
-    @answer = Answer.new(params[:answer])
+    @answer = Answer.new(answer_params)
     @answer.user = current_user
     unless @answer.question
       redirect_to questions_url
@@ -116,7 +116,7 @@ class AnswersController < ApplicationController
   # PUT /answers/1.json
   def update
     respond_to do |format|
-      if @answer.update_attributes(params[:answer])
+      if @answer.update_attributes(answer_update_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.answer'))
         format.html { redirect_to @answer }
         format.json { head :no_content }
@@ -137,4 +137,17 @@ class AnswersController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def answer_params
+    params.require(:answer).permit(
+      :question_id, :body, :item_identifier_list, :url_list
+    )
+  end
+
+  def answer_update_params
+    params.require(:answer).permit(
+      :body, :item_identifier_list, :url_list
+    )
+  end
 end

data/app/controllers/questions_controller.rb

@@ -129,7 +129,7 @@ class QuestionsController < ApplicationController
   # POST /questions
   # POST /questions.json
   def create
-    @question = Question.new(params[:question])
+    @question = Question.new(question_params)
     @question.user = current_user
 
     respond_to do |format|
@@ -148,7 +148,7 @@ class QuestionsController < ApplicationController
   # PUT /questions/1.json
   def update
     respond_to do |format|
-      if @question.update_attributes(params[:question])
+      if @question.update_attributes(question_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.question'))
         format.html { redirect_to @question }
         format.json { head :no_content }
@@ -169,4 +169,9 @@ class QuestionsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def question_params
+    params.require(:question).permit(:body, :shared, :solved, :note)
+  end
 end

data/app/models/answer.rb

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Answer < ActiveRecord::Base
-  attr_accessible :question_id, :body, :item_identifier_list, :url_list
   default_scope { order('answers.id ASC') }
   #scope :public_answers, where(:shared => true)
   #scope :private_answers, where(:shared => false)

data/app/models/answer_has_item.rb

@@ -1,5 +1,4 @@
 class AnswerHasItem < ActiveRecord::Base
-  attr_accessible :answer_id, :item_id
   belongs_to :answer
   belongs_to :item
 

data/app/models/question.rb

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 class Question < ActiveRecord::Base
-  attr_accessible :body, :shared, :solved, :note
   default_scope { order('id DESC') }
   scope :public_questions, -> {where(shared: true)}
   scope :private_questions, -> {where(shared: false)}

data/lib/enju_question/engine.rb

@@ -1,4 +1,3 @@
-require 'enju_seed'
 require 'acts-as-taggable-on'
 require 'enju_ndl'
 

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.1.0.pre13"
+  VERSION = "0.1.0.pre14"
 end

data/spec/controllers/answers_controller_spec.rb

@@ -37,24 +37,24 @@ describe AnswersController do
       end
 
       it "should get to my index if user_id is specified" do
-        get :index, :user_id => users(:user1).username
+        get :index, user_id: users(:user1).username
         response.should be_success
         assigns(:answers).should eq users(:user1).answers.order('answers.id DESC').page(1)
       end
 
       it "should not get other user's index without user_id" do
-        get :index, :user_id => users(:user2).username
+        get :index, user_id: users(:user2).username
         response.should be_forbidden
       end
 
       it "should get my index feed" do
-        get :index, :user_id => users(:user1).username, :format => 'rss'
+        get :index, user_id: users(:user1).username, format: 'rss'
         response.should be_success
         assigns(:answers).should_not be_empty
       end
 
       it "should not get other user's index if question is not shared" do
-        get :index, :user_id => users(:librarian1).username, :question_id => 2
+        get :index, user_id: users(:librarian1).username, question_id: 2
         response.should be_forbidden
       end
     end
@@ -67,24 +67,24 @@ describe AnswersController do
       end
 
       it "should not get index with other user's question_id" do
-        get :index, :question_id => 1
+        get :index, question_id: 1
         assigns(:answers).should eq assigns(:question).answers.order('answers.id DESC').page(1)
         response.should be_success
       end
 
       it "should get other user's index if question is shared" do
-        get :index, :question_id => 5
+        get :index, question_id: 5
         response.should be_success
         assigns(:answers).should eq assigns(:question).answers.order('answers.id DESC').page(1)
       end
 
       it "should not get other user's index feed if question is not shared" do
-        get :index, :question_id => 2, :format => 'rss'
+        get :index, question_id: 2, format: 'rss'
         response.should be_client_error
       end
 
       it "should get other user's index feed if question is shared" do
-        get :index, :question_id => 5, :format => 'rss'
+        get :index, question_id: 5, format: 'rss'
         response.should be_success
         assigns(:answers).should eq assigns(:question).answers.order('answers.id DESC').page(1)
       end
@@ -97,7 +97,7 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :show, :id => answer.id
+        get :show, id: answer.id
         assigns(:answer).should eq(answer)
       end
     end
@@ -107,7 +107,7 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :show, :id => answer.id
+        get :show, id: answer.id
         assigns(:answer).should eq(answer)
       end
     end
@@ -117,47 +117,47 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :show, :id => answer.id
+        get :show, id: answer.id
         assigns(:answer).should eq(answer)
       end
 
       it "should show answer without user_id" do
-        get :show, :id => 1, :question_id => 1
+        get :show, id: 1, question_id: 1
         assigns(:answer).should eq(answers(:answer_00001))
         assert_response :success
       end
 
       it "should show public answer without question_id" do
-        get :show, :id => 3, :user_id => users(:user1).username
+        get :show, id: 3, user_id: users(:user1).username
         assigns(:answer).should eq(Answer.find(3))
         assert_response :success
       end
 
       it "should show my answer" do
-        get :show, :id => 3, :user_id => users(:user1).username
+        get :show, id: 3, user_id: users(:user1).username
         assigns(:answer).should eq(Answer.find(3))
         assert_response :success
       end
 
       it "should not show private answer" do
-        get :show, :id => 4, :user_id => users(:user1).username
+        get :show, id: 4, user_id: users(:user1).username
         response.should be_forbidden
       end
 
       it "should not show missing answer" do
         lambda{
-          get :show, :id => 'missing', :user_id => users(:user1).username, :question_id => 1
+          get :show, id: 'missing', user_id: users(:user1).username, question_id: 1
         }.should raise_error(ActiveRecord::RecordNotFound)
         #response.should be_missing
       end
 
       it "should not show answer with other user's user_id" do
-        get :show, :id => 5, :user_id => users(:user2).username, :question_id => 2
+        get :show, id: 5, user_id: users(:user2).username, question_id: 2
         response.should be_forbidden
       end
 
       it "should not show answer without other user's user_id" do
-        get :show, :id => 5, :question_id => 2
+        get :show, id: 5, question_id: 2
         response.should be_forbidden
       end
     end
@@ -165,18 +165,18 @@ describe AnswersController do
     describe "When not logged in" do
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :show, :id => answer.id
+        get :show, id: answer.id
         assigns(:answer).should eq(answer)
       end
 
       it "should show public_answer" do
-        get :show, :id => 1, :question_id => 1
+        get :show, id: 1, question_id: 1
         assigns(:answer).should eq(Answer.find(1))
         response.should be_success
       end
 
       it "should not show private answer" do
-        get :show, :id => 4, :question_id => 1
+        get :show, id: 4, question_id: 1
         assigns(:answer).should eq(Answer.find(4))
         response.should redirect_to new_user_session_url
       end
@@ -211,7 +211,7 @@ describe AnswersController do
       end
 
       it "should get new template with question_id" do
-        get :new, :question_id => 1
+        get :new, question_id: 1
         assigns(:answer).should_not be_valid
         response.should be_success
       end
@@ -232,7 +232,7 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :edit, :id => answer.id
+        get :edit, id: answer.id
         assigns(:answer).should eq(answer)
       end
     end
@@ -242,7 +242,7 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :edit, :id => answer.id
+        get :edit, id: answer.id
         assigns(:answer).should eq(answer)
       end
     end
@@ -252,39 +252,39 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :edit, :id => answer.id
+        get :edit, id: answer.id
         response.should be_forbidden
       end
 
       it "should edit my answer without user_id" do
-        get :edit, :id => 3, :question_id => 1
+        get :edit, id: 3, question_id: 1
         response.should be_success
       end
   
       it "should not edit other answer without user_id" do
-        get :edit, :id => 4, :question_id => 1
+        get :edit, id: 4, question_id: 1
         response.should be_forbidden
       end
   
       it "should edit answer without question_id" do
-        get :edit, :id => 3 , :user_id => users(:user1).username
+        get :edit, id: 3 , user_id: users(:user1).username
         response.should be_success
       end
   
       it "should not edit missing answer" do
         lambda{
-          get :edit, :id => 100, :user_id => users(:user1).username, :question_id => 1
+          get :edit, id: 100, user_id: users(:user1).username, question_id: 1
         }.should raise_error(ActiveRecord::RecordNotFound)
         #response.should be_missing
       end
 
       it "should edit my answer" do
-        get :edit, :id => 3, :user_id => users(:user1).username, :question_id => 1
+        get :edit, id: 3, user_id: users(:user1).username, question_id: 1
         response.should be_success
       end
   
       it "should not edit other user's answer" do
-        get :edit, :id => 5, :user_id => users(:user2).username, :question_id => 2
+        get :edit, id: 5, user_id: users(:user2).username, question_id: 2
         response.should be_forbidden
       end
     end
@@ -292,7 +292,7 @@ describe AnswersController do
     describe "When not logged in" do
       it "should not assign the requested answer as @answer" do
         answer = FactoryGirl.create(:answer)
-        get :edit, :id => answer.id
+        get :edit, id: answer.id
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -301,25 +301,25 @@ describe AnswersController do
   describe "POST create" do
     before(:each) do
       @attrs = FactoryGirl.attributes_for(:answer)
-      @invalid_attrs = {:body => ''}
+      @invalid_attrs = {body: ''}
     end
 
     describe "When logged in as User" do
       login_fixture_user
 
       it "should create answer without user_id" do
-        post :create, :answer => {:question_id => 1, :body => 'hoge'}
+        post :create, answer: {question_id: 1, body: 'hoge'}
         response.should redirect_to answer_url(assigns(:answer))
       end
 
       it "should not create answer without question_id" do
-        post :create, :answer => {:body => 'hoge'}
+        post :create, answer: {body: 'hoge'}
         assigns(:answer).should_not be_valid
         response.should redirect_to questions_url
       end
 
       it "should create answer with question_id" do
-        post :create, :answer => {:question_id => 1, :body => 'hoge'}
+        post :create, answer: {question_id: 1, body: 'hoge'}
         assigns(:answer).should be_valid
         response.should redirect_to answer_url(assigns(:answer))
       end
@@ -328,24 +328,24 @@ describe AnswersController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created answer as @answer" do
-          post :create, :answer => @attrs
+          post :create, answer: @attrs
           assigns(:answer).should_not be_valid
         end
 
         it "redirects to the created answer" do
-          post :create, :answer => @attrs
+          post :create, answer: @attrs
           response.should redirect_to new_user_session_url
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved answer as @answer" do
-          post :create, :answer => @invalid_attrs
+          post :create, answer: @invalid_attrs
           assigns(:answer).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :answer => @invalid_attrs
+          post :create, answer: @invalid_attrs
           response.should redirect_to new_user_session_url
         end
       end
@@ -355,8 +355,8 @@ describe AnswersController do
   describe "PUT update" do
     before(:each) do
       @answer = answers(:answer_00001)
-      @attrs = {:body => 'test'}
-      @invalid_attrs = {:body => ''}
+      @attrs = {body: 'test'}
+      @invalid_attrs = {body: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -364,18 +364,18 @@ describe AnswersController do
 
       describe "with valid params" do
         it "updates the requested answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @attrs
+          put :update, id: answers(:answer_00003).id, answer: @attrs
         end
 
         it "assigns the requested answer as @answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @attrs
+          put :update, id: answers(:answer_00003).id, answer: @attrs
           assigns(:answer).should eq(Answer.find(3))
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested answer as @answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @invalid_attrs
+          put :update, id: answers(:answer_00003).id, answer: @invalid_attrs
           response.should render_template("edit")
         end
       end
@@ -386,24 +386,24 @@ describe AnswersController do
 
       describe "with valid params" do
         it "updates the requested answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @attrs
+          put :update, id: answers(:answer_00003).id, answer: @attrs
         end
 
         it "assigns the requested answer as @answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @attrs
+          put :update, id: answers(:answer_00003).id, answer: @attrs
           assigns(:answer).should eq(Answer.find(3))
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested answer as @answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @invalid_attrs
+          put :update, id: answers(:answer_00003).id, answer: @invalid_attrs
           response.should render_template("edit")
         end
       end
 
       it "should update other user's answer" do
-        put :update, :id => 3, :answer => { }, :user_id => users(:user1).username
+        put :update, id: 3, answer: {body: 'test'}, user_id: users(:user1).username
         response.should redirect_to answer_url(assigns(:answer))
       end
     end
@@ -413,41 +413,41 @@ describe AnswersController do
 
       describe "with valid params" do
         it "updates the requested answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @attrs
+          put :update, id: answers(:answer_00003).id, answer: @attrs
         end
 
         it "assigns the requested answer as @answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @attrs
+          put :update, id: answers(:answer_00003).id, answer: @attrs
           assigns(:answer).should eq(Answer.find(3))
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested answer as @answer" do
-          put :update, :id => answers(:answer_00003).id, :answer => @invalid_attrs
+          put :update, id: answers(:answer_00003).id, answer: @invalid_attrs
           response.should render_template("edit")
         end
       end
 
       it "should update my answer" do
-        put :update, :id => answers(:answer_00003), :answer => { }, :user_id => users(:user1).username
+        put :update, id: answers(:answer_00003), answer: {body: 'test'}, user_id: users(:user1).username
         response.should redirect_to answer_url(assigns(:answer))
       end
 
       it "should not update missing answer" do
         lambda{
-          put :update, :id => 'missing', :answer => { }, :user_id => users(:user1).username
+          put :update, id: 'missing', answer: {body: 'test'}, user_id: users(:user1).username
         }.should raise_error(ActiveRecord::RecordNotFound)
         #response.should be_missing
       end
   
       it "should not update other user's answer" do
-        put :update, :id => 5, :answer => { }, :user_id => users(:user2).username
+        put :update, id: 5, answer: {body: 'test'}, user_id: users(:user2).username
         response.should be_forbidden
       end
 
       it "should update my answer with question_id" do
-        put :update, :id => 3, :answer => { }, :user_id => users(:user1).username, :question_id => 1
+        put :update, id: 3, answer: {body: 'test'}, user_id: users(:user1).username, question_id: 1
         response.should redirect_to answer_url(assigns(:answer))
       end
     end
@@ -455,11 +455,11 @@ describe AnswersController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested answer" do
-          put :update, :id => @answer.id, :answer => @attrs
+          put :update, id: @answer.id, answer: @attrs
         end
 
         it "assigns the requested answer as @answer" do
-          put :update, :id => @answer.id, :answer => @attrs
+          put :update, id: @answer.id, answer: @attrs
           assigns(:answer).should eq(@answer)
           response.should redirect_to new_user_session_url
         end
@@ -472,19 +472,19 @@ describe AnswersController do
       login_fixture_user
 
       it "should destroy my answer" do
-        delete :destroy, :id => 3
+        delete :destroy, id: 3
         response.should redirect_to question_answers_url(assigns(:answer).question)
       end
 
       it "should not destroy other user's answer" do
-        delete :destroy, :id => 5
+        delete :destroy, id: 5
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should be forbidden" do
-        delete :destroy, :id => 1
+        delete :destroy, id: 1
         response.should redirect_to new_user_session_url
       end
     end