enju_circulation 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b38f62123745a87848e27bea905ec42fc17e30df0fc0ba9853cf7fe98db6d79b
-  data.tar.gz: f951bd48af2901ffca4a3a1499f0bbe88595498ceeecdd185909aa0580cdffd6
+  metadata.gz: 7b0b9972d6bbdc83978dfe89ade80938501efaf2b3ebb5276b8c8735bb72dfc1
+  data.tar.gz: '094bb7364db3cd6210ae9f3c6746ba6111d85e700c790ae442b186a63d6299ff'
 SHA512:
-  metadata.gz: c0d8649b6101178444596fde67c8574651881d8794bbd0656461fcef65a0fdce66bb67354089842be21412c673c2b1cf98a9ec0d39607ef811f6be8836d23b4e
-  data.tar.gz: f6345684a0fc171f5c78b1d41ff764a47fd4b02e97825c16afa5118eccc7e7498ff6b3b0822374203f60557e6c2c5a2315e77b33f6c5806429f736e0462dd1b7
+  metadata.gz: 55f809ad8fc660f27838d8fc0b39fc7a02ada4bca1a3a6b80a6f394dd38993d0918900733722692dac2537c0e15eb0275912979d795e8669212a9cbb6a7eea95
+  data.tar.gz: d2fd2702f0df03077ed417236d32c5b42c446c6c0c09545af9a61e9b9bb400aa111efd6b57d45db34b9a77757ddac7791f362b140bcb3f71cdca744b564692fc

data/app/controllers/reserves_controller.rb

@@ -296,4 +296,10 @@ class ReservesController < ApplicationController
   def prepare_options
     @libraries = Library.real.order(:position)
   end
+
+  def filtered_params
+    params.permit([:user_id, :reserved_from, :reserved_until, :query, :sort_by, :state])
+  end
+
+  helper_method :filtered_params
 end

data/app/controllers/user_group_has_checkout_types_controller.rb

@@ -101,7 +101,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
       :user_group_id, :checkout_type_id,
       :checkout_limit, :checkout_period, :checkout_renewal_limit,
       :reservation_limit, :reservation_expired_period,
-      :set_due_date_before_closing_day, :fixed_due_date, :note, :position,
+      :set_due_date_after_closing_day, :fixed_due_date, :note, :position,
       :user_group, :checkout_type
     )
   end

data/app/jobs/manifestation_checkout_stat_job.rb

@@ -1,4 +1,4 @@
-class ManifestationCheckoutStatJob < ActiveJob::Base
+class ManifestationCheckoutStatJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(manifestation_checkout_stat)

data/app/jobs/manifestation_reserve_stat_job.rb

@@ -1,4 +1,4 @@
-class ManifestationReserveStatJob < ActiveJob::Base
+class ManifestationReserveStatJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(manifestation_reserve_stat)

data/app/jobs/user_checkout_stat_job.rb

@@ -1,4 +1,4 @@
-class UserCheckoutStatJob < ActiveJob::Base
+class UserCheckoutStatJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(user_checkout_stat)

data/app/jobs/user_reserve_stat_job.rb

@@ -1,4 +1,4 @@
-class UserReserveStatJob < ActiveJob::Base
+class UserReserveStatJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(user_reserve_stat)

data/app/models/carrier_type_has_checkout_type.rb

@@ -1,4 +1,4 @@
-class CarrierTypeHasCheckoutType < ActiveRecord::Base
+class CarrierTypeHasCheckoutType < ApplicationRecord
   scope :available_for_carrier_type, lambda {|carrier_type| includes(:carrier_type).where('carrier_types.name = ?', carrier_type.name)}
   scope :available_for_user_group, lambda {|user_group| includes(checkout_type: :user_groups).where('user_groups.name = ?', user_group.name)}
 

data/app/models/checked_item.rb

@@ -1,4 +1,4 @@
-class CheckedItem < ActiveRecord::Base
+class CheckedItem < ApplicationRecord
   belongs_to :item
   belongs_to :basket
   belongs_to :librarian, class_name: 'User', optional: true
@@ -94,7 +94,7 @@ class CheckedItem < ActiveRecord::Base
       end
       # 返却期限日が閉館日の場合
       while item.shelf.library.closed?(due_date)
