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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77bf05eb53d054c79b891f6970a7e80277be554a4f4ce49588cc7836a2506f8a
-  data.tar.gz: 2b925b9a23968bd6a08ba40214e09523902e470da8ccc3e7ad5c43e3b5843134
+  metadata.gz: 6a25e3af94b4a4a12b8c78cb2a39f93d3b4d2d3994c716a062e2ac270c31786a
+  data.tar.gz: 2009ab77aa47750523a85de373b75db1409dfa3c73e89cef9fd31eb6d2b90bf5
 SHA512:
-  metadata.gz: fc7a73ccff4bf3621c210082b8856b633655e794f5c6efd04153d62e28cf88ae6522d0e428e1c8d8f6a626c5f9e5613dbf3c6e3e0719470201bd0e2e541bb4ad
-  data.tar.gz: d9d5d19fa8b23b459b14964e3bc68de2094931faa5b41bdcffba4bd835e49f64f3295d7374f8320e2ede400f78a29a2303f026e6b8929b20971a93ae53c0ae26
+  metadata.gz: fc80f7da0b4c02c70d5d223922c7a700a9aceb2a44141851d4c60a30eaf3dc48ae209eae26e13f517109dcb0d0f738841beb8e1dfd7283f626baf93958ee533d
+  data.tar.gz: 98489cd55753b5d2e4d5e02b0ed28cdb611db7028b70f1eadfb039e99c3cca9820d9b4ec3268e5a614839fe6d37c05e6cf8c2c7e5c9f5ca6b950bffb8c84afcc

data/README.md

@@ -1,6 +1,6 @@
 # EnjuSeed
