enju_circulation 0.4.0.beta.1 → 0.4.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2524b7384336afe28edefb0a5fd0ea8004c5ca9a56e87048df9047fade290b
-  data.tar.gz: c178fa1fb96decbd1e5b567055dda1e052e17e84da7e4101bdb2606f1c95e467
+  metadata.gz: ee71223ba0f27699750432bf7e8774bf5bff25fed58580e235ef66e20979ff95
+  data.tar.gz: 5c22855394daeae8c129c79589eb4da20a6bb810bfdf5e50be9463ac2fed7b69
 SHA512:
-  metadata.gz: 5f6c642dbfabfcce25d17386a11b4c34fc8aee9589b2147604c7efd8e8314cfea7440d6774d23593380657da02cda3abba621991ff140336bab16318cb63251f
-  data.tar.gz: d2dcf749b0de72a7be4e976f16d15cd7f3397b228a23f3582b028f1a8a9849378e7c6688ebe64ab115fda2b40fa296d9e8019148fd184567a42cbd8787b1dad5
+  metadata.gz: f6fa2f76cd44df019ee604d30435bda3bb70d756270954de18efd372994f43e3a54e6e3b392521eb47973abf6ccf46eda7ffc07ebbfd4645d7e822200587b5a3
+  data.tar.gz: '0883d232402ea5cd43249e774fc179aab8d149e6dfcbf533fe3aeb3e13091f77fad7e3ed26c5cb600ecffde456dd89f4e50be70099b28b28fd564ab927bbe3b6'

data/app/models/concerns/enju_circulation/enju_accept.rb

@@ -7,11 +7,11 @@ module EnjuCirculation
     end
 
     def accept!
-      circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
+      circulation_status = CirculationStatus.find_by(name: 'Available On Shelf')
       item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
-      use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
+      use_restriction = UseRestriction.find_by(name: 'Limited Circulation, Normal Loan Period')
       item.use_restriction = use_restriction if use_restriction
-      item.index
+      item.index!
     end
   end
 end

data/app/models/use_restriction.rb

@@ -5,6 +5,7 @@ class UseRestriction < ApplicationRecord
   scope :available, -> {where(name: ['Not For Loan', 'Limited Circulation, Normal Loan Period'])}
   has_many :item_has_use_restrictions
   has_many :items, through: :item_has_use_restrictions
+  translates :display_name
 
   private
 
@@ -17,11 +18,12 @@ end
 #
 # Table name: use_restrictions
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/db/migrate/20190816102803_add_display_name_translations_to_use_restriction.rb

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToUseRestriction < ActiveRecord::Migration[5.2]
+  def change
+    add_column :use_restrictions, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.4.0.beta.1"
+  VERSION = "0.4.0.beta.2"
 end

data/lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml

@@ -1,105 +1,93 @@
 --- 
 use_restriction_00001: 
   name: Available For Supply Without Return  
-  display_name: |-
-    en: Available For Supply Without Return
-    ja: 返却不要
+  display_name_translations: {"en": "Available For Supply Without Return", "ja": "返却不要"}
   id: 1
   position: 1
   note: ""
 use_restriction_00002: 
   name: In Library Use Only  
-  display_name: |-
-    en: In Library Use Only
-    ja: 館内利用のみ可
+  display_name_translations: {"en": "In Library Use Only", "ja": "館内利用のみ可"}
   id: 2
   position: 2
   note: ""
 use_restriction_00003: 
   name: Limited Circulation, Long Loan Period  
-  display_name: |-
-    en: Limited Circulation, Long Loan Period
-    ja: 長期期間貸出
+  display_name_translations: {"en": "Limited Circulation, Long Loan Period", "ja": "長期期間貸出"}
   id: 3
   position: 3
   note: ""
 use_restriction_00004: 
   name: Limited Circulation, Normal Loan Period  
-  display_name: |-
-    en: Limited Circulation, Normal Loan Period
-    ja: 通常期間貸出
+  display_name_translations: {"en": "Limited Circulation, Normal Loan Period", "ja": "通常期間貸出"}
   id: 4
   position: 4
   note: ""
 use_restriction_00005: 
   name: Limited Circulation, Short Loan Period  
-  display_name: |-
-    en: Limited Circulation, Short Loan Period
-    ja: 短期期間貸出
+  display_name_translations: {"en": "Limited Circulation, Short Loan Period", "ja": "短期期間貸出"}
   id: 5
   position: 5
   note: ""
 use_restriction_00006: 
   name: No Reproduction  