-        if item_checkout_type.set_due_date_before_closing_day
+        if item_checkout_type.set_due_date_after_closing_day
           self.due_date = due_date.yesterday.end_of_day
         else
           self.due_date = due_date.tomorrow.end_of_day

data/app/models/checkin.rb

@@ -1,4 +1,4 @@
-class Checkin < ActiveRecord::Base
+class Checkin < ApplicationRecord
   default_scope { order('checkins.id DESC') }
   scope :on, lambda {|date| where('created_at >= ? AND created_at < ?', date.beginning_of_day, date.tomorrow.beginning_of_day)}
   has_one :checkout

data/app/models/checkout.rb

@@ -1,4 +1,4 @@
-class Checkout < ActiveRecord::Base
+class Checkout < ApplicationRecord
   scope :not_returned, -> { where(checkin_id: nil) }
   scope :returned, -> { where('checkin_id IS NOT NULL') }
   scope :overdue, lambda {|date| where('checkin_id IS NULL AND due_date < ?', date)}

data/app/models/checkout_stat_has_manifestation.rb

@@ -1,4 +1,4 @@
-class CheckoutStatHasManifestation < ActiveRecord::Base
+class CheckoutStatHasManifestation < ApplicationRecord
   # attr_accessible :manifestation_checkout_stat_id, :manifestation_id,
   #  as: :admin
   belongs_to :manifestation_checkout_stat

data/app/models/checkout_stat_has_user.rb

@@ -1,4 +1,4 @@
-class CheckoutStatHasUser < ActiveRecord::Base
+class CheckoutStatHasUser < ApplicationRecord
   # attr_accessible :user_checkout_stat_id, :user_id,
   #  as: :admin
   belongs_to :user_checkout_stat

data/app/models/checkout_type.rb

@@ -1,4 +1,4 @@
-class CheckoutType < ActiveRecord::Base
+class CheckoutType < ApplicationRecord
   include MasterModel
   scope :available_for_carrier_type, lambda {|carrier_type| includes(:carrier_types).where('carrier_types.name = ?', carrier_type.name).order('carrier_types.position')}
   scope :available_for_user_group, lambda {|user_group| includes(:user_groups).where('user_groups.name = ?', user_group.name).order('user_group.position')}

data/app/models/circulation_status.rb

@@ -1,4 +1,4 @@
-class CirculationStatus < ActiveRecord::Base
+class CirculationStatus < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 

data/app/models/demand.rb

@@ -1,4 +1,4 @@
-class Demand < ActiveRecord::Base
+class Demand < ApplicationRecord
   belongs_to :user
   belongs_to :item
   belongs_to :message

data/app/models/item_has_use_restriction.rb

@@ -1,4 +1,4 @@
-class ItemHasUseRestriction < ActiveRecord::Base
+class ItemHasUseRestriction < ApplicationRecord
   belongs_to :item, validate: true
   belongs_to :use_restriction, validate: true
   accepts_nested_attributes_for :use_restriction

data/app/models/lending_policy.rb

@@ -1,4 +1,4 @@
-class LendingPolicy < ActiveRecord::Base
+class LendingPolicy < ApplicationRecord
   default_scope { order('lending_policies.position') }
   belongs_to :item
   belongs_to :user_group

data/app/models/manifestation_checkout_stat.rb

@@ -1,4 +1,4 @@
-class ManifestationCheckoutStat < ActiveRecord::Base
+class ManifestationCheckoutStat < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
   default_scope {order('manifestation_checkout_stats.id DESC')}

data/app/models/manifestation_checkout_stat_transition.rb

@@ -1,4 +1,4 @@
-class ManifestationCheckoutStatTransition < ActiveRecord::Base
+class ManifestationCheckoutStatTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/manifestation_reserve_stat.rb

@@ -1,4 +1,4 @@
-class ManifestationReserveStat < ActiveRecord::Base
+class ManifestationReserveStat < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
   default_scope {order('manifestation_reserve_stats.id DESC')}

data/app/models/manifestation_reserve_stat_transition.rb

@@ -1,4 +1,4 @@
-class ManifestationReserveStatTransition < ActiveRecord::Base
+class ManifestationReserveStatTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/reserve.rb

@@ -1,4 +1,4 @@
-class Reserve < ActiveRecord::Base
+class Reserve < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }

data/app/models/reserve_stat_has_manifestation.rb

@@ -1,4 +1,4 @@
-class ReserveStatHasManifestation < ActiveRecord::Base
+class ReserveStatHasManifestation < ApplicationRecord
   belongs_to :manifestation_reserve_stat
   belongs_to :manifestation
 

data/app/models/reserve_stat_has_user.rb

@@ -1,4 +1,4 @@
-class ReserveStatHasUser < ActiveRecord::Base
+class ReserveStatHasUser < ApplicationRecord
   # attr_accessible
   # attr_accessible :user_reserve_stat_id, :user_id,
   #  as: :admin

data/app/models/reserve_transition.rb

@@ -1,4 +1,4 @@
-class ReserveTransition < ActiveRecord::Base
+class ReserveTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/use_restriction.rb

@@ -1,4 +1,4 @@
-class UseRestriction < ActiveRecord::Base
+class UseRestriction < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 

data/app/models/user_checkout_stat.rb

@@ -1,4 +1,4 @@
-class UserCheckoutStat < ActiveRecord::Base
+class UserCheckoutStat < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
   default_scope {order('user_checkout_stats.id DESC')}

data/app/models/user_checkout_stat_transition.rb

@@ -1,4 +1,4 @@
-class UserCheckoutStatTransition < ActiveRecord::Base
+class UserCheckoutStatTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/user_group_has_checkout_type.rb

@@ -1,4 +1,4 @@
-class UserGroupHasCheckoutType < ActiveRecord::Base
+class UserGroupHasCheckoutType < ApplicationRecord
   scope :available_for_item, lambda{|item| where(checkout_type_id: item.checkout_type.id)}
   scope :available_for_carrier_type, lambda{|carrier_type| includes(checkout_type: :carrier_types).where('carrier_types.id' => carrier_type.id)}
 

data/app/models/user_reserve_stat.rb

@@ -1,4 +1,4 @@
-class UserReserveStat < ActiveRecord::Base
+class UserReserveStat < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
   default_scope {order('user_reserve_stats.id DESC')}

data/app/models/user_reserve_stat_transition.rb

@@ -1,4 +1,4 @@
-class UserReserveStatTransition < ActiveRecord::Base
+class UserReserveStatTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/views/checkouts/_index_overdue.html.erb

@@ -27,12 +27,12 @@
   <h4><%= t('page.other_format') %></h4>
   <ul>
     <li>
-      <%= link_to 'RSS', checkouts_path(format: :rss, days_overdue: 1) -%>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), checkouts_path(format: :rss, days_overdue: 1) -%>
+      <%= link_to 'RSS', url_for(filtered_params.merge(format: :rss, days_overdue: params[:days_overdue])) -%>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: 'RSS'), url_for(filtered_params.merge(format: :rss, days_overdue: params[:days_overdue])) -%>
     </li>
     <li>
-      <%= link_to 'TSV', checkouts_path(format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), checkouts_path(format: :txt, days_overdue: 1, locale: @locale.to_s) -%>
+      <%= link_to 'TSV', url_for(filtered_params.merge(format: :txt, days_overdue: params[:days_overdue], locale: @locale.to_s)) -%>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(format: :txt, days_overdue: params[:days_overdue], locale: @locale.to_s)) -%>
     </li>
   </ul>
 </div>

data/app/views/checkouts/_list.html.erb

@@ -3,7 +3,6 @@
     <th><%= t('activerecord.models.user') %></th>
     <th class="checked_item_title"><%= t('page.title') %></th>
     <th><%= t('activerecord.attributes.checkout.due_date') %></th>
-    <th></th>
   </tr>
 
   <%- checkouts.each_with_index do |checkout, i| %>
@@ -28,12 +27,11 @@
     </td>
     <td>
       <%= l(checkout.due_date, format: :only_date) -%>
-      <br />
       <% if checkout.checkin %>
+        <br />
         <strong><%= t('checkout.returned') %></strong>
       <% end %>
-    </td>
-    <td>
+      <br />
       <%- if policy(checkout).update? -%>
         <% unless checkout.checkin %>
           <%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>

data/app/views/checkouts/edit.html.erb

