enju_circulation 0.1.0.pre36 → 0.1.0.pre37

data/lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml

@@ -1,106 +1,129 @@
 --- 
 circulation_status_00001: 
   name: Available For Pickup  
-  display_name: "en: Available For Pickup\r\n\
-    ja: 持ち出し可能"
+  display_name: |-
+    en: Available For Pickup
+    ja: 持ち出し可能
   id: 1
   note: ""
   position: 1
 circulation_status_00002: 
   name: Available On Shelf  
-  display_name: "en: Available on Shelf\r\n\
-    ja: 在架（利用可能）"
+  display_name: |-
+    en: Available on Shelf
+    ja: 在架（利用可能）
   id: 2
   note: ""
   position: 2
 circulation_status_00003: 
   name: Circulation Status Undefined  
-  display_name: Circulation Status Undefined
+  display_name: |-
+    en: Circulation Status Undefined
+    ja: 貸出状態未定義
   id: 3
   note: ""
   position: 3
 circulation_status_00004: 
   name: Claimed Returned Or Never Borrowed  
-  display_name: Claimed Returned Or Never Borrowed
+  display_name: |-
+    en: Claimed Returned Or Never Borrowed
+    ja: 利用者が返却済み、または未貸出と主張
   id: 4
   note: ""
   position: 4
 circulation_status_00005: 
   name: In Process  
-  display_name: "en: In Process\r\n\
-    ja: 作業中"
+  display_name: |-
+    en: In Process
+    ja: 作業中
   id: 5
   note: ""
   position: 5
 circulation_status_00006: 
   name: In Transit Between Library Locations  
-  display_name: In Transit Between Library Locations
+  display_name: |-
+    en: In Transit Between Library Locations
+    ja: 移動中
   id: 6
   note: ""
   position: 6
 circulation_status_00007: 
   name: Lost  
-  display_name: "en: Lost\r\n\
-    ja: 紛失"
+  display_name: |-
+    en: Lost
+    ja: 紛失
   id: 7
   note: ""
   position: 7
 circulation_status_00008: 
   name: Missing  
-  display_name: "en: Missing\r\n\
-    ja: 行方不明"
+  display_name: |-
+    en: Missing
+    ja: 行方不明
   id: 8
   note: ""
   position: 8
 circulation_status_00009: 
   name: Not Available  
-  display_name: "en: Not Available\r\n\
-    ja: 利用不可"
+  display_name: |-
+    en: Not Available
+    ja: 利用不可
   id: 9
   note: ""
   position: 9
 circulation_status_00010: 
   name: On Loan  
-  display_name: "en: On Loan\r\n\
-    ja: 貸出中"
+  display_name: |-
+    en: On Loan
+    ja: 貸出中
   id: 10
   note: ""
   position: 10
 circulation_status_00011: 
   name: On Order  
-  display_name: On Order
+  display_name: |-
+    en: On Order
+    ja: 発注中
   id: 11
   note: ""
   position: 11
 circulation_status_00012: 
   name: Pending Transfer  
-  display_name: Pending Transfer
+  display_name: |-
+    en: Pending Transfer
+    ja: 移動予定
   id: 12
   note: ""
   position: 12
 circulation_status_00013: 
   name: Recalled  
-  display_name: Recalled
+  display_name: |-
+    en: Recalled
+    ja: 返却依頼中
   id: 13
   note: ""
   position: 13
 circulation_status_00014: 
   name: Waiting To Be Reshelved  
-  display_name: Waiting To Be Reshelved
+  display_name: |-
+    en: Waiting To Be Reshelved
+    ja: 再配架待ち
   id: 14
   note: ""
   position: 14
 circulation_status_00015: 
   name: Not arrived
-  display_name: "en: Not arrived\r\n\
-    ja: 未着"
+  display_name: |-
+    en: Not arrived
+    ja: 未着
   id: 15
   note: ""
   position: 15
 circulation_status_00016: 
   name: Removed
-  display_name: "en: Removed\r\n\
-    ja: 除籍済み"
+  display_name: |-
+    en: Removed
+    ja: 除籍済み
   id: 16
   note: ""
   position: 16

data/lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml

@@ -1,79 +1,105 @@
 --- 
 use_restriction_00001: 
   name: Available For Supply Without Return  
-  display_name: Available For Supply Without Return
+  display_name: |-
+    en: Available For Supply Without Return
+    ja: 返却不要
   id: 1
   position: 1
   note: ""
 use_restriction_00002: 
   name: In Library Use Only  
