enju_seed 0.4.0.beta.1 → 0.4.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5fffbc1a85f126c197b09fe20aa46de6d61fa3a
-  data.tar.gz: d6bb594aa98a2d6d93032321b2de745039da40f4
+SHA256:
+  metadata.gz: 24825e1b1fec92ac49f176547038b8034a5372a7b0532a2c933b763d46922b92
+  data.tar.gz: 6c83e33b4c0ad82842533b569c6ff3e6bdffd43b3c97420bb2ee3ed1a9ecf02f
 SHA512:
-  metadata.gz: 89cad5681535a5c84a81bd18489e4ebe861d676545d4301ba91fcfcf6fb967a8c07303b63466164190b44571a1520e9c9c571c6b3b4627e43fc147d68c648f17
-  data.tar.gz: 84e0a347b30ba2afb9d2f8a55aaefc3896f160b6285536b881e2e3b016e2442b1da6f796ef21ece33feeb31ffcebe1dc0b38dd3fa11ab78dfa2b3367fcf8970a
+  metadata.gz: c789d9f750e4cd24cee9676a24239ec4e0fe87247fa4ef82d49ad6f760ab479afbad06e20a2a5c476aa4d6cf6ee534950555fbc29cd21e01fd74b559459f03bf
+  data.tar.gz: 1bb53c986224cb240009fde3421b02ff066a58bff58090ac32346befb9a95e91ed4947ec6e937ece13e5fd6db80a795be7ebfbd049bc8ef4c3409535a8bdb735

data/README.md

@@ -1,12 +1,9 @@
 # EnjuSeed
-[![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)
+[![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)
 
-##  製作者・貢献者 (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))
+This project rocks and uses MIT-LICENSE.
 
-## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+## 製作者・貢献者 (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))

data/Rakefile

@@ -14,28 +14,19 @@ 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'
 
-require 'rake/testtask'
+Bundler::GemHelper.install_tasks
 
-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'
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-  # no rspec available
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+
 task default: :spec

data/app/controllers/profiles_controller.rb

@@ -1,4 +1,5 @@
 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]
@@ -17,7 +18,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'
@@ -87,7 +88,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
@@ -95,7 +96,9 @@ class ProfilesController < ApplicationController
       redirect_to edit_my_account_url
       return
     end
-    @profile.user.locked = true if @profile.user.try(:locked_at?)
+    if @profile.user.try(:locked_at?)
+      @profile.user.locked = true
+    end
   end
 
   # POST /profiles
@@ -103,7 +106,9 @@ class ProfilesController < ApplicationController
   def create
     if current_user.has_role?('Librarian')
       @profile = Profile.new(profile_params)
-      password = @profile.user.set_auto_generated_password if @profile.user
+      if @profile.user
+        password = @profile.user.set_auto_generated_password
+      end
     else
       @profile = Profile.new(profile_params)
     end
@@ -118,7 +123,7 @@ class ProfilesController < ApplicationController
         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
@@ -129,7 +134,7 @@ class ProfilesController < ApplicationController
   def update
     @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
@@ -141,7 +146,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
@@ -159,7 +164,6 @@ class ProfilesController < ApplicationController
   end
 
   private
-
   def set_profile
     @profile = Profile.find(params[:id])
     authorize @profile
@@ -176,17 +180,15 @@ class ProfilesController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
-    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
+    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')
     params.require(:profile).permit(*attrs)
   end
 
@@ -197,17 +199,15 @@ class ProfilesController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
-    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
+    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')
     params.require(:profile).permit(*attrs)
   end
 

data/app/controllers/roles_controller.rb

@@ -39,14 +39,13 @@ class RolesController < ApplicationController
         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, dependent: :nullify
       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? && user.active_for_authentication?
+          user.lock_access! if user.expired? and user.active_for_authentication?
         end
       end
 
       # ユーザの情報をエクスポートします。
       # @param [Hash] options
-      def self.export(options = { format: :txt })
+      def self.export(options = {format: :txt})
         header = %w(
           username
           full_name
@@ -76,16 +76,14 @@ module EnjuSeed
           keyword_list
           note
         )
-        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
+        header += %w(
+          checkout_icalendar_token
+          save_checkout_history
+        ) if defined? EnjuCirculation
+        header << "save_search_history" if defined? EnjuSearchLog
+        header << "share_bookmarks" if defined? EnjuBookmark
         lines = []
-        User.find_each.map do |u|
+        User.find_each.map{|u|
           line = []
           line << u.username
           line << u.try(:profile).try(:full_name)
@@ -101,7 +99,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)
@@ -110,11 +108,13 @@ module EnjuSeed
           if defined? EnjuSearchLog
             line << u.try(:profile).try(:save_search_history)
           end
-          line << u.try(:profile).try(:share_bookmarks) if defined? EnjuBookmark
+          if defined? EnjuBookmark
+            line << u.try(:profile).try(:share_bookmarks)
+          end
           lines << line
-        end
+        }
         if options[:format] == :txt
