enju_seed 0.3.0.beta.2 → 0.3.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b31d26672c8844701cfdbec37fc2675a81a78c
-  data.tar.gz: 7464aa8b393cce0ee2b65f25b23df7854dcbfe84
+  metadata.gz: 5ba893a5163fd2bb7eb4b681a7265c7fba70b8e3
+  data.tar.gz: c3b528b1fd10d49fed41d74fcd7224abe454b449
 SHA512:
-  metadata.gz: af5c9d7deddcb3bc31ab7d907aaa9b8e8c2caee1aaef4dec4c2a18b58fab80390524358b066df1a881cba048c63f9318b206d301b1877b2f1047d8ad0e388e88
-  data.tar.gz: 92acef3d30732debbfb63d4829f908a670c79cf6e037eb8e30b72e444912bb4482de8fe8b3013e17902356f379c807ea2f554088845ba607a1d241ce5f33759a
+  metadata.gz: c487ad5770413b2821716618cad27f5a24039ab7b798de925533cdb89695a456590a1573cbb9b3ada21a282d8e50d76391185e325724bc31244a36d3079c011a
+  data.tar.gz: ffa66d57221c9a9238a5b62128837ede6fe453581c67dcf6d57064e0d6bf876d37abc183e85171d586e4ea1e87cdbef79c71fc86566b7ed5561cd0372a7c09b3

data/app/controllers/my_accounts_controller.rb

@@ -86,9 +86,9 @@ class MyAccountsController < ApplicationController
     @libraries = Library.order(:position)
     @languages = Language.order(:position)
     current_user.locked = if current_user.active_for_authentication?
-                            '0'
-                          else
-                            '1'
-                          end
+      '0'
+    else
+      '1'
+    end
   end
 end

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

@@ -6,13 +6,13 @@ 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
       if defined?(EnjuBiblio)
         has_many :import_requests
         has_many :picture_files, as: :picture_attachable, dependent: :destroy
       end
       has_one :user_has_role, dependent: :destroy
       has_one :role, through: :user_has_role
+      belongs_to :profile
       belongs_to :user_group
       belongs_to :library
       belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'

data/app/models/concerns/master_model.rb

@@ -3,14 +3,10 @@ module MasterModel
 
   included do
     acts_as_list
-    validates :name, uniqueness: { case_sensitive: false }
-    validates :name, presence: true
+    validates :name, presence: true, uniqueness: { case_sensitive: false }
     validate :name do
       valid_name?
     end
-    validate :display_name do
-      valid_yaml?
-    end
     validates :display_name, presence: true
     before_validation :set_display_name, on: :create
     strip_attributes only: :name
@@ -28,10 +24,4 @@ module MasterModel
       errors.add(:name, I18n.t('page.only_lowercase_letters_and_numbers_are_allowed'))
     end
   end
-
-  def valid_yaml?
-    YAML.load(display_name)
-  rescue Psych::SyntaxError
-    errors.add(:display_name, I18n.t('page.cannot_parse_yaml_header'))
-  end
 end

data/app/models/identity.rb

@@ -19,5 +19,5 @@ end
 #  profile_id      :integer
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
-#  provider        :string
+#  provider        :string           not null
 #

data/app/models/profile.rb

@@ -3,7 +3,7 @@ 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
+  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
@@ -15,7 +15,6 @@ class Profile < ActiveRecord::Base
   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
@@ -79,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

@@ -3,30 +3,13 @@ class Role < ActiveRecord::Base
   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.where(name: 'Guest').first
+    Role.find_by(name: 'Guest')
   end
 
   private
@@ -40,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

@@ -14,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/my_accounts/_edit_credential.html.slim

@@ -24,9 +24,9 @@
       br
       = user_form.fields_for :user_has_role do |u|
         - if current_user.has_role?('Administrator') and current_user != profile.user
-          = u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {class: 'form-control'})
+          = u.select(:role_id, @roles.collect{|r| [r.display_name, r.id]}, {}, {class: 'form-control'})
         - else
-          = u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {disabled: 'disabled', class: 'form-control'})
+          = u.select(:role_id, @roles.collect{|r| [r.display_name, r.id]}, {}, {disabled: 'disabled', class: 'form-control'})
   #right_pane_detail
     .form-group
       = f.label :full_name
@@ -40,7 +40,7 @@
       .form-group
         = f.label t('activerecord.models.user_group')
         br
-        = f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}, {}, {class: 'form-control'})
+        = f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}, {}, {class: 'form-control'})
       .form-group
         = f.label :user_number
         br
@@ -52,12 +52,12 @@
         .form-group
           = f.label t('activerecord.models.library')
           br
-          = f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}, {}, {class: 'form-control'})
+          = f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]}, {}, {class: 'form-control'})
         .form-group
           = f.label t('role.required_role')
           br
-          = f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {class: 'form-control'})
+          = f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}, {}, {class: 'form-control'})
         .form-group
           = f.label :locale
           br
-          = f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}, {}, {class: 'form-control'})
+          = f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}, {}, {class: 'form-control'})

data/app/views/my_accounts/show.html.slim

@@ -8,7 +8,7 @@
         ul.list-group
           - current_user.profile.user_group.user_group_has_checkout_types.each do |available_checkout_type|
             li.list-group-item
-              = available_checkout_type.checkout_type.display_name.localize
+              = available_checkout_type.checkout_type.display_name
               | : 
               = current_user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"]
               |  / 

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

