enju_seed 0.3.6 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 954c50f3db39ed75d15e494f3abe93af699556e4981fbf21ea8dad5ea6f8b8b1
-  data.tar.gz: 35991b1a992c6b70e0726dcaa35faf211faa75c997f51717d8260a9c706ef41f
+SHA1:
+  metadata.gz: b5fffbc1a85f126c197b09fe20aa46de6d61fa3a
+  data.tar.gz: d6bb594aa98a2d6d93032321b2de745039da40f4
 SHA512:
-  metadata.gz: 202247de7ec8a79ba7cb7a5844b7d6d25668a7cdb4f40af97c740bf6d6c2068262e06791c4317d07fdc733568bd53a539be6137ec73e7c3f45c17c106a3cda32
-  data.tar.gz: cb12be922423784e642770a0ddbdbeabfbfa78d78bb9aee8d640c9768a4400b1ad67a91faac531cf4b0caecf77c6b6bb20ff2f04abc92ca2d5cd2e47e24ab78a
+  metadata.gz: 89cad5681535a5c84a81bd18489e4ebe861d676545d4301ba91fcfcf6fb967a8c07303b63466164190b44571a1520e9c9c571c6b3b4627e43fc147d68c648f17
+  data.tar.gz: 84e0a347b30ba2afb9d2f8a55aaefc3896f160b6285536b881e2e3b016e2442b1da6f796ef21ece33feeb31ffcebe1dc0b38dd3fa11ab78dfa2b3367fcf8970a

data/README.md

@@ -1,10 +1,12 @@
 # EnjuSeed
-[![Travis CI](https://travis-ci.com/next-l/enju_seed.svg?branch=1.3)](https://travis-ci.com/next-l/enju_seed)
-[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_seed/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_seed?branch=1.3)
-[![security](https://hakiri.io/github/next-l/enju_seed/1.3.svg)](https://hakiri.io/github/next-l/enju_seed/1.3)
+[![Build Status](https://travis-ci.org/next-l/enju_seed.svg?branch=master)](https://travis-ci.org/next-l/enju_seed)
+[![Maintainability](https://api.codeclimate.com/v1/badges/1af7690d4817559ccef9/maintainability)](https://codeclimate.com/github/next-l/enju_seed/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/1af7690d4817559ccef9/test_coverage)](https://codeclimate.com/github/next-l/enju_seed/test_coverage)
+[![security](https://hakiri.io/github/next-l/enju_seed/master.svg)](https://hakiri.io/github/next-l/enju_seed/master)
 
-This project rocks and uses MIT-LICENSE.
+##  製作者・貢献者 (Authors and contributors)
+- [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+- [Project Next-L](http://www.next-l.jp) ([@ProjectNextL]([https://twitter.com/ProjectNextL))
 
-## 製作者・貢献者 (Authors and contributors)
-* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
-* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
+## License
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -14,19 +14,28 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
+load 'rails/tasks/statistics.rake'
 
+require 'bundler/gem_tasks'
 
-Bundler::GemHelper.install_tasks
+require 'rake/testtask'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  # no rspec available
+end
 
 task default: :spec

data/app/controllers/profiles_controller.rb

@@ -1,5 +1,4 @@
 class ProfilesController < ApplicationController
-  before_action :authenticate_user!
   before_action :set_profile, only: [:show, :edit, :update, :destroy]
   before_action :check_policy, only: [:index, :new, :create]
   before_action :prepare_options, only: [:new, :edit]
@@ -8,7 +7,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
@@ -18,7 +17,7 @@ class ProfilesController < ApplicationController
     @query = query.dup
     @count = {}
 
-    sort = {sort_by: 'created_at', order: 'desc'}
+    sort = { sort_by: 'created_at', order: 'desc' }
     case params[:sort_by]
     when 'username'
       sort[:sort_by] = 'username'
@@ -88,7 +87,7 @@ class ProfilesController < ApplicationController
         else
           @profile.reset_checkout_icalendar_token
         end
-        render partial: 'feed_token', locals: {profile: @profile}
+        render partial: 'feed_token', locals: { profile: @profile }
         return
       end
     end
@@ -96,9 +95,7 @@ class ProfilesController < ApplicationController
       redirect_to edit_my_account_url
       return
     end
-    if @profile.user.try(:locked_at?)
-      @profile.user.locked = true
-    end
+    @profile.user.locked = true if @profile.user.try(:locked_at?)
   end
 
   # POST /profiles
@@ -106,9 +103,7 @@ class ProfilesController < ApplicationController
   def create
     if current_user.has_role?('Librarian')
       @profile = Profile.new(profile_params)
-      if @profile.user
-        password = @profile.user.set_auto_generated_password
-      end
+      password = @profile.user.set_auto_generated_password if @profile.user
     else
       @profile = Profile.new(profile_params)
     end
@@ -116,14 +111,14 @@ 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')) }
         format.json { render json: @profile, status: :created, location: @profile }
       else
         prepare_options
-        format.html { render action: "new" }
+        format.html { render action: 'new' }
         format.json { render json: @profile.errors, status: :unprocessable_entity }
       end
     end
@@ -132,9 +127,9 @@ 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"
+      if @profile.user.auto_generated_password == '1'
         password = @profile.user.set_auto_generated_password
       end
     end
@@ -146,7 +141,7 @@ class ProfilesController < ApplicationController
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render action: "edit" }
+        format.html { render action: 'edit' }
         format.json { render json: @profile.errors, status: :unprocessable_entity }
       end
     end
@@ -164,6 +159,7 @@ class ProfilesController < ApplicationController
   end
 
   private
+
   def set_profile
     @profile = Profile.find(params[:id])
     authorize @profile
@@ -180,15 +176,17 @@ class ProfilesController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
-    attrs += [
-      :library_id, :expired_at, :birth_date,
-      :user_group_id, :required_role_id, :note, :user_number, {
-        user_attributes: [
-          :id, :username, :email, :current_password, :locked,
-          {user_has_role_attributes: [:id, :role_id]}
-        ]
-      }
-    ] if current_user.has_role?('Librarian')
+    if current_user.has_role?('Librarian')
+      attrs += [
+        :library_id, :expired_at, :birth_date,
+        :user_group_id, :required_role_id, :note, :user_number, {
+          user_attributes: [
+            :id, :username, :email, :current_password, :locked,
+            { user_has_role_attributes: [:id, :role_id] }
+          ]
+        }
+      ]
+    end
     params.require(:profile).permit(*attrs)
   end
 
@@ -199,15 +197,17 @@ class ProfilesController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
-    attrs += [
-      :library_id, :expired_at, :birth_date,
-      :user_group_id, :required_role_id, :note, :user_number, {
-        user_attributes: [
-          :id, :email, :current_password, :auto_generated_password, :locked,
-          {user_has_role_attributes: [:id, :role_id]}
-        ]
-      }
-    ] if current_user.has_role?('Librarian')
+    if current_user.has_role?('Librarian')
+      attrs += [
+        :library_id, :expired_at, :birth_date,
+        :user_group_id, :required_role_id, :note, :user_number, {
+          user_attributes: [
+            :id, :email, :current_password, :auto_generated_password, :locked,
+            { user_has_role_attributes: [:id, :role_id] }
+          ]
+        }
+      ]
+    end
     params.require(:profile).permit(*attrs)
   end
 

data/app/controllers/roles_controller.rb

@@ -35,17 +35,18 @@ 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
-        format.html { render action: "edit" }
+        format.html { render action: 'edit' }
         format.json { render json: @role.errors, status: :unprocessable_entity }
       end
     end
   end
 
   private
+
   def set_role
     @role = Role.find(params[:id])
     authorize @role

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

@@ -6,26 +6,26 @@ 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
       accepts_nested_attributes_for :user_has_role
 
       validates :username, presence: true, uniqueness: true, format: {
         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 :email, format: Devise.email_regexp, allow_blank: true, uniqueness: true
       validates_date :expired_at, allow_blank: true
 
       with_options if: :password_required? do |v|
         v.validates_presence_of     :password
         v.validates_confirmation_of :password
         v.validates_length_of       :password, allow_blank: true,
-          within: Devise::password_length
+                                               within: Devise.password_length
       end
 
       before_validation :set_lock_information
@@ -39,8 +39,8 @@ module EnjuSeed
       strip_attributes only: :email, allow_empty: true
 
       attr_accessor :password_not_verified,
-        :update_own_account, :auto_generated_password,
-        :locked, :current_password #, :agent_id
+                    :update_own_account, :auto_generated_password,
+                    :locked, :current_password # , :agent_id
 
       paginates_per 10
 
@@ -51,13 +51,13 @@ module EnjuSeed
       # 有効期限切れのユーザを一括で使用不可にします。
       def self.lock_expired_users
         User.find_each do |user|
-          user.lock_access! if user.expired? and user.active_for_authentication?
+          user.lock_access! if user.expired? && user.active_for_authentication?
         end
       end
 
       # ユーザの情報をエクスポートします。
       # @param [Hash] options
-      def self.export(options = {format: :text})
+      def self.export(options = { format: :txt })
         header = %w(
           username
           full_name
@@ -76,14 +76,16 @@ module EnjuSeed
           keyword_list
           note
         )
-        header += %w(
-          checkout_icalendar_token
-          save_checkout_history
-        ) if defined? EnjuCirculation
-        header << "save_search_history" if defined? EnjuSearchLog
-        header << "share_bookmarks" if defined? EnjuBookmark
+        if defined? EnjuCirculation
+          header += %w(
+            checkout_icalendar_token
+            save_checkout_history
+          )
+        end
+        header << 'save_search_history' if defined? EnjuSearchLog
+        header << 'share_bookmarks' if defined? EnjuBookmark
         lines = []
-        User.find_each.map{|u|
+        User.find_each.map do |u|
           line = []
           line << u.username
           line << u.try(:profile).try(:full_name)
@@ -99,7 +101,7 @@ module EnjuSeed
           line << u.created_at
           line << u.updated_at
           line << u.try(:profile).try(:expired_at)
-          line << u.try(:profile).try(:keyword_list).try(:split).try(:join, "//")
+          line << u.try(:profile).try(:keyword_list).try(:split).try(:join, '//')
           line << u.try(:profile).try(:note)
           if defined? EnjuCirculation
             line << u.try(:profile).try(:checkout_icalendar_token)
@@ -108,13 +110,11 @@ module EnjuSeed
           if defined? EnjuSearchLog
             line << u.try(:profile).try(:save_search_history)
           end
-          if defined? EnjuBookmark
-            line << u.try(:profile).try(:share_bookmarks)
-          end
+          line << u.try(:profile).try(:share_bookmarks) if defined? EnjuBookmark
           lines << line
-        }
-        if options[:format] == :text
-          lines.map{|line| line.to_csv(col_sep: "\t")}.unshift(header.to_csv(col_sep: "\t")).join
+        end
+        if options[:format] == :txt
+          lines.map { |line| line.to_csv(col_sep: "\t") }.unshift(header.to_csv(col_sep: "\t")).join
         else
           lines
         end
@@ -147,9 +147,9 @@ module EnjuSeed
 
     # ユーザに使用不可の設定を反映させます。
     def set_lock_information
-      if locked == '1' and active_for_authentication?
+      if (locked == '1') && active_for_authentication?
         lock_access!
-      elsif locked == '0' and !active_for_authentication?
+      elsif (locked == '0') && !active_for_authentication?
         unlock_access!
       end
     end
@@ -176,7 +176,7 @@ module EnjuSeed
     # @return [Object]
     def check_role_before_destroy
       if has_role?('Administrator')
-        if Role.find_by(name: 'Administrator').users.count == 1
+        if Role.where(name: 'Administrator').first.users.count == 1
           raise username + 'This is the last administrator in this system.'
         end
       end
@@ -209,7 +209,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
@@ -237,14 +237,12 @@ module EnjuSeed
           errors[:base] << I18n.t('user.only_administrator_can_destroy')
         end
         # 最後の図書館員を削除しようとした
-        if last_librarian?
-          errors[:base] << I18n.t('user.last_librarian')
-        end
+        errors[:base] << I18n.t('user.last_librarian') if last_librarian?
       end
 
       # 最後の管理者を削除しようとした
       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
@@ -258,7 +256,6 @@ module EnjuSeed
   end
 end
 
-
 # == Schema Information
 #
 # Table name: users
@@ -303,4 +300,3 @@ end
 #  save_search_history      :boolean
 #  answer_feed_token        :string(255)
 #
-

data/app/models/concerns/master_model.rb

@@ -3,14 +3,10 @@ module MasterModel
 
   included do
     acts_as_list
-    validates_uniqueness_of :name, 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
@@ -22,17 +18,10 @@ module MasterModel
   end
 
   private
+
   def valid_name?
     unless name =~ /\A[a-z][0-9a-z_]*[0-9a-z]\z/
       errors.add(:name, I18n.t('page.only_lowercase_letters_and_numbers_are_allowed'))
     end
   end
-
-  def valid_yaml?
-    begin
-      YAML.load(display_name)
-    rescue Psych::SyntaxError
-      errors.add(:display_name, I18n.t('page.cannot_parse_yaml_header'))
-    end
-  end
 end

data/app/models/identity.rb

@@ -1,6 +1,6 @@
-class Identity < ApplicationRecord
+class Identity < ActiveRecord::Base
   belongs_to :profile
-  validates :name, presence: true, uniqueness: {scope: :provider}
+  validates :name, presence: true, uniqueness: { scope: :provider }
   validates :provider, presence: true
 
   def self.find_for_oauth(auth)
@@ -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

@@ -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