enju_bookmark 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b200d81f1cb303f3b686f898925995f1114152
-  data.tar.gz: ed5980df4d50477ced0ae37659a9bdae7927b640
+  metadata.gz: 0c8a6178c8d4e0b7e1437ed9201cd6b937e8064c
+  data.tar.gz: 1b3754c7ebb25dea1bb8f8d6fbfda53ea9b7979e
 SHA512:
-  metadata.gz: 024043757fadad79dbf1b7a50dabe264fb9dcab556261c240277bc4413cb41fca965a30c293c8667933a0320fc086958c83e39d9bb726219308b9161464206b3
-  data.tar.gz: 3f10a7807401d3c43b91c37875ba4a368e812858bb5356ee586926568c3d4c51d76eefaeb83c22f251a9a9b8ee283c636cea984e2ad39038838cc5c62c2fa0eb
+  metadata.gz: b32e5e216313d4bc7408e67b42c1c341ed51733d3d9ff2221a19f401b37c00e1308776537d303b70b37ef331b7a2c7d61538e6de951f73b7a6f308b9636222ab
+  data.tar.gz: d5df204992e4fc76c7ac3e33c4ccbda2b189fbc0d099c6f6fa54064572a4b34a2c06d809aeed9f05a2cca918a2dc669b50ed1705d6447bf3adb6dd897052cf52

data/app/models/bookmark_stat.rb

@@ -8,7 +8,7 @@ class BookmarkStat < ActiveRecord::Base
 
   paginates_per 10
 
-  has_many :bookmark_stat_transitions
+  has_many :bookmark_stat_transitions, autosave: false
 
   def state_machine
     BookmarkStatStateMachine.new(self, transition_class: BookmarkStatTransition)

data/db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb

@@ -0,0 +1,13 @@
+class AddConstraintsToMostRecentForBookmarkStatTransitions < ActiveRecord::Migration
+  disable_ddl_transaction!
+
+  def up
+    add_index :bookmark_stat_transitions, [:bookmark_stat_id, :most_recent], unique: true, where: "most_recent", name: "index_bookmark_stat_transitions_parent_most_recent" #, algorithm: :concurrently
+    change_column_null :bookmark_stat_transitions, :most_recent, false
+  end
+
+  def down
+    remove_index :bookmark_stat_transitions, name: "index_bookmark_stat_transitions_parent_most_recent"
+    change_column_null :bookmark_stat_transitions, :most_recent, true
+  end
+end

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/controllers/bookmark_stats_controller_spec.rb

@@ -7,7 +7,7 @@ describe BookmarkStatsController do
 
   describe "GET index" do
     before(:each) do
-      FactoryGirl.create(:bookmark_stat)
+      FactoryBot.create(:bookmark_stat)
     end
 
     describe "When logged in as Administrator" do
@@ -50,7 +50,7 @@ describe BookmarkStatsController do
       login_fixture_admin
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
@@ -60,7 +60,7 @@ describe BookmarkStatsController do
       login_fixture_librarian
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
@@ -70,7 +70,7 @@ describe BookmarkStatsController do
       login_fixture_user
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
@@ -78,7 +78,7 @@ describe BookmarkStatsController do
 
     describe "When not logged in" do
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :show, :id => bookmark_stat.id
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
@@ -128,7 +128,7 @@ describe BookmarkStatsController do
       login_fixture_admin
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
@@ -138,7 +138,7 @@ describe BookmarkStatsController do
       login_fixture_librarian
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
         expect(assigns(:bookmark_stat)).to eq(bookmark_stat)
       end
@@ -148,7 +148,7 @@ describe BookmarkStatsController do
       login_fixture_user
 
       it "assigns the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
         expect(response).to be_forbidden
       end
@@ -156,7 +156,7 @@ describe BookmarkStatsController do
 
     describe "When not logged in" do
       it "should not assign the requested bookmark_stat as @bookmark_stat" do
-        bookmark_stat = FactoryGirl.create(:bookmark_stat)
+        bookmark_stat = FactoryBot.create(:bookmark_stat)
         get :edit, :id => bookmark_stat.id
         expect(response).to redirect_to(new_user_session_url)
       end
@@ -165,7 +165,7 @@ describe BookmarkStatsController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:bookmark_stat)
+      @attrs = FactoryBot.attributes_for(:bookmark_stat)
       @invalid_attrs = {:start_date => ''}
     end
 
