enju_circulation 0.1.0.pre7 → 0.1.0.pre8

data/app/models/basket.rb

@@ -53,11 +53,11 @@ end
 #
 # Table name: baskets
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  user_id      :integer
 #  note         :text
-#  lock_version :integer         default(0), not null
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  lock_version :integer          default(0), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/carrier_type_has_checkout_type.rb

@@ -17,12 +17,12 @@ end
 #
 # Table name: carrier_type_has_checkout_types
 #
-#  id               :integer         not null, primary key
-#  carrier_type_id  :integer         not null
-#  checkout_type_id :integer         not null
+#  id               :integer          not null, primary key
+#  carrier_type_id  :integer          not null
+#  checkout_type_id :integer          not null
 #  note             :text
 #  position         :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/app/models/checked_item.rb

@@ -101,12 +101,12 @@ end
 #
 # Table name: checked_items
 #
-#  id           :integer         not null, primary key
-#  item_id      :integer         not null
-#  basket_id    :integer         not null
-#  due_date     :datetime        not null
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  id           :integer          not null, primary key
+#  item_id      :integer          not null
+#  basket_id    :integer          not null
+#  due_date     :datetime         not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  librarian_id :integer
 #
 

data/app/models/checkin.rb

@@ -66,15 +66,16 @@ class Checkin < ActiveRecord::Base
     end
   end
 end
+
 # == Schema Information
 #
 # Table name: checkins
 #
-#  id           :integer         not null, primary key
-#  item_id      :integer         not null
+#  id           :integer          not null, primary key
+#  item_id      :integer          not null
 #  librarian_id :integer
 #  basket_id    :integer
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/checkout.rb

@@ -132,20 +132,21 @@ class Checkout < ActiveRecord::Base
     user.checkouts.returned.update_all(:user_id => nil)
   end
 end
+
 # == Schema Information
 #
 # Table name: checkouts
 #
-#  id                     :integer         not null, primary key
+#  id                     :integer          not null, primary key
 #  user_id                :integer
-#  item_id                :integer         not null
+#  item_id                :integer          not null
 #  checkin_id             :integer
 #  librarian_id           :integer
 #  basket_id              :integer
 #  due_date               :datetime
-#  checkout_renewal_count :integer         default(0), not null
-#  lock_version           :integer         default(0), not null
-#  created_at             :datetime        not null
-#  updated_at             :datetime        not null
+#  checkout_renewal_count :integer          default(0), not null
+#  lock_version           :integer          default(0), not null
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #
 

data/app/models/checkout_stat_has_manifestation.rb

@@ -15,11 +15,11 @@ end
 #
 # Table name: checkout_stat_has_manifestations
 #
-#  id                             :integer         not null, primary key
-#  manifestation_checkout_stat_id :integer         not null
-#  manifestation_id               :integer         not null
+#  id                             :integer          not null, primary key
+#  manifestation_checkout_stat_id :integer          not null
+#  manifestation_id               :integer          not null
 #  checkouts_count                :integer
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #
 

data/app/models/checkout_stat_has_user.rb

@@ -15,11 +15,11 @@ end
 #
 # Table name: checkout_stat_has_users
 #
-#  id                    :integer         not null, primary key
-#  user_checkout_stat_id :integer         not null
-#  user_id               :integer         not null
-#  checkouts_count       :integer         default(0), not null
-#  created_at            :datetime
-#  updated_at            :datetime
+#  id                    :integer          not null, primary key
+#  user_checkout_stat_id :integer          not null
+#  user_id               :integer          not null
+#  checkouts_count       :integer          default(0), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #
 

data/app/models/checkout_type.rb

@@ -20,12 +20,12 @@ end
 #
 # Table name: checkout_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/circulation_status.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: circulation_statuses
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/item_has_use_restriction.rb

@@ -15,10 +15,10 @@ end
 #
 # Table name: item_has_use_restrictions
 #
-#  id                 :integer         not null, primary key
-#  item_id            :integer         not null
-#  use_restriction_id :integer         not null
-#  created_at         :datetime
-#  updated_at         :datetime
+#  id                 :integer          not null, primary key
+#  item_id            :integer          not null
+#  use_restriction_id :integer          not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #
 

data/app/models/lending_policy.rb

@@ -18,16 +18,16 @@ end
 #
 # Table name: lending_policies
 #
-#  id             :integer         not null, primary key
-#  item_id        :integer         not null
-#  user_group_id  :integer         not null
-#  loan_period    :integer         default(0), not null
+#  id             :integer          not null, primary key
+#  item_id        :integer          not null
+#  user_group_id  :integer          not null
+#  loan_period    :integer          default(0), not null
 #  fixed_due_date :datetime
-#  renewal        :integer         default(0), not null
-#  fine           :decimal(, )     default(0.0), not null
+#  renewal        :integer          default(0), not null
+#  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/app/models/manifestation_checkout_stat.rb