@@ -4,6 +4,15 @@
 
   <%= render 'manifestations/title', manifestation: @checkout.item.manifestation if @checkout.item -%>
 
+<h3><%= t('item.current_checkout') %></h3>
+
+<ul>
+  <li><%= t('activerecord.attributes.user.username') %>: 
+    <%= @checkout.user.username %></li>
+  <li><%= t('activerecord.attributes.profile.user_number') %>: 
+    <%= @checkout.user.profile.user_number %></li>
+</ul>
+
 <h3><%= t('checkout.renewal') -%></h3>
 <%- if @checkout.renewable? -%>
   <%= form_for(@checkout) do |f| -%>

data/app/views/reserves/_state_facet.html.erb

@@ -4,12 +4,12 @@
     <% @state_facet.each do |state| %>
       <li>
         <% if state.value == params[:state].to_s.downcase %><strong><% end %>
-        <%= link_to "#{i18n_state(state.value)} (#{state.count})", url_for(params.permit.merge(state: state.value, page: nil, view: nil, only_path: true)) %>
+        <%= link_to "#{i18n_state(state.value)} (#{state.count})", url_for(filtered_params.merge(state: state.value, page: nil, view: nil, only_path: true)) %>
         <% if state.value == params[:state].to_s.downcase %></strong><% end %>
       </li>
     <% end %>
     <%- if params[:state] -%>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.permit.merge(state: nil, page: nil, view: nil, only_path: true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(filtered_params.merge(state: nil, page: nil, view: nil, only_path: true)) -%></li>
     <%- end -%>
   </ul>
 <%- end -%>

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

@@ -21,12 +21,12 @@
   <%- if @sort_by == :created_at -%>
     <strong><%= t('activerecord.attributes.reserve.created_at') -%></strong>
   <%- else -%>
-    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(params.permit.merge(sort_by: nil, only_path: true)) -%>
+    <%= link_to t('activerecord.attributes.reserve.created_at'), url_for(filtered_params.merge(sort_by: nil, only_path: true)) -%>
   <% end %>
   <%- if @sort_by == :title -%>
     <strong><%= t('page.title') -%></strong>
   <%- else -%>
-    <%= link_to t('page.title'), url_for(params.permit.merge(sort_by: 'title', only_path: true)) -%>
+    <%= link_to t('page.title'), url_for(filtered_params.merge(sort_by: 'title', only_path: true)) -%>
   <%- end -%>
 </p>
 
@@ -103,15 +103,15 @@
 
   <p>
     <%- if @user -%>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), reserves_path(user_id: @user.username, format: :rss) -%>