-  display_name: |-
-    en: No Reproduction
-    ja: 複製不可
+  display_name_translations: {"en": "No Reproduction", "ja": "複製不可"}
   id: 6
   position: 6
   note: ""
 use_restriction_00007: 
   name: Not For Loan  
-  display_name: |-
-    en: Not For Loan
-    ja: 貸出不可
+  display_name_translations: {"en": "Not For Loan", "ja": "貸出不可"}
   id: 7
   position: 7
   note: ""
 use_restriction_00008: 
   name: Overnight Only  
-  display_name: |-
-    en: Overnight Only
-    ja: 一夜貸出のみ
+  display_name_translations: {"en": "Overnight Only", "ja": "一夜貸出のみ"}
   id: 8
   position: 8
   note: ""
 use_restriction_00009: 
   name: Renewals Not Permitted  
-  display_name: |-
-    en: Renewals Not Permitted
-    ja: 貸出更新不可
+  display_name_translations: {"en": "Renewals Not Permitted", "ja": "貸出更新不可"}
   id: 9
   position: 9
   note: ""
 use_restriction_00010: 
   name: Supervision Required  
-  display_name: |-
-    en: Supervision Required
-    ja: 監督下でのみ利用可
+  display_name_translations: {"en": "Supervision Required", "ja": "監督下でのみ利用可"}
   id: 10
   position: 10
   note: ""
 use_restriction_00011: 
   name: Term Loan  
-  display_name: |-
-    en: Term Loan
-    ja: 学期間の貸出
+  display_name_translations: {"en": "Term Loan" , "ja": "学期間の貸出"}
   id: 11
   position: 11
   note: ""
 use_restriction_00012: 
   name: Use Only In Controlled Access  
-  display_name: |-
-    en: Use Only In Controlled Access
-    ja: 立ち入り制限区域でのみ利用可
+  display_name_translations: {"en": "Use Only In Controlled Access", "ja": "立ち入り制限区域でのみ利用可"}
   id: 12
   position: 12
   note: ""
 use_restriction_00013: 
   name: User Signature Required  
-  display_name: |-
-    en: User Signature Required
-    ja: 利用者の署名が必要
+  display_name_translations: {"en": "User Signature Required", "ja": "利用者の署名が必要"}
   id: 13
   position: 13
   note: ""
+
+# == Schema Information
+#
+# Table name: use_restrictions
+#
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
+#

data/lib/tasks/enju_circulation_tasks.rake

@@ -78,10 +78,4 @@ namespace :enju_circulation do
       end
     end
   end
-
-  desc "upgrade enju_circulation to enju_leaf 2.0"
-  task upgrade_20: :environment do
-    sql = 'UPDATE checkins SET checkout_id = checkouts.id FROM checkouts WHERE checkouts.checkin_id = checkins.id;'
-    ActiveRecord::Base.connection.execute(sql)
-  end
 end

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

@@ -2,13 +2,14 @@ class User < ApplicationRecord
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, #:registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+         :recoverable, :rememberable, :trackable, :lockable
 
   include EnjuSeed::EnjuUser
   include EnjuMessage::EnjuUser
   include EnjuCirculation::EnjuUser
 end
 
+Accept.include(EnjuCirculation::EnjuAccept)
 Basket.include(EnjuCirculation::EnjuBasket)
 Manifestation.include(EnjuCirculation::EnjuManifestation)
 Manifestation.include(EnjuManifestationViewer::EnjuManifestation)

data/spec/dummy/db/schema.rb

@@ -10,10 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_08_14_120827) do
+ActiveRecord::Schema.define(version: 2019_08_16_102803) do
 
   # These are extensions that must be enabled in order to support this database
-  enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
   create_table "accepts", id: :serial, force: :cascade do |t|
@@ -1298,6 +1297,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
     t.integer "position"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.jsonb "display_name_translations", default: {}, null: false
   end
 
   create_table "user_checkout_stat_transitions", id: :serial, force: :cascade do |t|

data/spec/fixtures/use_restrictions.yml

@@ -1,79 +1,79 @@
 --- 
 use_restriction_00001: 
   name: Available For Supply Without Return  
-  display_name: Available For Supply Without Return
+  display_name_translations: {"en": "Available For Supply Without Return", "ja": "返却不要"}
   id: 1
   position: 1
   note: ""
 use_restriction_00002: 
   name: In Library Use Only  
