enju_seed 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9840693279f858c771db87616a36faac54f576468c54fbe7f90ee3353b323d
-  data.tar.gz: 3bfbfdbaf6b9f76e53692c8e4bdf297d6a7926bfcf61efc6a0b980b062ccf69f
+  metadata.gz: 954c50f3db39ed75d15e494f3abe93af699556e4981fbf21ea8dad5ea6f8b8b1
+  data.tar.gz: 35991b1a992c6b70e0726dcaa35faf211faa75c997f51717d8260a9c706ef41f
 SHA512:
-  metadata.gz: b83d9d6441b55998b8553c6fa56c3433f657c5105cb82ed3cfbae77abc8a83f61c2057b6df71b56e50501cd4ba520579c911dd3a7e039e0af6fadd1b85aed03b
-  data.tar.gz: e3c548f4bc03ba8ec07507be460c1d97c60f1c4c537e71f62b538ead89f3ffbf92e2403a58b3a46807c7c42eec978e76cc7b8be429e82b11267dfde55bb62346
+  metadata.gz: 202247de7ec8a79ba7cb7a5844b7d6d25668a7cdb4f40af97c740bf6d6c2068262e06791c4317d07fdc733568bd53a539be6137ec73e7c3f45c17c106a3cda32
+  data.tar.gz: cb12be922423784e642770a0ddbdbeabfbfa78d78bb9aee8d640c9768a4400b1ad67a91faac531cf4b0caecf77c6b6bb20ff2f04abc92ca2d5cd2e47e24ab78a

data/README.md

@@ -0,0 +1,10 @@
+# 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)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (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

@@ -10,7 +10,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'EnjuSeed'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

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

@@ -57,7 +57,7 @@ module EnjuSeed
 
       # ユーザの情報をエクスポートします。
       # @param [Hash] options
-      def self.export(options = {format: :txt})
+      def self.export(options = {format: :text})
         header = %w(
           username
           full_name
@@ -113,7 +113,7 @@ module EnjuSeed
           end
           lines << line
         }
-        if options[:format] == :txt
+        if options[:format] == :text
           lines.map{|line| line.to_csv(col_sep: "\t")}.unshift(header.to_csv(col_sep: "\t")).join
         else
           lines
@@ -147,9 +147,9 @@ module EnjuSeed
 
     # ユーザに使用不可の設定を反映させます。
     def set_lock_information
-      if locked == '1' and self.active_for_authentication?
+      if locked == '1' and active_for_authentication?
         lock_access!
-      elsif locked == '0' and !self.active_for_authentication?
+      elsif locked == '0' and !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.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/identity.rb

@@ -1,4 +1,4 @@
-class Identity < ActiveRecord::Base
+class Identity < ApplicationRecord
   belongs_to :profile
   validates :name, presence: true, uniqueness: {scope: :provider}
   validates :provider, presence: true

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
 

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
@@ -26,7 +26,7 @@ class Role < ActiveRecord::Base
   end
 
   def self.default_role
-    Role.where(name: 'Guest').first
+    Role.find_by(name: 'Guest')
   end
 
   private

data/app/models/user_has_role.rb

@@ -1,10 +1,7 @@
-class UserHasRole < ActiveRecord::Base
+class UserHasRole < ApplicationRecord
   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

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

@@ -13,11 +13,6 @@
   <%= @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 -%>

data/lib/enju_seed/version.rb

@@ -1,3 +1,3 @@
 module EnjuSeed
-  VERSION = "0.3.2"
+  VERSION = "0.3.6".freeze
 end

data/lib/generators/enju_seed/setup/setup_generator.rb

@@ -0,0 +1,9 @@
+class EnjuSeed::SetupGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc "Create a setup file for Next-L Enju"
+
+  def copy_setup_files
+    directory("db/fixtures", "db/fixtures/enju_seed")
+    rake("enju_seed_engine:install:migrations")
+  end
+end

data/lib/generators/enju_seed/setup/templates/db/fixtures/roles.yml

@@ -0,0 +1,38 @@
+--- 
+role_00001: 
+  name: Guest  
+  display_name: Guest
+  id: 1
+  note: 
+  position: 1
+role_00002: 
+  name: User  
+  display_name: User
+  id: 2
+  note: 
+  position: 2
+role_00003: 
+  name: Librarian  
+  display_name: Librarian
+  id: 3
+  note: 
+  position: 3
+role_00004: 
+  name: Administrator  
+  display_name: Administrator
+  id: 4
+  note:
+  position: 4
+
+# == Schema Information
+#
+# Table name: roles
+#
+#  id                        :bigint(8)        not null, primary key
+#  name                      :string           not null
+#  display_name_translations :jsonb            not null
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#