@@ -36,13 +36,13 @@ end
 #
 # Table name: manifestation_checkout_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
 #  state        :string(255)
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
 #

data/app/models/manifestation_reserve_stat.rb

@@ -36,13 +36,13 @@ end
 #
 # Table name: manifestation_reserve_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
 #  state        :string(255)
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
 #

data/app/models/reserve.rb

@@ -269,23 +269,24 @@ class Reserve < ActiveRecord::Base
     has_one :inter_library_loan
   end
 end
+
 # == Schema Information
 #
 # Table name: reserves
 #
-#  id                           :integer         not null, primary key
-#  user_id                      :integer         not null
-#  manifestation_id             :integer         not null
+#  id                           :integer          not null, primary key
+#  user_id                      :integer          not null
+#  manifestation_id             :integer          not null
 #  item_id                      :integer
-#  request_status_type_id       :integer         not null
+#  request_status_type_id       :integer          not null
 #  checked_out_at               :datetime
-#  created_at                   :datetime        not null
-#  updated_at                   :datetime        not null
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
 #  state                        :string(255)
-#  expiration_notice_to_patron  :boolean         default(FALSE)
-#  expiration_notice_to_library :boolean         default(FALSE)
+#  expiration_notice_to_patron  :boolean          default(FALSE)
+#  expiration_notice_to_library :boolean          default(FALSE)
 #
 

data/app/models/reserve_stat_has_manifestation.rb

@@ -15,11 +15,11 @@ end
 #
 # Table name: reserve_stat_has_manifestations
 #
-#  id                            :integer         not null, primary key
-#  manifestation_reserve_stat_id :integer         not null
-#  manifestation_id              :integer         not null
+#  id                            :integer          not null, primary key
+#  manifestation_reserve_stat_id :integer          not null
+#  manifestation_id              :integer          not null
 #  reserves_count                :integer
-#  created_at                    :datetime
-#  updated_at                    :datetime
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #
 

data/app/models/reserve_stat_has_user.rb

@@ -15,11 +15,11 @@ end
 #
 # Table name: reserve_stat_has_users
 #
-#  id                   :integer         not null, primary key
-#  user_reserve_stat_id :integer         not null
-#  user_id              :integer         not null
+#  id                   :integer          not null, primary key
+#  user_reserve_stat_id :integer          not null
+#  user_id              :integer          not null
 #  reserves_count       :integer
-#  created_at           :datetime
-#  updated_at           :datetime
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
 #
 

data/app/models/use_restriction.rb

@@ -11,12 +11,12 @@ end
 #
 # Table name: use_restrictions
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/app/models/user_checkout_stat.rb

@@ -30,17 +30,18 @@ class UserCheckoutStat < ActiveRecord::Base
     self.completed_at = Time.zone.now
   end
 end
+
 # == Schema Information
 #
 # Table name: user_checkout_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
 #  state        :string(255)
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
 #

data/app/models/user_group_has_checkout_type.rb

@@ -68,20 +68,20 @@ end
 #
 # Table name: user_group_has_checkout_types
 #
-#  id                              :integer         not null, primary key
-#  user_group_id                   :integer         not null
-#  checkout_type_id                :integer         not null
-#  checkout_limit                  :integer         default(0), not null
-#  checkout_period                 :integer         default(0), not null
-#  checkout_renewal_limit          :integer         default(0), not null
-#  reservation_limit               :integer         default(0), not null
-#  reservation_expired_period      :integer         default(7), not null
-#  set_due_date_before_closing_day :boolean         default(FALSE), not null
+#  id                              :integer          not null, primary key
+#  user_group_id                   :integer          not null
+#  checkout_type_id                :integer          not null
+#  checkout_limit                  :integer          default(0), not null
+#  checkout_period                 :integer          default(0), not null
+#  checkout_renewal_limit          :integer          default(0), not null
+#  reservation_limit               :integer          default(0), not null
+#  reservation_expired_period      :integer          default(7), not null
+#  set_due_date_before_closing_day :boolean          default(FALSE), not null
 #  fixed_due_date                  :datetime
 #  note                            :text
 #  position                        :integer
-#  created_at                      :datetime
-#  updated_at                      :datetime
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
 #  current_checkout_count          :integer
 #
 

data/app/models/user_reserve_stat.rb

@@ -30,17 +30,18 @@ class UserReserveStat < ActiveRecord::Base
     self.completed_at = Time.zone.now
   end
 end
+
 # == Schema Information
 #
 # Table name: user_reserve_stats
 #
-#  id           :integer         not null, primary key
+#  id           :integer          not null, primary key
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
 #  state        :string(255)
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  started_at   :datetime
 #  completed_at :datetime
 #

data/lib/enju_circulation/item.rb

@@ -50,7 +50,7 @@ module EnjuCirculation
         accepts_nested_attributes_for :item_has_use_restriction
 
         after_create :create_lending_policy
