enju_circulation 0.0.64 → 0.0.65

data/app/models/checkout.rb

@@ -2,6 +2,7 @@ class Checkout < ActiveRecord::Base
   attr_accessible :due_date
   default_scope :order => 'checkouts.id DESC'
   scope :not_returned, where(:checkin_id => nil)
+  scope :returned, where('checkin_id IS NOT NULL')
   scope :overdue, lambda {|date| {:conditions => ['checkin_id IS NULL AND due_date < ?', date]}}
   scope :due_date_on, lambda {|date| where(:checkin_id => nil, :due_date => date.beginning_of_day .. date.end_of_day)}
   scope :completed, lambda {|start_date, end_date| {:conditions => ['created_at >= ? AND created_at < ?', start_date, end_date]}}
@@ -108,7 +109,7 @@ class Checkout < ActiveRecord::Base
   end
 
   def self.remove_all_history(user)
-    user.checkouts.update_all(:user_id => nil)
+    user.checkouts.returned.update_all(:user_id => nil)
   end
 end
 # == Schema Information

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

@@ -53,7 +53,7 @@
   </ul>
   <ul>
     <% if @user == current_user %>
-      <li><%= link_to t('checkout.remove_all_history'), remove_all_user_checkouts_path(current_user), :method => :put %></li>
+      <li><%= link_to t('checkout.remove_all_history'), remove_all_user_checkouts_path(current_user), :method => :put, :data => {:confirm => t('page.are_you_sure')} %></li>
     <% end %>
   </ul>
 </div>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.64"
+  VERSION = "0.0.65"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -276,13 +276,13 @@ describe CheckoutsController do
 
       it "should remove its own checkout history" do
         put :remove_all, :user_id => users(:user1).username
-        users(:user1).checkouts.count.should eq 0
+        users(:user1).checkouts.returned.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
+        users(:user1).checkouts.returned.count.should_not eq 0
         response.should redirect_to checkouts_url
       end
     end
@@ -327,13 +327,13 @@ describe CheckoutsController do
 
       it "should remove its own checkout history" do
         put :remove_all, :user_id => users(:user1).username
-        users(:user1).checkouts.count.should eq 0
+        users(:user1).checkouts.returned.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
+        users(:user1).checkouts.returned.count.should_not eq 0
         response.should redirect_to checkouts_url
       end
     end
@@ -386,13 +386,13 @@ describe CheckoutsController do
 
       it "should remove its own checkout history" do
         put :remove_all, :user_id => users(:user1).username
-        assigns(:user).checkouts.count.should eq 0
+        assigns(:user).checkouts.returned.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
+        assigns(:user).checkouts.returned.count.should eq 0
         response.should be_forbidden
       end
     end

data/spec/models/checkout_spec.rb

@@ -51,7 +51,7 @@ describe Checkout do
     user = users(:user1)
     old_count = Checkout.count
     Checkout.remove_all_history(user)
-    user.checkouts.count.should eq 0
+    user.checkouts.returned.count.should eq 0
     Checkout.count.should eq old_count
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.64
+  version: 0.0.65
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails