enju_seed 0.3.5 → 0.4.0.beta.1

data/app/models/profile.rb

@@ -1,19 +1,20 @@
-class Profile < ApplicationRecord
+class Profile < ActiveRecord::Base
+  enju_search_log_profile_model if defined?(EnjuSearchLog)
+
   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
-  belongs_to :library
+  has_one :user
+  belongs_to :library, validate: true
   belongs_to :user_group
-  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' #, validate: true
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' # , validate: true
   has_many :identities
   has_many :agents
   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_associated :user
+  validates :user_group, :library, :locale, presence: true # , :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 +51,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 +78,17 @@ end
 #
 # Table name: profiles
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
-#  user_group_id            :integer
-#  library_id               :integer
+#  id                       :uuid             not null, primary key
+#  user_group_id            :uuid
+#  library_id               :uuid
 #  locale                   :string
 #  user_number              :string
 #  full_name                :text
 #  note                     :text
 #  keyword_list             :text
 #  required_role_id         :integer
-#  created_at               :datetime
-#  updated_at               :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #  checkout_icalendar_token :string
 #  save_checkout_history    :boolean          default(FALSE), not null
 #  expired_at               :datetime

data/app/models/role.rb

@@ -1,35 +1,19 @@
-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
   has_many :users, through: :user_has_roles
-  after_save :clear_all_cache
-  after_destroy :clear_all_cache
 
   extend FriendlyId
   friendly_id :name
-
-  def localized_name
-    display_name.localize
-  end
-
-  def self.all_cache
-    if Rails.env == 'production'
-      Rails.cache.fetch('role_all'){ Role.select(:name).all }
-    else
-      Role.select(:name)
-    end
-  end
-
-  def clear_all_cache
-    Rails.cache.delete('role_all')
-  end
+  translates :display_name
 
   def self.default_role
     Role.find_by(name: 'Guest')
   end
 
   private
+
   def valid_name?
     true
   end
@@ -39,12 +23,12 @@ end
 #
 # Table name: roles
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :string
-#  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
-#  score        :integer          default(0), not null
-#  position     :integer
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name_translations :jsonb
+#  note                      :text
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  score                     :integer          default(0), not null
+#  position                  :integer
 #

data/app/models/user_has_role.rb

@@ -1,7 +1,10 @@
-class UserHasRole < ApplicationRecord
+class UserHasRole < ActiveRecord::Base
   belongs_to :user
   belongs_to :role
   accepts_nested_attributes_for :role
+
+  #  validates_uniqueness_of :role_id, scope: :user_id
+  #  validates_presence_of :role_id, :user_id
 end
 
 # == Schema Information
@@ -11,6 +14,6 @@ end
 #  id         :integer          not null, primary key
 #  user_id    :integer          not null
 #  role_id    :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #

data/app/policies/user_export_file_policy.rb

@@ -0,0 +1,21 @@
+class UserExportFilePolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Administrator')
+  end
+end

data/app/policies/user_import_file_policy.rb

@@ -0,0 +1,21 @@
+class UserImportFilePolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Librarian')
+  end
+end

data/app/policies/user_import_result_policy.rb

@@ -0,0 +1,21 @@
+class UserImportResultPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    false
+  end
+
+  def update?
+    false
+  end
+
+  def destroy?
+    false
+  end
+end

data/app/views/profiles/show.html.erb

@@ -28,7 +28,7 @@
     <%= render 'submenu_checkout', profile: @profile %>
   <% end %>
   <ul>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), :back %></li>
     <% if user_signed_in? %>
       <% if policy(@profile).update? %>
         <li><%= link_to t('page.edit'), edit_profile_path(@profile) -%></li>

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/app/views/roles/show.html.erb

@@ -13,6 +13,11 @@
   <%= @role.display_name.localize -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.role.score') -%>:</strong>
+  <%= @role.score -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.role.note') -%>:</strong>
   <%= @role.note -%>
@@ -36,6 +41,6 @@
     <%- if policy(@role).update? -%>
       <li><%= link_to t('page.edit'), edit_role_path(@role) -%></li>
     <%- end -%>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <li><%= link_to t('page.back'), roles_path -%></li>
   </ul>
 </div>

data/db/migrate/041_create_roles.rb

@@ -1,11 +1,10 @@
-class CreateRoles < ActiveRecord::Migration[4.2]
+class CreateRoles < ActiveRecord::Migration[5.1]
   def change
-    create_table "roles" do |t|
-      t.column :name, :string, null: false
-      t.column :display_name, :string
-      t.column :note, :text
-      t.column :created_at, :datetime
-      t.column :updated_at, :datetime
+    create_table 'roles' do |t|
+      t.string :name, null: false
+      t.jsonb :display_name_translations
+      t.text :note
+      t.timestamps
       t.integer :score, default: 0, null: false
       t.integer :position
     end

data/db/migrate/20100606065209_create_user_has_roles.rb

@@ -1,8 +1,8 @@
-class CreateUserHasRoles < ActiveRecord::Migration[4.2]
+class CreateUserHasRoles < ActiveRecord::Migration[5.1]
   def change
     create_table :user_has_roles do |t|
-      t.references :user, index: true, foreign_key: true, null: false
-      t.references :role, index: true, foreign_key: true, null: false
+      t.references :user, foreign_key: {on_delete: :cascade}, null: false
+      t.references :role, foreign_key: true, null: false
 
       t.timestamps
     end

data/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -1,4 +1,4 @@
-class AddAdditionalAttributesToUser < ActiveRecord::Migration[4.2]
+class AddAdditionalAttributesToUser < ActiveRecord::Migration[5.1]
   def change
     add_column :users, :username, :string
     add_column :users, :deleted_at, :datetime
@@ -11,6 +11,6 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration[4.2]
     add_column :users, :confirmed_at, :datetime
 
     add_index :users, :username, unique: true
-    add_index :users, :unlock_token,         unique: true
+    add_index :users, :unlock_token, unique: true
   end
 end

data/db/migrate/20140122054321_create_profiles.rb

@@ -1,11 +1,10 @@
-class CreateProfiles < ActiveRecord::Migration[4.2]
+class CreateProfiles < ActiveRecord::Migration[5.1]
   def change
-    create_table :profiles do |t|
-      t.references :user, index: true, foreign_key: true
-      t.references :user_group, index: true
-      t.references :library, index: true
+    create_table :profiles, id: :uuid, default: 'gen_random_uuid()' do |t|
+      t.references :user_group, type: :uuid
+      t.references :library, type: :uuid
       t.string :locale
-      t.string :user_number
+      t.string :user_number, index: {unique: true}
       t.text :full_name
       t.text :note
       t.text :keyword_list
@@ -13,7 +12,5 @@ class CreateProfiles < ActiveRecord::Migration[4.2]
 
       t.timestamps
     end
-
-    add_index :profiles, :user_number, unique: true
   end
 end

data/db/migrate/20140811031145_add_expired_at_to_profile.rb

@@ -1,4 +1,4 @@
-class AddExpiredAtToProfile < ActiveRecord::Migration[4.2]
+class AddExpiredAtToProfile < ActiveRecord::Migration[5.1]
   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[4.2]
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[5.1]
   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[4.2]
+class AddDateOfBirthToProfile < ActiveRecord::Migration[5.1]
   def change
     add_column :profiles, :date_of_birth, :datetime
   end

data/db/migrate/20150421023923_create_identities.rb

@@ -1,14 +1,12 @@
-class CreateIdentities < ActiveRecord::Migration[4.2]
+class CreateIdentities < ActiveRecord::Migration[5.1]
   def change
     create_table :identities do |t|
-      t.string :name
-      t.string :email
+      t.string :name, index: true
+      t.string :email, index: true
       t.string :password_digest
       t.references :profile, index: true
 
-      t.timestamps null: false
+      t.timestamps
     end
-    add_index :identities, :name
-    add_index :identities, :email
   end
 end

data/db/migrate/20151126005552_add_provider_to_identity.rb

