enju_seed 0.4.0.rc.2 → 0.5.0.beta.1

data/spec/factories/profile.rb

@@ -7,11 +7,9 @@ FactoryBot.define do
     f.locale { "ja" }
     factory :librarian_profile, class: Profile do |profile|
       profile.required_role_id {Role.where(name: 'Librarian').first.id}
-      profile.association :user, factory: :librarian
     end
     factory :admin_profile, class: Profile do |profile|
       profile.required_role_id {Role.where(name: 'Administrator').first.id}
-      profile.association :user, factory: :admin
     end
   end
 end

data/spec/factories/user.rb

@@ -1,43 +1,37 @@
 FactoryBot.define do
-  factory :admin, class: User do |f|
-    f.sequence(:username){|n| "admin_#{n}"}
-    f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.password { 'adminpassword' }
-    f.password_confirmation { 'adminpassword' }
-    f.after(:create) do |user|
-      user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Administrator').id})
-      user_has_role.save
-      user.reload
+  factory :admin, class: User do
+    sequence(:username){|n| "admin_#{n}"}
+    sequence(:email){|n| "admin_#{n}@example.jp"}
+    password { 'adminpassword' }
+    password_confirmation { 'adminpassword' }
+    association :profile
+    after(:create) do |user|
+      user.role = Role.find_by(name: 'Administrator')
     end
   end
 
-  factory :librarian, class: User do |f|
-    f.sequence(:username){|n| "librarian_#{n}"}
-    f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.password { 'librarianpassword' }
-    f.password_confirmation { 'librarianpassword' }
-    f.after(:create) do |user|
-      user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Librarian').id})
-      user_has_role.save
-      user.reload
+  factory :librarian, class: User do
+    sequence(:username){|n| "librarian_#{n}"}
+    sequence(:email){|n| "librarian_#{n}@example.jp"}
+    password { 'librarianpassword' }
+    password_confirmation { 'librarianpassword' }
+    association :profile
+    after(:create) do |user|
+      user.role = Role.find_by(name: 'Librarian')
     end
   end
 
-  factory :user, class: User do |f|
-    f.sequence(:username){|n| "user_#{n}"}
-    f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.password { 'userpassword' }
-    f.password_confirmation { 'userpassword' }
-    f.after(:create) do |user|
-      user_has_role = UserHasRole.new
-      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'User').id})
-      user_has_role.save
-      user.reload
+  factory :user, class: User do
+    sequence(:username){|n| "user_#{n}"}
+    sequence(:email){|n| "user_#{n}@example.jp"}
+    password { 'userpassword' }
+    password_confirmation { 'userpassword' }
+    association :profile
+    after(:create) do |user|
+      user.role = Role.find_by(name: 'User')
     end
   end
 
-  factory :invalid_user, class: User do |f|
+  factory :invalid_user, class: User do
   end
 end

data/spec/fixtures/profiles.yml

@@ -3,7 +3,6 @@ admin:
   updated_at: 2008-05-31 13:16:30.163731 +09:00
   user_group_id: 2
   id: 1
-  user_id: 1
   note: 
   library_id: 2
   created_at: 2007-11-19 16:58:32.111941 +09:00
@@ -14,7 +13,6 @@ librarian1:
   updated_at: 2008-05-31 12:41:16.337474 +09:00
   user_group_id: 1
   id: 2
-  user_id: 2
   note: 
   library_id: 1
   created_at: 2007-11-19 16:58:33.172441 +09:00
@@ -25,7 +23,6 @@ user1:
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   user_group_id: 1
   id: 3
-  user_id: 3
   note: 
   library_id: 2
   created_at: 2007-11-19 16:58:34.637413 +09:00
@@ -36,7 +33,6 @@ librarian2:
   updated_at: 2008-05-31 12:42:23.340575 +09:00
   user_group_id: 1
   id: 4
-  user_id: 4
   note: 
   library_id: 2
   created_at: 2008-01-18 12:24:04.222344 +09:00
@@ -47,7 +43,6 @@ user2:
   updated_at: 2008-05-31 12:42:44.711117 +09:00
   user_group_id: 1
   id: 5
-  user_id: 5
   note: 
   library_id: 1
   created_at: 2008-01-18 13:29:06.922728 +09:00
@@ -58,7 +53,6 @@ user3:
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   user_group_id: 1
   id: 6
-  user_id: 6
   note: 
   library_id: 2
   created_at: 2007-11-19 16:58:34.637413 +09:00
@@ -69,7 +63,6 @@ user4:
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   user_group_id: 1
   id: 7
-  user_id: 7
   note: 
   library_id: 2
   created_at: 2007-11-19 16:58:34.637413 +09:00
@@ -81,18 +74,18 @@ user4:
 #
 # Table name: profiles
 #
-#  id                       :bigint           not null, primary key
-#  user_id                  :bigint
-#  user_group_id            :bigint
-#  library_id               :bigint
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  user_group_id            :integer
+#  library_id               :integer
 #  locale                   :string
 #  user_number              :string
 #  full_name                :text
 #  note                     :text
 #  keyword_list             :text
-#  required_role_id         :bigint
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
+#  required_role_id         :integer
+#  created_at               :datetime
+#  updated_at               :datetime
 #  checkout_icalendar_token :string
 #  save_checkout_history    :boolean          default(FALSE), not null
 #  expired_at               :datetime

data/spec/fixtures/roles.yml

@@ -28,7 +28,7 @@ role_00004:
 #
 # Table name: roles
 #
-#  id                        :bigint           not null, primary key
+#  id                        :integer          not null, primary key
 #  name                      :string           not null
 #  display_name              :string
 #  note                      :text

data/spec/fixtures/user_has_roles.yml