@@ -34,9 +34,9 @@
       <%= user_form.label t('activerecord.models.role') -%><br />
       <%= user_form.fields_for :user_has_role do |u| %>
         <%- if current_user.has_role?('Administrator') and current_user != profile.user -%>
-          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name.localize, r.id]} %>
+          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name, r.id]} %>
         <% else %>
-          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name.localize, r.id]}, {}, {disabled: 'disabled'} %>
+          <%= u.select :role_id, @roles.select{|r| r.name != 'Guest' }.collect{|r| [r.display_name, r.id]}, {}, {disabled: 'disabled'} %>
         <% end %>
       <% end %>
     </div>
@@ -56,7 +56,7 @@
     <%- if current_user.has_role?('Librarian') -%>
       <div class="field">
         <%= f.label t('activerecord.models.user_group') -%><br />
-        <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
+        <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%>
       </div>
     <%- end -%>
 
@@ -72,17 +72,17 @@
     <%- if current_user.has_role?('Librarian') -%>
       <div class="field">
         <%= f.label t('activerecord.models.library') -%><br />
-        <%= f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%>
+        <%= f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]}) -%>
       </div>
 
       <div class="field">
         <%= f.label t('role.required_role') -%><br />
-        <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}) -%>
+        <%= f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}) -%>
       </div>
     <%- end -%>
     <div class="field">
       <%= f.label :locale -%><br />
-      <%= f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}) -%>
+      <%= f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}) -%>
     </div>
   </div>
 <% end %>

data/app/views/profiles/_edit_credential.html.slim

@@ -28,9 +28,9 @@
       br
       = user_form.fields_for :user_has_role do |u|
         - if current_user.has_role?('Administrator') and current_user != profile.user
-          = u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {class: 'form-control', disabled: 'disabled'})
+          = u.select(:role_id, @roles.collect{|r| [r.display_name, r.id]}, {}, {class: 'form-control', disabled: 'disabled'})
         - else
-          = u.select(:role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {class: 'form-control', disabled: 'disabled'})
+          = u.select(:role_id, @roles.collect{|r| [r.display_name, r.id]}, {}, {class: 'form-control', disabled: 'disabled'})
   #right_pane_detail
     .form-group
       = f.label :full_name
@@ -44,7 +44,7 @@
       .form-group
         = f.label t('activerecord.models.user_group')
         br
-        = f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}, {}, {class: 'form-control'})
+        = f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}, {}, {class: 'form-control'})
       .form-group
         = f.label :user_number
         br
@@ -56,12 +56,12 @@
         .form-group
           = f.label t('activerecord.models.library')
           br
-          = f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}, {}, {class: 'form-control'})
+          = f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]}, {}, {class: 'form-control'})
         .form-group
           = f.label t('role.required_role')
           br
-          = f.select(:required_role_id, @roles.collect{|r| [r.display_name.localize, r.id]}, {}, {class: 'form-control'})
+          = f.select(:required_role_id, @roles.collect{|r| [r.display_name, r.id]}, {}, {class: 'form-control'})
         .form-group
           = f.label :locale
           br
-          = f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]}, {}, {class: 'form-control'})
+          = f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]}, {}, {class: 'form-control'})

data/app/views/profiles/new.html.slim

@@ -38,13 +38,13 @@
             = f.text_field :full_name_transcription, class: 'form-control'
           .form-group
             = f.label :user_group_id
-            = f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]})
+            = f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]})
           .form-group
             = f.label t('activerecord.models.library')
-            = f.select(:library_id, @libraries.collect{|l| [l.display_name.localize, l.id]})
+            = f.select(:library_id, @libraries.collect{|l| [l.display_name, l.id]})
           .form-group
             = f.label :locale
-            = f.select(:locale, @available_languages.collect{|language| [language.display_name.localize, language.iso_639_1]})
+            = f.select(:locale, @available_languages.collect{|language| [language.display_name, language.iso_639_1]})
           - if defined?(EnjuSearchLog)
             .form-group
               = f.label :save_search_history

data/app/views/roles/index.html.slim

@@ -21,7 +21,7 @@
         td
           = link_to role.name, role
         td
-          = link_to role.display_name.localize, role
+          = link_to role.display_name, role
         td
           = link_to t('page.edit'), edit_role_path(role)
           = link_to t('page.destroy'), role, data: {confirm: t('page.are_you_sure')}, method: :delete

data/app/views/roles/show.html.slim

@@ -23,7 +23,7 @@
       strong
         = t('activerecord.attributes.role.display_name')
         | :
-      = @role.display_name.localize
+      = @role.display_name
     p
       strong
         = t('activerecord.attributes.role.score')

data/db/migrate/041_create_roles.rb

@@ -1,11 +1,10 @@
-class CreateRoles < ActiveRecord::Migration
+class CreateRoles < ActiveRecord::Migration[5.0]
   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
+      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
+class CreateUserHasRoles < ActiveRecord::Migration[5.0]
   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/20140122054321_create_profiles.rb

@@ -1,16 +1,10 @@
-class CreateProfiles < ActiveRecord::Migration
+class CreateProfiles < ActiveRecord::Migration[5.0]
   def change
-    if ENV['ENJU_ID_TYPE'] == 'uuid'
-      options = {id: :uuid, default: 'gen_random_uuid()'}
-    else
-      options = {}
-    end
-    create_table :profiles, options 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
@@ -18,7 +12,5 @@ class CreateProfiles < ActiveRecord::Migration
 
       t.timestamps
     end
-
-    add_index :profiles, :user_number, unique: true
   end
 end