@@ -282,8 +282,8 @@ describe BookmarkStatsController do
 
   describe "PUT update" do
     before(:each) do
-      @bookmark_stat = FactoryGirl.create(:bookmark_stat)
-      @attrs = FactoryGirl.attributes_for(:bookmark_stat)
+      @bookmark_stat = FactoryBot.create(:bookmark_stat)
+      @attrs = FactoryBot.attributes_for(:bookmark_stat)
       @invalid_attrs = {:start_date => ''}
     end
 
@@ -383,7 +383,7 @@ describe BookmarkStatsController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @bookmark_stat = FactoryGirl.create(:bookmark_stat)
+      @bookmark_stat = FactoryBot.create(:bookmark_stat)
     end
 
     describe "When logged in as Administrator" do

data/spec/controllers/bookmarks_controller_spec.rb

@@ -77,7 +77,7 @@ describe BookmarksController do
       login_fixture_admin
 
       it "assigns the requested bookmark as @bookmark" do
-        bookmark = FactoryGirl.create(:bookmark)
+        bookmark = FactoryBot.create(:bookmark)
         get :show, :id => bookmark.id
         expect(assigns(:bookmark)).to eq(bookmark)
       end
@@ -87,7 +87,7 @@ describe BookmarksController do
       login_fixture_librarian
 
       it "assigns the requested bookmark as @bookmark" do
-        bookmark = FactoryGirl.create(:bookmark)
+        bookmark = FactoryBot.create(:bookmark)
         get :show, :id => bookmark.id
         expect(assigns(:bookmark)).to eq(bookmark)
       end
@@ -102,7 +102,7 @@ describe BookmarksController do
       login_fixture_user
 
       it "assigns the requested bookmark as @bookmark" do
-        bookmark = FactoryGirl.create(:bookmark)
+        bookmark = FactoryBot.create(:bookmark)
         get :show, :id => bookmark.id
         expect(assigns(:bookmark)).to eq(bookmark)
       end
@@ -120,7 +120,7 @@ describe BookmarksController do
 
     describe "When not logged in" do
       it "assigns the requested bookmark as @bookmark" do
-        bookmark = FactoryGirl.create(:bookmark)
+        bookmark = FactoryBot.create(:bookmark)
         get :show, :id => bookmark.id
         expect(assigns(:bookmark)).to eq(bookmark)
         expect(response).to redirect_to new_user_session_url
@@ -222,14 +222,14 @@ describe BookmarksController do
   describe "POST create" do
     before(:each) do
       @bookmark = bookmarks(:bookmark_00001)
-      @attrs = FactoryGirl.attributes_for(:bookmark)
+      @attrs = FactoryBot.attributes_for(:bookmark)
       @invalid_attrs = {:url => ''}
     end
 
     describe "When logged in as User" do
       login_fixture_user
 #      before(:each) do
-#        @user = FactoryGirl.create(:user)
+#        @user = FactoryBot.create(:user)
 #        sign_in @user
 #      end
 
@@ -312,7 +312,7 @@ describe BookmarksController do
   describe "PUT update" do
     before(:each) do
       @bookmark = bookmarks(:bookmark_00001)
-      @attrs = FactoryGirl.attributes_for(:bookmark)
+      @attrs = FactoryBot.attributes_for(:bookmark)
       @invalid_attrs = {:url => ''}
     end
 

data/spec/controllers/tags_controller_spec.rb

@@ -48,7 +48,7 @@ describe TagsController do
       login_fixture_admin
 
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :show, :id => tag.name
         expect(assigns(:tag)).to eq(tag)
       end
@@ -58,7 +58,7 @@ describe TagsController do
       login_fixture_librarian
 
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :show, :id => tag.name
         expect(assigns(:tag)).to eq(tag)
       end
@@ -68,7 +68,7 @@ describe TagsController do
       login_fixture_user
 
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :show, :id => tag.name
         expect(assigns(:tag)).to eq(tag)
       end
@@ -76,7 +76,7 @@ describe TagsController do
 
     describe "When not logged in" do
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :show, :id => tag.name
         expect(assigns(:tag)).to eq(tag)
       end
@@ -88,7 +88,7 @@ describe TagsController do
       login_fixture_admin
 
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :edit, :id => tag.name
         expect(assigns(:tag)).to eq(tag)
       end
