enju_circulation 0.0.34 → 0.0.35

data/app/controllers/checked_items_controller.rb

@@ -56,7 +56,7 @@ class CheckedItemsController < ApplicationController
     @checked_item.basket = @basket
     @checked_item.librarian = current_user
 
-    flash[:message] = []
+    flash[:message] = ''
     item_identifier = @checked_item.item_identifier.to_s.strip
     unless item_identifier.blank?
       item = Item.where(:item_identifier => item_identifier).first

data/app/controllers/checkins_controller.rb

@@ -34,6 +34,7 @@ class CheckinsController < ApplicationController
 
   # GET /checkins/new
   def new
+    flash[:message] = nil
     if flash[:checkin_basket_id]
       @basket = Basket.find(flash[:checkin_basket_id])
     else

data/app/controllers/checkouts_controller.rb

@@ -1,8 +1,8 @@
 class CheckoutsController < ApplicationController
   before_filter :store_location, :only => :index
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
-  before_filter :get_user, :only => :index
+  load_and_authorize_resource :except => [:index, :remove_all]
+  authorize_resource :only => [:index, :remove_all]
+  before_filter :get_user, :only => [:index, :remove_all]
   helper_method :get_item
   after_filter :convert_charset, :only => :index
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
@@ -133,4 +133,20 @@ class CheckoutsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  def remove_all
+    if @user
+      unless current_user.has_role?('Librarian')
+        if @user != current_user
+          access_denied; return
+        end
+      end
+      Checkout.remove_all_history(@user)
+    end
+
+    respond_to do |format|
+      format.html { redirect_to checkouts_url, :notice => t('controller.successfully_deleted', :model => t('activerecord.models.checkout')) }
+      format.json { head :no_content }
+    end
+  end
 end

data/app/models/checkout.rb

@@ -28,8 +28,8 @@ class Checkout < ActiveRecord::Base
   end
 
   def is_not_checked?
-    checkout = Checkout.not_returned.find(self.item) rescue nil
-    unless checkout.nil?
+    checkout = Checkout.not_returned.where(:item_id => item_id)
+    unless checkout.empty?
       errors[:base] << I18n.t('activerecord.errors.messages.checkin.already_checked_out')
     end
   end
@@ -107,6 +107,10 @@ class Checkout < ActiveRecord::Base
     end
     queues.size
   end
+
+  def self.remove_all_history(user)
+    user.checkouts.update_all(:user_id => nil)
+  end
 end
 
 # == Schema Information

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

@@ -1,4 +1,4 @@
-<div style="color: red"><%= flash[:message].try(:join) -%></div>
+<div style="color: red"><%= flash[:message] -%></div>
 
 <div class="search_form">
 <%= form_for :checked_item, :html => {:method => :post}, :url => basket_checked_items_path(@basket), :remote => true do |f| -%>

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

@@ -50,6 +50,8 @@
         <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_checkouts_path(user, :format => :csv, :locale => @locale.to_s) -%>
       </li>
     <%- end -%>
-  </p>
-
+  </ul>
+  <ul>
+    <li><%= link_to t('checkout.remove_all_history'), checkouts_path, :method => :delete %></li>
+  </ul>
 </div>

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

@@ -1,4 +1,4 @@
-<div style="color: red"><%= flash[:message].to_s -%></div>
+<div style="color: red"><%= flash[:message] -%></div>
 <div id="content_detail" class="ui-corner-all">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.reserve')) -%></h1>
 <div id="content_list">

data/config/locales/translation_en.yml

@@ -122,6 +122,7 @@ en:
     checkout: "Checkout!"
     ignore_restriction: "Ignore restriction"
     already_checked_out: "This item is already checked out."
+    already_checked_out_try_again: "Item already checked out. Try again."
   checkout:
     user_checkout: "%{login_name}'s checkouts"
     library_group_checkout: "Checkouts in %{library_group_name}"

data/config/locales/translation_ja.yml

@@ -120,6 +120,7 @@ ja:
     checkout: "上記の資料を貸し出す"
     ignore_restriction: "制限を無視する"
     already_checked_out: "この資料はすでに貸し出されています。"
+    already_checked_out_try_again: "資料はすでに貸し出されています。もう一度やり直してください。"
   checkout:
     user_checkout: "%{login_name} さんの貸出資料"
     library_group_checkout: "%{library_group_name} での貸出"

data/config/routes.rb

@@ -8,7 +8,9 @@ Rails.application.routes.draw do
     resources :checkins
   end
   resources :users do