-[![CircleCI](https://circleci.com/gh/next-l/enju_seed/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_seed/tree/2.x)
-[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_seed/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_seed?branch=2.x)
+[![CircleCI](https://circleci.com/gh/next-l/enju_seed/tree/master.svg?style=svg)](https://circleci.com/gh/next-l/enju_seed/tree/master)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_seed/badge.svg?branch=master)](https://coveralls.io/github/next-l/enju_seed?branch=master)
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/profiles_controller.rb

@@ -8,7 +8,7 @@ class ProfilesController < ApplicationController
   # GET /profiles.json
   def index
     if params[:username].present?
-      profile = User.find_by(username: params[:username]).try(:profile)
+      profile = User.where(username: params[:username]).first.try(:profile)
       if profile
         redirect_to profile
         return
@@ -116,7 +116,7 @@ class ProfilesController < ApplicationController
     respond_to do |format|
       if @profile.save
         if @profile.user
-          @profile.user.role = Role.find_by(name: 'User')
+          @profile.user.role = Role.where(name: 'User').first
           flash[:temporary_password] = password
         end
         format.html { redirect_to @profile, notice: t('controller.successfully_created', model: t('activerecord.models.profile')) }
@@ -132,7 +132,7 @@ class ProfilesController < ApplicationController
   # PUT /profiles/1
   # PUT /profiles/1.json
   def update
-    @profile.update(profile_update_params)
+    @profile.update_attributes(profile_update_params)
     if @profile.user
       if @profile.user.auto_generated_password == "1"
         password = @profile.user.set_auto_generated_password

data/app/controllers/roles_controller.rb

@@ -35,7 +35,7 @@ class RolesController < ApplicationController
     end
 
     respond_to do |format|
-      if @role.update(role_params)
+      if @role.update_attributes(role_params)
         format.html { redirect_to @role, notice: t('controller.successfully_updated', model: t('activerecord.models.role')) }
         format.json { head :no_content }
       else

data/app/models/concerns/enju_seed/enju_user.rb

@@ -6,7 +6,7 @@ module EnjuSeed
       scope :administrators, -> { joins(:role).where('roles.name = ?', 'Administrator') }
       scope :librarians, -> { joins(:role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') }
       scope :suspended, -> { where('locked_at IS NOT NULL') }
-      has_one :profile, dependent: :nullify
+      belongs_to :profile
       if defined?(EnjuBiblio)
         has_many :import_requests
         has_many :picture_files, as: :picture_attachable, dependent: :destroy
@@ -19,6 +19,7 @@ module EnjuSeed
         with: /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\z/
       }
       validates :email, format: Devise::email_regexp, allow_blank: true, uniqueness: true
+      validates :profile_id, uniqueness: true
       validates_date :expired_at, allow_blank: true
 
       with_options if: :password_required? do |v|
@@ -29,7 +30,6 @@ module EnjuSeed
       end
 
       before_validation :set_lock_information
-      before_destroy :check_role_before_destroy
       before_save :check_expiration
       after_create :set_confirmation
 
@@ -172,16 +172,6 @@ module EnjuSeed
       end
     end
 
-    # ユーザの削除前に、管理者ユーザが不在にならないかどうかをチェックします。
-    # @return [Object]
-    def check_role_before_destroy
-      if has_role?('Administrator')
-        if Role.find_by(name: 'Administrator').users.count == 1
-          raise username + 'This is the last administrator in this system.'
-        end
-      end
-    end
-
     # ユーザに自動生成されたパスワードを設定します。
     # @return [String]
     def set_auto_generated_password
@@ -209,7 +199,7 @@ module EnjuSeed
     # @return [Boolean]
     def last_librarian?
       if has_role?('Librarian')
-        role = Role.find_by(name: 'Librarian')
+        role = Role.where(name: 'Librarian').first
         return true if role.users.count == 1
         false
       end
@@ -244,7 +234,7 @@ module EnjuSeed
 
       # 最後の管理者を削除しようとした
       if has_role?('Administrator')
-        if Role.find_by(name: 'Administrator').users.count == 1
+        if Role.where(name: 'Administrator').first.users.count == 1
           errors[:base] << I18n.t('user.last_administrator')
         end
       end

data/app/models/profile.rb

@@ -1,7 +1,7 @@
-class Profile < ApplicationRecord
+class Profile < ActiveRecord::Base
   scope :administrators, -> { joins(user: :role).where('roles.name = ?', 'Administrator') }
   scope :librarians, -> { joins(user: :role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') }
-  belongs_to :user, dependent: :destroy, optional: true
+  has_one :user, dependent: :destroy
   belongs_to :library
   belongs_to :user_group
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' #, validate: true
@@ -10,10 +10,8 @@ class Profile < ApplicationRecord
   accepts_nested_attributes_for :identities, allow_destroy: true, reject_if: :all_blank
 
   validates_associated :user_group, :library
-  validates :user, uniqueness: true, associated: true, allow_blank: true
   validates_presence_of :user_group, :library, :locale #, :user_number
   validates :user_number, uniqueness: true, format: { with: /\A[0-9A-Za-z_]+\z/ }, allow_blank: true
-  validates :user_id, uniqueness: true, allow_blank: true
   validates :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\z/ }, allow_blank: true
 
   strip_attributes only: :user_number
@@ -50,7 +48,7 @@ class Profile < ApplicationRecord
   # 既定のユーザ権限を設定します。
   # @return [void]
   def set_role_and_agent
-    self.required_role = Role.find_by(name: 'Librarian') unless required_role
+    self.required_role = Role.where(name: 'Librarian').first unless required_role
     self.locale = I18n.default_locale.to_s unless locale
   end
 
@@ -77,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/app/models/role.rb

@@ -1,4 +1,4 @@
-class Role < ApplicationRecord
+class Role < ActiveRecord::Base
   include MasterModel
   validates :name, presence: true, format: { with: /\A[A-Za-z][a-z_,]*[a-z]\z/ }
   has_many :user_has_roles
@@ -22,7 +22,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/app/models/user_has_role.rb

@@ -1,16 +1,27 @@
-class UserHasRole < ApplicationRecord
+class UserHasRole < ActiveRecord::Base
   belongs_to :user
   belongs_to :role
   accepts_nested_attributes_for :role
+
+  before_destroy :check_role_before_destroy
+
+  # ユーザの削除前に、管理者ユーザが不在にならないかどうかをチェックします。
+  # @return [Object]
+  def check_role_before_destroy
+    return unless user.has_role?('Administrator')
+    if UserHasRole.where(role: Role.find_by(name: 'Administrator')).count == 1
+      raise user.username + ': This is the last administrator in this system.'
+    end
+  end
 end
 
 # == Schema Information
 #
 # 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/app/views/roles/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name, required: true %>
+    <%= f.text_field :name %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/db/migrate/041_create_roles.rb

@@ -1,4 +1,4 @@
-class CreateRoles < ActiveRecord::Migration[5.2]
+class CreateRoles < ActiveRecord::Migration[4.2]
   def change
     create_table "roles" do |t|
       t.column :name, :string, null: false

data/db/migrate/20100606065209_create_user_has_roles.rb

@@ -1,4 +1,4 @@
-class CreateUserHasRoles < ActiveRecord::Migration[5.2]
+class CreateUserHasRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :user_has_roles do |t|
       t.references :user, index: true, foreign_key: true, null: false

data/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -1,6 +1,7 @@
-class AddAdditionalAttributesToUser < ActiveRecord::Migration[5.2]
+class AddAdditionalAttributesToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :username, :string
+    add_column :users, :deleted_at, :datetime
     add_column :users, :expired_at, :datetime
 
     add_column :users, :failed_attempts, :integer, default: 0

data/db/migrate/20140122054321_create_profiles.rb

@@ -1,4 +1,4 @@
-class CreateProfiles < ActiveRecord::Migration[5.2]
+class CreateProfiles < ActiveRecord::Migration[4.2]
   def change
     create_table :profiles do |t|
       t.references :user, index: true, foreign_key: true

data/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb

@@ -1,4 +1,4 @@
-class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration[5.2]
+class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration[4.2]
   def up
     remove_index :users, :email
     add_index :users, :email

data/db/migrate/20140811031145_add_expired_at_to_profile.rb

@@ -1,4 +1,4 @@
-class AddExpiredAtToProfile < ActiveRecord::Migration[5.2]
+class AddExpiredAtToProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :profiles, :expired_at, :datetime
   end

data/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb

@@ -1,4 +1,4 @@
-class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[5.2]
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :profiles, :full_name_transcription, :text
   end

data/db/migrate/20141003182825_add_date_of_birth_to_profile.rb

@@ -1,4 +1,4 @@
-class AddDateOfBirthToProfile < ActiveRecord::Migration[5.2]
+class AddDateOfBirthToProfile < ActiveRecord::Migration[4.2]
   def change
     add_column :profiles, :date_of_birth, :datetime
   end

data/lib/enju_seed/engine.rb

@@ -13,7 +13,6 @@ require 'rails_autolink'
 require 'browser'
 require 'simple_form'
 require 'validates_timeliness'
-require 'paperclip'
 require 'json_translate'
 
 module EnjuSeed

data/lib/enju_seed/version.rb

@@ -1,3 +1,3 @@
 module EnjuSeed
-  VERSION = "0.4.0.rc.2".freeze
+  VERSION = "0.5.0.beta.1"
 end

data/lib/tasks/enju_seed_tasks.rake

@@ -5,23 +5,4 @@ namespace :enju_seed do
       ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_seed', File.basename(file, '.*'))
     end
   end
-
-  desc "upgrade enju_seed to enju_leaf 2.0"
-  task upgrade: :environment do
-    sql = 'UPDATE users SET profile_id = profiles.id FROM profiles WHERE profiles.user_id = users.id;'
-    ActiveRecord::Base.connection.execute(sql)
-
-    class_names = [
-      Role
-    ]
-    class_names.each do |klass|
-      klass.find_each do |record|
-        I18n.available_locales.each do |locale|
-          next unless record.respond_to?("display_name_#{locale}")
-          record.update("display_name_#{locale}": YAML.safe_load(record[:display_name])[locale.to_s])
-        end
-      end
-    end
-    puts 'enju_seed: The upgrade completed successfully.'
-  end
 end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -27,9 +27,7 @@ describe MyAccountsController do
   describe "GET edit" do
     describe "When logged in as Administrator" do
       before(:each) do
-        profile = FactoryBot.create(:profile)
         @user = FactoryBot.create(:admin)
-        @user.profile = profile
         sign_in @user
       end
 
@@ -41,9 +39,7 @@ describe MyAccountsController do
 
     describe "When logged in as Librarian" do
       before(:each) do
-        profile = FactoryBot.create(:profile)
         @user = FactoryBot.create(:librarian)
-        @user.profile = profile
         sign_in @user
       end
 
@@ -55,9 +51,7 @@ describe MyAccountsController do
 
     describe "When logged in as User" do
       before(:each) do
-        profile = FactoryBot.create(:profile)
         @user = FactoryBot.create(:user)
-        @user.profile = profile
         sign_in @user
       end
 
@@ -86,9 +80,7 @@ describe MyAccountsController do
 
     describe "When logged in as Administrator" do
       before(:each) do
-        profile = FactoryBot.create(:profile)
         @user = FactoryBot.create(:admin, password: 'password', password_confirmation: 'password')
-        @user.profile = profile
         sign_in @user
       end
 
@@ -134,9 +126,7 @@ describe MyAccountsController do
 
     describe "When logged in as Librarian" do
       before(:each) do
-        profile = FactoryBot.create(:profile)
         @user = FactoryBot.create(:librarian, password: 'password', password_confirmation: 'password')
-        @user.profile = profile
         sign_in @user
       end
 
@@ -177,9 +167,7 @@ describe MyAccountsController do
 
     describe "When logged in as User" do
       before(:each) do
-        profile = FactoryBot.create(:profile)
         @user = FactoryBot.create(:user, password: 'password', password_confirmation: 'password')
-        @user.profile = profile
         sign_in @user
       end
 

data/spec/controllers/profiles_controller_spec.rb

@@ -71,10 +71,10 @@ describe ProfilesController do
         assigns(:profile).should eq(profiles(:admin))
       end
       it "assigns the another requested user as @profile" do
-        admin_profile = FactoryBot.create :admin_profile
-        get :show, params: { id: admin_profile.id }
+        admin = FactoryBot.create(:admin).profile
+        get :show, params: { id: admin.id }
         expect(response).not_to be_forbidden
-        expect(assigns(:profile)).to eq admin_profile
+        expect(assigns(:profile)).to eq admin
       end
     end
 
@@ -85,16 +85,20 @@ describe ProfilesController do
         get :show, params: { id: profiles(:librarian1).id }
         assigns(:profile).should eq(profiles(:librarian1))
       end
+
       it "should not assign the requested user as @admin" do
-        admin = FactoryBot.create(:admin_profile)
-        get :show, params: { id: admin.id }
+        admin = FactoryBot.create(:admin)
+        admin.profile.update(required_role: Role.find_by(name: 'Administrator'))
+        get :show, params: { id: admin.profile.id }
         response.should be_forbidden
       end
+
       it "should assign the requested user as @librarian" do
-        librarian = FactoryBot.create(:librarian_profile)
-        get :show, params: { id: librarian.id }
+        librarian = FactoryBot.create(:librarian)
+        librarian.profile.update(required_role: Role.find_by(name: 'Librarian'))
+        get :show, params: { id: librarian.profile.id }
         response.should_not be_forbidden
-        assigns(:profile).should eq librarian
+        assigns(:profile).should eq librarian.profile
       end
     end
 
@@ -185,23 +189,24 @@ describe ProfilesController do
         assigns(:profile).should eq(profile)
       end
       it "should not get edit page for admin required user" do
-        admin = FactoryBot.create(:admin_profile)
+        admin = FactoryBot.create(:admin).profile
         get :edit, params: { id: admin.id }
         response.should be_forbidden
         # assigns(:profile).should_not eq(admin)
       end
       it "should get edit page for other librarian user" do
-        librarian = FactoryBot.create(:librarian_profile)
+        librarian = FactoryBot.create(:librarian).profile
         get :edit, params: { id: librarian.id }
         response.should_not be_forbidden
         assigns(:profile).should eq librarian
       end
 
       it "should get edit page for other librarian user" do
-        admin = FactoryBot.create(:admin_profile, required_role_id: Role.where(name: 'Librarian').first.id)
-        get :edit, params: { id: admin.id }
+        admin = FactoryBot.create(:admin)
+        admin.profile.update(required_role: Role.find_by(name: 'Librarian'))
+        get :edit, params: { id: admin.profile.id }
         response.should be_forbidden
-        assigns(:profile).should eq admin
+        assigns(:profile).should eq admin.profile
       end
     end
 
@@ -551,8 +556,8 @@ describe ProfilesController do
       end
 
       it "should not be able to delete other librarian user" do
-        librarian = FactoryBot.create(:librarian_profile)
-        delete :destroy, params: { id: librarian.id }
+        librarian = FactoryBot.create(:librarian)
+        delete :destroy, params: { id: librarian.profile.id }
         response.should be_forbidden
       end
     end