enju_seed 0.4.0.rc.1 → 0.4.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3eb7783992df08a7f2b7ffa7d88c8301bdd6420e1642169cb6dbb57d7746790
-  data.tar.gz: 2626fd3315092d7af9ead73d5cafb47cc83ec1a5f067d1aa4d1ef44a6396dde2
+  metadata.gz: 77bf05eb53d054c79b891f6970a7e80277be554a4f4ce49588cc7836a2506f8a
+  data.tar.gz: 2b925b9a23968bd6a08ba40214e09523902e470da8ccc3e7ad5c43e3b5843134
 SHA512:
-  metadata.gz: 79c4094fb4962cc4fa22892ca087ad4bad144b0d80a8d81e460dae9be21f93691b5d24fed3ab85cdfbfdf543942ea5e30817fe2629705880fdba8e48b80b1c04
-  data.tar.gz: cee4b40822562a0e03f523dc5790c46ad0e8e957fae71f00fc792f5fb110454fa7e834596f86d278711ce75c2b86cb74f75fc29056f854cdbf0367d9d303e8ff
+  metadata.gz: fc7a73ccff4bf3621c210082b8856b633655e794f5c6efd04153d62e28cf88ae6522d0e428e1c8d8f6a626c5f9e5613dbf3c6e3e0719470201bd0e2e541bb4ad
+  data.tar.gz: d9d5d19fa8b23b459b14964e3bc68de2094931faa5b41bdcffba4bd835e49f64f3295d7374f8320e2ede400f78a29a2303f026e6b8929b20971a93ae53c0ae26

data/README.md

@@ -1,5 +1,5 @@
 # EnjuSeed
