enju_library 0.4.0.beta.1 → 0.4.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e934beedc96dce953f9b68e7cb6d95bea1e0e4cb83454f03a5f2404797a52269
-  data.tar.gz: 0fc18a6416735b39a602e6389a6ccfe1b5410bab4ccf648d88a77ea76e1077ef
+  metadata.gz: d1c75319a25ae87f9ea02f08f1162def1502216acb8c4b8f9287f25e1e210b6a
+  data.tar.gz: ec1be62fc92d1a8ec899cf5e14ad5fe20afcc05a37b2338df7e139eebd831a7e
 SHA512:
-  metadata.gz: 1ebd80409b9b708aaf8253f17276c4c250f5d743606d016332fbc639669a009c4b35359f22264f0f73a0b5f327cbe867a5067d0ae953b88461c77767fdaa7d99
-  data.tar.gz: 2c60aa8ecdecfe494380649894c571de5634024a10006b4b41067da1fde3e7aa40e218baa1bf64a858f31f79eefa4cfd0cb5b66b2e750bceb1b86711bc87228e
+  metadata.gz: 836f596b0f34970787d4ae1c36d95a584b00b4c13a1d5cc7a1908396e125546fd6b60c5f52b6373823b998e3f030a469b6269d90f0962557fb91430195d505ae
+  data.tar.gz: 3a291af12182dc72a64b24da112bbde2931902f85c0ea575ee4da498199d6dd5376aba2a72129c4602c04717924bc5f4f6cf025779aa8cf9bdb306738c025391

data/app/controllers/baskets_controller.rb

@@ -54,7 +54,13 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       if @basket.save
-        format.html { redirect_to new_checked_item_url(basket_id: @basket.id), notice: t('controller.successfully_created', model: t('activerecord.models.basket')) }
+        format.html {
+          if defined?(EnjuCirculation)
+            redirect_to new_checked_item_url(basket_id: @basket.id), notice: t('controller.successfully_created', model: t('activerecord.models.basket'))
+          else
+            redirect_to basket_url(@basket), notice: t('controller.successfully_created', model: t('activerecord.models.basket'))
+          end
+        }
         format.json { render json: @basket, status: :created, location:  @basket }
       else
         format.html { render action: "new" }
@@ -67,30 +73,43 @@ class BasketsController < ApplicationController
   # PUT /baskets/1.json
   def update
     librarian = current_user
-    begin
-      unless @basket.basket_checkout(librarian)
+    if defined?(EnjuCirculation)
+      begin
+        unless @basket.basket_checkout(librarian)
+          redirect_to new_checked_item_url(basket_id: @basket.id)
+          return
+        end
+      rescue ActiveRecord::RecordInvalid
+        flash[:message] = t('checked_item.already_checked_out_try_again')
+        @basket.checked_items.delete_all
         redirect_to new_checked_item_url(basket_id: @basket.id)
         return
       end
-    rescue ActiveRecord::RecordInvalid
-      flash[:message] = t('checked_item.already_checked_out_try_again')
-      @basket.checked_items.delete_all
-      redirect_to new_checked_item_url(basket_id: @basket.id)
-      return
     end
 
     respond_to do |format|
       # if @basket.update_attributes({})
       if @basket.save(validate: false)
         # 貸出完了時
-        format.html { redirect_to checkouts_url(user_id: @basket.user.username), notice: t('basket.checkout_completed') }
+        format.html {
+          if defined?(EnjuCirculation)
+            redirect_to checkouts_url(user_id: @basket.user.username), notice: t('basket.checkout_completed')
+          else
+            redirect_to basket_url(@basket), notice: t('basket.checkout_completed')
+          end
+        }
         format.json { head :no_content }
       else
-        format.html { redirect_to checked_items_url(basket_id: @basket.id) }
+        format.html {
+          if defined?(EnjuCirculation)
+            redirect_to checked_items_url(basket_id: @basket.id)
+          else
+            render action: "edit"
+          end
+        }
         format.json { render json: @basket.errors, status: :unprocessable_entity }
       end
     end
-
   end
 
   # DELETE /baskets/1
@@ -99,7 +118,13 @@ class BasketsController < ApplicationController
     @basket.destroy
 
     respond_to do |format|
-      format.html { redirect_to checkouts_url(user_id: @basket.user.username) }
+      format.html {
+        if defined?(EnjuCirculation)
+          redirect_to checkouts_url(user_id: @basket.user.username)
+        else
+          redirect_to baskets_url
+        end
+      }
       format.json { head :no_content }
     end
   end

data/app/views/withdraws/index.html.erb