@@ -1,5 +1,5 @@
-class AddProviderToIdentity < ActiveRecord::Migration[4.2]
+class AddProviderToIdentity < ActiveRecord::Migration[5.1]
   def change
-    add_column :identities, :provider, :string
+    add_column :identities, :provider, :string, null: false
   end
 end

data/db/migrate/20170114174536_add_profile_id_to_user.rb

@@ -0,0 +1,5 @@
+class AddProfileIdToUser < ActiveRecord::Migration[5.1]
+  def change
+    add_reference :users, :profile, foreign_key: {on_delete: :cascade}, type: :uuid
+  end
+end

data/lib/enju_seed.rb

@@ -1,6 +1,5 @@
-require "enju_seed/engine"
-require "enju_seed/version"
-require "enju_seed/localized_name"
+require 'enju_seed/engine'
 
 module EnjuSeed
+  # Your code goes here...
 end

data/lib/enju_seed/engine.rb

@@ -13,9 +13,8 @@ require 'sitemap_generator'
 require 'browser'
 require 'simple_form'
 require 'validates_timeliness'
-require 'paperclip'
-require 'globalize'
-require 'globalize-accessors'
+require 'json_translate'
+require 'statesman'
 
 module EnjuSeed
   class Engine < ::Rails::Engine

data/lib/enju_seed/localized_name.rb

@@ -1,9 +1,7 @@
 module LocalizedName
   def localize(locale = I18n.locale)
     string = YAML.load(self)
-    if string.is_a?(Hash) and string[locale.to_s]
-      return string[locale.to_s]
-    end
+    return string[locale.to_s] if string.is_a?(Hash) && string[locale.to_s]
     self
   rescue NoMethodError
     self

data/lib/enju_seed/version.rb

@@ -1,3 +1,3 @@
 module EnjuSeed
-  VERSION = "0.3.5".freeze
+  VERSION = '0.4.0.beta.1'.freeze
 end

data/lib/tasks/enju_seed_tasks.rake

@@ -1,8 +1,4 @@
-namespace :enju_seed do
-  desc "create initial records for enju_seed"
-  task setup: :environment do
-    Dir.glob(Rails.root.to_s + '/db/fixtures/enju_seed/*.yml').each do |file|
-      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_seed', File.basename(file, '.*'))
-    end
-  end
-end
+# desc "Explaining what the task does"
+# task :enju_seed do
+#   # Task goes here
+# end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -3,20 +3,20 @@ require 'rails_helper'
 describe MyAccountsController do
   fixtures :all
 
-  describe "GET show" do
-    describe "When logged in as Administrator" do
+  describe 'GET show' do
+    describe 'When logged in as Administrator' do
       before(:each) do
         sign_in User.friendly.find('enjuadmin')
       end
 
-      it "assigns the requested user as @user" do
+      it 'assigns the requested user as @user' do
         get :show, params: { id: 'admin' }
         expect(response).to be_successful
       end
     end
 
-    describe "When not logged in" do
-      it "assigns the requested user as @user" do
+    describe 'When not logged in' do
+      it 'assigns the requested user as @user' do
         get :show, params: { id: 'admin' }
         expect(assigns(:user)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -24,52 +24,46 @@ describe MyAccountsController do
     end
   end
 
-  describe "GET edit" do
-    describe "When logged in as Administrator" 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
 
-      it "assigns the requested user as @user" do
+      it 'assigns the requested user as @user' do
         get :edit
         expect(assigns(:profile)).to eq(@user.profile)
       end
     end
 
-    describe "When logged in as Librarian" 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
 
-      it "should assign the requested user as @user" do
+      it 'should assign the requested user as @user' do
         get :edit
         expect(assigns(:profile)).to eq(@user.profile)
       end
     end
 
-    describe "When logged in as User" 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
 
-      it "should assign the requested user as @user" do
+      it 'should assign the requested user as @user' do
         get :edit
         expect(assigns(:profile)).to eq(@user.profile)
         expect(response).to be_successful
       end
     end
 
-    describe "When not logged in" do
-      it "should not assign the requested user as @user" do
+    describe 'When not logged in' do
+      it 'should not assign the requested user as @user' do
         get :edit
         expect(assigns(:user)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
@@ -77,34 +71,32 @@ describe MyAccountsController do
     end
   end
 
-  describe "PUT update" do
+  describe 'PUT update' do
     before(:each) do
       @attrs = { user_attributes: { email: 'newaddress@example.jp', current_password: 'password' }, locale: 'en' }
       @invalid_attrs = { user_attributes: { username: '' }, user_number: '日本語' }
       @invalid_passwd_attrs = { user_attributes: { current_password: '' } }
     end
 
-    describe "When logged in as Administrator" 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
 
-      describe "with valid params" do
-        it "updates the requested user" do
+      describe 'with valid params' do
+        it 'updates the requested user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
         end
 
-        it "assigns the requested user as @user" do
+        it 'assigns the requested user as @user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
         end
 
-        it "redirects to the user" do
+        it 'redirects to the user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
@@ -112,15 +104,15 @@ describe MyAccountsController do
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested user as @user" do
+      describe 'with invalid params' do
+        it 'assigns the requested user as @user' do
           put :update, params: { profile: @invalid_attrs }
           expect(assigns(:profile)).to eq(@user.profile)
         end
 
         it "re-renders the 'edit' template" do
           put :update, params: { profile: @invalid_attrs }
-          expect(response).to render_template("edit")
+          expect(response).to render_template('edit')
         end
       end
 
@@ -132,27 +124,25 @@ describe MyAccountsController do
       # end
     end
 
-    describe "When logged in as Librarian" 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
 
-      describe "with valid params" do
-        it "updates the requested user" do
+      describe 'with valid params' do
+        it 'updates the requested user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
         end
 
-        it "assigns the requested user as @user" do
+        it 'assigns the requested user as @user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
         end
 
-        it "redirects to the user" do
+        it 'redirects to the user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
@@ -160,36 +150,34 @@ describe MyAccountsController do
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the user as @user" do
+      describe 'with invalid params' do
+        it 'assigns the user as @user' do
           put :update, params: { profile: @invalid_attrs }
           expect(assigns(:profile)).to_not be_valid
           expect(response).to be_successful
         end
 
-        it "should ignore username" do
+        it 'should ignore username' do
           put :update, params: { profile: @invalid_attrs }
-          expect(response).to render_template("edit")
+          expect(response).to render_template('edit')
           expect(assigns(:profile).changed?).to be_truthy
         end
       end
     end
 
-    describe "When logged in as User" 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
 
-      describe "with valid params" do
-        it "updates the requested user" do
+      describe 'with valid params' do
+        it 'updates the requested user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
         end
 
-        it "assigns the requested user as @user" do
+        it 'assigns the requested user as @user' do
           @attrs[:user_attributes][:id] = @user.id
           put :update, params: { profile: @attrs }
           expect(assigns(:profile)).to eq(@user.profile)
@@ -197,29 +185,30 @@ describe MyAccountsController do
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested user as @user" do
+      describe 'with invalid params' do
+        it 'assigns the requested user as @user' do
           put :update, params: { profile: @invalid_attrs }
+          #expect(response).to be_successful
           expect(assigns(:profile).user.username).to eq(@user.username)
           expect(response).to redirect_to(my_account_url)
         end
       end
     end
 
-    describe "When not logged in" do
-      describe "with valid params" do
-        it "updates the requested user" do
+    describe 'When not logged in' do
+      describe 'with valid params' do
+        it 'updates the requested user' do
           put :update, params: { profile: @attrs }
         end
 
-        it "should be forbidden" do
+        it 'should be forbidden' do
           put :update, params: { profile: @attrs }
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
-      describe "with invalid params" do
-        it "assigns the requested user as @user" do
+      describe 'with invalid params' do
+        it 'assigns the requested user as @user' do
           put :update, params: { profile: @invalid_attrs }
           expect(response).to redirect_to(new_user_session_url)
         end