enju_library 0.1.0.pre33 → 0.1.0.pre34

data/spec/controllers/subscribes_controller_spec.rb

@@ -13,7 +13,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all subscribes as @subscribes" do
         get :index
@@ -22,7 +22,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all subscribes as @subscribes" do
         get :index
@@ -31,7 +31,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should be forbidden" do
         get :index
@@ -51,7 +51,7 @@ describe SubscribesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested subscribe as @subscribe" do
         subscribe = FactoryGirl.create(:subscribe)
@@ -61,7 +61,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested subscribe as @subscribe" do
         subscribe = FactoryGirl.create(:subscribe)
@@ -71,7 +71,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested subscribe as @subscribe" do
         subscribe = FactoryGirl.create(:subscribe)
@@ -91,7 +91,7 @@ describe SubscribesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested subscribe as @subscribe" do
         get :new
@@ -101,7 +101,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested subscribe as @subscribe" do
         get :new
@@ -111,7 +111,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested subscribe as @subscribe" do
         get :new
@@ -131,7 +131,7 @@ describe SubscribesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested subscribe as @subscribe" do
         subscribe = FactoryGirl.create(:subscribe)
@@ -141,7 +141,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested subscribe as @subscribe" do
         subscribe = FactoryGirl.create(:subscribe)
@@ -151,7 +151,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested subscribe as @subscribe" do
         subscribe = FactoryGirl.create(:subscribe)
@@ -176,7 +176,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created subscribe as @subscribe" do
@@ -204,7 +204,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created subscribe as @subscribe" do
@@ -232,7 +232,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created subscribe as @subscribe" do
@@ -294,7 +294,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested subscribe" do
@@ -317,7 +317,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested subscribe" do
@@ -340,7 +340,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested subscribe" do
@@ -389,7 +389,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested subscribe" do
         delete :destroy, :id => @subscribe.id
@@ -402,7 +402,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested subscribe" do
         delete :destroy, :id => @subscribe.id
@@ -415,7 +415,7 @@ describe SubscribesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested subscribe" do
         delete :destroy, :id => @subscribe.id

data/spec/controllers/subscriptions_controller_spec.rb

@@ -14,7 +14,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all subscriptions as @subscriptions" do
         get :index
@@ -23,7 +23,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all subscriptions as @subscriptions" do
         get :index
@@ -32,7 +32,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all subscriptions as @subscriptions" do
         get :index
@@ -50,7 +50,7 @@ describe SubscriptionsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested subscription as @subscription" do
         subscription = FactoryGirl.create(:subscription)
@@ -60,7 +60,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested subscription as @subscription" do
         subscription = FactoryGirl.create(:subscription)
@@ -70,7 +70,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested subscription as @subscription" do
         subscription = FactoryGirl.create(:subscription)
@@ -90,7 +90,7 @@ describe SubscriptionsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested subscription as @subscription" do
         get :new
@@ -99,7 +99,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested subscription as @subscription" do
         get :new
@@ -108,7 +108,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested subscription as @subscription" do
         get :new
@@ -128,7 +128,7 @@ describe SubscriptionsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested subscription as @subscription" do
         subscription = FactoryGirl.create(:subscription)
@@ -138,7 +138,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested subscription as @subscription" do
         subscription = FactoryGirl.create(:subscription)
@@ -148,7 +148,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested subscription as @subscription" do
         subscription = FactoryGirl.create(:subscription)
@@ -173,7 +173,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created subscription as @subscription" do
@@ -201,7 +201,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created subscription as @subscription" do
@@ -229,7 +229,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created subscription as @subscription" do
@@ -291,7 +291,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested subscription" do
@@ -313,7 +313,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested subscription" do
@@ -341,7 +341,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested subscription" do
@@ -390,7 +390,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested subscription" do
         delete :destroy, :id => @subscription.id
@@ -403,7 +403,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested subscription" do
         delete :destroy, :id => @subscription.id
@@ -416,7 +416,7 @@ describe SubscriptionsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested subscription" do
         delete :destroy, :id => @subscription.id

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 module ApplicationHelper
+  include EnjuLeaf::EnjuLeafHelper
   include EnjuBiblio::BiblioHelper
 
   def back_to_index(options = {})

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

@@ -1,89 +1,9 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  #has_one :agent
-  has_one :user_has_role
-  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
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
-
-  enju_bookmark_user_model if defined?(EnjuBookmark)
-  enju_message_user_model if defined?(EnjuBookmark)
-
-  def agent
-    LocalAgent.new(self)
-  end
-
-  def full_name
-    username
-  end
+  enju_leaf_user_model
+  enju_circulation_user_model
 end