-          lines.map { |line| line.to_csv(col_sep: "\t") }.unshift(header.to_csv(col_sep: "\t")).join
+          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') && active_for_authentication?
+      if locked == '1' and self.active_for_authentication?
         lock_access!
-      elsif (locked == '0') && !active_for_authentication?
+      elsif locked == '0' and !self.active_for_authentication?
         unlock_access!
       end
     end
@@ -237,7 +237,9 @@ module EnjuSeed
           errors[:base] << I18n.t('user.only_administrator_can_destroy')
         end
         # 最後の図書館員を削除しようとした
-        errors[:base] << I18n.t('user.last_librarian') if last_librarian?
+        if last_librarian?
+          errors[:base] << I18n.t('user.last_librarian')
+        end
       end
 
       # 最後の管理者を削除しようとした
@@ -256,6 +258,7 @@ module EnjuSeed
   end
 end
 
+
 # == Schema Information
 #
 # Table name: users
@@ -300,3 +303,4 @@ end
 #  save_search_history      :boolean
 #  answer_feed_token        :string(255)
 #
+

data/app/models/concerns/master_model.rb

@@ -3,7 +3,8 @@ module MasterModel
 
   included do
     acts_as_list
-    validates :name, presence: true, uniqueness: { case_sensitive: false }
+    validates_uniqueness_of :name, case_sensitive: false
+    validates :name, presence: true
     validate :name do
       valid_name?
     end
@@ -14,11 +15,10 @@ module MasterModel
 
   # 表示名を設定します。
   def set_display_name
-    self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?
+    self.display_name = name if display_name.blank?
   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'))

data/app/models/profile.rb

@@ -1,20 +1,19 @@
 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') }
-  has_one :user
-  belongs_to :library, validate: true
+  belongs_to :user, dependent: :destroy, optional: true
+  belongs_to :library
   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_associated :user
-  validates :user_group, :library, :locale, presence: true # , :user_number
+  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
@@ -78,20 +77,22 @@ end
 #
 # Table name: profiles
 #
-#  id                       :uuid             not null, primary key
-#  user_group_id            :uuid
-#  library_id               :uuid
+#  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         :integer
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
+#  created_at               :datetime
+#  updated_at               :datetime
 #  checkout_icalendar_token :string
 #  save_checkout_history    :boolean          default(FALSE), not null
 #  expired_at               :datetime
 #  full_name_transcription  :text
 #  date_of_birth            :datetime
+#  full_name_translations   :jsonb            not null
 #

data/app/models/role.rb

@@ -13,7 +13,6 @@ class Role < ActiveRecord::Base
   end
 
   private
-
   def valid_name?
     true
   end
@@ -25,10 +24,11 @@ end
 #
 #  id                        :integer          not null, primary key
 #  name                      :string           not null
-#  display_name_translations :jsonb
+#  display_name              :string
 #  note                      :text
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  created_at                :datetime
+#  updated_at                :datetime
 #  score                     :integer          default(0), not null
 #  position                  :integer
+#  display_name_translations :jsonb            not null
 #