-  display_name: "en: In Library Use Only\r\nja: 館内利用のみ可"
+  display_name: |-
+    en: In Library Use Only
+    ja: 館内利用のみ可
   id: 2
   position: 2
   note: ""
 use_restriction_00003: 
   name: Limited Circulation, Long Loan Period  
-  display_name: "en: Limited Circulation, Long Loan Period\r\nja: 長期期間貸出"
+  display_name: |-
+    en: Limited Circulation, Long Loan Period
+    ja: 長期期間貸出
   id: 3
   position: 3
   note: ""
 use_restriction_00004: 
   name: Limited Circulation, Normal Loan Period  
-  display_name: "en: Limited Circulation, Normal Loan Period\r\nja: 通常期間貸出"
+  display_name: |-
+    en: Limited Circulation, Normal Loan Period
+    ja: 通常期間貸出
   id: 4
   position: 4
   note: ""
 use_restriction_00005: 
   name: Limited Circulation, Short Loan Period  
-  display_name: "en: Limited Circulation, Short Loan Period\r\nja: 短期期間貸出"
+  display_name: |-
+    en: Limited Circulation, Short Loan Period
+    ja: 短期期間貸出
   id: 5
   position: 5
   note: ""
 use_restriction_00006: 
   name: No Reproduction  
-  display_name: No Reproduction
+  display_name: |-
+    en: No Reproduction
+    ja: 複製不可
   id: 6
   position: 6
   note: ""
 use_restriction_00007: 
   name: Not For Loan  
-  display_name: "en: Not For Loan\r\nja: 貸出不可"
+  display_name: |-
+    en: Not For Loan
+    ja: 貸出不可
   id: 7
   position: 7
   note: ""
 use_restriction_00008: 
   name: Overnight Only  
-  display_name: "en: Overnight Only\r\nja: 一夜貸出のみ"
+  display_name: |-
+    en: Overnight Only
+    ja: 一夜貸出のみ
   id: 8
   position: 8
   note: ""
 use_restriction_00009: 
   name: Renewals Not Permitted  
-  display_name: Renewals Not Permitted
+  display_name: |-
+    en: Renewals Not Permitted
+    ja: 貸出更新不可
   id: 9
   position: 9
   note: ""
 use_restriction_00010: 
   name: Supervision Required  
-  display_name: Supervision Required
+  display_name: |-
+    en: Supervision Required
+    ja: 監督下でのみ利用可
   id: 10
   position: 10
   note: ""
 use_restriction_00011: 
   name: Term Loan  
-  display_name: Term Loan
+  display_name: |-
+    en: Term Loan
+    ja: 学期間の貸出
   id: 11
   position: 11
   note: ""
 use_restriction_00012: 
   name: Use Only In Controlled Access  
-  display_name: Use Only In Controlled Access
+  display_name: |-
+    en: Use Only In Controlled Access
+    ja: 立ち入り制限区域でのみ利用可
   id: 12
   position: 12
   note: ""
 use_restriction_00013: 
   name: User Signature Required  
-  display_name: User Signature Required
+  display_name: |-
+    en: User Signature Required
+    ja: 利用者の署名が必要
   id: 13
   position: 13
   note: ""

data/lib/tasks/circulation_status.rb

@@ -0,0 +1,6 @@
+def update_circulation_status
+  YAML.load(open('db/fixtures/enju_circulation/circulation_statuses.yml').read).each do |line|
+    l = line[1].select!{|k, v| %w(name display_name).include?(k)}
+    CirculationStatus.where(name: l["name"]).first.try(:update_attributes!, l)
+  end
+end

data/lib/tasks/enju_circulation_tasks.rake

@@ -1,4 +1,8 @@
 require 'active_record/fixtures'
+require 'tasks/reserve'
+require 'tasks/circulation_status'
+require 'tasks/use_restriction'
+
 namespace :enju_circulation do
   desc "create initial records for enju_circulation"
   task :setup => :environment do
@@ -31,4 +35,14 @@ namespace :enju_circulation do
     Checkout.send_due_date_notification
     Checkout.send_overdue_notification
   end
+
+  desc "upgrade enju_circulation"
+  task :upgrade => :environment do
+    Reserve.transaction do
+      update_reserve
+      update_circulation_status
+      update_use_restriction
+    end
+    puts 'enju_circulation: The upgrade completed successfully.'
+  end
 end

data/lib/tasks/reserve.rb

@@ -0,0 +1,5 @@
+def update_reserve
+  Reserve.find_each do |reserve|
+    ReserveTransition.create(reserve_id: 1, sort_key: 0, to_state: reserve.state)
+  end
+end