-  display_name: In Library Use Only
+  display_name_translations: {"en": "In Library Use Only", "ja": "館内利用のみ可"}
   id: 2
   position: 2
   note: ""
 use_restriction_00003: 
   name: Limited Circulation, Long Loan Period  
-  display_name: Limited Circulation, Long Loan Period
+  display_name_translations: {"en": "Limited Circulation, Long Loan Period", "ja": "長期期間貸出"}
   id: 3
   position: 3
   note: ""
 use_restriction_00004: 
   name: Limited Circulation, Normal Loan Period  
-  display_name: Limited Circulation, Normal Loan Period
+  display_name_translations: {"en": "Limited Circulation, Normal Loan Period", "ja": "通常期間貸出"}
   id: 4
   position: 4
   note: ""
 use_restriction_00005: 
   name: Limited Circulation, Short Loan Period  
-  display_name: Limited Circulation, Short Loan Period
+  display_name_translations: {"en": "Limited Circulation, Short Loan Period", "ja": "短期期間貸出"}
   id: 5
   position: 5
   note: ""
 use_restriction_00006: 
   name: No Reproduction  
-  display_name: No Reproduction
+  display_name_translations: {"en": "No Reproduction", "ja": "複製不可"}
   id: 6
   position: 6
   note: ""
 use_restriction_00007: 
   name: Not For Loan  
-  display_name: Not For Loan
+  display_name_translations: {"en": "Not For Loan", "ja": "貸出不可"}
   id: 7
   position: 7
   note: ""
 use_restriction_00008: 
   name: Overnight Only  
-  display_name: Overnight Only
+  display_name_translations: {"en": "Overnight Only", "ja": "一夜貸出のみ"}
   id: 8
   position: 8
   note: ""
 use_restriction_00009: 
   name: Renewals Not Permitted  
-  display_name: Renewals Not Permitted
+  display_name_translations: {"en": "Renewals Not Permitted", "ja": "貸出更新不可"}
   id: 9
   position: 9
   note: ""
 use_restriction_00010: 
   name: Supervision Required  
-  display_name: Supervision Required
+  display_name_translations: {"en": "Supervision Required", "ja": "監督下でのみ利用可"}
   id: 10
   position: 10
   note: ""
 use_restriction_00011: 
   name: Term Loan  
-  display_name: Term Loan
+  display_name_translations: {"en": "Term Loan" , "ja": "学期間の貸出"}
   id: 11
   position: 11
   note: ""
 use_restriction_00012: 
   name: Use Only In Controlled Access  
-  display_name: Use Only In Controlled Access
+  display_name_translations: {"en": "Use Only In Controlled Access", "ja": "立ち入り制限区域でのみ利用可"}
   id: 12
   position: 12
   note: ""
 use_restriction_00013: 
   name: User Signature Required  
-  display_name: User Signature Required
+  display_name_translations: {"en": "User Signature Required", "ja": "利用者の署名が必要"}
   id: 13
   position: 13
   note: ""
@@ -82,11 +82,12 @@ use_restriction_00013:
 #
 # Table name: use_restrictions
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/spec/models/accept_spec.rb

@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe Accept do
+  fixtures :all
+
+  it "should change circulation_status" do
+    accept = FactoryBot.create(:accept)
+    accept.item.circulation_status.name.should eq 'Available On Shelf'
+    accept.item.use_restriction.name.should eq 'Limited Circulation, Normal Loan Period'
+  end
+end
+
+# == Schema Information
+#
+# Table name: accepts
+#
+#  id           :integer          not null, primary key
+#  basket_id    :integer
+#  item_id      :integer
+#  librarian_id :integer
+#  created_at   :datetime
+#  updated_at   :datetime
+#

data/spec/models/user_import_file_spec.rb