-    resources :checkouts, :only => :index
+    resources :checkouts, :only => :index do
+      put :remove_all, :on => :collection
+    end
     resources :reserves, :only => :index
     resources :baskets, :only => :index
   end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.34"
+  VERSION = "0.0.35"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -264,6 +264,18 @@ describe CheckoutsController do
         put :update, :id => 'missing', :checkout => { }
         response.should be_missing
       end
+
+      it "should remove its own checkout history" do
+        put :remove_all, :user_id => users(:user1).username
+        users(:user1).checkouts.count.should eq 0
+        response.should redirect_to checkouts_url
+      end
+
+      it "should not remove other checkout history" do
+        put :remove_all, :user_id => users(:user2).username
+        users(:user1).checkouts.count.should_not eq 0
+        response.should redirect_to checkouts_url
+      end
     end
 
     describe "When logged in as Librarian" do
@@ -303,6 +315,18 @@ describe CheckoutsController do
         put :update, :id => 1, :checkout => { }
         response.should redirect_to checkout_url(assigns(:checkout))
       end
+
+      it "should remove its own checkout history" do
+        put :remove_all, :user_id => users(:user1).username
+        users(:user1).checkouts.count.should eq 0
+        response.should redirect_to checkouts_url
+      end
+
+      it "should not remove other checkout history" do
+        put :remove_all, :user_id => users(:user2).username
+        users(:user1).checkouts.count.should_not eq 0
+        response.should redirect_to checkouts_url
+      end
     end
 
     describe "When logged in as User" do
@@ -349,6 +373,18 @@ describe CheckoutsController do
         assigns(:checkout).should_not be_valid
         response.should be_success
       end
+
+      it "should remove its own checkout history" do
+        put :remove_all, :user_id => users(:user1).username
+        assigns(:user).checkouts.count.should eq 0
+        response.should redirect_to checkouts_url
+      end
+
+      it "should not remove other checkout history" do
+        put :remove_all, :user_id => users(:admin).username
+        assigns(:user).checkouts.count.should_not eq 0
+        response.should be_forbidden
+      end
     end
 
     describe "When not logged in" do

data/spec/dummy/app/controllers/baskets_controller.rb

@@ -56,7 +56,7 @@ class BasketsController < ApplicationController
 
     respond_to do |format|
       if @basket.save
-        format.html { redirect_to basket_checked_items_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
+        format.html { redirect_to new_basket_checked_item_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
         format.json { render :json => @basket, :status => :created, :location => @basket }
       else
         format.html { render :action => "new" }

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

@@ -71,7 +71,7 @@ class Ability
         manifestation.items.empty? and !manifestation.periodical_master? and !manifestation.is_reserved?
       end
     when 'User'
-      can [:index, :create], Checkout
+      can [:index, :create, :remove_all], Checkout
       can [:show, :update, :destroy], Checkout do |checkout|
         checkout.user == user
       end

data/spec/models/checkout_spec.rb

@@ -46,6 +46,14 @@ describe Checkout do
   it "should respond to send_overdue_notification" do
     Checkout.send_overdue_notification.should eq 1
   end
+
+  it "should destroy all history" do
+    user = users(:user1)
+    old_count = Checkout.count
+    Checkout.remove_all_history(user)
+    user.checkouts.count.should eq 0
+    Checkout.count.should eq old_count
+  end
 end
 
 # == Schema Information

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -529,7 +529,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- spec/controllers/baskets_controller_spec.rb
 - spec/controllers/carrier_type_has_checkout_types_controller_spec.rb
 - spec/controllers/checked_items_controller_spec.rb
 - spec/controllers/checkins_controller_spec.rb
@@ -714,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
@@ -761,7 +759,6 @@ signing_key:
 specification_version: 3
 summary: enju_circulation plugin
 test_files:
-- spec/controllers/baskets_controller_spec.rb
 - spec/controllers/carrier_type_has_checkout_types_controller_spec.rb
 - spec/controllers/checked_items_controller_spec.rb
 - spec/controllers/checkins_controller_spec.rb
@@ -946,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/controllers/baskets_controller_spec.rb

@@ -1,379 +0,0 @@
-require 'spec_helper'
-
-describe BasketsController do
-  fixtures :all
-
-  describe "GET index" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should_not be_empty
-        response.should be_success
-      end
-
-      it "should get index without user_id" do
-        get :index
-        response.should be_success
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should_not be_empty
-        response.should be_success
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should be_empty
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should be_empty
-        response.should redirect_to(new_user_session_url)
-      end
-    end
-  end
-
-  describe "GET show" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-        response.should redirect_to(new_user_session_url)
-      end
-    end
-  end
-
-  describe "GET new" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "should not assign the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "should not assign the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-        response.should redirect_to(new_user_session_url)
-      end
-    end
-  end
-
-  describe "GET edit" do
-    describe "When logged in as Administrator" do
-      login_admin
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "assigns the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "assigns the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "should not assign the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "should not assign the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-        response.should redirect_to new_user_session_url
-      end
-    end
-  end
-
-  describe "POST create" do
-    before(:each) do
-      @attrs = {:user_number => users(:user1).user_number }
-      @invalid_attrs = {:user_number => 'invalid'}
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      describe "with valid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          assigns(:basket).should be_valid
-        end
-      end
-
-      describe "with blank params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => @invalid_attrs
-          assigns(:basket).should_not be_valid
-        end
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      describe "with valid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          assigns(:basket).should be_valid
-        end
-      end
-
-      describe "with blank params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => @invalid_attrs
-          assigns(:basket).should_not be_valid
-        end
-      end
-
-      it "should not create basket when user is suspended" do
-        post :create, :basket => {:user_number => users(:user4).user_number }
-        assigns(:basket).should_not be_valid
-        assigns(:basket).errors["base"].include?(I18n.t('basket.this_account_is_suspended')).should be_true
-        response.should be_success
-      end
-
-      it "should not create basket when user is not found" do
-        post :create, :basket => {:user_number => 'not found' }
-        assigns(:basket).should_not be_valid
-        assigns(:basket).errors["base"].include?(I18n.t('user.not_found')).should be_true
-        response.should be_success
-      end
-
-      it "should not create basket without user_number" do
-        post :create, :basket => { }
-        assigns(:basket).should_not be_valid
-        response.should be_success
-      end
-
-      it "should create basket" do
-        post :create, :basket => {:user_number => users(:user1).user_number }
-        assigns(:basket).should be_valid
-        response.should redirect_to basket_checked_items_url(assigns(:basket))
-      end
-
-      it "should not create basket without user_number" do
-        post :create, :basket => { }
-        assigns(:basket).should_not be_valid
-        response.should be_success
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      describe "with valid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          assigns(:basket).should_not be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          response.should be_forbidden
-        end
-      end
-
-      it "should not create basket" do
-        post :create, :basket => {:user_number => users(:user1).user_number }
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      describe "with blank params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-        end
-
-        it "should be redirected to new_user_session_url" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-          assert_response :redirect
-          response.should redirect_to new_user_session_url
-        end
-      end
-    end
-  end
-
-  describe "PUT update" do
-    before(:each) do
-      @attrs = {:user_id => users(:user1).username}
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      describe "with valid params" do
-        it "updates the requested basket" do
-          put :update, :id => 8, :basket => @attrs
-        end
-
-        it "assigns the requested basket as @basket" do
-          put :update, :id => 8, :basket => @attrs
-          assigns(:basket).checkouts.first.item.circulation_status.name.should eq 'On Loan'
-          response.should redirect_to(user_checkouts_url(assigns(:basket).user))
-        end
-      end
-    end
-  end
-
-  describe "DELETE destroy" do
-    before(:each) do
-      @basket = FactoryGirl.create(:basket)
-    end
-
-    describe "When logged in as Administrator" do
-      login_fixture_admin
-
-      it "should destroy basket without user_id" do
-        delete :destroy, :id => 1, :basket => {:user_id => nil}, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-
-      it "should destroy basket" do
-        delete :destroy, :id => 1, :basket => { }, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_fixture_librarian
-
-      it "should destroy basket without user_id" do
-        delete :destroy, :id => 1, :basket => {:user_id => nil}, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-
-      it "should destroy basket" do
-        delete :destroy, :id => 1, :basket => { }, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_fixture_user
-
-      it "should not destroy basket" do
-        delete :destroy, :id => 3, :user_id => users(:user1).username
-        response.should be_forbidden
-      end
-    end
-  
-    describe "When not logged in" do
-      it "destroys the requested basket" do
-        delete :destroy, :id => @basket.id
-      end
-
-      it "should be forbidden" do
-        delete :destroy, :id => @basket.id
-        response.should redirect_to new_user_session_url
-      end
-    end
-  end
-end

data/spec/models/basket_spec.rb

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'spec_helper'
-
-describe Basket do
-  #pending "add some examples to (or delete) #{__FILE__}"
-  fixtures :all
-
-  it "should not create basket when user is not active" do
-    Basket.create(:user => users(:user4)).id.should be_nil
-  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
-#
-