data/lib/tasks/use_restriction.rb

@@ -0,0 +1,6 @@
+def update_use_restriction
+  YAML.load(open('db/fixtures/enju_circulation/use_restrictions.yml').read).each do |line|
+    l = line[1].select!{|k, v| %w(name display_name).include?(k)}
+    UseRestriction.where(name: l["name"]).first.try(:update_attributes!, l)
+  end
+end

data/spec/controllers/carrier_type_has_checkout_types_controller_spec.rb

@@ -9,7 +9,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
@@ -18,7 +18,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
@@ -27,7 +27,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all carrier_type_has_checkout_types as @carrier_type_has_checkout_types" do
         get :index
@@ -47,7 +47,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
@@ -57,7 +57,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
@@ -67,7 +67,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
@@ -87,7 +87,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         get :new
@@ -97,7 +97,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         get :new
@@ -107,7 +107,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         get :new
@@ -127,7 +127,7 @@ describe CarrierTypeHasCheckoutTypesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
@@ -137,7 +137,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
@@ -147,7 +147,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
         carrier_type_has_checkout_type = FactoryGirl.create(:carrier_type_has_checkout_type)
@@ -172,7 +172,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -200,7 +200,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -228,7 +228,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -290,7 +290,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested carrier_type_has_checkout_type" do
@@ -313,7 +313,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns the requested carrier_type_has_checkout_type as @carrier_type_has_checkout_type" do
@@ -340,7 +340,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested carrier_type_has_checkout_type" do
@@ -389,7 +389,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested carrier_type_has_checkout_type" do
         delete :destroy, :id => @carrier_type_has_checkout_type.id
@@ -402,7 +402,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested carrier_type_has_checkout_type" do
         delete :destroy, :id => @carrier_type_has_checkout_type.id
@@ -415,7 +415,7 @@ describe CarrierTypeHasCheckoutTypesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested carrier_type_has_checkout_type" do
         delete :destroy, :id => @carrier_type_has_checkout_type.id

data/spec/controllers/checkins_controller_spec.rb

@@ -11,7 +11,7 @@ describe CheckinsController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all checkins as @checkins" do
         get :index
@@ -29,7 +29,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all checkins as @checkins" do
         get :index
@@ -47,7 +47,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign all checkins as @checkins" do
         get :index
@@ -59,7 +59,7 @@ describe CheckinsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested checkin as @checkin" do
         checkin = checkins(:checkin_00001)
@@ -69,7 +69,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested checkin as @checkin" do
         checkin = checkins(:checkin_00001)
@@ -79,7 +79,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested checkin as @checkin" do
         checkin = checkins(:checkin_00001)
@@ -101,7 +101,7 @@ describe CheckinsController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested checkin as @checkin" do
         get :new
@@ -110,7 +110,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested checkin as @checkin" do
         get :new
@@ -119,7 +119,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested checkin as @checkin" do
         get :new
@@ -139,7 +139,7 @@ describe CheckinsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested checkin as @checkin" do
         checkin = checkins(:checkin_00001)
@@ -149,7 +149,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested checkin as @checkin" do
         checkin = checkins(:checkin_00001)
@@ -159,7 +159,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested checkin as @checkin" do
         checkin = checkins(:checkin_00001)
@@ -184,7 +184,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created checkin as @checkin" do
@@ -233,7 +233,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created checkin as @checkin" do
@@ -249,7 +249,7 @@ describe CheckinsController do
         it "should show notification when it is reserved" do
           post :create, :checkin => {:item_identifier => '00008'}, :basket_id => 9
           flash[:message].to_s.index(I18n.t('item.this_item_is_reserved')).should be_truthy
-          assigns(:checkin).item.manifestation.next_reservation.state.should eq 'retained'
+          assigns(:checkin).item.manifestation.next_reservation.current_state.should eq 'retained'
           assigns(:checkin).item.circulation_status.name.should eq 'Available On Shelf'
           response.should redirect_to basket_checkins_url(assigns(:basket))
         end
@@ -272,7 +272,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created checkin as @checkin" do
@@ -314,7 +314,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested checkin" do
@@ -347,7 +347,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested checkin" do
@@ -375,7 +375,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested checkin" do
@@ -424,7 +424,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested checkin" do
         delete :destroy, :id => @checkin.id
@@ -437,7 +437,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested checkin" do
         delete :destroy, :id => @checkin.id
@@ -450,7 +450,7 @@ describe CheckinsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested checkin" do
         delete :destroy, :id => @checkin.id