data/lib/tasks/enju_seed_tasks.rake

@@ -1,4 +1,8 @@
-# desc "Explaining what the task does"
-# task :enju_seed do
-#   # Task goes here
-# end
+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

data/spec/controllers/profiles_controller_spec.rb

@@ -418,6 +418,14 @@ describe ProfilesController do
         assigns(:profile).user.locked_at.should be_truthy
         assigns(:profile).user.access_locked?.should be_truthy
       end
+
+      it "should unlock other user" do
+        profiles(:user1).user.lock_access!
+        put :update, params: { id: profiles(:user1).id, profile: { user_attributes: { id: 3, locked: '0', username: 'user1' } } }
+        response.should redirect_to profile_url(assigns(:profile))
+        expect(assigns(:profile).user.locked_at).to be_falsy
+        expect(assigns(:profile).user.access_locked?).to be_falsy
+      end
     end
 
     describe "When logged in as User" do

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+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/config/application.rb

@@ -9,7 +9,7 @@ require "enju_leaf"
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/spec/dummy/config/webpack/development.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/spec/dummy/config/webpack/environment.js

@@ -0,0 +1,11 @@
+const { environment } = require('@rails/webpacker')
+const webpack = require('webpack')
+environment.plugins.prepend(
+  'Provide',
+  new webpack.ProvidePlugin({
+    $: 'jquery',
+    jQuery: 'jquery'
+  })
+)
+
+module.exports = environment

data/spec/dummy/config/webpack/production.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'production'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/spec/dummy/config/webpack/test.js

@@ -0,0 +1,5 @@
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+
+const environment = require('./environment')
+
+module.exports = environment.toWebpackConfig()

data/spec/dummy/config/webpacker.yml

@@ -0,0 +1,95 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/javascript
+  source_entry_path: packs
+  public_root_path: public
+  public_output_path: packs
+  cache_path: tmp/cache/webpacker
+  check_yarn_integrity: false
+  webpack_compile_output: false
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  resolved_paths: []
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  # Extract and emit a css file
+  extract_css: false
+
+  static_assets_extensions:
+    - .jpg
+    - .jpeg
+    - .png
+    - .gif
+    - .tiff
+    - .ico
+    - .svg
+    - .eot
+    - .otf
+    - .ttf
+    - .woff
+    - .woff2
+
+  extensions:
+    - .mjs
+    - .js
+    - .sass
+    - .scss
+    - .css
+    - .module.sass
+    - .module.scss
+    - .module.css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+development:
+  <<: *default
+  compile: true
+
+  # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules
+  check_yarn_integrity: true
+
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3035
+    public: localhost:3035
+    hmr: false
+    # Inline should be set to true if using HMR
+    inline: true
+    overlay: true
+    compress: true
+    disable_host_check: true
+    use_local_ip: false
+    quiet: false
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: '**/node_modules/**'
+
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Extract and emit a css file
+  extract_css: true
+
+  # Cache manifest.json for performance
+  cache_manifest: true

data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -8,19 +8,11 @@ class AddTranslationTableToLibraryGroup < ActiveRecord::Migration[4.2]
         migrate_data: true
       })
     end
-
-    if defined?(AwesomeHstoreTranslate)
-      add_column :library_groups, :login_banner, :hstore
-    end
   end
 
   def down
     if defined?(Globalize)
       LibraryGroup.drop_translation_table! migrate_data: true
     end
-
-    if defined?(AwesomeHstoreTranslate)
-      remove_column :library_groups, :login_banner
-    end
   end
 end

data/spec/dummy/db/migrate/20160319144230_create_issn_records.rb

@@ -0,0 +1,11 @@
+class CreateIssnRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :issn_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :issn_type
+      t.string :source
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20160506144040_create_isbn_records.rb

@@ -0,0 +1,11 @@
+class CreateIsbnRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :isbn_records do |t|
+      t.string :body, index: {unique: true}, null: false
+      t.string :isbn_type
+      t.string :source
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20160801080612_add_most_recent_to_import_request_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToImportRequestTransitions < ActiveRecord::Migration[4.2]
+  def up
+    add_column :import_request_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :import_request_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160801080619_add_most_recent_to_resource_import_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToResourceImportFileTransitions < ActiveRecord::Migration[4.2]
+  def up
+    add_column :resource_import_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :resource_import_file_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToResourceExportFileTransitions < ActiveRecord::Migration[4.2]
+  def up
+    add_column :resource_export_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :resource_export_file_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToAgentImportFileTransitions < ActiveRecord::Migration[4.2]
+  def up
+    add_column :agent_import_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :agent_import_file_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb

@@ -0,0 +1,6 @@
+class AddPictureWidthToPictureFile < ActiveRecord::Migration[4.2]
+  def change
+    add_column :picture_files, :picture_width, :integer
+    add_column :picture_files, :picture_height, :integer
+  end
+end

data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration[5.2]
+  def up
+    add_column :message_request_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_request_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb

@@ -0,0 +1,11 @@
+class AddAttachmentAttachmentToCarrierTypes < ActiveRecord::Migration[4.2]
+  def self.up
+    change_table :carrier_types do |t|
+      t.attachment :attachment
+    end
+  end
+
+  def self.down
+    remove_attachment :carrier_types, :attachment
+  end
+end

data/spec/dummy/db/migrate/20170116134107_create_issn_record_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreateIssnRecordAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :issn_record_and_manifestations do |t|
+      t.references :issn_record, foreign_key: true, on_delete: :cascade, null: false
+      t.references :manifestation, foreign_key: true, on_delete: :cascade, null: false
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20170116134120_create_isbn_record_and_manifestations.rb

@@ -0,0 +1,11 @@
+class CreateIsbnRecordAndManifestations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :isbn_record_and_manifestations do |t|
+      t.references :isbn_record, foreign_key: true, on_delete: :cascade, null: false
+      t.references :manifestation, foreign_key: true, null: false, on_delete: :cascade
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20171119051258_set_not_null_to_manifestation_id_on_items.rb

@@ -0,0 +1,5 @@
+class SetNotNullToManifestationIdOnItems < ActiveRecord::Migration[4.2]
+  def change
+    change_column_null :items, :manifestation_id, false
+  end
+end

data/spec/dummy/db/migrate/20180107160726_add_constraints_to_most_recent_for_user_import_file_transitions.rb

@@ -0,0 +1,13 @@
+class AddConstraintsToMostRecentForUserImportFileTransitions < ActiveRecord::Migration[4.2]
+  disable_ddl_transaction!
+
+  def up
+    add_index :user_import_file_transitions, [:user_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_user_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
+    change_column_null :user_import_file_transitions, :most_recent, false
+  end
+
+  def down
+    remove_index :user_import_file_transitions, name: "index_user_import_file_transitions_parent_most_recent"
+    change_column_null :user_import_file_transitions, :most_recent, true
+  end
+end

data/spec/dummy/db/migrate/20180107160740_add_constraints_to_most_recent_for_user_export_file_transitions.rb

@@ -0,0 +1,13 @@
+class AddConstraintsToMostRecentForUserExportFileTransitions < ActiveRecord::Migration[4.2]
+  disable_ddl_transaction!
+
+  def up
+    add_index :user_export_file_transitions, [:user_export_file_id, :most_recent], unique: true, where: "most_recent", name: "index_user_export_file_transitions_parent_most_recent" #, algorithm: :concurrently
+    change_column_null :user_export_file_transitions, :most_recent, false
+  end
+
+  def down
+    remove_index :user_export_file_transitions, name: "index_user_export_file_transitions_parent_most_recent"
+    change_column_null :user_export_file_transitions, :most_recent, true
+  end
+end

data/spec/dummy/db/migrate/20180107161311_add_constraints_to_most_recent_for_agent_import_file_transitions.rb

@@ -0,0 +1,13 @@
+class AddConstraintsToMostRecentForAgentImportFileTransitions < ActiveRecord::Migration[4.2]
+  disable_ddl_transaction!
+
+  def up
+    add_index :agent_import_file_transitions, [:agent_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_agent_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
+    change_column_null :agent_import_file_transitions, :most_recent, false
+  end
+
+  def down
+    remove_index :agent_import_file_transitions, name: "index_agent_import_file_transitions_parent_most_recent"
+    change_column_null :agent_import_file_transitions, :most_recent, true
+  end
+end

data/spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb

@@ -0,0 +1,13 @@
+class AddConstraintsToMostRecentForResourceImportFileTransitions < ActiveRecord::Migration[4.2]
+  disable_ddl_transaction!
+
+  def up
+    add_index :resource_import_file_transitions, [:resource_import_file_id, :most_recent], unique: true, where: "most_recent", name: "index_resource_import_file_transitions_parent_most_recent" #, algorithm: :concurrently
+    change_column_null :resource_import_file_transitions, :most_recent, false
+  end
+
+  def down
+    remove_index :resource_import_file_transitions, name: "index_resource_import_file_transitions_parent_most_recent"
+    change_column_null :resource_import_file_transitions, :most_recent, true
+  end
+end