enju_circulation 0.2.5 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda5244be075c380ff8290904ec4d0bd0503d075
-  data.tar.gz: 76ea8769aeeb402fe0516f8b38bc7b80a7fd6114
+  metadata.gz: 2171f72d6b8294ecadc813f1fce2913b181b8ada
+  data.tar.gz: 7cc0cce388307b726847650cbdf55ecea30b8754
 SHA512:
-  metadata.gz: 7f9b1b8a03dfa58fe4710fdd65ca34a00f0b44e6cbcf54a506b0197d3b63237aacecd6ead72a44a437e978f3dfba4d73d06b1b41c6110ed7a41461fa6d2b589f
-  data.tar.gz: c02c164437b5b2183841af93e8163adc3dfdcb97633de55f11755124f094e12a7d72675b97492b6adb553874a2b6d4f1a8c5a47a1af05cf8bbf55233d950721d
+  metadata.gz: 231d92bae9545ef89cf5a88a4db5e33664f9d3504c6c937beb84c7c32641d62c0919ac828fe5ed634df3ff09227518e37c6d081a16212972909eeb9f96f7fcfe
+  data.tar.gz: 2c7ccd5a94d2277fa33e96aa403ad2c09f0ffb858e4b3eada1ee3660a293b58518401ab27c61c3d242f0e27a83a44de67fbbe4f1397d59b84b51913a75ec03a8

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuCirculation
-{<img src="https://travis-ci.org/next-l/enju_circulation.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
-{<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_circulation?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_circulation/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.2]
+{<img src="https://travis-ci.org/next-l/enju_circulation.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_circulation]
+{<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_circulation?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_circulation/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/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}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -33,7 +33,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
@@ -44,4 +44,4 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task :default => :spec
+task default: :spec

data/app/controllers/carrier_type_has_checkout_types_controller.rb

@@ -63,7 +63,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
   # PUT /carrier_type_has_checkout_types/1.json
   def update
     respond_to do |format|
-      if @carrier_type_has_checkout_type.update_attributes(carrier_type_has_checkout_type_params)
+      if @carrier_type_has_checkout_type.update(carrier_type_has_checkout_type_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.carrier_type_has_checkout_type'))
         format.html { redirect_to @carrier_type_has_checkout_type }
         format.json { head :no_content }
@@ -87,6 +87,7 @@ class CarrierTypeHasCheckoutTypesController < ApplicationController
   end
 
   private
+
   def set_carrier_type_has_checkout_type
     @carrier_type_has_checkout_type = CarrierTypeHasCheckoutType.find(params[:id])
     authorize @carrier_type_has_checkout_type

data/app/controllers/checked_items_controller.rb

@@ -89,7 +89,7 @@ class CheckedItemsController < ApplicationController
     end
 
     respond_to do |format|
-      if @checked_item.update_attributes(checked_item_params)
+      if @checked_item.update(checked_item_params)
         format.html { redirect_to checked_item_url(@checked_item), notice: t('controller.successfully_updated', model: t('activerecord.models.checked_item')) }
         format.json { head :no_content }
       else
@@ -111,6 +111,7 @@ class CheckedItemsController < ApplicationController
   end
 
   private
+
   def set_checked_item
     @checked_item = CheckedItem.find(params[:id])
     authorize @checked_item

data/app/controllers/checkins_controller.rb

@@ -22,7 +22,7 @@ class CheckinsController < ApplicationController
   # GET /checkins/1
   # GET /checkins/1.json
   def show
-    #@checkin = Checkin.find(params[:id])
+    # @checkin = Checkin.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -52,7 +52,7 @@ class CheckinsController < ApplicationController
 
   # GET /checkins/1/edit
   def edit
-    #@checkin = Checkin.find(params[:id])
+    # @checkin = Checkin.find(params[:id])
   end
 
   # POST /checkins
@@ -108,7 +108,7 @@ class CheckinsController < ApplicationController
   # DELETE /checkins/1
   # DELETE /checkins/1.json
   def destroy
-    #@checkin = Checkin.find(params[:id])
+    # @checkin = Checkin.find(params[:id])
     @checkin.destroy
 
     respond_to do |format|
@@ -118,6 +118,7 @@ class CheckinsController < ApplicationController
   end
 
   private
+
   def set_checkin
     @checkin = Checkin.find(params[:id])
     authorize @checkin

data/app/controllers/checkout_types_controller.rb

@@ -79,7 +79,7 @@ class CheckoutTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @checkout_type.update_attributes(checkout_type_params)
+      if @checkout_type.update(checkout_type_params)
         format.html { redirect_to @checkout_type, notice: t('controller.successfully_updated', model: t('activerecord.models.checkout_type')) }
         format.json { head :no_content }
       else
@@ -104,6 +104,7 @@ class CheckoutTypesController < ApplicationController
   end
 
   private
+
   def set_checkout_type
     @checkout_type = CheckoutType.find(params[:id])
     authorize @checkout_type

data/app/controllers/checkouts_controller.rb

@@ -167,6 +167,7 @@ class CheckoutsController < ApplicationController
   end
 
   private
+
   def set_checkout
     @checkout = Checkout.find(params[:id])
     authorize @checkout

data/app/controllers/circulation_statuses_controller.rb

@@ -62,7 +62,7 @@ class CirculationStatusesController < ApplicationController
     end
 
     respond_to do |format|
-      if @circulation_status.update_attributes(circulation_status_params)
+      if @circulation_status.update(circulation_status_params)
         format.html { redirect_to @circulation_status, notice: t('controller.successfully_updated', model: t('activerecord.models.circulation_status')) }
         format.json { head :no_content }
       else
@@ -84,6 +84,7 @@ class CirculationStatusesController < ApplicationController
   end
 
   private
+
   def set_circulation_status
     @circulation_status = CirculationStatus.find(params[:id])
     authorize @circulation_status

data/app/controllers/demands_controller.rb

@@ -58,7 +58,7 @@ class DemandsController < ApplicationController
   # PUT /demands/1.json
   def update
     respond_to do |format|
-      if @demand.update_attributes(demand_params)
+      if @demand.update(demand_params)
         format.html { redirect_to @demand, notice: t('controller.successfully_updated', model: t('activerecord.models.demand')) }
         format.json { head :no_content }
       else
@@ -80,6 +80,7 @@ class DemandsController < ApplicationController
   end
 
   private
+
   def set_demand
     @demand = Demand.find(params[:id])
     authorize @demand

data/app/controllers/item_has_use_restrictions_controller.rb

@@ -89,6 +89,7 @@ class ItemHasUseRestrictionsController < ApplicationController
   end
 
   private
+
   def set_item_has_use_restriction
     @item_has_use_restriction = ItemHasUseRestriction.find(params[:id])
     authorize @item_has_use_restriction

data/app/controllers/lending_policies_controller.rb

@@ -60,7 +60,7 @@ class LendingPoliciesController < ApplicationController
   # PUT /lending_policies/1.json
   def update
     respond_to do |format|
-      if @lending_policy.update_attributes(lending_policy_params)
+      if @lending_policy.update(lending_policy_params)
         format.html { redirect_to @lending_policy, notice: t('controller.successfully_updated', model: t('activerecord.models.lending_policy')) }
         format.json { head :no_content }
       else
@@ -83,6 +83,7 @@ class LendingPoliciesController < ApplicationController
   end
 
   private
+
   def set_lending_policy
     @lending_policy = LendingPolicy.find(params[:id])
     authorize @lending_policy

data/app/controllers/manifestation_checkout_stats_controller.rb

@@ -96,7 +96,7 @@ class ManifestationCheckoutStatsController < ApplicationController
   # PUT /manifestation_checkout_stats/1.json
   def update
     respond_to do |format|
-      if @manifestation_checkout_stat.update_attributes(manifestation_checkout_stat_params)
+      if @manifestation_checkout_stat.update(manifestation_checkout_stat_params)
         if @manifestation_checkout_stat.mode == 'import'
           ManifestationCheckoutStatJob.perform_later(@manifestation_checkout_stat)
         end
@@ -121,6 +121,7 @@ class ManifestationCheckoutStatsController < ApplicationController
   end
 
   private
+
   def set_manifestation_checkout_stat
     @manifestation_checkout_stat = ManifestationCheckoutStat.find(params[:id])
     authorize @manifestation_checkout_stat

data/app/controllers/manifestation_reserve_stats_controller.rb

@@ -69,7 +69,7 @@ class ManifestationReserveStatsController < ApplicationController
   # PUT /manifestation_reserve_stats/1.json
   def update
     respond_to do |format|
-      if @manifestation_reserve_stat.update_attributes(manifestation_reserve_stat_params)
+      if @manifestation_reserve_stat.update(manifestation_reserve_stat_params)
         if @manifestation_reserve_stat.mode == 'import'
           ManifestationReserveStatJob.perform_later(@manifestation_reserve_stat)
         end
@@ -94,6 +94,7 @@ class ManifestationReserveStatsController < ApplicationController
   end
 
   private
+
   def set_manifestation_reserve_stat
     @manifestation_reserve_stat = ManifestationReserveStat.find(params[:id])
     authorize @manifestation_reserve_stat

data/app/controllers/reserves_controller.rb

@@ -42,7 +42,7 @@ class ReservesController < ApplicationController
       page = params[:page] || 1
     end
 
-    if params[:mode] == 'hold' and current_user.has_role?('Librarian')
+    if (params[:mode] == 'hold') && current_user.has_role?('Librarian')
       search.build do
         with(:hold).equal_to true
       end
@@ -139,7 +139,7 @@ class ReservesController < ApplicationController
       authorize @manifestation, :show?
       @reserve.manifestation = @manifestation
       if @reserve.user
-        #@reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
+        # @reserve.expired_at = @manifestation.reservation_expired_period(@reserve.user).days.from_now.end_of_day
         if @manifestation.is_reserved_by?(@reserve.user)
           flash[:notice] = t('reserve.this_manifestation_is_already_reserved')
           redirect_to @manifestation
@@ -201,7 +201,7 @@ class ReservesController < ApplicationController
         @reserve.transition_to!(:canceled)
       else
         if @reserve.retained?
-          if @reserve.item_identifier.present? and @reserve.force_retaining == '1'
+          if @reserve.item_identifier.present? && (@reserve.force_retaining == '1')
             @reserve.transition_to!(:retained)
           end
         else
@@ -231,7 +231,7 @@ class ReservesController < ApplicationController
   # DELETE /reserves/1.json
   def destroy
     @reserve.destroy
-    #flash[:notice] = t('reserve.reservation_was_canceled')
+    # flash[:notice] = t('reserve.reservation_was_canceled')
 
     if @reserve.manifestation.is_reserved?
       if @reserve.item
@@ -249,6 +249,7 @@ class ReservesController < ApplicationController
   end
 
   private
+
   def set_reserve
     @reserve = Reserve.find(params[:id])
     authorize @reserve

data/app/controllers/use_restrictions_controller.rb

@@ -62,7 +62,7 @@ class UseRestrictionsController < ApplicationController
     end
 
     respond_to do |format|
-      if @use_restriction.update_attributes(use_restriction_params)
+      if @use_restriction.update(use_restriction_params)
         format.html { redirect_to @use_restriction, notice: t('controller.successfully_updated', model: t('activerecord.models.use_restriction')) }
         format.json { head :no_content }
       else
@@ -84,6 +84,7 @@ class UseRestrictionsController < ApplicationController
   end
 
   private
+
   def set_use_restriction
     @use_restriction = UseRestriction.find(params[:id])
     authorize @use_restriction

data/app/controllers/user_checkout_stats_controller.rb

@@ -68,7 +68,7 @@ class UserCheckoutStatsController < ApplicationController
   # PUT /user_checkout_stats/1.json
   def update
     respond_to do |format|
-      if @user_checkout_stat.update_attributes(user_checkout_stat_params)
+      if @user_checkout_stat.update(user_checkout_stat_params)
         if @user_checkout_stat.mode == 'import'
           UserCheckoutStatJob.perform_later(@user_checkout_stat)
         end
@@ -93,6 +93,7 @@ class UserCheckoutStatsController < ApplicationController
   end
 
   private
+
   def set_user_checkout_stat
     @user_checkout_stat = UserCheckoutStat.find(params[:id])
     authorize @user_checkout_stat

data/app/controllers/user_group_has_checkout_types_controller.rb

@@ -28,8 +28,8 @@ class UserGroupHasCheckoutTypesController < ApplicationController
   # GET /user_group_has_checkout_types/new.json
   def new
     @user_group_has_checkout_type = UserGroupHasCheckoutType.new(
-      :checkout_type => get_checkout_type,
-      :user_group => get_user_group
+      checkout_type: get_checkout_type,
+      user_group: get_user_group
     )
 
     respond_to do |format|
@@ -63,7 +63,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
   # PUT /user_group_has_checkout_types/1.json
   def update
     respond_to do |format|
-      if @user_group_has_checkout_type.update_attributes(user_group_has_checkout_type_params)
+      if @user_group_has_checkout_type.update(user_group_has_checkout_type_params)
         format.html { redirect_to @user_group_has_checkout_type, notice: t('controller.successfully_updated', model: t('activerecord.models.user_group_has_checkout_type')) }
         format.json { head :no_content }
       else
@@ -86,6 +86,7 @@ class UserGroupHasCheckoutTypesController < ApplicationController
   end
 
   private
+
   def set_user_group_has_checkout_type
     @user_group_has_checkout_type = UserGroupHasCheckoutType.find(params[:id])
     authorize @user_group_has_checkout_type

data/app/controllers/user_reserve_stats_controller.rb

@@ -68,7 +68,7 @@ class UserReserveStatsController < ApplicationController
   # PUT /user_reserve_stats/1.json
   def update
     respond_to do |format|
-      if @user_reserve_stat.update_attributes(user_reserve_stat_params)
+      if @user_reserve_stat.update(user_reserve_stat_params)
         if @user_reserve_stat.mode == 'import'
           UserReserveStatJob.perform_later(@user_reserve_stat)
         end
@@ -93,6 +93,7 @@ class UserReserveStatsController < ApplicationController
   end
 
   private
+
   def set_user_reserve_stat
     @user_reserve_stat = UserReserveStat.find(params[:id])
     authorize @user_reserve_stat

data/app/helpers/items_helper.rb

@@ -3,14 +3,14 @@ module ItemsHelper
     string = ''
     circulation_status = CirculationStatus.where(name: facet.value).select([:name, :display_name]).first
     if circulation_status
-      #string << form_icon(circulation_status)
+      # string << form_icon(circulation_status)
       current = true if params[:circulation_status] == circulation_status.name
       if current
         content_tag :strong do
-          link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
+          link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
         end
       else
-        link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
+        link_to("#{circulation_status.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(circulation_status: circulation_status.name, page: nil, view: nil, only_path: true)))
       end
     end
   end

data/app/models/carrier_type_has_checkout_type.rb

@@ -5,9 +5,9 @@ class CarrierTypeHasCheckoutType < ActiveRecord::Base
   belongs_to :carrier_type, validate: true
   belongs_to :checkout_type, validate: true
 
-  validates_presence_of :carrier_type, :checkout_type
+  validates :carrier_type, :checkout_type, presence: true
   validates_associated :carrier_type, :checkout_type
-  validates_uniqueness_of :checkout_type_id, scope: :carrier_type_id
+  validates :checkout_type_id, uniqueness: { scope: :carrier_type_id }
 
   acts_as_list scope: :carrier_type_id
 end

data/app/models/checked_item.rb

@@ -1,11 +1,11 @@
 class CheckedItem < ActiveRecord::Base
-  belongs_to :item #, validate: true
-  belongs_to :basket #, validate: true
-  belongs_to :librarian, class_name: 'User' #, validate: true
+  belongs_to :item
+  belongs_to :basket
+  belongs_to :librarian, class_name: 'User', optional: true
 
   validates_associated :item, :basket, on: :update
-  validates_presence_of :item, :basket, :due_date, on: :update
-  validates_uniqueness_of :item_id, scope: :basket_id
+  validates :item, :basket, :due_date, presence: { on: :update }
+  validates :item_id, uniqueness: { scope: :basket_id }
   validate :available_for_checkout?, on: :create
   validates :due_date_string, format: {with: /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, allow_blank: true
   validate :check_due_date
@@ -14,7 +14,7 @@ class CheckedItem < ActiveRecord::Base
   before_validation :set_due_date, on: :create
   strip_attributes only: :item_identifier
 
-  #attr_protected :user_id
+  # attr_protected :user_id
   attr_accessor :item_identifier, :ignore_restriction, :due_date_string
 
   def available_for_checkout?
@@ -72,7 +72,7 @@ class CheckedItem < ActiveRecord::Base
   end
 
   def item_checkout_type
-    if item and basket
+    if item && basket
       basket.user.profile.user_group.user_group_has_checkout_types.available_for_item(item).first
     end
   end
@@ -86,10 +86,10 @@ class CheckedItem < ActiveRecord::Base
       return nil if lending_rule.nil?
 
       if lending_rule.fixed_due_date.blank?
-        #self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
+        # self.due_date = item_checkout_type.checkout_period.days.since Time.zone.today
         self.due_date = lending_rule.loan_period.days.since(Time.zone.now).end_of_day
       else
-        #self.due_date = item_checkout_type.fixed_due_date
+        # self.due_date = item_checkout_type.fixed_due_date
         self.due_date = lending_rule.fixed_due_date.tomorrow.end_of_day
       end
       # 返却期限日が閉館日の場合
@@ -113,6 +113,7 @@ class CheckedItem < ActiveRecord::Base
   end
 
   private
+
   def check_due_date
     return nil unless due_date
     if due_date <= Time.zone.now

data/app/models/checkin.rb

@@ -6,8 +6,8 @@ class Checkin < ActiveRecord::Base
   belongs_to :librarian, class_name: 'User'
   belongs_to :basket
 
-  validates_uniqueness_of :item_id, scope: :basket_id
-  validates_presence_of :item_id, :basket_id
+  validates :item_id, uniqueness: { scope: :basket_id }
+  validates :item_id, :basket_id, presence: true
   validate :available_for_checkin?, on: :create
   before_validation :set_item
 
@@ -62,8 +62,8 @@ class Checkin < ActiveRecord::Base
       end
 
       # メールとメッセージの送信
-      #ReservationNotifier.deliver_reserved(item.manifestation.reserves.first.user, item.manifestation)
-      #Message.create(sender: current_user, receiver: item.manifestation.next_reservation.user, subject: message_template.title, body: message_template.body, recipient: item.manifestation.next_reservation.user)
+      # ReservationNotifier.deliver_reserved(item.manifestation.reserves.first.user, item.manifestation)
+      # Message.create(sender: current_user, receiver: item.manifestation.next_reservation.user, subject: message_template.title, body: message_template.body, recipient: item.manifestation.next_reservation.user)
     end
     if message.present?
       message