@@ -98,7 +98,7 @@ describe TagsController do
       login_fixture_librarian
 
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :edit, :id => tag.name
         expect(assigns(:tag)).to eq(tag)
       end
@@ -108,7 +108,7 @@ describe TagsController do
       login_fixture_user
 
       it "assigns the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :edit, :id => tag.name
         expect(response).to be_forbidden
       end
@@ -116,7 +116,7 @@ describe TagsController do
 
     describe "When not logged in" do
       it "should not assign the requested tag as @tag" do
-        tag = FactoryGirl.create(:tag)
+        tag = FactoryBot.create(:tag)
         get :edit, :id => tag.name
         expect(response).to redirect_to(new_user_session_url)
       end
@@ -125,8 +125,8 @@ describe TagsController do
 
   describe "PUT update" do
     before(:each) do
-      @tag = FactoryGirl.create(:tag)
-      @attrs = FactoryGirl.attributes_for(:tag)
+      @tag = FactoryBot.create(:tag)
+      @attrs = FactoryBot.attributes_for(:tag)
       @invalid_attrs = {:name => ''}
     end
 
@@ -231,7 +231,7 @@ describe TagsController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @tag = FactoryGirl.create(:tag)
+      @tag = FactoryBot.create(:tag)
     end
 
     describe "When logged in as Administrator" do

data/spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -8,7 +8,7 @@ class AddDcndlSchema < ActiveRecord::Migration
     add_column :manifestations, :valid_until, :timestamp
     add_column :manifestations, :date_submitted, :timestamp
     add_column :manifestations, :date_accepted, :timestamp
-    add_column :manifestations, :date_caputured, :timestamp
+    add_column :manifestations, :date_captured, :timestamp
     rename_column :manifestations, :copyright_date, :date_copyrighted
   end
 
@@ -21,7 +21,7 @@ class AddDcndlSchema < ActiveRecord::Migration
     remove_column :manifestations, :valid_until
     remove_column :manifestations, :date_submitted
     remove_column :manifestations, :date_accepted
-    remove_column :manifestations, :date_caputured
+    remove_column :manifestations, :date_captured
     rename_column :manifestations, :date_copyrighted, :copyright_date
   end
 end

data/spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToItemsReferencingManifestations < ActiveRecord::Migration
+  def change
+    add_foreign_key :items, :manifestations
+  end
+end

data/spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb

@@ -0,0 +1,6 @@
+class AddProfileIdToAgent < ActiveRecord::Migration
+  def change
+    add_column :agents, :profile_id, :integer
+    add_index :agents, :profile_id
+  end
+end

data/spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddCsvCharsetConversionToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :csv_charset_conversion, :boolean, null: false, default: false
+  end
+end

data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_attachment :library_groups, :header_logo
+  end
+end

data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb

@@ -0,0 +1,5 @@
+class SetNotNullToManifestationIdOnItems < ActiveRecord::Migration
+  def change
+    change_column_null :items, :manifestation_id, false
+  end
+end

data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb

@@ -0,0 +1,5 @@
+class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration
+  def change
+    rename_column :library_groups, :login_banner, :old_login_banner
+  end
+end

data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration
+  def change
+    add_foreign_key :libraries, :library_groups, null: false
+  end
+end

data/spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHeaderLogoMetaToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :header_logo_meta, :text
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160820004638) do
+ActiveRecord::Schema.define(version: 20180102162311) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -160,12 +160,14 @@ ActiveRecord::Schema.define(version: 20160820004638) do
     t.string   "birth_date"
     t.string   "death_date"
     t.string   "agent_identifier"
+    t.integer  "profile_id"
   end
 
   add_index "agents", ["agent_identifier"], name: "index_agents_on_agent_identifier"
   add_index "agents", ["country_id"], name: "index_agents_on_country_id"
   add_index "agents", ["full_name"], name: "index_agents_on_full_name"
   add_index "agents", ["language_id"], name: "index_agents_on_language_id"
+  add_index "agents", ["profile_id"], name: "index_agents_on_profile_id"
   add_index "agents", ["required_role_id"], name: "index_agents_on_required_role_id"
 
   create_table "baskets", force: :cascade do |t|
@@ -615,7 +617,7 @@ ActiveRecord::Schema.define(version: 20160820004638) do
     t.string   "binding_item_identifier"
     t.string   "binding_call_number"
     t.datetime "binded_at"
