enju_circulation 0.0.40 → 0.0.41

data/config/locales/translation_en.yml

@@ -142,7 +142,7 @@ en:
     extend: "Extend"
     returned: "Returned"
     my_checkout: "My checkout"
-    remove_all: "Remove all checkout history"
+    remove_all_history: "Remove all checkout history"
   checkin:
     item_not_found: "Item not found."
     enter_item_identifier: "Enter item identifier."

data/config/locales/translation_ja.yml

@@ -140,7 +140,7 @@ ja:
     extend: "貸出期間の延長"
     returned: "返却済み"
     my_checkout: "自分の貸出"
-    remove_all: "すべての貸出履歴を削除"
+    remove_all_history: "すべての貸出履歴を削除"
   checkin:
     item_not_found: "資料が見つかりません。"
     enter_item_identifier: "所蔵情報番号を入力してください。"

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.40"
+  VERSION = "0.0.41"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -411,6 +411,7 @@ describe CheckoutsController do
   describe "DELETE destroy" do
     before(:each) do
       @checkout = checkouts(:checkout_00003)
+      @returned_checkout = checkouts(:checkout_00012)
     end
 
     describe "When logged in as Administrator" do
@@ -420,16 +421,16 @@ describe CheckoutsController do
         delete :destroy, :id => @checkout.id
       end
 
-      it "redirects to the checkouts list" do
+      it "should not destroy the checkout that is not checked in" do
         delete :destroy, :id => @checkout.id
-        response.should redirect_to(user_checkouts_url(@checkout.user))
+        response.should be_forbidden
       end
 
-      it "should destroy other user's checkout" do
-        delete :destroy, :id => 3
-        response.should redirect_to user_checkouts_url(@checkout.user)
+      it "redirects to the checkouts list" do
+        delete :destroy, :id => @returned_checkout.id
+        response.should redirect_to(user_checkouts_url(@returned_checkout.user))
       end
-  
+
       it "should not destroy missing checkout" do
         delete :destroy, :id => 'missing'
         response.should be_missing
@@ -443,15 +444,14 @@ describe CheckoutsController do
         delete :destroy, :id => @checkout.id
       end
 
-      it "redirects to the checkouts list" do
+      it "should not destroy the checkout that is not checked in" do
         delete :destroy, :id => @checkout.id
-        response.should redirect_to(user_checkouts_url(@checkout.user))
+        response.should be_forbidden
       end
 
-      it "should destroy other user's checkout" do
-        user = Checkout.find(1).user
-        delete :destroy, :id => 1
-        response.should redirect_to user_checkouts_url(user)
+      it "redirects to the checkouts list" do
+        delete :destroy, :id => @returned_checkout.id
+        response.should redirect_to(user_checkouts_url(@returned_checkout.user))
       end
     end
 
@@ -468,7 +468,7 @@ describe CheckoutsController do
       end
 
       it "should destroy my checkout" do
-        delete :destroy, :id => 3
+        delete :destroy, :id => 13
         response.should redirect_to user_checkouts_url(users(:user1))
       end
     end

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

@@ -9,7 +9,6 @@ class Ability
         CarrierTypeHasCheckoutType,
         CheckedItem,
         Checkin,
-        Checkout,
         CheckoutStatHasManifestation,
         CheckoutStatHasUser,
         CheckoutType,
@@ -23,6 +22,10 @@ class Ability
         UserGroupHasCheckoutType,
         UserReserveStat
       ]
+      can [:read, :create, :update, :remove_all], Checkout
+      can :destroy, Checkout do |checkout|
+        checkout.checkin
+      end
       can [:read, :update], [
         CirculationStatus,
         LendingPolicy,
@@ -42,11 +45,14 @@ class Ability
         Basket,
         CheckedItem,
         Checkin,
-        Checkout,
         ManifestationCheckoutStat,
         ManifestationReserveStat,
         Reserve
       ]
+      can [:read, :create, :update, :remove_all], Checkout
+      can :destroy, Checkout do |checkout|
+        checkout.checkin
+      end
       can [:read, :create, :update], UserCheckoutStat
       can [:read, :create, :update], UserReserveStat
       can :read, [
@@ -72,9 +78,12 @@ class Ability
       end
     when 'User'
       can [:index, :create, :remove_all], Checkout
-      can [:show, :update, :destroy], Checkout do |checkout|
+      can [:show, :update], Checkout do |checkout|
         checkout.user == user
       end
+      can :destroy, Checkout do |checkout|
+        checkout.user == user && checkout.checkin
+      end
       can :index, Reserve
       can :create, Reserve do |reserve|
         user.user_number.present?

data/spec/fixtures/checkouts.yml

@@ -119,6 +119,30 @@ checkout_00011:
   due_date: <%= 180.days.ago.beginning_of_day %>
   created_at: 2007-09-08 01:39:03.210081 +09:00
   basket_id: 7
+checkout_00012: 
+  item_id: 6
+  updated_at: 2007-09-09 21:15:11.648996 +09:00
+  lock_version: 0
+  user_id: 3
+  id: 12
+  librarian_id: 1
+  checkout_renewal_count: 1
+  due_date: <%= 180.days.ago.beginning_of_day %>
+  created_at: 2007-09-08 01:39:03.210081 +09:00
+  basket_id: 8
+  checkin_id: 5
+checkout_00013: 
+  item_id: 7
+  updated_at: 2007-09-09 21:15:11.648996 +09:00
+  lock_version: 0
+  user_id: 3
+  id: 13
+  librarian_id: 1
+  checkout_renewal_count: 1
+  due_date: <%= 180.days.ago.beginning_of_day %>
+  created_at: 2007-09-08 01:39:03.210081 +09:00
+  basket_id: 8
+  checkin_id: 4
 
 # == Schema Information
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
   prerelease: 
 platform: ruby
 authors:
@@ -713,7 +713,6 @@ files:
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
-- spec/models/basket_spec.rb
 - spec/models/carrier_type_has_checkout_type_spec.rb
 - spec/models/checked_item_spec.rb
 - spec/models/checkin_spec.rb
@@ -944,7 +943,6 @@ test_files:
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
-- spec/models/basket_spec.rb
 - spec/models/carrier_type_has_checkout_type_spec.rb
 - spec/models/checked_item_spec.rb
 - spec/models/checkin_spec.rb

data/spec/models/basket_spec.rb

@@ -1,39 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
-
-describe Basket do
-  fixtures :all
-
-  it "should not create basket when user is not active" do
-    Basket.create(:user => users(:user4)).id.should be_nil
-  end
-
-  it "should not check out items that are already checked out" do
-    items(:item_00021).checkouts.count.should eq 0
-    basket_1 = Basket.create(:user => users(:admin))
-    checked_item_1 = basket_1.checked_items.new
-    checked_item_1.item = items(:item_00011)
-    checked_item_1.save
-    basket_2 = Basket.create(:user => users(:user1))
-    checked_item_2 = basket_2.checked_items.new
-    checked_item_2.item = items(:item_00011)
-    checked_item_2.save
-    basket_1.basket_checkout(users(:librarian1))
-    lambda{basket_2.basket_checkout(users(:librarian1))}.should raise_exception ActiveRecord::RecordInvalid
-    items(:item_00011).checkouts.first.user.should eq users(:admin)
-  end
-end
-
-# == Schema Information
-#
-# Table name: baskets
-#
-#  id           :integer         not null, primary key
-#  user_id      :integer
-#  note         :text
-#  type         :string(255)
-#  lock_version :integer         default(0), not null
-#  created_at   :datetime
-#  updated_at   :datetime
-#
-