@@ -45,6 +45,8 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.new', model: t('activerecord.models.withdraw')), new_withdraw_path -%></li>
-    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <% if defined?(EnjuCirculation) %>
+      <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <% end %>
   </ul>
 </div>

data/app/views/withdraws/new.html.erb

@@ -10,6 +10,8 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.listing', model: t('activerecord.models.withdraw')), withdraws_path -%></li>
-    <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <% if defined?(EnjuCirculation) %>
+      <li><%= link_to t('page.listing', model: t('activerecord.attributes.withdraw.removed_items', status: CirculationStatus.where(name: 'Removed').first.display_name) + t('activerecord.models.item')), items_path(circulation_status: 'Removed')  -%></li>
+    <% end %>
   </ul>
 </div>

data/lib/enju_library/version.rb

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

data/lib/generators/enju_library/setup/templates/db/fixtures/budget_types.yml

@@ -1,4 +1,4 @@
 default:
   name: default
-  display_name: "既定の予算"
+  display_name_translations: {"en": "Default budget", "ja": "既定の予算"}
   position: 1

data/spec/controllers/accepts_controller_spec.rb

@@ -156,14 +156,6 @@ describe AcceptsController do
           post :create, params: { accept: @attrs }
           response.should be_forbidden
         end
-
-        describe 'When basket_id is specified' do
-          it 'redirects to the created accept' do
-            post :create, params: { accept: @attrs, basket_id: 9 }
-            response.should redirect_to(accepts_url(basket_id: assigns(:accept).basket.id))
-            assigns(:accept).item.circulation_status.name.should eq 'Available On Shelf'
-          end
-        end
       end
 
       describe 'with invalid params' do

data/spec/controllers/baskets_controller_spec.rb

@@ -253,7 +253,7 @@ describe BasketsController do
       it 'should create basket' do
         post :create, params: { basket: { user_number: users(:user1).profile.user_number } }
         assigns(:basket).should be_valid
-        response.should redirect_to new_checked_item_url(basket_id: assigns(:basket).id)
+        response.should redirect_to basket_url(assigns(:basket))
       end
 
       it 'should not create basket without user_number' do
@@ -316,8 +316,7 @@ describe BasketsController do
 
         it 'assigns the requested basket as @basket' do
           put :update, params: { id: 8, basket: @attrs }
-          assigns(:basket).checkouts.order('created_at DESC').first.item.circulation_status.name.should eq 'On Loan'
-          response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
+          response.should redirect_to(basket_url(assigns(:basket)))
         end
       end
     end
@@ -333,12 +332,12 @@ describe BasketsController do
 
       it 'should destroy basket without user_id' do
         delete :destroy, params: { id: 1, basket: { user_id: nil }, user_id: users(:user1).username }
-        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
+        response.should redirect_to(baskets_url)
       end
 
       it 'should destroy basket' do
         delete :destroy, params: { id: 1, basket: {}, user_id: users(:user1).username }
-        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
+        response.should redirect_to(baskets_url)
       end
     end
 
@@ -347,12 +346,12 @@ describe BasketsController do
 
       it 'should destroy basket without user_id' do
         delete :destroy, params: { id: 1, basket: { user_id: nil }, user_id: users(:user1).username }
-        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
+        response.should redirect_to(baskets_url)
       end
 
       it 'should destroy basket' do
         delete :destroy, params: { id: 1, basket: {}, user_id: users(:user1).username }
-        response.should redirect_to(checkouts_url(user_id: assigns(:basket).user.username))
+        response.should redirect_to(baskets_url)
       end
     end
 

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

@@ -4,13 +4,6 @@ class User < ApplicationRecord
     :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuLibrary::EnjuUser
-  include EnjuCirculation::EnjuUser
 end
 
-Accept.include(EnjuCirculation::EnjuAccept)
-Basket.include(EnjuCirculation::EnjuBasket)
-Manifestation.include(EnjuCirculation::EnjuManifestation)
-Manifestation.include(EnjuSubject::EnjuManifestation)
-Item.include(EnjuCirculation::EnjuItem)
 Item.include(EnjuLibrary::EnjuItem)
-Withdraw.include(EnjuCirculation::EnjuWithdraw)

data/spec/dummy/config/application.rb

@@ -5,9 +5,8 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 require "enju_library"
 require "enju_leaf"
-require "enju_circulation"
-require "enju_subject"
 require "enju_manifestation_viewer"
+require "enju_message"
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/db/schema.rb

@@ -1895,7 +1895,7 @@ ActiveRecord::Schema.define(version: 2019_08_14_120827) do
   add_foreign_key "reserves", "manifestations"
   add_foreign_key "reserves", "users"
   add_foreign_key "retains", "items"
-  add_foreign_key "retains", "reserves"
+  add_foreign_key "retains", "reserves", column: "reserve_id"
   add_foreign_key "user_checkout_stats", "users"
   add_foreign_key "user_group_has_checkout_types", "checkout_types"
   add_foreign_key "user_group_has_checkout_types", "user_groups"

data/spec/fixtures/budget_types.yml

@@ -2,14 +2,14 @@
 
 public_fund:
   name: Public fund
-  display_name: Public fund
+  display_name: {"en": "Public fund"}
   note: 
   position: 1
   id: 1
 
 donation:
   name: Donation
-  display_name: Donation
+  display_name: {"en": "Donation"}
   note: 
   position: 2
   id: 2

data/spec/models/accept_spec.rb

@@ -5,8 +5,6 @@ describe Accept do
 
   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
 

data/spec/models/user_import_file_spec.rb

@@ -49,8 +49,6 @@ describe UserImportFile do
       user003.profile.user_number.should eq '001003'
       user003.profile.library.name.should eq 'kamata'
       user003.profile.locale.should eq 'ja'
-      user003.profile.checkout_icalendar_token.should eq 'secrettoken'
-      user003.profile.save_checkout_history.should be_truthy
       user003.profile.save_search_history.should be_falsy
       user003.profile.share_bookmarks.should be_falsy
       User.find_by(username: 'user000').should be_nil
@@ -77,7 +75,7 @@ describe UserImportFile do
       file.executed_at.should be_truthy
 
       file.reload
-      file.error_message.should eq "The following column(s) were ignored: save_search_history, share_bookmarks, invalid\nline 8: Password is too short (minimum is 6 characters)\nline 9: User number is invalid\nline 10: User number has already been taken"
+      file.error_message.should eq "The following column(s) were ignored: checkout_icalendar_token, save_checkout_history, save_search_history, share_bookmarks, invalid\nline 8: Password is too short (minimum is 6 characters)\nline 9: User number is invalid\nline 10: User number has already been taken"
       file.current_state.should eq 'failed'
     end
 
@@ -199,24 +197,9 @@ describe UserImportFile do
       )
       old_message_count = Message.count
       file.remove
-      User.count.should eq old_count - 2
+      User.count.should eq old_count - 3
       Message.count.should eq old_message_count + 1
     end
-
-    it "should not remove users if there are checkouts" do
-      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
 
   it "should import in background" do

data/spec/models/withdraw_spec.rb

@@ -5,14 +5,6 @@ RSpec.describe Withdraw, type: :model do
 
   it "should change circulation_status" do
     withdraw = FactoryBot.create(:withdraw)
-    withdraw.item.circulation_status.name.should eq 'Removed'
-    withdraw.item.use_restriction.name.should eq 'Not For Loan'
-  end
-
-  it "should not withdraw rented item" do
-    withdraw = Withdraw.new(librarian: users(:librarian1))
-    withdraw.item = items(:item_00013)
-    withdraw.valid?.should be_falsy
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 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_seed
@@ -86,28 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0.beta.1
+        version: 2.0.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: enju_biblio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.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: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: enju_ndl
+  name: enju_message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -889,7 +875,6 @@ files:
 - spec/factories/bookstore.rb
 - spec/factories/budget_types.rb
 - spec/factories/carrier_types.yml
-- spec/factories/checkout.rb
 - spec/factories/item.rb
 - spec/factories/library.rb
 - spec/factories/manifestation.rb
@@ -912,16 +897,8 @@ files:
 - spec/fixtures/baskets.yml
 - spec/fixtures/bookstores.yml
 - spec/fixtures/budget_types.yml
-- spec/fixtures/carrier_type_has_checkout_types.yml
 - spec/fixtures/carrier_types.yml
-- spec/fixtures/checked_items.yml
-- spec/fixtures/checkins.yml
-- spec/fixtures/checkout_stat_has_manifestations.yml
-- spec/fixtures/checkout_stat_has_users.yml
-- spec/fixtures/checkout_types.yml
-- spec/fixtures/checkouts.yml
 - spec/fixtures/circulation_statuses.yml
-- spec/fixtures/classification_types.yml
 - spec/fixtures/colors.yml
 - spec/fixtures/content_types.yml
 - spec/fixtures/create_types.yml
@@ -936,9 +913,7 @@ files:
 - spec/fixtures/lending_policies.yml
 - spec/fixtures/libraries.yml
 - spec/fixtures/library_groups.yml
-- spec/fixtures/manifestation_checkout_stats.yml
 - spec/fixtures/manifestation_relationship_types.yml
-- spec/fixtures/manifestation_reserve_stats.yml
 - spec/fixtures/manifestations.yml
 - spec/fixtures/message_requests.yml
 - spec/fixtures/message_templates.yml
@@ -947,26 +922,17 @@ files:
 - spec/fixtures/realize_types.yml
 - spec/fixtures/request_status_types.yml
 - spec/fixtures/request_types.yml
-- spec/fixtures/reserve_stat_has_manifestations.yml
-- spec/fixtures/reserve_stat_has_users.yml
-- spec/fixtures/reserve_transitions.yml
-- spec/fixtures/reserves.yml
 - spec/fixtures/roles.yml
 - spec/fixtures/search_engines.yml
 - spec/fixtures/shelves.yml
-- spec/fixtures/subject_heading_types.yml
-- spec/fixtures/subject_types.yml
 - spec/fixtures/subscribes.yml
 - spec/fixtures/subscriptions.yml
 - spec/fixtures/use_restrictions.yml
-- spec/fixtures/user_checkout_stats.yml
 - spec/fixtures/user_export_files.yml
-- spec/fixtures/user_group_has_checkout_types.yml
 - spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/user_import_files.yml
 - spec/fixtures/user_import_results.yml
-- spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
 - spec/fixtures/withdraws.yml
 - spec/mailers/previews/user_export_preview.rb
@@ -1373,7 +1339,6 @@ test_files:
 - spec/factories/item.rb
 - spec/factories/budget_types.rb
 - spec/factories/basket.rb
-- spec/factories/checkout.rb
 - spec/factories/accepts.rb
 - spec/factories/request_status_type.rb
 - spec/factories/request_type.rb
@@ -1397,52 +1362,36 @@ test_files:
 - spec/fixtures/produce_types.yml
 - spec/fixtures/message_requests.yml
 - spec/fixtures/agent_relationship_types.yml
-- spec/fixtures/checkout_stat_has_manifestations.yml
-- spec/fixtures/checked_items.yml
 - spec/fixtures/content_types.yml
-- spec/fixtures/classification_types.yml
 - spec/fixtures/profiles.yml
 - spec/fixtures/use_restrictions.yml
-- spec/fixtures/user_group_has_checkout_types.yml
 - spec/fixtures/lending_policies.yml
-- spec/fixtures/reserve_stat_has_users.yml
 - spec/fixtures/agent_types.yml
 - spec/fixtures/user_export_files.yml
 - spec/fixtures/withdraws.yml
 - spec/fixtures/users.yml
 - spec/fixtures/circulation_statuses.yml
 - spec/fixtures/budget_types.yml
-- spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/manifestations.yml
 - spec/fixtures/request_types.yml
 - spec/fixtures/bookstores.yml
-- spec/fixtures/checkins.yml
-- spec/fixtures/user_checkout_stats.yml
 - spec/fixtures/subscribes.yml
 - spec/fixtures/item_has_use_restrictions.yml
-- spec/fixtures/checkouts.yml
-- spec/fixtures/carrier_type_has_checkout_types.yml
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/realize_types.yml
 - spec/fixtures/user_import_results.yml
 - spec/fixtures/library_groups.yml
 - spec/fixtures/search_engines.yml
-- spec/fixtures/subject_heading_types.yml
 - spec/fixtures/events.yml
 - spec/fixtures/user_groups.yml
-- spec/fixtures/subject_types.yml
 - spec/fixtures/agents.yml
-- spec/fixtures/reserve_stat_has_manifestations.yml
 - spec/fixtures/libraries.yml
 - spec/fixtures/create_types.yml
-- spec/fixtures/reserves.yml
 - spec/fixtures/frequencies.yml
 - spec/fixtures/shelves.yml
 - spec/fixtures/subscriptions.yml
 - spec/fixtures/items.yml
-- spec/fixtures/checkout_types.yml
 - spec/fixtures/request_status_types.yml
-- spec/fixtures/manifestation_checkout_stats.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/colors.yml
 - spec/fixtures/exemplifies.yml
@@ -1450,10 +1399,7 @@ test_files:
 - spec/fixtures/message_templates.yml
 - spec/fixtures/manifestation_relationship_types.yml
 - spec/fixtures/event_categories.yml
-- spec/fixtures/checkout_stat_has_users.yml
 - spec/fixtures/languages.yml
-- spec/fixtures/manifestation_reserve_stats.yml
-- spec/fixtures/reserve_transitions.yml
 - spec/fixtures/identifier_types.yml
 - spec/routing/withdraws_routing_spec.rb
 - spec/routing/budget_types_routing_spec.rb