-    t.integer  "manifestation_id"
+    t.integer  "manifestation_id",                        null: false
   end
 
   add_index "items", ["binding_item_identifier"], name: "index_items_on_binding_item_identifier"
@@ -705,7 +707,7 @@ ActiveRecord::Schema.define(version: 20160820004638) do
     t.text     "display_name"
     t.string   "short_name",                                                       null: false
     t.text     "my_networks"
-    t.text     "login_banner"
+    t.text     "old_login_banner"
     t.text     "note"
     t.integer  "country_id"
     t.integer  "position"
@@ -720,6 +722,12 @@ ActiveRecord::Schema.define(version: 20160820004638) do
     t.boolean  "family_name_first",             default: true
     t.integer  "pub_year_facet_range_interval", default: 10
     t.integer  "user_id"
+    t.string   "header_logo_file_name"
+    t.string   "header_logo_content_type"
+    t.integer  "header_logo_file_size"
+    t.datetime "header_logo_updated_at"
+    t.boolean  "csv_charset_conversion",        default: false,                    null: false
+    t.text     "header_logo_meta"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"

data/spec/factories/bookmark.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :bookmark do |f|
     f.sequence(:title){|n| "bookmark_#{n}"}
     f.sequence(:url){|n| "http://example.jp/#{n}"}
-    f.user_id{FactoryGirl.create(:user).id}
+    f.user_id{FactoryBot.create(:user).id}
   end
 end

data/spec/factories/bookmark_stat.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :bookmark_stat do |f|
     f.start_date 1.week.ago
     f.end_date 1.day.ago

data/spec/factories/bookmark_stat_has_manifestation.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :bookmark_stat_has_manifestation do |f|
-    f.bookmark_stat_id{FactoryGirl.create(:bookmark_stat).id}
-    f.manifestation_id{FactoryGirl.create(:manifestation).id}
+    f.bookmark_stat_id{FactoryBot.create(:bookmark_stat).id}
+    f.manifestation_id{FactoryBot.create(:manifestation).id}
   end
 end

data/spec/factories/library.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :library do |f|
     f.sequence(:name){|n| "library#{n}"}
     f.sequence(:short_display_name){|n| "library_#{n}"}
@@ -6,7 +6,7 @@ FactoryGirl.define do
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :invalid_library, :class => Library do |f|
     f.library_group_id{LibraryGroup.first.id}
   end

data/spec/factories/manifestation.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :manifestation do |f|
     f.sequence(:original_title){|n| "manifestation_title_#{n}"}
     f.carrier_type_id{CarrierType.find(1).id}

data/spec/factories/profile.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :profile, :class => Profile do |f|
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}
     f.library_id 2
     f.locale "ja"
-    f.user_id {FactoryGirl.create(:user).id}
+    f.user_id {FactoryBot.create(:user).id}
   end
 end

data/spec/factories/tag.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :tag do |f|
     f.sequence(:name){|n| "tag_#{n}"}
   end

data/spec/factories/user.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}

data/spec/models/bookmark_spec.rb

@@ -13,7 +13,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryGirl.create(:user).bookmarks.create(:url => 'http://www.example.com/', :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(:url => 'http://www.example.com/', :title => 'test')
     }.should change(Bookmark, :count)
     Manifestation.count.should eq old_manifestation_count + 1
     Item.count.should eq old_item_count + 1
@@ -23,7 +23,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryGirl.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}manifestations/1", :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}manifestations/1", :title => 'test')
     }.should change(Bookmark, :count)
     assert_equal old_manifestation_count, Manifestation.count
     assert_equal old_item_count, Item.count
@@ -33,7 +33,7 @@ describe Bookmark do
     old_manifestation_count = Manifestation.count
     old_item_count = Item.count
     lambda{
-      bookmark = FactoryGirl.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}libraries/1", :title => 'test')
+      bookmark = FactoryBot.create(:user).bookmarks.create(:url => "#{LibraryGroup.site_config.url}libraries/1", :title => 'test')
     }.should_not change(Bookmark, :count)
     assert_equal old_manifestation_count, Manifestation.count
     assert_equal old_item_count, Item.count

data/spec/models/user_spec.rb

@@ -13,8 +13,8 @@ describe User do
     end
 
     it "should export share_bookmarks" do
