enju_question 0.2.0 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ab6aedf27bad977bdb6ec51f78e8f97d681158
-  data.tar.gz: c70b515bafd6b1f38d68413f36c8609895d95362
+  metadata.gz: 0dccb9130426b74dbbd512fc1e5f5c4962a8f7b8
+  data.tar.gz: 8e8eaef3a5e39725a34a863e60fea8d17c58a547
 SHA512:
-  metadata.gz: 31b74281816fd86827f03177560c49fce69475c1bf72c47cfe28fc8db765e8c8d9fea15e72656d3f3b8b59db62ada1652c4c01dd5a8f150ee5e4b5f8ec1bf89c
-  data.tar.gz: 0b3b8f93638cbf51882a9afd65555558f00bb0796277cfc73e0954f97bc9c8675854fd851938be415de72f08d51933f8022d897899d9bee9690788cfa72f699d
+  metadata.gz: 76dc78c701b4d6693875f30795228d8dd02bbde47177c18e2e2741b32f9c9fb553acf7adf479e60b11851dd07f6569731b10cb40c17882bcb34e7cedc95998b6
+  data.tar.gz: a5c58779c776a56bcf55cf48afc59cb05e88c84bc47d8fb90173e6aadde477f87456d4767d5139fee27e6ab3fa417d132aadc1dd6ff5fe9dc024e6aaa7c78cb1

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuQuestion
-{<img src="https://travis-ci.org/next-l/enju_question.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_question]
-{<img src="https://coveralls.io/repos/next-l/enju_question/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_question?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_question/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_question/1.2]
+{<img src="https://travis-ci.org/next-l/enju_question.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_question]
+{<img src="https://coveralls.io/repos/next-l/enju_question/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_question?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_question/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_question/1.3]
 
 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])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/answers_controller.rb

@@ -112,7 +112,7 @@ class AnswersController < ApplicationController
   # PUT /answers/1.json
   def update
     respond_to do |format|
-      if @answer.update_attributes(answer_update_params)
+      if @answer.update(answer_update_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.answer'))
         format.html { redirect_to @answer }
         format.json { head :no_content }

data/app/controllers/questions_controller.rb

@@ -145,7 +145,7 @@ class QuestionsController < ApplicationController
   # PUT /questions/1.json
   def update
     respond_to do |format|
-      if @question.update_attributes(question_params)
+      if @question.update(question_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.question'))
         format.html { redirect_to @question }
         format.json { head :no_content }

data/app/models/answer.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class Answer < ActiveRecord::Base
   default_scope { order('answers.id ASC') }
   #scope :public_answers, where(:shared => true)

data/app/models/question.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class Question < ActiveRecord::Base
   default_scope { order('id DESC') }
   scope :public_questions, -> {where(shared: true)}

data/db/migrate/098_create_questions.rb

@@ -1,4 +1,4 @@
-class CreateQuestions < ActiveRecord::Migration
+class CreateQuestions < ActiveRecord::Migration[4.2]
   def self.up
     create_table :questions do |t|
       t.integer :user_id, :null => false

data/db/migrate/099_create_answers.rb

@@ -1,4 +1,4 @@
-class CreateAnswers < ActiveRecord::Migration
+class CreateAnswers < ActiveRecord::Migration[4.2]
   def self.up
     create_table :answers do |t|
       t.integer :user_id, :null => false

data/db/migrate/20100217054028_create_answer_has_items.rb

@@ -1,4 +1,4 @@
-class CreateAnswerHasItems < ActiveRecord::Migration
+class CreateAnswerHasItems < ActiveRecord::Migration[4.2]
   def self.up
     create_table :answer_has_items do |t|
       t.integer :answer_id

data/db/migrate/20120418124018_add_answer_feed_token_to_user.rb

@@ -1,4 +1,4 @@
-class AddAnswerFeedTokenToUser < ActiveRecord::Migration
+class AddAnswerFeedTokenToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :answer_feed_token, :string
     add_index :users, :answer_feed_token, :unique => true

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.beta.1"
 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, params: { 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, params: { 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, params: { 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, params: { 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, params: { 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, params: { 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, params: { 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, params: { question_id: 5, format: 'rss' }
         response.should be_success
         assigns(:answers).should eq assigns(:question).answers.order('answers.id DESC').page(1)
       end
@@ -96,8 +96,8 @@ describe AnswersController do
       login_fixture_admin
 
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :show, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :show, params: { id: answer.id }
         assigns(:answer).should eq(answer)
       end
     end
@@ -106,8 +106,8 @@ describe AnswersController do
       login_fixture_user
 
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :show, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :show, params: { id: answer.id }
         assigns(:answer).should eq(answer)
       end
     end
@@ -116,67 +116,67 @@ describe AnswersController do
       login_fixture_user
 
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :show, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :show, params: { 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, params: { 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, params: { 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, params: { 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, params: { 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
+        lambda {
+          get :show, params: { id: 'missing', user_id: users(:user1).username, question_id: 1 }
         }.should raise_error(ActiveRecord::RecordNotFound)
-        #response.should be_missing
+        # 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, params: { 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, params: { id: 5, question_id: 2 }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :show, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :show, params: { id: answer.id }
         assigns(:answer).should eq(answer)
       end
 
       it "should show public_answer" do
-        get :show, id: 1, question_id: 1
+        get :show, params: { 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, params: { id: 4, question_id: 1 }
         assigns(:answer).should eq(Answer.find(4))
         response.should redirect_to new_user_session_url
       end
@@ -214,7 +214,7 @@ describe AnswersController do
       end
 
       it "should get new template with question_id" do
-        get :new, question_id: 1
+        get :new, params: { question_id: 1 }
         assigns(:answer).should_not be_valid
         response.should be_success
       end
@@ -234,8 +234,8 @@ describe AnswersController do
       login_fixture_admin
 
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :edit, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :edit, params: { id: answer.id }
         assigns(:answer).should eq(answer)
       end
     end
@@ -244,8 +244,8 @@ describe AnswersController do
       login_fixture_user
 
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :edit, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :edit, params: { id: answer.id }
         assigns(:answer).should eq(answer)
       end
     end
@@ -254,48 +254,48 @@ describe AnswersController do
       login_fixture_user
 
       it "assigns the requested answer as @answer" do
-        answer = FactoryGirl.create(:answer)
-        get :edit, id: answer.id
+        answer = FactoryBot.create(:answer)
+        get :edit, params: { 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, params: { 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, params: { 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, params: { 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
+        lambda {
+          get :edit, params: { id: 100, user_id: users(:user1).username, question_id: 1 }
         }.should raise_error(ActiveRecord::RecordNotFound)
-        #response.should be_missing
+        # 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, params: { 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, params: { id: 5, user_id: users(:user2).username, question_id: 2 }
         response.should be_forbidden
       end
     end
 
     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
+        answer = FactoryBot.create(:answer)
+        get :edit, params: { id: answer.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -303,26 +303,26 @@ describe AnswersController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:answer)
-      @invalid_attrs = {body: ''}
+      @attrs = FactoryBot.attributes_for(:answer)
+      @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, params: { 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, params: { 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, params: { answer: { question_id: 1, body: 'hoge' } }
         assigns(:answer).should be_valid
         response.should redirect_to answer_url(assigns(:answer))
       end
@@ -331,24 +331,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, params: { answer: @attrs }
           assigns(:answer).should be_nil
         end
 
         it "redirects to the created answer" do
-          post :create, answer: @attrs
+          post :create, params: { 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, params: { answer: @invalid_attrs }
           assigns(:answer).should be_nil
         end
 
         it "re-renders the 'new' template" do
-          post :create, answer: @invalid_attrs
+          post :create, params: { answer: @invalid_attrs }
           response.should redirect_to new_user_session_url
         end
       end
@@ -358,8 +358,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
@@ -367,90 +367,90 @@ 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, params: { 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, params: { 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, params: { id: answers(:answer_00003).id, answer: @invalid_attrs }
           response.should render_template("edit")
         end
       end
     end
-  
+
     describe "When logged in as Librarian" do
       login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested answer" do
-          put :update, id: answers(:answer_00003).id, answer: @attrs
+          put :update, params: { 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, params: { 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, params: { 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: {body: 'test'}, user_id: users(:user1).username
+        put :update, params: { id: 3, answer: { body: 'test' }, user_id: users(:user1).username }
         response.should redirect_to answer_url(assigns(:answer))
       end
     end
-  
+
     describe "When logged in as User" do
       login_fixture_user
 
       describe "with valid params" do
         it "updates the requested answer" do
-          put :update, id: answers(:answer_00003).id, answer: @attrs
+          put :update, params: { 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, params: { 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, params: { 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: {body: 'test'}, user_id: users(:user1).username
+        put :update, params: { 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: {body: 'test'}, user_id: users(:user1).username
+        lambda {
+          put :update, params: { id: 'missing', answer: { body: 'test' }, user_id: users(:user1).username }
         }.should raise_error(ActiveRecord::RecordNotFound)
-        #response.should be_missing
+        # response.should be_missing
       end
-  
+
       it "should not update other user's answer" do
-        put :update, id: 5, answer: {body: 'test'}, user_id: users(:user2).username
+        put :update, params: { 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: {body: 'test'}, user_id: users(:user1).username, question_id: 1
+        put :update, params: { id: 3, answer: { body: 'test' }, user_id: users(:user1).username, question_id: 1 }
         response.should redirect_to answer_url(assigns(:answer))
       end
     end
@@ -458,11 +458,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, params: { id: @answer.id, answer: @attrs }
         end
 
         it "assigns the requested answer as @answer" do
-          put :update, id: @answer.id, answer: @attrs
+          put :update, params: { id: @answer.id, answer: @attrs }
           assigns(:answer).should eq(@answer)
           response.should redirect_to new_user_session_url
         end
@@ -475,19 +475,19 @@ describe AnswersController do
       login_fixture_user
 
       it "should destroy my answer" do
-        delete :destroy, id: 3
+        delete :destroy, params: { 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, params: { 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, params: { id: 1 }
         response.should redirect_to new_user_session_url
       end
     end