enju_circulation 0.0.43 → 0.0.45

data/app/models/reserve_stat_has_manifestation.rb

@@ -1,4 +1,7 @@
 class ReserveStatHasManifestation < ActiveRecord::Base
+  attr_accessible
+  attr_accessible :manifestation_reserve_stat_id, :manifestation_id,
+    :as => :admin
   belongs_to :manifestation_reserve_stat
   belongs_to :manifestation
 

data/app/models/reserve_stat_has_user.rb

@@ -1,4 +1,7 @@
 class ReserveStatHasUser < ActiveRecord::Base
+  attr_accessible
+  attr_accessible :user_reserve_stat_id, :user_id,
+    :as => :admin
   belongs_to :user_reserve_stat
   belongs_to :user
 

data/app/models/use_restriction.rb

@@ -1,10 +1,10 @@
 class UseRestriction < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope :order => 'use_restrictions.position'
   scope :available, where(:name => ['Not For Loan', 'Limited Circulation, Normal Loan Period'])
   has_many :item_has_use_restrictions
   has_many :items, :through => :item_has_use_restrictions
-  attr_protected :name
 end
 
 # == Schema Information

data/app/models/user_checkout_stat.rb

@@ -1,6 +1,7 @@
 class UserCheckoutStat < ActiveRecord::Base
+  attr_accessible :start_date, :end_date, :note
   include CalculateStat
-  default_scope :order => 'id DESC'
+  default_scope :order => 'user_checkout_stats.id DESC'
   scope :not_calculated, where(:state => 'pending')
   has_many :checkout_stat_has_users
   has_many :users, :through => :checkout_stat_has_users

data/app/models/user_group_has_checkout_type.rb

@@ -1,4 +1,8 @@
 class UserGroupHasCheckoutType < ActiveRecord::Base
+  attr_accessible :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
   scope :available_for_item, lambda{|item| where(:checkout_type_id => item.checkout_type.id)}
   scope :available_for_carrier_type, lambda{|carrier_type| {:include => {:checkout_type => :carrier_types}, :conditions => ['carrier_types.id = ?', carrier_type.id]}}
 

data/app/models/user_reserve_stat.rb

@@ -1,6 +1,7 @@
 class UserReserveStat < ActiveRecord::Base
+  attr_accessible :start_date, :end_date, :note
   include CalculateStat
-  default_scope :order => 'id DESC'
+  default_scope :order => 'user_reserve_stats.id DESC'
   scope :not_calculated, where(:state => 'pending')
   has_many :reserve_stat_has_users
   has_many :users, :through => :reserve_stat_has_users

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.43"
+  VERSION = "0.0.45"
 end

data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb

@@ -26,7 +26,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
@@ -66,7 +66,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -106,7 +106,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -146,7 +146,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -227,7 +227,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
@@ -339,7 +339,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
@@ -414,7 +414,7 @@ describe CarrierTypeHasCheckoutTypesController do
       end
     end
 
-    describe "When logged in as Subject" do
+    describe "When logged in as User" do
       login_user
 
       it "destroys the requested carrier_type_has_checkout_type" do

data/spec/controllers/checkout_stat_has_manifestations_controller_spec.rb

@@ -26,7 +26,7 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns all checkout_stat_has_manifestations as @checkout_stat_has_manifestations" do
@@ -66,7 +66,7 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested checkout_stat_has_manifestation as @checkout_stat_has_manifestation" do
@@ -106,7 +106,7 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "should not assign the requested checkout_stat_has_manifestation as @checkout_stat_has_manifestation" do
@@ -146,7 +146,7 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "assigns the requested checkout_stat_has_manifestation as @checkout_stat_has_manifestation" do
@@ -205,7 +205,7 @@ describe CheckoutStatHasManifestationsController do
       describe "with valid params" do
         it "assigns a newly created checkout_stat_has_manifestation as @checkout_stat_has_manifestation" do
           post :create, :checkout_stat_has_manifestation => @attrs
-          assigns(:checkout_stat_has_manifestation).should be_valid
+          assigns(:checkout_stat_has_manifestation).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -227,13 +227,13 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
         it "assigns a newly created checkout_stat_has_manifestation as @checkout_stat_has_manifestation" do
           post :create, :checkout_stat_has_manifestation => @attrs
-          assigns(:checkout_stat_has_manifestation).should be_valid
+          assigns(:checkout_stat_has_manifestation).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe CheckoutStatHasManifestationsController do
       describe "with valid params" do
         it "assigns a newly created checkout_stat_has_manifestation as @checkout_stat_has_manifestation" do
           post :create, :checkout_stat_has_manifestation => @attrs