-      user = FactoryGirl.create(:user,
-        profile: FactoryGirl.create(:profile,
+      user = FactoryBot.create(:user,
+        profile: FactoryBot.create(:profile,
           share_bookmarks: true))
       lines = User.export
       rows = CSV.new(lines, col_sep: "\t", headers: true)

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ Coveralls.wear!
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'sunspot-rails-tester'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -49,5 +49,5 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
 end
 
-FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"
-FactoryGirl.find_definitions
+FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"
+FactoryBot.find_definitions

data/spec/support/controller_macros.rb

@@ -2,14 +2,14 @@ module ControllerMacros
   def login_admin
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:admin]
-      sign_in FactoryGirl.create(:admin)
+      sign_in FactoryBot.create(:admin)
     end
   end
 
   def login_librarian
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:librarian)
+      user = FactoryBot.create(:librarian)
       sign_in user
     end
   end
@@ -17,7 +17,7 @@ module ControllerMacros
   def login_user
     before(:each) do
       @request.env["devise.mapping"] = Devise.mappings[:user]
-      user = FactoryGirl.create(:user)
+      user = FactoryBot.create(:user)
       sign_in user
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -239,6 +239,7 @@ files:
 - db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - db/migrate/20160815045420_add_most_recent_to_bookmark_stat_transitions.rb
+- db/migrate/20180107172413_add_constraints_to_most_recent_for_bookmark_stat_transitions.rb
 - lib/enju_bookmark.rb
 - lib/enju_bookmark/bookmark_helper.rb
 - lib/enju_bookmark/bookmark_url.rb
@@ -480,10 +481,12 @@ files:
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb
 - spec/dummy/db/migrate/20150124152756_add_foreign_key_to_shelves_referencing_libraries.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb
 - spec/dummy/db/migrate/20150924115059_create_withdraws.rb
+- spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb
 - spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
 - spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
 - spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb
@@ -501,6 +504,12 @@ files:
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
 - spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
+- spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
+- spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb
+- spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
+- spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
+- spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -564,7 +573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: enju_bookmark plugin
@@ -605,6 +614,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
 - spec/dummy/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20130416054135_add_circulation_status_id_to_item.rb
@@ -632,11 +642,13 @@ test_files:
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/migrate/20081030023412_create_checkout_types.rb
+- spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb
 - spec/dummy/db/migrate/20121116031206_add_fulltext_content_to_manifestation.rb
 - spec/dummy/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb
 - spec/dummy/db/migrate/015_create_creates.rb
 - spec/dummy/db/migrate/20081025083905_create_languages.rb
 - spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb
+- spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb
 - spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
 - spec/dummy/db/migrate/20130504143515_add_manifestation_id_to_classification.rb
@@ -657,6 +669,7 @@ test_files:
 - spec/dummy/db/migrate/20091012101112_add_dcndl_schema.rb
 - spec/dummy/db/migrate/20130519065638_add_lock_version_to_reserve.rb
 - spec/dummy/db/migrate/20100925043847_create_resource_import_results.rb
+- spec/dummy/db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb
 - spec/dummy/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb
 - spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb
 - spec/dummy/db/migrate/20100525124311_create_manifestation_relationships.rb
@@ -719,6 +732,8 @@ test_files:
 - spec/dummy/db/migrate/125_create_donates.rb
 - spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb
 - spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb
+- spec/dummy/db/migrate/20151125004028_add_profile_id_to_agent.rb
+- spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb
 - spec/dummy/db/migrate/20110918162329_add_note_to_series_statement.rb
 - spec/dummy/db/migrate/154_create_messages.rb
 - spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
@@ -732,6 +747,7 @@ test_files:
 - spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
 - spec/dummy/db/migrate/20120415164821_add_attachment_meta_to_manifestation.rb
 - spec/dummy/db/migrate/041_create_roles.rb
+- spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb
 - spec/dummy/db/migrate/20110301035123_add_pub_date_to_manifestation.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb
@@ -746,6 +762,7 @@ test_files:
 - spec/dummy/db/migrate/20111124110059_create_create_types.rb
 - spec/dummy/db/migrate/129_create_item_has_use_restrictions.rb
 - spec/dummy/db/migrate/20120319120638_add_content_type_id_to_manifestation.rb
+- spec/dummy/db/migrate/20180102162311_add_header_logo_meta_to_library_group.rb
 - spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb
 - spec/dummy/db/migrate/20081027150907_create_picture_files.rb
 - spec/dummy/db/migrate/20100607044753_create_manifestation_relationship_types.rb