enju_circulation 0.0.37 → 0.0.38

data/app/controllers/reserves_controller.rb

@@ -109,7 +109,6 @@ class ReservesController < ApplicationController
         @reserve.sm_request!
         @reserve.send_message
 
-        #format.html { redirect_to reserve_url(@reserve) }
         format.html { redirect_to @reserve, :notice => t('controller.successfully_created', :model => t('activerecord.models.reserve')) }
         format.json { render :json => @reserve, :status => :created, :location => reserve_url(@reserve) }
       else

data/app/models/item_has_use_restriction.rb

@@ -1,13 +1,14 @@
 class ItemHasUseRestriction < ActiveRecord::Base
   belongs_to :item, :validate => true
   belongs_to :use_restriction, :validate => true
+  accepts_nested_attributes_for :use_restriction
+
+  validates_associated :item, :use_restriction
+  validates_presence_of :item, :use_restriction
 
   def self.per_page
     10
   end
-
-  validates_associated :item, :use_restriction
-  validates_presence_of :item, :use_restriction
 end
 
 # == Schema Information

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 end

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

@@ -32,15 +32,14 @@ class Basket < ActiveRecord::Base
     has_many :checkins
 
     def basket_checkout(librarian)
-      return nil if self.checked_items.size == 0
+      return nil if checked_items.size == 0
       Item.transaction do
         self.checked_items.each do |checked_item|
-          checkout = self.user.checkouts.new(:librarian_id => librarian.id, :item_id => checked_item.item.id, :basket_id => self.id, :due_date => checked_item.due_date)
-          if checked_item.item.checkout!(self.user)
-            checkout.save!
-          end
+          checkout = self.user.checkouts.new(:librarian_id => librarian.id, :item_id => checked_item.item.id, :basket_id => id, :due_date => checked_item.due_date)
+          checked_item.item.checkout!(user)
+          checkout.save!
         end
-        CheckedItem.destroy_all(:basket_id => self.id)
+        CheckedItem.destroy_all(:basket_id => id)
       end
     end
   end

data/spec/fixtures/languages.yml

@@ -2,8 +2,8 @@
 language_00001: 
   position: 1
   name: unknown  
-  display_name: "en:unknown\r\n\
-    ja:不明"
+  display_name: "en: unknown\r\n\
+    ja: 不明"
   iso_639_1: unknown
   iso_639_2: unknown
   iso_639_3: unknown
@@ -1355,8 +1355,8 @@ language_00160:
 language_00077: 
   position: 77
   name: Japanese  
-  display_name: "en:Japanese\r\n\
-    ja:日本語"
+  display_name: "en: Japanese\r\n\
+    ja: 日本語"
   iso_639_1: ja
   iso_639_2: jpn
   iso_639_3: jpn

data/spec/fixtures/lending_policies.yml

@@ -6,7 +6,7 @@ lending_policy_00001:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
   note: MyText
   position: 1
 lending_policy_00002:
@@ -15,7 +15,7 @@ lending_policy_00002:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
   note: MyText
   position: 2
 lending_policy_00003:
@@ -24,7 +24,7 @@ lending_policy_00003:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
   note: MyText
   position: 1
 lending_policy_00004:
@@ -33,7 +33,7 @@ lending_policy_00004:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
   note: MyText
   position: 1
 lending_policy_00005:
@@ -42,7 +42,7 @@ lending_policy_00005:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
   note: MyText
   position: 1
 lending_policy_00006:
@@ -51,7 +51,9 @@ lending_policy_00006:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
+  note: MyText
+  position: 1
   note: MyText
   position: 1
 lending_policy_00007:
@@ -60,9 +62,16 @@ lending_policy_00007:
   loan_period: 1
   fixed_due_date: 
   renewal: 1
-  fine: 9.99
+  fine: 10
   note: MyText
   position: 1
+lending_policy_00008:
+  item_id: 11
+  user_group_id: 2
+  loan_period: 1
+  fixed_due_date: 
+  renewal: 1
+  fine: 10
 
 # == Schema Information
 #
@@ -77,7 +86,7 @@ lending_policy_00007:
 #  fine           :decimal(, )     default(0.0), not null
 #  note           :text
 #  position       :integer
-#  created_at     :datetime
-#  updated_at     :datetime
+#  created_at     :datetime        not null
+#  updated_at     :datetime        not null
 #
 

data/spec/models/basket_spec.rb

@@ -0,0 +1,39 @@
+# -*- 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
+#
+

data/spec/models/user_group_has_checkout_type_spec.rb

@@ -6,8 +6,8 @@ describe UserGroupHasCheckoutType do
 
   it "should create lending_policy" do
     old_count = LendingPolicy.count
-    user_group_has_checkout_types(:user_group_has_checkout_type_00001).create_lending_policy
-    user_group_has_checkout_types(:user_group_has_checkout_type_00001).checkout_type.items.count.should eq old_count
+    user_group_has_checkout_types(:user_group_has_checkout_type_00004).create_lending_policy
+    user_group_has_checkout_types(:user_group_has_checkout_type_00004).checkout_type.items.count.should eq old_count
   end
 
   it "should update lending_policy" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
   prerelease: 
 platform: ruby
 authors:
@@ -713,6 +713,7 @@ 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
@@ -943,6 +944,7 @@ 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