-          assigns(:checkout_stat_has_manifestation).should be_valid
+          assigns(:checkout_stat_has_manifestation).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -339,7 +339,7 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       describe "with valid params" do
@@ -414,7 +414,7 @@ describe CheckoutStatHasManifestationsController do
       end
     end
 
-    describe "When logged in as Manifestation" do
+    describe "When logged in as User" do
       login_user
 
       it "destroys the requested checkout_stat_has_manifestation" do

data/spec/controllers/checkout_stat_has_users_controller_spec.rb

@@ -205,7 +205,7 @@ describe CheckoutStatHasUsersController do
       describe "with valid params" do
         it "assigns a newly created checkout_stat_has_user as @checkout_stat_has_user" do
           post :create, :checkout_stat_has_user => @attrs
-          assigns(:checkout_stat_has_user).should be_valid
+          assigns(:checkout_stat_has_user).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -233,7 +233,7 @@ describe CheckoutStatHasUsersController do
       describe "with valid params" do
         it "assigns a newly created checkout_stat_has_user as @checkout_stat_has_user" do
           post :create, :checkout_stat_has_user => @attrs
-          assigns(:checkout_stat_has_user).should be_valid
+          assigns(:checkout_stat_has_user).should_not be_valid
         end
 
         it "should be forbidden" do
@@ -259,7 +259,7 @@ describe CheckoutStatHasUsersController do
       describe "with valid params" do
         it "assigns a newly created checkout_stat_has_user as @checkout_stat_has_user" do
           post :create, :checkout_stat_has_user => @attrs
-          assigns(:checkout_stat_has_user).should be_valid
+          assigns(:checkout_stat_has_user).should_not be_valid
         end
 
         it "should be forbidden" do

data/spec/controllers/checkouts_controller_spec.rb

@@ -254,9 +254,10 @@ describe CheckoutsController do
           put :update, :id => @checkout.id, :checkout => @invalid_attrs
         end
 
-        it "re-renders the 'edit' template" do
+        it "should ignore item_id" do
           put :update, :id => @checkout.id, :checkout => @invalid_attrs
-          response.should render_template("edit")
+          response.should redirect_to(assigns(:checkout))
+          assigns(:checkout).changed?.should be_false
         end
       end
 
@@ -296,12 +297,12 @@ describe CheckoutsController do
       describe "with invalid params" do
         it "assigns the checkout as @checkout" do
           put :update, :id => @checkout.id, :checkout => @invalid_attrs, :user_id => @checkout.user.username
-          assigns(:checkout).should_not be_valid
+          assigns(:checkout).should be_valid
         end
 
-        it "re-renders the 'edit' template" do
+        it "should ignore item_id" do
           put :update, :id => @checkout.id, :checkout => @invalid_attrs, :user_id => @checkout.user.username
-          response.should render_template("edit")
+          response.should redirect_to(assigns(:checkout))
         end
       end
   
@@ -370,8 +371,9 @@ describe CheckoutsController do
   
       it "should not update checkout without item_id" do
         put :update, :id => 3, :checkout => {:item_id => nil}
-        assigns(:checkout).should_not be_valid
-        response.should be_success
+        assigns(:checkout).should be_valid
+        response.should redirect_to(assigns(:checkout))
+        assigns(:checkout).changed?.should be_false
       end
 
       it "should remove its own checkout history" do

data/spec/controllers/circulation_statuses_controller_spec.rb

