enju_circulation 0.0.56 → 0.0.57

data/app/controllers/checkouts_controller.rb

@@ -110,9 +110,11 @@ class CheckoutsController < ApplicationController
     end
     @checkout.reload
     @checkout.checkout_renewal_count += 1
+    @checkout.assign_attributes(params[:checkout])
+    @checkout.due_date = @checkout.due_date.end_of_day
 
     respond_to do |format|
-      if @checkout.update_attributes(params[:checkout])
+      if @checkout.save
         format.html { redirect_to @checkout, :notice => t('controller.successfully_updated', :model => t('activerecord.models.checkout')) }
         format.json { head :no_content }
       else

data/app/models/checkout.rb

@@ -1,5 +1,5 @@
 class Checkout < ActiveRecord::Base
-  attr_accessible
+  attr_accessible :due_date
   default_scope :order => 'checkouts.id DESC'
   scope :not_returned, where(:checkin_id => nil)
   scope :overdue, lambda {|date| {:conditions => ['checkin_id IS NULL AND due_date < ?', date]}}

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.56"
+  VERSION = "0.0.57"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -243,9 +243,11 @@ describe CheckoutsController do
         end
 
         it "assigns the requested checkout as @checkout" do
+          old_due_date = @checkout.due_date
           put :update, :id => @checkout.id, :checkout => @attrs
           assigns(:checkout).should eq(@checkout)
           response.should redirect_to(assigns(:checkout))
+          assigns(:checkout).due_date.should eq 1.day.from_now.end_of_day
         end
       end
 

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

@@ -1,4 +1,22 @@
 class UserHasRole < ActiveRecord::Base
+  attr_accessible :user_id, :role_id
+  attr_accessible :user_id, :role_id, :as => :admin
   belongs_to :user
   belongs_to :role
+  accepts_nested_attributes_for :role
+
+#  validates_uniqueness_of :role_id, :scope => :user_id
+#  validates_presence_of :role_id, :user_id
 end
+
+# == Schema Information
+#
+# Table name: user_has_roles
+#
+#  id         :integer         not null, primary key
+#  user_id    :integer
+#  role_id    :integer
+#  created_at :datetime
+#  updated_at :datetime
+#
+

data/spec/dummy/config/application.rb

@@ -35,6 +35,17 @@ module Dummy
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+
     # Enable the asset pipeline
     config.assets.enabled = true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.57
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -563,7 +563,6 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/basket.rb
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
@@ -842,7 +841,6 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
-- spec/dummy/app/models/basket.rb
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb

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

@@ -1,63 +0,0 @@
-class Basket < ActiveRecord::Base
-  attr_accessible :note, :user_number
-  default_scope :order => 'baskets.id DESC'
-  scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}}
-  belongs_to :user, :validate => true
-  has_many :accepts
-
-  validates_associated :user, :on => :create
-  # 貸出完了後にかごのユーザidは破棄する
-  validates_presence_of :user, :on => :create
-  validate :check_suspended
-
-  attr_accessor :user_number
-
-  def check_suspended
-    if self.user
-      errors[:base] << I18n.t('basket.this_account_is_suspended') if self.user.locked_at?
-    else
-      errors[:base] << I18n.t('user.not_found')
-    end
-  end
-
-  def self.expire
-    Basket.will_expire(Time.zone.now.beginning_of_day).destroy_all
-    logger.info "#{Time.zone.now} baskets expired!"
-  end
-
-  if defined?(EnjuCirculation)
-    has_many :checked_items, :dependent => :destroy
-    has_many :items, :through => :checked_items
-    has_many :checkouts
-    has_many :checkins
-
-    def basket_checkout(librarian)
-      return nil if checked_items.size == 0
-      Item.transaction do
-        self.checked_items.each do |checked_item|
-          checkout = self.user.checkouts.new
-          checkout.librarian = librarian
-          checkout.item = checked_item.item
-          checkout.basket = self
-          checkout.due_date = checked_item.due_date
-          checked_item.item.checkout!(user)
-          checkout.save!
-        end
-        CheckedItem.destroy_all(:basket_id => id)
-      end
-    end
-  end
-end
-
-# == Schema Information
-#
-# Table name: baskets
-#
-#  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
-#
-