-![](https://github.com/next-l/enju_seed/workflows/Ruby/badge.svg?branch=2.x)
+[![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)
 
 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.where(username: params[:username]).first.try(:profile)
+      profile = User.find_by(username: params[:username]).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.where(name: 'User').first
+          @profile.user.role = Role.find_by(name: 'User')
           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_attributes(profile_update_params)
+    @profile.update(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_attributes(role_params)
+      if @role.update(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

@@ -176,7 +176,7 @@ module EnjuSeed
     # @return [Object]
     def check_role_before_destroy
       if has_role?('Administrator')
-        if Role.where(name: 'Administrator').first.users.count == 1
+        if Role.find_by(name: 'Administrator').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.where(name: 'Librarian').first
+        role = Role.find_by(name: 'Librarian')
         return true if role.users.count == 1
         false
       end
@@ -244,7 +244,7 @@ module EnjuSeed
 
       # 最後の管理者を削除しようとした
       if has_role?('Administrator')
-        if Role.where(name: 'Administrator').first.users.count == 1
+        if Role.find_by(name: 'Administrator').users.count == 1
           errors[:base] << I18n.t('user.last_administrator')
         end
       end

data/app/models/profile.rb

@@ -1,4 +1,4 @@
-class Profile < ActiveRecord::Base
+class Profile < ApplicationRecord
   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
@@ -50,7 +50,7 @@ class Profile < ActiveRecord::Base
   # 既定のユーザ権限を設定します。
   # @return [void]
   def set_role_and_agent
-    self.required_role = Role.where(name: 'Librarian').first unless required_role
+    self.required_role = Role.find_by(name: 'Librarian') unless required_role
     self.locale = I18n.default_locale.to_s unless locale
   end
 
@@ -77,18 +77,18 @@ end
 #
 # Table name: profiles
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
-#  user_group_id            :integer
-#  library_id               :integer
+#  id                       :bigint           not null, primary key
+#  user_id                  :bigint
+#  user_group_id            :bigint
+#  library_id               :bigint
 #  locale                   :string
 #  user_number              :string
 #  full_name                :text
 #  note                     :text
 #  keyword_list             :text
-#  required_role_id         :integer
-#  created_at               :datetime
-#  updated_at               :datetime
+#  required_role_id         :bigint
+#  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,4 +1,4 @@
-class Role < ActiveRecord::Base
+class Role < ApplicationRecord
   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                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :string
 #  note                      :text

data/app/models/user_has_role.rb

@@ -1,4 +1,4 @@
-class UserHasRole < ActiveRecord::Base
+class UserHasRole < ApplicationRecord
   belongs_to :user
   belongs_to :role
   accepts_nested_attributes_for :role
@@ -8,9 +8,9 @@ end
 #
 # Table name: user_has_roles
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer          not null
-#  role_id    :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
+#  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
 #

data/app/views/roles/_form.html.erb

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

data/db/migrate/041_create_roles.rb

@@ -1,4 +1,4 @@
-class CreateRoles < ActiveRecord::Migration[4.2]
+class CreateRoles < ActiveRecord::Migration[5.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[4.2]
+class CreateUserHasRoles < ActiveRecord::Migration[5.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,7 +1,6 @@
-class AddAdditionalAttributesToUser < ActiveRecord::Migration[4.2]
+class AddAdditionalAttributesToUser < ActiveRecord::Migration[5.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[4.2]
+class CreateProfiles < ActiveRecord::Migration[5.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[4.2]
+class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration[5.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[4.2]
+class AddExpiredAtToProfile < ActiveRecord::Migration[5.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[4.2]
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration[5.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[4.2]
+class AddDateOfBirthToProfile < ActiveRecord::Migration[5.2]
   def change
     add_column :profiles, :date_of_birth, :datetime
   end

data/lib/enju_seed/version.rb

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

data/spec/dummy/app/models/user.rb

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, lock_strategy: :none, unlock_strategy: :none

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,4 +1,4 @@
-class CreateLibraries < ActiveRecord::Migration[4.2]
+class CreateLibraries < ActiveRecord::Migration[5.2]
   def change
     create_table :libraries do |t|
       t.string :name, index: true, null: false
@@ -20,7 +20,6 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
       t.references :country
 
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,4 +1,4 @@
-class CreateShelves < ActiveRecord::Migration[4.2]
+class CreateShelves < ActiveRecord::Migration[5.2]
   def change
     create_table :shelves do |t|
       t.string :name, null: false
@@ -8,7 +8,6 @@ class CreateShelves < ActiveRecord::Migration[4.2]
       t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/077_create_user_groups.rb

@@ -1,4 +1,4 @@
-class CreateUserGroups < ActiveRecord::Migration[4.2]
+class CreateUserGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :user_groups do |t|
       t.string :name, not_null: true
@@ -6,7 +6,6 @@ class CreateUserGroups < ActiveRecord::Migration[4.2]
       t.text :note
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

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

data/spec/dummy/db/migrate/120_create_baskets.rb

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

data/spec/dummy/db/migrate/124_create_bookstores.rb

@@ -1,4 +1,4 @@
-class CreateBookstores < ActiveRecord::Migration[4.2]
+class CreateBookstores < ActiveRecord::Migration[5.2]
   def change
     create_table :bookstores do |t|
       t.text :name, null: false
@@ -9,7 +9,6 @@ class CreateBookstores < ActiveRecord::Migration[4.2]
       t.string :fax_number
       t.string :url
       t.integer :position
-      t.datetime :deleted_at
 
       t.timestamps
     end

data/spec/dummy/db/migrate/130_create_request_status_types.rb

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

data/spec/dummy/db/migrate/131_create_request_types.rb

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

data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb

@@ -1,11 +1,10 @@
-class CreateSubscriptions < ActiveRecord::Migration[4.2]
+class CreateSubscriptions < ActiveRecord::Migration[5.2]
   def change
     create_table :subscriptions do |t|
       t.text :title, null: false
       t.text :note
       t.references :user, index: true
       t.references :order_list, index: true
-      t.datetime :deleted_at
       t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps

data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb

@@ -1,4 +1,4 @@
-class CreateSubscribes < ActiveRecord::Migration[4.2]
+class CreateSubscribes < ActiveRecord::Migration[5.2]
   def change
     create_table :subscribes do |t|
       t.references :subscription, index: true, null: false

data/spec/dummy/db/migrate/20081023092436_create_search_engines.rb

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

data/spec/dummy/db/migrate/20100211105551_add_admin_networks_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddAdminNetworksToLibraryGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :library_groups, :admin_networks, :text
   end

data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -1,4 +1,4 @@
-class AddOpeningHourToLibrary < ActiveRecord::Migration[4.2]
+class AddOpeningHourToLibrary < ActiveRecord::Migration[5.2]
   def self.up
     add_column :libraries, :opening_hour, :text
   end

data/spec/dummy/db/migrate/20110222073537_add_url_to_library_group.rb

@@ -1,4 +1,4 @@
-class AddUrlToLibraryGroup < ActiveRecord::Migration[4.2]
+class AddUrlToLibraryGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :library_groups, :url, :string, default: 'http://localhost:3000/'
   end

data/spec/dummy/db/migrate/20110318183304_add_valid_period_for_new_user_to_user_group.rb

@@ -1,4 +1,4 @@
-class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration[4.2]
+class AddValidPeriodForNewUserToUserGroup < ActiveRecord::Migration[5.2]
   def self.up
     add_column :user_groups, :valid_period_for_new_user, :integer, default: 0, null: false
     add_column :user_groups, :expired_at, :timestamp

data/spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb

@@ -1,4 +1,4 @@
-class AddIsilToLibrary < ActiveRecord::Migration[4.2]
+class AddIsilToLibrary < ActiveRecord::Migration[5.2]
   def change
     add_column :libraries, :isil, :string
   end

data/spec/dummy/db/migrate/20120129014038_create_budget_types.rb

@@ -1,4 +1,4 @@
-class CreateBudgetTypes < ActiveRecord::Migration[4.2]
+class CreateBudgetTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :budget_types do |t|
       t.string :name

data/spec/dummy/db/migrate/20120319173203_create_accepts.rb

@@ -1,4 +1,4 @@
-class CreateAccepts < ActiveRecord::Migration[4.2]
+class CreateAccepts < ActiveRecord::Migration[5.2]
   def change
     create_table :accepts do |t|
       t.references :basket, index: true

data/spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb

@@ -1,4 +1,4 @@
-class AddClosedToShelf < ActiveRecord::Migration[4.2]
+class AddClosedToShelf < ActiveRecord::Migration[5.2]
   def change
     add_column :shelves, :closed, :boolean, default: false, null: false
   end

data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb

@@ -1,4 +1,4 @@
-class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration[4.2]
+class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration[5.2]
   def change
     add_column :libraries, :latitude, :float
     add_column :libraries, :longitude, :float

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

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

data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb

@@ -1,4 +1,4 @@
-class CreateUserImportResults < ActiveRecord::Migration[4.2]
+class CreateUserImportResults < ActiveRecord::Migration[5.2]
   def change
     create_table :user_import_results do |t|
       t.references :user_import_file, index: true

data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -1,12 +1,8 @@
-class CreateUserImportFileTransitions < ActiveRecord::Migration[4.2]
+class CreateUserImportFileTransitions < ActiveRecord::Migration[5.2]
   def change
     create_table :user_import_file_transitions do |t|
       t.string :to_state
-      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
-        t.text :metadata
-      else
-        t.text :metadata, default: "{}"
-      end
+      t.text :metadata, default: "{}"
       t.integer :sort_key
       t.references :user_import_file, index: true
       t.timestamps