@@ -0,0 +1,83 @@
+require 'rails_helper'
+
+describe UserImportFile do
+  fixtures :all
+
+  describe "when its mode is 'create'" do
+    it "should be imported" do
+      file = UserImportFile.new user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
+      file.default_user_group = UserGroup.find(2)
+      file.default_library = Library.find(3)
+      file.user = users(:admin)
+      file.save
+      old_users_count = User.count
+      old_import_results_count = UserImportResult.count
+      file.current_state.should eq 'pending'
+      file.import_start.should eq({user_imported: 5, user_found: 0, error: 3})
+      user003 = User.find_by(username: 'user003')
+      user003.profile.checkout_icalendar_token.should eq 'secrettoken'
+      user003.profile.save_checkout_history.should be_truthy
+    end
+  end
+
+  describe "when its mode is 'destroy'" do
+    it "should not remove users" do
+      old_count = User.count
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      old_message_count = Message.count
+      file.remove
+      User.count.should eq old_count - 2
+      Message.count.should eq old_message_count + 1
+    end
+
+    it "should not remove users if there are checkouts" do
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      file.import_start
+
+      user001 = User.find_by(username: 'user001')
+      FactoryBot.create(:checkout, user: user001, item: FactoryBot.create(:item))
+      old_count = User.count
+      file = UserImportFile.create!(
+        user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"),
+        user: users(:admin),
+        default_user_group: UserGroup.find(2),
+        default_library: Library.find(3)
+      )
+      file.remove
+      User.where(username: 'user001').should_not be_blank
+      User.count.should eq old_count - 2
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: user_import_files
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  note                     :text
+#  executed_at              :datetime
+#  user_import_file_name    :string
+#  user_import_content_type :string
+#  user_import_file_size    :integer
+#  user_import_updated_at   :datetime
+#  user_import_fingerprint  :string
+#  edit_mode                :string
+#  error_message            :text
+#  created_at               :datetime
+#  updated_at               :datetime
+#  user_encoding            :string
+#  default_library_id       :integer
+#  default_user_group_id    :integer
+#

data/spec/system/manifestations_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe 'Checkouts', type: :system do
     it 'should contain use_restriction' do
       sign_in users(:librarian1)
       visit manifestation_path(@item.manifestation)
-      expect(page).to have_content 'Not For Loan'
+      expect(page).to have_content '貸出不可'
     end
   end
 
@@ -23,7 +23,7 @@ RSpec.describe 'Checkouts', type: :system do
     it 'should contain use_restriction' do
       sign_in users(:librarian1)
       visit manifestation_path(@item.manifestation)
-      expect(page).to have_content 'Not For Loan'
+      expect(page).to have_content '貸出不可'
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta.1
+  version: 0.4.0.beta.2
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: enju_library
+  name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: enju_biblio
+  name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: enju_manifestation_viewer
+  name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: enju_event
+  name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
-  type: :runtime
+        version: 2.0.0.beta.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 2.0.0.beta.1
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: enju_leaf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0.beta.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0.beta.1
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -530,6 +516,7 @@ files:
 - db/migrate/20190706052525_add_display_name_translations_to_circulation_status.rb
 - db/migrate/20190713114724_add_checkout_id_to_checkin.rb
 - db/migrate/20190814120827_add_display_name_translations_to_checkout_type.rb
+- db/migrate/20190816102803_add_display_name_translations_to_use_restriction.rb
 - lib/enju_circulation.rb
 - lib/enju_circulation/engine.rb
 - lib/enju_circulation/helper.rb
@@ -815,8 +802,6 @@ files:
 - spec/dummy/db/migrate/20190713115451_add_full_name_translations_to_profile.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png
-- spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -894,6 +879,7 @@ files:
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
 - spec/helpers/items_helper_spec.rb
+- spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/models/carrier_type_has_checkout_type_spec.rb
 - spec/models/checked_item_spec.rb
@@ -916,6 +902,7 @@ files:
 - spec/models/use_resetriction_spec.rb
 - spec/models/user_checkout_stat_spec.rb
 - spec/models/user_group_has_checkout_type_spec.rb
+- spec/models/user_import_file_spec.rb
 - spec/models/user_reserve_stat_spec.rb
 - spec/models/user_spec.rb
 - spec/models/withdraw_spec.rb
@@ -1023,8 +1010,6 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/404.html
-- spec/dummy/private/system/carrier_types/attachments/000/000/001/original/book.png
-- spec/dummy/private/system/carrier_types/attachments/000/000/001/thumb/book.png
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/db/migrate/20170305064014_add_csv_charset_conversion_to_library_group.rb
@@ -1245,6 +1230,7 @@ test_files:
 - spec/models/checkout_spec.rb
 - spec/models/item_spec.rb
 - spec/models/checkin_spec.rb
+- spec/models/user_import_file_spec.rb
 - spec/models/circulation_status_spec.rb
 - spec/models/manifestation_spec.rb
 - spec/models/manifestation_reserve_stat_spec.rb
@@ -1252,6 +1238,7 @@ test_files:
 - spec/models/reserve_stat_has_user_spec.rb
 - spec/models/use_resetriction_spec.rb
 - spec/models/user_spec.rb
+- spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/policies/manifestation_policy_spec.rb
 - spec/system/manifestations_spec.rb