-        before_update :delete_lending_policy
+        before_update :update_lending_policy
       end
     end
 
@@ -128,8 +128,8 @@ module EnjuCirculation
         end
       end
 
-      def delete_lending_policy
-        return nil unless changes[:circulation_status_id]
+      def update_lending_policy
+        return nil unless changes[:checkout_type_id]
         self.transaction do
           lending_policies.delete_all
           create_lending_policy

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre7"
+  VERSION = "0.1.0.pre8"
 end

data/spec/fixtures/baskets.yml

@@ -70,12 +70,11 @@ basket_00011:
 #
 # Table name: baskets
 #
-#  id           :integer         not null, primary key
+#  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
+#  lock_version :integer          default(0), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/spec/fixtures/carrier_type_has_checkout_types.yml

@@ -20,12 +20,12 @@ carrier_type_has_checkout_type_00003:
 #
 # Table name: carrier_type_has_checkout_types
 #
-#  id               :integer         not null, primary key
-#  carrier_type_id  :integer         not null
-#  checkout_type_id :integer         not null
+#  id               :integer          not null, primary key
+#  carrier_type_id  :integer          not null
+#  checkout_type_id :integer          not null
 #  note             :text
 #  position         :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #
 

data/spec/fixtures/checked_items.yml

@@ -24,12 +24,12 @@ checked_item_00004:
 #
 # Table name: checked_items
 #
-#  id           :integer         not null, primary key
-#  item_id      :integer         not null
-#  basket_id    :integer         not null
-#  due_date     :datetime        not null
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  id           :integer          not null, primary key
+#  item_id      :integer          not null
+#  basket_id    :integer          not null
+#  due_date     :datetime         not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  librarian_id :integer
 #
 

data/spec/fixtures/checkins.yml

@@ -34,15 +34,16 @@ checkin_00005:
   librarian_id: 1
   created_at: 2007-12-20 21:25:04.619479 +09:00
   basket_id: 10
+
 # == Schema Information
 #
 # Table name: checkins
 #
-#  id           :integer         not null, primary key
-#  item_id      :integer         not null
+#  id           :integer          not null, primary key
+#  item_id      :integer          not null
 #  librarian_id :integer
 #  basket_id    :integer
-#  created_at   :datetime        not null
-#  updated_at   :datetime        not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/spec/fixtures/checkout_stat_has_manifestations.yml

@@ -14,11 +14,11 @@ two:
 #
 # Table name: checkout_stat_has_manifestations
 #
-#  id                             :integer         not null, primary key
-#  manifestation_checkout_stat_id :integer         not null
-#  manifestation_id               :integer         not null
+#  id                             :integer          not null, primary key
+#  manifestation_checkout_stat_id :integer          not null
+#  manifestation_id               :integer          not null
 #  checkouts_count                :integer
-#  created_at                     :datetime
-#  updated_at                     :datetime
+#  created_at                     :datetime         not null
+#  updated_at                     :datetime         not null
 #
 

data/spec/fixtures/checkout_stat_has_users.yml

@@ -14,11 +14,11 @@ two:
 #
 # Table name: checkout_stat_has_users
 #
-#  id                    :integer         not null, primary key
-#  user_checkout_stat_id :integer         not null
-#  user_id               :integer         not null
-#  checkouts_count       :integer         default(0), not null
-#  created_at            :datetime
-#  updated_at            :datetime
+#  id                    :integer          not null, primary key
+#  user_checkout_stat_id :integer          not null
+#  user_id               :integer          not null
+#  checkouts_count       :integer          default(0), not null
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
 #
 

data/spec/fixtures/checkout_types.yml

@@ -23,12 +23,12 @@ checkout_type_00003:
 #
 # Table name: checkout_types
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #
 

data/spec/fixtures/checkouts.yml

@@ -143,20 +143,21 @@ checkout_00013:
   created_at: 2007-09-08 01:39:13.210081 +09:00
   basket_id: 8
   checkin_id: 4
+
 # == Schema Information
 #
 # Table name: checkouts
 #
-#  id                     :integer         not null, primary key
+#  id                     :integer          not null, primary key
 #  user_id                :integer
-#  item_id                :integer         not null
+#  item_id                :integer          not null
 #  checkin_id             :integer
 #  librarian_id           :integer
 #  basket_id              :integer
 #  due_date               :datetime
-#  checkout_renewal_count :integer         default(0), not null
-#  lock_version           :integer         default(0), not null
-#  created_at             :datetime        not null
-#  updated_at             :datetime        not null
+#  checkout_renewal_count :integer          default(0), not null
+#  lock_version           :integer          default(0), not null
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #
 

data/spec/fixtures/circulation_statuses.yml

@@ -116,12 +116,12 @@ circulation_status_00004:
 #
 # Table name: circulation_statuses
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)     not null
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #