enju_circulation 0.0.63 → 0.0.64

data/app/controllers/baskets_controller.rb

@@ -46,8 +46,8 @@ class BasketsController < ApplicationController
   # POST /baskets
   # POST /baskets.json
   def create
-    @basket = Basket.new
-    @user = User.where(:user_number => params[:basket][:user_number]).first rescue nil
+    @basket = Basket.new(params[:basket])
+    @user = User.where(:user_number => @basket.user_number).first if @basket.user_number
     if @user
       if @user.user_number?
         @basket.user = @user
@@ -81,7 +81,6 @@ class BasketsController < ApplicationController
       return
     end
 
-    #@checkout_count = @basket.user.checkouts.count
     respond_to do |format|
       #if @basket.update_attributes({})
       if @basket.save(:validate => false)

data/lib/enju_circulation/user.rb

@@ -0,0 +1,65 @@
+module EnjuCirculation
+  module User
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_circulation_user
+        include InstanceMethods
+        attr_accessible :save_checkout_history, :checkout_icalendar_token
+        attr_accessible :save_checkout_history, :checkout_icalendar_token,
+          :as => :admin
+
+        has_many :checkouts, :dependent => :nullify
+        has_many :reserves, :dependent => :destroy
+        has_many :reserved_manifestations, :through => :reserves, :source => :manifestation
+        has_many :checkout_stat_has_users
+        has_many :user_checkout_stats, :through => :checkout_stat_has_users
+        has_many :reserve_stat_has_users
+        has_many :user_reserve_stats, :through => :reserve_stat_has_users
+        has_many :baskets, :dependent => :destroy
+
+        before_destroy :check_item_before_destroy
+      end
+    end
+
+    module InstanceMethods
+      def check_item_before_destroy
+        # TODO: 貸出記録を残す場合
+        if checkouts.size > 0
+          raise 'This user has items still checked out.'
+        end
+      end
+
+      def reset_checkout_icalendar_token
+        self.checkout_icalendar_token = Devise.friendly_token
+      end
+
+      def delete_checkout_icalendar_token
+        self.checkout_icalendar_token = nil
+      end
+
+      def checked_item_count
+        checkout_count = {}
+        CheckoutType.all.each do |checkout_type|
+          # 資料種別ごとの貸出中の冊数を計算
+          checkout_count[:"#{checkout_type.name}"] = self.checkouts.count_by_sql(["
+            SELECT count(item_id) FROM checkouts
+              WHERE item_id IN (
+                SELECT id FROM items
+                  WHERE checkout_type_id = ?
+              )
+              AND user_id = ? AND checkin_id IS NULL", checkout_type.id, self.id]
+          )
+        end
+        return checkout_count
+      end
+
+      def reached_reservation_limit?(manifestation)
+        return true if user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => user_group.id).collect(&:reservation_limit).max.to_i <= reserves.waiting.size
+        false
+      end
+    end
+  end
+end

data/lib/enju_circulation/version.rb

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

data/lib/enju_circulation.rb

@@ -1,5 +1,6 @@
 require "enju_circulation/engine"
 require "enju_circulation/manifestation"
+require "enju_circulation/user"
 require "enju_circulation/controller"
 
 module EnjuCirculation
@@ -7,3 +8,4 @@ end
 
 ActionController::Base.send :include, EnjuCirculation::Controller
 ActiveRecord::Base.send :include, EnjuCirculation::Manifestation
+ActiveRecord::Base.send :include, EnjuCirculation::User

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

@@ -12,56 +12,11 @@ class User < ActiveRecord::Base
   has_one :role, :through => :user_has_role
   belongs_to :user_group
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  has_many :checkouts, :dependent => :nullify
-  has_many :reserves, :dependent => :destroy
-  has_many :reserved_manifestations, :through => :reserves, :source => :manifestation
-  has_many :checkout_stat_has_users
-  has_many :user_checkout_stats, :through => :checkout_stat_has_users
-  has_many :reserve_stat_has_users
-  has_many :user_reserve_stats, :through => :reserve_stat_has_users
-  has_many :baskets, :dependent => :destroy
   belongs_to :library
 
-  before_destroy :check_item_before_destroy
-
   extend FriendlyId
   friendly_id :username
-
-  def check_item_before_destroy
-    # TODO: 貸出記録を残す場合
-    if checkouts.size > 0
-      raise 'This user has items still checked out.'
-    end
-  end
-
-  def reset_checkout_icalendar_token
-    self.checkout_icalendar_token = Devise.friendly_token
-  end
-
-  def delete_checkout_icalendar_token
-    self.checkout_icalendar_token = nil
-  end
-
-  def checked_item_count
-    checkout_count = {}
-    CheckoutType.all.each do |checkout_type|
-      # 資料種別ごとの貸出中の冊数を計算
-      checkout_count[:"#{checkout_type.name}"] = self.checkouts.count_by_sql(["
-        SELECT count(item_id) FROM checkouts
-          WHERE item_id IN (
-            SELECT id FROM items
-              WHERE checkout_type_id = ?
-          )
-          AND user_id = ? AND checkin_id IS NULL", checkout_type.id, self.id]
-      )
-    end
-    return checkout_count
-  end
-
-  def reached_reservation_limit?(manifestation)
-    return true if self.user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => self.user_group.id).collect(&:reservation_limit).max.to_i <= self.reserves.waiting.size
-    false
-  end
+  enju_circulation_user
 
   def has_role?(role_in_question)
     return false unless role

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.63
+  version: 0.0.64
   prerelease: 
 platform: ruby
 authors:
@@ -450,6 +450,7 @@ files:
 - lib/enju_circulation/controller.rb
 - lib/enju_circulation/engine.rb
 - lib/enju_circulation/manifestation.rb
+- lib/enju_circulation/user.rb
 - lib/enju_circulation/version.rb
 - lib/enju_circulation.rb
 - lib/tasks/enju_circulation_tasks.rake