@@ -0,0 +1,445 @@
+require 'spec_helper'
+require 'sunspot/rails/spec_helper'
+
+describe CirculationStatusesController do
+  fixtures :all
+  disconnect_sunspot
+
+  def valid_attributes
+    FactoryGirl.attributes_for(:circulation_status)
+  end
+
+  describe "GET index" do
+    before(:each) do
+      FactoryGirl.create(:circulation_status)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns all circulation_statuses as @circulation_statuses" do
+        get :index
+        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns all circulation_statuses as @circulation_statuses" do
+        get :index
+        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns all circulation_statuses as @circulation_statuses" do
+        get :index
+        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns all circulation_statuses as @circulation_statuses" do
+        get :index
+        assigns(:circulation_statuses).should eq(CirculationStatus.all)
+      end
+    end
+  end
+
+  describe "GET show" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :show, :id => circulation_status.id
+        assigns(:circulation_status).should eq(circulation_status)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :show, :id => circulation_status.id
+        assigns(:circulation_status).should eq(circulation_status)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :show, :id => circulation_status.id
+        assigns(:circulation_status).should eq(circulation_status)
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :show, :id => circulation_status.id
+        assigns(:circulation_status).should eq(circulation_status)
+      end
+    end
+  end
+
+  describe "GET new" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "should be forbidden" do
+        get :new
+        assigns(:circulation_status).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "should be forbidden" do
+        get :new
+        assigns(:circulation_status).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "should be forbidden" do
+        get :new
+        assigns(:circulation_status).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should be redirected" do
+        get :new
+        assigns(:circulation_status).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
+
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :edit, :id => circulation_status.id
+        assigns(:circulation_status).should eq(circulation_status)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :edit, :id => circulation_status.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :edit, :id => circulation_status.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested circulation_status as @circulation_status" do
+        circulation_status = FactoryGirl.create(:circulation_status)
+        get :edit, :id => circulation_status.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "POST create" do
+    before(:each) do
+      @attrs = valid_attributes
+      @invalid_attrs = {:name => ''}
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      describe "with valid params" do
+        it "assigns a newly created circulation_status as @circulation_status" do
+          post :create, :circulation_status => @attrs
+          assigns(:circulation_status).should be_valid
+        end
+
+        it "redirects to the created patron" do
+          post :create, :circulation_status => @attrs
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved circulation_status as @circulation_status" do
+          post :create, :circulation_status => @invalid_attrs
+          assigns(:circulation_status).should_not be_valid
+        end
+
+        it "should be successful" do
+          post :create, :circulation_status => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      describe "with valid params" do
+        it "assigns a newly created circulation_status as @circulation_status" do
+          post :create, :circulation_status => @attrs
+          assigns(:circulation_status).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :circulation_status => @attrs
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved circulation_status as @circulation_status" do
+          post :create, :circulation_status => @invalid_attrs
+          assigns(:circulation_status).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :circulation_status => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      describe "with valid params" do
+        it "assigns a newly created circulation_status as @circulation_status" do
+          post :create, :circulation_status => @attrs
+          assigns(:circulation_status).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :circulation_status => @attrs
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved circulation_status as @circulation_status" do
+          post :create, :circulation_status => @invalid_attrs
+          assigns(:circulation_status).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :circulation_status => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "assigns a newly created circulation_status as @circulation_status" do
+          post :create, :circulation_status => @attrs
+          assigns(:circulation_status).should be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :circulation_status => @attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns a newly created but unsaved circulation_status as @circulation_status" do
+          post :create, :circulation_status => @invalid_attrs
+          assigns(:circulation_status).should_not be_valid
+        end
+
+        it "should be forbidden" do
+          post :create, :circulation_status => @invalid_attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe "PUT update" do
+    before(:each) do
+      @circulation_status = FactoryGirl.create(:circulation_status)
+      @attrs = valid_attributes
+      @invalid_attrs = {:display_name => ''}
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      describe "with valid params" do
+        it "updates the requested circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+        end
+
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+          assigns(:circulation_status).should eq(@circulation_status)
+        end
+
+        it "moves its position when specified" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs, :move => 'lower'
+          response.should redirect_to(circulation_statuses_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @invalid_attrs
+          response.should render_template("edit")
+        end
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      describe "with valid params" do
+        it "updates the requested circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+        end
+
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+          assigns(:circulation_status).should eq(@circulation_status)
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      describe "with valid params" do
+        it "updates the requested circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+        end
+
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+          assigns(:circulation_status).should eq(@circulation_status)
+          response.should be_forbidden
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @invalid_attrs
+          response.should be_forbidden
+        end
+      end
+    end
+
+    describe "When not logged in" do
+      describe "with valid params" do
+        it "updates the requested circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+        end
+
+        it "should be forbidden" do
+          put :update, :id => @circulation_status.id, :circulation_status => @attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+
+      describe "with invalid params" do
+        it "assigns the requested circulation_status as @circulation_status" do
+          put :update, :id => @circulation_status.id, :circulation_status => @invalid_attrs
+          response.should redirect_to(new_user_session_url)
+        end
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @circulation_status = FactoryGirl.create(:circulation_status)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "destroys the requested circulation_status" do
+        delete :destroy, :id => @circulation_status.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @circulation_status.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "destroys the requested circulation_status" do
+        delete :destroy, :id => @circulation_status.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @circulation_status.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "destroys the requested circulation_status" do
+        delete :destroy, :id => @circulation_status.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @circulation_status.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested circulation_status" do
+        delete :destroy, :id => @circulation_status.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @circulation_status.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end