-      (<%= link_to 'RSS', reserves_path(user_id: @user.username, format: :rss) -%>)
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>
-      (<%= link_to 'TSV', reserves_path(user_id: @user.username, format: :txt, locale: @locale.to_s) -%>)
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(user_id: @user.username, format: :rss)) -%>
+      (<%= link_to 'RSS', url_for(filtered_params.merge(user_id: @user.username, format: :rss)) -%>)
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(user_id: @user.username, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', url_for(filtered_params.merge(user_id: @user.username, format: :txt, locale: @locale.to_s)) -%>)
     <%- else -%>
-      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), reserves_path(format: :rss) -%>
-      (<%= link_to 'RSS', reserves_path(format: :rss) -%>)
-      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), reserves_path(format: :txt, locale: @locale.to_s) -%>
-      (<%= link_to 'TSV', reserves_path(format: :txt, locale: @locale.to_s) -%>)
+      <%= link_to image_tag('icons/feed.png', size: '16x16', class: 'enju_icon', alt: t('page.feed')), url_for(filtered_params.merge(format: :rss)) -%>
+      (<%= link_to 'RSS', url_for(filtered_params.merge(format: :rss)) -%>)
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), url_for(filtered_params.merge(format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', url_for(filtered_params.merge(format: :txt, locale: @locale.to_s)) -%>)
     <%- end -%>
   </p>
 </div>

data/app/views/reserves/index.txt.ruby

@@ -0,0 +1,22 @@
+CSV.generate(col_sep: "\t", row_sep: "\r\n") do |csv|
+  csv << %w(id state maniestation_id title creator publisher pub_date isbn item_identifier call_number user_number username library created_at expired_at)
+  @reserves.each do |reserve|
+    csv << [
+      reserve.id,
+      reserve.current_state,
+      reserve.manifestation_id,
+      reserve.manifestation.original_title,
+      reserve.manifestation.creators.pluck(:full_name).join('//'),
+      reserve.manifestation.publishers.pluck(:full_name).join('//'),
+      reserve.manifestation.pub_date,
+      reserve.manifestation.identifier_contents(:isbn).join('//'),
+      reserve.item.try(:item_identifier),
+      reserve.item.try(:call_number),
+      reserve.user.profile.try(:user_number),
+      reserve.user.try(:username),
+      reserve.pickup_location.try(:name),
+      reserve.created_at,
+      reserve.updated_at
+    ]
+  end
+end

data/app/views/user_group_has_checkout_types/edit.html.erb

@@ -34,8 +34,8 @@
   </div>
 
   <div class="field">
-    <%= f.label :set_due_date_before_closing_day -%>
-    <%= f.check_box :set_due_date_before_closing_day -%>
+    <%= f.label :set_due_date_after_closing_day -%>
+    <%= f.check_box :set_due_date_after_closing_day -%>
   </div>
 
   <div class="field">

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

@@ -34,8 +34,8 @@
   </div>
 
   <div class="field">
-    <%= f.label :set_due_date_before_closing_day -%>
-    <%= f.check_box :set_due_date_before_closing_day -%>
+    <%= f.label :set_due_date_after_closing_day -%>
+    <%= f.check_box :set_due_date_after_closing_day -%>
   </div>
 
   <div class="field">

data/app/views/user_group_has_checkout_types/show.html.erb

@@ -39,8 +39,8 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.user_group_has_checkout_type.set_due_date_before_closing_day') -%>:</strong>
-  <%= localized_boolean(@user_group_has_checkout_type.set_due_date_before_closing_day) -%>
+  <strong><%= t('activerecord.attributes.user_group_has_checkout_type.set_due_date_after_closing_day') -%>:</strong>
+  <%= localized_boolean(@user_group_has_checkout_type.set_due_date_after_closing_day) -%>
 </p>
 
 <p>

data/app/views/user_groups/_user_group_has_checkout_type_fields.html.erb

@@ -8,7 +8,7 @@
   <br />
   <%= f.label :reservation_limit -%>
   <%= f.text_field :reservation_limit, class: 'resource_integer' %>
-  <%= f.label :set_due_date_before_closing_day -%>
-  <%= f.check_box :set_due_date_before_closing_day %>
+  <%= f.label :set_due_date_after_closing_day -%>
+  <%= f.check_box :set_due_date_after_closing_day %>
   <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %>
 </div>

data/config/locales/translation_en.yml

@@ -72,7 +72,7 @@ en:
         checkout_renewal_limit: Checkout renewal limit
         reservation_limit: Reservation limit
         reservation_expired_period: Reservation expired period
-        set_due_date_before_closing_day: Set due date before the closing day
+        set_due_date_after_closing_day: Set due date before the closing day
         fixed_due_date: Fixed due date
         note: Note
         position: Position

data/config/locales/translation_ja.yml

@@ -70,7 +70,7 @@ ja:
         checkout_renewal_limit: 貸出更新回数の上限
         reservation_limit: 予約数の上限
         reservation_expired_period: 予約の期限切れまでの期間
-        set_due_date_before_closing_day: 返却日を閉館日の前日にする
+        set_due_date_after_closing_day: 返却日を閉館日の翌日にする
         fixed_due_date: 固定貸出期限
         note: 注記
         position: 位置

data/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb

@@ -1,7 +1,7 @@
 class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 1, null: false
-    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 7, null: false
+    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 7, null: false
+    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 3, null: false
     add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 3, null: false
   end
 

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

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

@@ -10,7 +10,7 @@ circulation_status_00001:
 circulation_status_00002: 
   name: Available On Shelf  
   display_name: |-
-    en: Available on Shelf
+    en: Available On Shelf
     ja: 在架（利用可能）
   id: 2
   note: ""

data/spec/concerns/enju_accept_spec.rb

@@ -1,29 +1,29 @@
 require 'rails_helper'
 
-class MyAccept < Accept
-  include EnjuCirculation::EnjuAccept
-end
-
 describe EnjuCirculation::EnjuAccept do
   fixtures :all
 
   it "should successfully accept" do
-    accept = MyAccept.new(FactoryBot.attributes_for(:accept))
-    expect(accept.item).to be_truthy
-    expect(accept.item.circulation_status.name).to eq "In Process"
+    accept = Accept.new(FactoryBot.attributes_for(:accept))
+    accept.item = FactoryBot.create(:item)
     accept.save!
     expect(accept.item.circulation_status.name).to eq "Available On Shelf"
     expect(accept.item.use_restriction.name).to eq "Limited Circulation, Normal Loan Period"
   end
 
   it "should reflect to items list", solr: true do
-    FactoryBot.create(:item)
-    FactoryBot.create(:item)
-    FactoryBot.create(:item)
+    Item.reindex
+
+    3.times do
+      FactoryBot.create(:item, circulation_status: CirculationStatus.find_by(name: 'In Process'))
+    end
+
     result = Item.search.build { facet :circulation_status }.execute
     inprocess_count = result.facet(:circulation_status).rows.find{|e| e.value == "In Process" }.count
     onshelf_count = result.facet(:circulation_status).rows.find{|e| e.value == "Available On Shelf" }.try(:count) || 0
-    accept = MyAccept.new(FactoryBot.attributes_for(:accept))
+
+    accept = Accept.new(FactoryBot.attributes_for(:accept))
+    accept.item = FactoryBot.create(:item)
     accept.save!
     result = Item.search.build { facet :circulation_status }.execute
     expect(result.facet(:circulation_status).rows.find{|e| e.value == "In Process" }.count).to eq inprocess_count

data/spec/controllers/items_controller_spec.rb

@@ -0,0 +1,62 @@
+require 'rails_helper'
+
+describe ItemsController do
+  fixtures :all
+
+  describe 'POST create' do
+    before(:each) do
+      manifestation = FactoryBot.create(:manifestation)
+      @attrs = FactoryBot.attributes_for(:item, manifestation_id: manifestation.id)
+      @invalid_attrs = { item_identifier: '無効なID', manifestation_id: manifestation.id }
+    end
+
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      describe 'with valid params' do
+        it 'should create reserved item' do
+          post :create, params: { item: { circulation_status_id: 1, manifestation_id: 2 } }
+          expect(assigns(:item)).to be_valid
+
+          expect(response).to redirect_to item_url(assigns(:item))
+          flash[:message].should eq I18n.t('item.this_item_is_reserved')
+          assigns(:item).manifestation.should eq Manifestation.find(2)
+          assigns(:item).should be_retained
+        end
+
+        it "should create another item with already retained" do
+          reserve = FactoryBot.create(:reserve)
+          reserve.transition_to!(:requested)
+          post :create, params: { item: FactoryBot.attributes_for(:item, manifestation_id: reserve.manifestation.id) }
+          expect(assigns(:item)).to be_valid
+          expect(response).to redirect_to item_url(assigns(:item))
+          post :create, params: { item: FactoryBot.attributes_for(:item, manifestation_id: reserve.manifestation.id) }
+          expect(assigns(:item)).to be_valid
+          expect(response).to redirect_to item_url(assigns(:item))
+        end
+
+        it 'should create a lending policy' do
+          old_lending_policy_count = LendingPolicy.count
+          post :create, params: { item: @attrs }
+          LendingPolicy.count.should eq old_lending_policy_count
+        end
+      end
+    end
+  end
+
+  describe 'DELETE destroy' do
+    describe 'When logged in as Administrator' do
+      login_fixture_admin
+
+      it 'should not destroy item if not checked in' do
+        delete :destroy, params: { id: 1 }
+        expect(response).to be_forbidden
+      end
+
+      it 'should not destroy a removed item' do
+        delete :destroy, params: { id: 26 }
+        expect(response).to be_forbidden
+      end
+    end
+  end
+end

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end

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
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, #:registerable,
@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
   include EnjuCirculation::EnjuUser
 end
 
+Accept.include(EnjuCirculation::EnjuAccept)
 Basket.include(EnjuCirculation::EnjuBasket)
 Manifestation.include(EnjuCirculation::EnjuManifestation)
 Item.include(EnjuCirculation::EnjuItem)