@@ -32,9 +32,9 @@ user4:
 #
 # Table name: user_has_roles
 #
-#  id         :bigint           not null, primary key
-#  user_id    :bigint           not null
-#  role_id    :bigint           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  role_id    :integer          not null
+#  created_at :datetime
+#  updated_at :datetime
 #

data/spec/fixtures/users.yml

@@ -6,6 +6,7 @@ admin:
   username: enjuadmin
   email: tanabe@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:32.111941 +09:00
+  profile_id: 1
 librarian1: 
   updated_at: 2008-05-31 12:41:16.337474 +09:00
   encrypted_password: $2a$10$9O2VuTccN4gHq36ARg0QReSrb1D7WrBBhZZ759RM9moHbB0W5zCzS
@@ -13,6 +14,7 @@ librarian1:
   username: librarian1
   email: librarian1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:33.172441 +09:00
+  profile_id: 2
 user1: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   encrypted_password: $2a$10$JthS59A0BNkDOoFpCXM0V.GhhffKaoWKbzpPahYp/vTFrOyM7h/uW
@@ -20,6 +22,7 @@ user1:
   username: user1
   email: user1@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
+  profile_id: 3
 librarian2: 
   updated_at: 2008-05-31 12:42:23.340575 +09:00
   encrypted_password: $2a$10$YmmTGrYQ1Ir6oc7wXnp.GuNeO1eYLoP3sv8wMSIrTdaGw2BPwRrpS
@@ -27,6 +30,7 @@ librarian2:
   username: librarian2
   email: librarian2@library.example.jp
   created_at: 2008-01-18 12:24:04.222344 +09:00
+  profile_id: 4
 user2: 
   updated_at: 2008-05-31 12:42:44.711117 +09:00
   encrypted_password: $2a$10$i7UjJhLVrJM/J7qaTwW39OXw1NiwowUEbtNHVDV0sqMLjX9.UO9ca
@@ -34,6 +38,7 @@ user2:
   username: user2
   email: user2@library.example.jp
   created_at: 2008-01-18 13:29:06.922728 +09:00
+  profile_id: 5
 user3: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
@@ -41,6 +46,7 @@ user3:
   username: user3
   email: user3@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
+  profile_id: 6
 user4: 
   updated_at: 2008-05-31 13:02:25.101261 +09:00
   encrypted_password: cc53de0c2d9a1a228daa9a673ec824473747e17507a6c3c4f7e5eff8821f531d4b9e23616b3ddc66fe17006b2298a556fbd567ac080e87f00f37eef8cee6c417
@@ -49,3 +55,4 @@ user4:
   email: user4@kamata.lib.teu.ac.jp
   created_at: 2007-11-19 16:58:34.637413 +09:00
   locked_at: <%= 1.day.ago.to_s(:db) %>
+  profile_id: 7

data/spec/models/profile_spec.rb

@@ -75,18 +75,18 @@ end
 #
 # Table name: profiles
 #
-#  id                       :bigint           not null, primary key
-#  user_id                  :bigint
-#  user_group_id            :bigint
-#  library_id               :bigint
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  user_group_id            :integer
+#  library_id               :integer
 #  locale                   :string
 #  user_number              :string
 #  full_name                :text
 #  note                     :text
 #  keyword_list             :text
-#  required_role_id         :bigint
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
+#  required_role_id         :integer
+#  created_at               :datetime
+#  updated_at               :datetime
 #  checkout_icalendar_token :string
 #  save_checkout_history    :boolean          default(FALSE), not null
 #  expired_at               :datetime

data/spec/models/role_spec.rb

@@ -29,7 +29,7 @@ end
 #
 # Table name: roles
 #
-#  id                        :bigint           not null, primary key
+#  id                        :integer          not null, primary key
 #  name                      :string           not null
 #  display_name              :string
 #  note                      :text

data/spec/models/user_has_role_spec.rb

@@ -9,9 +9,9 @@ end
 #
 # Table name: user_has_roles
 #
-#  id         :bigint           not null, primary key
-#  user_id    :bigint           not null
-#  role_id    :bigint           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  role_id    :integer          not null
+#  created_at :datetime
+#  updated_at :datetime
 #

data/spec/models/user_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe User do
@@ -106,6 +105,12 @@ describe User do
     users(:user1).active_for_authentication?.should be_falsy
   end
 
+  it "should not destroy all administrators" do
+    expect { Role.find_by(name: 'Administrator').users.each do |user|
+      user.destroy
+    end }.to raise_error(RuntimeError, "#{users(:admin).username}: This is the last administrator in this system.")
+  end
+
   if defined?(EnjuQuestion)
     it "should reset answer_feed_token" do
       users(:user1).reset_answer_feed_token

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: enju_seed
 version: !ruby/object:Gem::Version
-  version: 0.4.0.rc.2
+  version: 0.5.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: friendly_id
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: strip_attributes
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -178,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: enju_leaf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -496,7 +454,6 @@ files:
 - spec/controllers/roles_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -733,7 +690,6 @@ files:
 - spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb
 - spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb
 - spec/dummy/db/migrate/20190630115523_add_login_banner_translations_to_library_group.rb
-- spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/package.json
@@ -801,7 +757,6 @@ test_files:
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/helpers/application_helper.rb
@@ -966,7 +921,6 @@ test_files:
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb
-- spec/dummy/db/migrate/20191216131755_add_email_to_library_group.rb
 - spec/dummy/db/migrate/20120129014038_create_budget_types.rb
 - spec/dummy/db/migrate/112_create_frequencies.rb
 - spec/dummy/db/migrate/20110603184217_add_edit_mode_to_resource_import_file.rb