enju_bookmark 0.2.2 → 0.3.0.beta.1

data/lib/enju_bookmark/bookmark_url.rb

@@ -16,7 +16,7 @@ module BookmarkUrl
     if self.my_host?
       url = ::Addressable::URI.parse(self)
       path = url.path.split("/").reverse
-      if path[1] == "manifestations" and Manifestation.where(:id => path[0]).first
+      if path[1] == "manifestations" and Manifestation.where(id: path[0]).first
         true
       else
         false

data/lib/enju_bookmark/expire_tag_cloud.rb

@@ -2,8 +2,8 @@ module ExpireTagCloud
   def expire_tag_cloud(bookmark)
     I18n.available_locales.each do |locale|
       Role.all_cache.each do |role|
-        expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name)
-        expire_fragment(:controller => :tags, :action => :index, :page => 'public_tag_cloud', :locale => locale, :role => role.name, :user_id => nil)
+        expire_fragment(controller: :tags, action: :index, page: 'user_tag_cloud', user_id: bookmark.user.username, locale: locale, role: role.name)
+        expire_fragment(controller: :tags, action: :index, page: 'public_tag_cloud', locale: locale, role: role.name, user_id: nil)
       end
     end
   end

data/lib/enju_bookmark/suggest_tag.rb

@@ -2,7 +2,7 @@ module SuggestTag
   def suggest_tags
     tags = []
     threshold = (self.strip.split(//).size * 0.2).round
-    Bookmark.tag_counts(:limit => 100).each do |t|
+    Bookmark.tag_counts(limit: 100).each do |t|
       distance = Text::Levenshtein.distance(t.name, self)
       tags << t if distance <= threshold
     end

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.2.2"
+  VERSION = "0.3.0.beta.1"
 end

data/spec/controllers/bookmark_stats_controller_spec.rb

@@ -51,7 +51,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :show, :id => bookmark_stat.id
+        get :show, params: { id: bookmark_stat.id }
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
@@ -61,7 +61,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :show, :id => bookmark_stat.id
+        get :show, params: { id: bookmark_stat.id }
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
@@ -71,7 +71,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :show, :id => bookmark_stat.id
+        get :show, params: { id: bookmark_stat.id }
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
@@ -79,7 +79,7 @@ describe BookmarkStatsController do
     describe "When not logged in" do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :show, :id => bookmark_stat.id
+        get :show, params: { id: bookmark_stat.id }
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
@@ -129,7 +129,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :edit, :id => bookmark_stat.id
+        get :edit, params: { id: bookmark_stat.id }
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
@@ -139,7 +139,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :edit, :id => bookmark_stat.id
+        get :edit, params: { id: bookmark_stat.id }
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
     end
@@ -149,7 +149,7 @@ describe BookmarkStatsController do
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :edit, :id => bookmark_stat.id
+        get :edit, params: { id: bookmark_stat.id }
         expect(response).to be_forbidden
       end
     end
@@ -157,7 +157,7 @@ describe BookmarkStatsController do
     describe "When not logged in" do
       it "should not assign the requested bookmark_stat as @bookmark_stat" do
         bookmark_stat = FactoryBot.create(:bookmark_stat)
-        get :edit, :id => bookmark_stat.id
+        get :edit, params: { id: bookmark_stat.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -166,7 +166,7 @@ describe BookmarkStatsController do
   describe "POST create" do
     before(:each) do
       @attrs = FactoryBot.attributes_for(:bookmark_stat)
-      @invalid_attrs = {:start_date => ''}
+      @invalid_attrs = {start_date: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -174,24 +174,24 @@ describe BookmarkStatsController do
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to be_valid
         end
 
         it "redirects to the created bookmark_stat" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(response).to redirect_to(bookmark_stat_url(assigns(:bookmark_stat)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(response).to render_template("new")
         end
       end
@@ -202,24 +202,24 @@ describe BookmarkStatsController do
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to be_valid
         end
 
         it "redirects to the created bookmark_stat" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(response).to redirect_to(bookmark_stat_url(assigns(:bookmark_stat)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(response).to render_template("new")
         end
       end
@@ -230,24 +230,24 @@ describe BookmarkStatsController do
 
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(response).to be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(assigns(:bookmark_stat)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -256,24 +256,24 @@ describe BookmarkStatsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :bookmark_stat => @attrs
+          post :create, params: { bookmark_stat: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark_stat as @bookmark_stat" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(assigns(:bookmark_stat)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :bookmark_stat => @invalid_attrs
+          post :create, params: { bookmark_stat: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -284,7 +284,7 @@ describe BookmarkStatsController do
     before(:each) do
       @bookmark_stat = FactoryBot.create(:bookmark_stat)
       @attrs = FactoryBot.attributes_for(:bookmark_stat)
-      @invalid_attrs = {:start_date => ''}
+      @invalid_attrs = {start_date: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -292,18 +292,18 @@ describe BookmarkStatsController do
 
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
         end
 
         it "assigns the requested bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to eq(@bookmark_stat)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @invalid_attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @invalid_attrs }
           expect(response).to render_template("edit")
         end
       end
@@ -314,11 +314,11 @@ describe BookmarkStatsController do
 
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
         end
 
         it "assigns the requested bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to eq(@bookmark_stat)
           expect(response).to redirect_to(@bookmark_stat)
         end
@@ -326,12 +326,12 @@ describe BookmarkStatsController do
 
       describe "with invalid params" do
         it "assigns the bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat, :bookmark_stat => @invalid_attrs
+          put :update, params: { id: @bookmark_stat, bookmark_stat: @invalid_attrs }
           expect(assigns(:bookmark_stat)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @bookmark_stat, :bookmark_stat => @invalid_attrs
+          put :update, params: { id: @bookmark_stat, bookmark_stat: @invalid_attrs }
           expect(response).to render_template("edit")
         end
       end
@@ -342,11 +342,11 @@ describe BookmarkStatsController do
 
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
         end
 
         it "assigns the requested bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
           expect(assigns(:bookmark_stat)).to eq(@bookmark_stat)
           expect(response).to be_forbidden
         end
@@ -354,7 +354,7 @@ describe BookmarkStatsController do
 
       describe "with invalid params" do
         it "assigns the requested bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @invalid_attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
@@ -363,18 +363,18 @@ describe BookmarkStatsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
         end
 
         it "should be forbidden" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested bookmark_stat as @bookmark_stat" do
-          put :update, :id => @bookmark_stat.id, :bookmark_stat => @invalid_attrs
+          put :update, params: { id: @bookmark_stat.id, bookmark_stat: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -390,11 +390,11 @@ describe BookmarkStatsController do
       login_fixture_admin
 
       it "destroys the requested bookmark_stat" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
       end
 
       it "redirects to the bookmark_stats list" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
         expect(response).to redirect_to(bookmark_stats_url)
       end
     end
@@ -403,11 +403,11 @@ describe BookmarkStatsController do
       login_fixture_librarian
 
       it "destroys the requested bookmark_stat" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
         expect(response).to be_forbidden
       end
     end
@@ -416,22 +416,22 @@ describe BookmarkStatsController do
       login_fixture_user
 
       it "destroys the requested bookmark_stat" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested bookmark_stat" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @bookmark_stat.id
+        delete :destroy, params: { id: @bookmark_stat.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end

data/spec/controllers/bookmarks_controller_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 describe BookmarksController do
   fixtures :all
 
-  describe "GET index", :solr => true do
+  describe "GET index", solr: true do
     before do
       Bookmark.reindex
     end
@@ -41,20 +41,20 @@ describe BookmarksController do
       end
 
       it "should redirect to my bookmark index if user_id is specified" do
-        get :index, :user_id => users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         expect(response).to redirect_to bookmarks_url
         expect(assigns(:bookmarks)).to be_nil
       end
 
       it "should get other user's public bookmark index" do
-        get :index, :user_id => users(:admin).username
+        get :index, params: { user_id: users(:admin).username }
         expect(response).to be_success
         expect(assigns(:bookmarks)).to eq users(:admin).bookmarks.page(1)
       end
 
       it "should not get other user's private bookmark index" do
         sign_in users(:user3)
-        get :index, :user_id => users(:user1).username
+        get :index, params: { user_id: users(:user1).username }
         expect(response).to be_forbidden
       end
     end
@@ -65,7 +65,7 @@ describe BookmarksController do
         expect(assigns(:bookmarks)).to be_nil
       end
 
-      it "should be redirected to new_user_session_url "do
+      it "should be redirected to new_user_session_url " do
         get :index
         expect(response).to redirect_to new_user_session_url
       end
@@ -78,7 +78,7 @@ describe BookmarksController do
 
       it "assigns the requested bookmark as @bookmark" do
         bookmark = FactoryBot.create(:bookmark)
-        get :show, :id => bookmark.id
+        get :show, params: { id: bookmark.id }
         expect(assigns(:bookmark)).to eq(bookmark)
       end
     end
@@ -88,12 +88,12 @@ describe BookmarksController do
 
       it "assigns the requested bookmark as @bookmark" do
         bookmark = FactoryBot.create(:bookmark)
-        get :show, :id => bookmark.id
+        get :show, params: { id: bookmark.id }
         expect(assigns(:bookmark)).to eq(bookmark)
       end
 
       it "should shot other user's bookmark" do
-        get :show, :id => 3
+        get :show, params: { id: 3 }
         expect(response).to be_success
       end
     end
@@ -103,17 +103,17 @@ describe BookmarksController do
 
       it "assigns the requested bookmark as @bookmark" do
         bookmark = FactoryBot.create(:bookmark)
-        get :show, :id => bookmark.id
+        get :show, params: { id: bookmark.id }
         expect(assigns(:bookmark)).to eq(bookmark)
       end
 
       it "should not show other user's bookmark" do
-        get :show, :id => 1
+        get :show, params: { id: 1 }
         expect(response).to be_forbidden
       end
-  
+
       it "should show my bookmark" do
-        get :show, :id => 3
+        get :show, params: { id: 3 }
         expect(response).to be_success
       end
     end
@@ -121,7 +121,7 @@ describe BookmarksController do
     describe "When not logged in" do
       it "assigns the requested bookmark as @bookmark" do
         bookmark = FactoryBot.create(:bookmark)
-        get :show, :id => bookmark.id
+        get :show, params: { id: bookmark.id }
         expect(assigns(:bookmark)).to eq(bookmark)
         expect(response).to redirect_to new_user_session_url
       end
@@ -133,7 +133,7 @@ describe BookmarksController do
       login_fixture_admin
 
       it "assigns the requested bookmark as @bookmark" do
-        get :new, bookmark: { title: 'test' }
+        get :new, params: { bookmark: { title: 'test' } }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
@@ -143,7 +143,7 @@ describe BookmarksController do
       login_fixture_librarian
 
       it "assigns the requested bookmark as @bookmark" do
-        get :new, bookmark: { title: 'test' }
+        get :new, params: { bookmark: { title: 'test' } }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
@@ -153,23 +153,23 @@ describe BookmarksController do
       login_fixture_user
 
       it "should get my new template without url" do
-        get :new, bookmark: { title: 'test' }
+        get :new, params: { bookmark: { title: 'test' } }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
-  
+
       it "should not get new template with url already bookmarked" do
-        get :new, :bookmark => {:url => 'http://www.slis.keio.ac.jp/'}
+        get :new, params: { bookmark: {url: 'http://www.slis.keio.ac.jp/'} }
         expect(response).to be_success
       end
-  
+
       it "should get my new template with external url" do
-        get :new, :bookmark => {:title => 'example', :url => 'http://example.com'}
+        get :new, params: { bookmark: {title: 'example', url: 'http://example.com'} }
         expect(response).to be_success
       end
-  
+
       it "should get my new template with internal url" do
-        get :new, :bookmark => {:url => "#{LibraryGroup.site_config.url}/manifestations/1"}
+        get :new, params: { bookmark: {url: "#{LibraryGroup.site_config.url}/manifestations/1"} }
         expect(response).to be_success
       end
     end
@@ -180,7 +180,7 @@ describe BookmarksController do
       login_fixture_admin
 
       it "assigns the requested bookmark as @bookmark" do
-        get :edit, :id => 3
+        get :edit, params: { id: 3 }
         expect(assigns(:bookmark)).to eq(Bookmark.find(3))
         expect(response).to be_success
       end
@@ -190,7 +190,7 @@ describe BookmarksController do
       login_fixture_librarian
 
       it "assigns the requested bookmark as @bookmark" do
-        get :edit, :id => 3
+        get :edit, params: { id: 3 }
         expect(assigns(:bookmark)).to eq(Bookmark.find(3))
         expect(response).to be_success
       end
@@ -200,12 +200,12 @@ describe BookmarksController do
       login_fixture_user
 
       it "should not edit other user's bookmark" do
-        get :edit, :id => 1
+        get :edit, params: { id: 1 }
         expect(response).to be_forbidden
       end
-  
+
       it "should edit my bookmark" do
-        get :edit, :id => 3
+        get :edit, params: { id: 3 }
         expect(assigns(:bookmark)).to eq(Bookmark.find(3))
         expect(response).to be_success
       end
@@ -213,41 +213,41 @@ describe BookmarksController do
 
     describe "When not logged in" do
       it "should not assign the requested bookmark as @bookmark" do
-        get :edit, :id => 1
+        get :edit, params: { id: 1 }
         expect(response).to redirect_to(new_user_session_url)
       end
     end
   end
-  
+
   describe "POST create" do
     before(:each) do
       @bookmark = bookmarks(:bookmark_00001)
       @attrs = FactoryBot.attributes_for(:bookmark)
-      @invalid_attrs = {:url => ''}
+      @invalid_attrs = {url: ''}
     end
 
     describe "When logged in as User" do
       login_fixture_user
-#      before(:each) do
-#        @user = FactoryBot.create(:user)
-#        sign_in @user
-#      end
+      #      before(:each) do
+      #        @user = FactoryBot.create(:user)
+      #        sign_in @user
+      #      end
 
       it "should create bookmark" do
-        post :create, :bookmark => {:title => 'example', :url => 'http://www1.example.com/'}
+        post :create, params: { bookmark: {title: 'example', url: 'http://www1.example.com/'} }
         assigns(:bookmark).save!
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
       end
 
       it "should create bookmark with local url" do
-        post :create, :bookmark => {:title => 'example', :url => "#{LibraryGroup.site_config.url}manifestations/10"}
+        post :create, params: { bookmark: {title: 'example', url: "#{LibraryGroup.site_config.url}manifestations/10"} }
         expect(assigns(:bookmark)).to be_valid
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
       end
 
       it "should create bookmark with tag_list" do
         old_tag_count = Tag.count
-        post :create, :bookmark => {:tag_list => 'search', :title => 'example', :url => 'http://example.com/'}
+        post :create, params: { bookmark: {tag_list: 'search', title: 'example', url: 'http://example.com/'} }
         assigns(:bookmark).tag_list.should eq ['search']
         assigns(:bookmark).taggings.size.should eq 1
         Tag.count.should eq old_tag_count + 1
@@ -256,26 +256,26 @@ describe BookmarksController do
 
       it "should create bookmark with tag_list include wide space" do
         old_tag_count = Tag.count
-        post :create, :bookmark => {:tag_list => 'タグの　テスト', :title => 'example', :url => 'http://example.com/'}
+        post :create, params: { bookmark: {tag_list: 'タグの　テスト', title: 'example', url: 'http://example.com/'} }
         Tag.count.should eq old_tag_count + 2
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
       end
 
       it "should not create bookmark without url" do
-        post :create, :bookmark => {:title => 'test'}
+        post :create, params: { bookmark: {title: 'test'} }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
 
       it "should not create bookmark already bookmarked" do
-        post :create, :bookmark => {:user_id => users(:user1).id, :url => 'http://www.slis.keio.ac.jp/'}
+        post :create, params: { bookmark: {user_id: users(:user1).id, url: 'http://www.slis.keio.ac.jp/'} }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
 
       it "should not create other user's bookmark" do
         old_bookmark_counts = users(:user2).bookmarks.count
-        post :create, :bookmark => {:user_id => users(:user2).id, :title => 'example', :url => 'http://example.com/'}
+        post :create, params: { bookmark: {user_id: users(:user2).id, title: 'example', url: 'http://example.com/'} }
         users(:user2).bookmarks.count.should eq old_bookmark_counts
         assigns(:bookmark).user.should eq users(:user1)
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
@@ -285,24 +285,24 @@ describe BookmarksController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created bookmark as @bookmark" do
-          post :create, :bookmark => @attrs
+          post :create, params: { bookmark: @attrs }
           expect(assigns(:bookmark)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :bookmark => @attrs
+          post :create, params: { bookmark: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved bookmark as @bookmark" do
-          post :create, :bookmark => @invalid_attrs
+          post :create, params: { bookmark: @invalid_attrs }
           expect(assigns(:bookmark)).to be_nil
         end
 
         it "should be forbidden" do
-          post :create, :bookmark => @invalid_attrs
+          post :create, params: { bookmark: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -313,7 +313,7 @@ describe BookmarksController do
     before(:each) do
       @bookmark = bookmarks(:bookmark_00001)
       @attrs = FactoryBot.attributes_for(:bookmark)
-      @invalid_attrs = {:url => ''}
+      @invalid_attrs = {url: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -321,11 +321,11 @@ describe BookmarksController do
 
       describe "with valid params" do
         it "updates the requested bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
         end
 
         it "assigns the requested bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
           expect(assigns(:bookmark)).to eq(@bookmark)
           expect(response).to redirect_to bookmark_url(@bookmark)
         end
@@ -333,11 +333,11 @@ describe BookmarksController do
 
       describe "with invalid params" do
         it "assigns the requested bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @invalid_attrs
+          put :update, params: { id: @bookmark.id, bookmark: @invalid_attrs }
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @bookmark.id, :bookmark => @invalid_attrs
+          put :update, params: { id: @bookmark.id, bookmark: @invalid_attrs }
           expect(response).to render_template("edit")
         end
       end
@@ -348,11 +348,11 @@ describe BookmarksController do
 
       describe "with valid params" do
         it "updates the requested bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
         end
 
         it "assigns the requested bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
           expect(assigns(:bookmark)).to eq(@bookmark)
           expect(response).to redirect_to bookmark_url(@bookmark)
         end
@@ -360,12 +360,12 @@ describe BookmarksController do
 
       describe "with invalid params" do
         it "assigns the bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @invalid_attrs
+          put :update, params: { id: @bookmark.id, bookmark: @invalid_attrs }
           expect(assigns(:bookmark)).not_to be_valid
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @bookmark.id, :bookmark => @invalid_attrs
+          put :update, params: { id: @bookmark.id, bookmark: @invalid_attrs }
           expect(response).to render_template("edit")
         end
       end
@@ -376,11 +376,11 @@ describe BookmarksController do
 
       describe "with valid params" do
         it "updates the requested bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
         end
 
         it "assigns the requested bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
           expect(assigns(:bookmark)).to eq(@bookmark)
           expect(response).to be_forbidden
         end
@@ -388,42 +388,42 @@ describe BookmarksController do
 
       describe "with invalid params" do
         it "assigns the requested bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @invalid_attrs
+          put :update, params: { id: @bookmark.id, bookmark: @invalid_attrs }
           expect(response).to be_forbidden
         end
       end
 
       it "should update bookmark" do
-        put :update, :id => 3, :bookmark => { title: 'test' }
+        put :update, params: { id: 3, bookmark: { title: 'test' } }
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
       end
-  
+
       it "should add tags to bookmark" do
-        put :update, :id => 3, :bookmark => {:user_id => users(:user1).id, :tag_list => 'search', :title => 'test'}
+        put :update, params: { id: 3, bookmark: {user_id: users(:user1).id, tag_list: 'search', title: 'test'} }
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
         assigns(:bookmark).tag_list.should eq ['search']
       end
-  
+
       it "should remove tags from bookmark" do
-        put :update, :id => 3, :bookmark => {:user_id => users(:user1).id, :tag_list => nil, :title => 'test'}
+        put :update, params: { id: 3, bookmark: {user_id: users(:user1).id, tag_list: nil, title: 'test'} }
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
         assigns(:bookmark).tag_list.should be_empty
       end
 
       it "should not update other user's bookmark" do
-        put :update, :id => 1, :bookmark => { }
+        put :update, params: { id: 1, bookmark: { } }
         expect(response).to be_forbidden
       end
 
       it "should not update missing bookmark" do
         lambda{
-          put :update, :id => 'missing', :bookmark => { }
+          put :update, params: { id: 'missing', bookmark: { } }
         }.should raise_error(ActiveRecord::RecordNotFound)
-        #expect(response).to be_missing
+        # expect(response).to be_missing
       end
 
       it "should update bookmark without manifestation_id" do
-        put :update, :id => 3, :bookmark => {:manifestation_id => nil}
+        put :update, params: { id: 3, bookmark: {manifestation_id: nil} }
         expect(assigns(:bookmark)).to be_valid
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
         assigns(:bookmark).manifestation.should_not be_nil
@@ -433,18 +433,18 @@ describe BookmarksController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
         end
 
         it "should be forbidden" do
-          put :update, :id => @bookmark.id, :bookmark => @attrs
+          put :update, params: { id: @bookmark.id, bookmark: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested bookmark as @bookmark" do
-          put :update, :id => @bookmark.id, :bookmark => @invalid_attrs
+          put :update, params: { id: @bookmark.id, bookmark: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
@@ -460,11 +460,11 @@ describe BookmarksController do
       login_fixture_admin
 
       it "destroys the requested bookmark" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
       end
 
       it "redirects to the bookmarks list" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
         expect(response).to redirect_to bookmarks_url(user_id: @bookmark.user.username)
       end
     end
@@ -473,11 +473,11 @@ describe BookmarksController do
       login_fixture_librarian
 
       it "destroys the requested bookmark" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
       end
 
       it "redirects to the bookmarks list" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
         expect(response).to redirect_to bookmarks_url(user_id: @bookmark.user.username)
       end
     end
@@ -486,32 +486,32 @@ describe BookmarksController do
       login_fixture_user
 
       it "destroys the requested bookmark" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
         expect(response).to be_forbidden
       end
 
       it "should destroy my bookmark" do
-        delete :destroy, :id => 3
+        delete :destroy, params: { id: 3 }
         expect(response).to redirect_to bookmarks_url(user_id: users(:user1).username)
       end
 
       it "should not destroy other user's bookmark" do
-        delete :destroy, :id => 1
+        delete :destroy, params: { id: 1 }
         expect(response).to be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested bookmark" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @bookmark.id
+        delete :destroy, params: { id: @bookmark.id }
         expect(response).to redirect_to(new_user_session_url)
       end
     end