enju_circulation 0.1.0.pre9 → 0.1.0.pre10

data/app/models/checked_item.rb

@@ -26,8 +26,14 @@ class CheckedItem < ActiveRecord::Base
     end
 
     unless item.available_for_checkout?
-      errors[:base] << I18n.t('activerecord.errors.messages.checked_item.not_available_for_checkout')
-      return false
+      if item.circulation_status.name == 'Missing'
+        item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+        item.save
+        set_due_date
+      else
+        errors[:base] << I18n.t('activerecord.errors.messages.checked_item.not_available_for_checkout')
+        return false
+      end
     end
 
     if item_checkout_type.blank?

data/app/models/checkin.rb

@@ -55,6 +55,10 @@ class Checkin < ActiveRecord::Base
         message << I18n.t('item.this_item_include_supplement')
       end
 
+      if item.circulation_status.name == 'Missing'
+        message << I18n.t('checkout.missing_item_found')
+      end
+
       # メールとメッセージの送信
       #ReservationNotifier.deliver_reserved(item.manifestation.reserves.first.user, item.manifestation)
       #Message.create(:sender => current_user, :receiver => item.manifestation.next_reservation.user, :subject => message_template.title, :body => message_template.body, :recipient => item.manifestation.next_reservation.user)

data/config/locales/translation_en.yml

@@ -151,6 +151,7 @@ en:
     already_checked_in: "This item is already checked in."
     checkin: "Checkin!"
     successfully_checked_in: "This items was successfully checked in."
+    missing_item_found: "A missing item is found."
   reserve:
     user_reserve: "%{login_name}'s reservations"
     library_group_reserve: "Reservations in %{library_group_name}"

data/config/locales/translation_ja.yml

@@ -149,6 +149,7 @@ ja:
     already_checked_in: "この資料はすでに返却されています。"
     checkin: "返却（取り消しはできません）"
     successfully_checked_in: "この資料は正常に返却されました。"
+    missing_item_found: "行方不明だった資料が見つかりました。"
   reserve:
     user_reserve: "%{login_name} さんの予約資料"
     library_group_reserve: "%{library_group_name} での予約資料"

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre9"
+  VERSION = "0.1.0.pre10"
 end

data/spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb

@@ -0,0 +1,6 @@
+class AddDoiToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :doi, :string
+    add_index :manifestations, :doi
+  end
+end

data/spec/dummy/db/schema.rb

@@ -455,10 +455,12 @@ ActiveRecord::Schema.define(:version => 20121119153944) do
     t.integer  "volume_number"
     t.integer  "issue_number"
     t.integer  "serial_number"
+    t.string   "doi"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
   add_index "manifestations", ["carrier_type_id"], :name => "index_manifestations_on_carrier_type_id"
+  add_index "manifestations", ["doi"], :name => "index_manifestations_on_doi"
   add_index "manifestations", ["frequency_id"], :name => "index_manifestations_on_frequency_id"
   add_index "manifestations", ["isbn"], :name => "index_manifestations_on_isbn"
   add_index "manifestations", ["issn"], :name => "index_manifestations_on_issn"

data/spec/factories/user.rb

@@ -27,7 +27,7 @@ FactoryGirl.define do
     f.role {Role.find_by_name('User')}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
-    f.user_group {UserGroup.first}
+    f.user_group {UserGroup.find(2)}
     f.required_role {Role.find_by_name('User')}
     f.sequence(:user_number){|n| "user_number_#{n}"}
   end

data/spec/fixtures/circulation_statuses.yml

@@ -1,127 +1,106 @@
 --- 
+circulation_status_00001: 
+  name: Available For Pickup  
+  display_name: "en: Available For Pickup\r\n\
+    ja: 持ち出し可能"
+  id: 1
+  note: ""
+  position: 1
+circulation_status_00002: 
+  name: Available On Shelf  
+  display_name: "en: Available on Shelf\r\n\
+    ja: 在架（利用可能）"
+  id: 2
+  note: ""
+  position: 2
+circulation_status_00003: 
+  name: Circulation Status Undefined  
+  display_name: Circulation Status Undefined
+  id: 3
+  note: ""
+  position: 3
+circulation_status_00004: 
+  name: Claimed Returned Or Never Borrowed  
+  display_name: Claimed Returned Or Never Borrowed
+  id: 4
+  note: ""
+  position: 4
 circulation_status_00005: 
   name: In Process  
-  display_name: In Process
-  updated_at: 2008-02-15 17:31:42.422676 +09:00
+  display_name: "en: In Process\r\n\
+    ja: 作業中"
   id: 5
   note: ""
-  created_at: 2008-02-15 17:31:42.422676 +09:00
   position: 5
 circulation_status_00006: 
   name: In Transit Between Library Locations  
   display_name: In Transit Between Library Locations
-  updated_at: 2008-02-15 17:31:51.227056 +09:00
   id: 6
   note: ""
-  created_at: 2008-02-15 17:31:51.227056 +09:00
   position: 6
 circulation_status_00007: 
   name: Lost  
-  display_name: Lost
-  updated_at: 2008-02-15 17:31:58.627987 +09:00
+  display_name: "en: Lost\r\n\
+    ja: 紛失"
   id: 7
   note: ""
-  created_at: 2008-02-15 17:31:58.627987 +09:00
   position: 7
 circulation_status_00008: 
   name: Missing  
-  display_name: Missing
-  updated_at: 2008-02-15 17:32:07.006541 +09:00
+  display_name: "en: Missing\r\n\
+    ja: 行方不明"
   id: 8
   note: ""
-  created_at: 2008-02-15 17:32:07.006541 +09:00
   position: 8
-circulation_status_00010: 
-  name: On Loan  
-  display_name: On Loan
-  updated_at: 2008-02-15 17:32:22.969896 +09:00
-  id: 10
-  note: ""
-  created_at: 2008-02-15 17:32:22.969896 +09:00
-  position: 10
 circulation_status_00009: 
   name: Not Available  
-  display_name: Not Available
-  updated_at: 2008-02-15 17:32:15.454067 +09:00
+  display_name: "en: Not Available\r\n\
+    ja: 利用不可"
   id: 9
   note: ""
-  created_at: 2008-02-15 17:32:15.454067 +09:00
   position: 9
+circulation_status_00010: 
+  name: On Loan  
+  display_name: "en: On Loan\r\n\
+    ja: 貸出中"
+  id: 10
+  note: ""
+  position: 10
 circulation_status_00011: 
   name: On Order  
   display_name: On Order
-  updated_at: 2008-02-15 17:32:30.675735 +09:00
   id: 11
   note: ""
-  created_at: 2008-02-15 17:32:30.675735 +09:00
   position: 11
 circulation_status_00012: 
   name: Pending Transfer  
   display_name: Pending Transfer
-  updated_at: 2008-02-15 17:32:39.395000 +09:00
   id: 12
   note: ""
-  created_at: 2008-02-15 17:32:39.395000 +09:00
   position: 12
-circulation_status_00001: 
-  name: Available For Pickup  
-  display_name: Available For Pickup
-  updated_at: 2008-02-15 17:31:10.588524 +09:00
-  id: 1
-  note: ""
-  created_at: 2008-02-15 17:31:10.588524 +09:00
-  position: 1
-circulation_status_00002: 
-  name: Available On Shelf  
-  display_name: Available On Shelf
-  updated_at: 2008-02-15 17:31:18.946298 +09:00
-  id: 2
-  note: ""
-  created_at: 2008-02-15 17:31:18.946298 +09:00
-  position: 2
 circulation_status_00013: 
   name: Recalled  
   display_name: Recalled
-  updated_at: 2008-02-15 17:32:48.355304 +09:00
   id: 13
   note: ""
-  created_at: 2008-02-15 17:32:48.355304 +09:00
   position: 13
 circulation_status_00014: 
   name: Waiting To Be Reshelved  
   display_name: Waiting To Be Reshelved
-  updated_at: 2008-02-15 17:32:59.078750 +09:00
   id: 14
   note: ""
-  created_at: 2008-02-15 17:32:59.078750 +09:00
   position: 14
-circulation_status_00003: 
-  name: Circulation Status Undefined  
-  display_name: Circulation Status Undefined
-  updated_at: 2008-02-15 17:31:26.564769 +09:00
-  id: 3
+circulation_status_00015: 
+  name: Not arrived
+  display_name: "en: Not arrived\r\n\
+    ja: 未着"
+  id: 15
   note: ""
-  created_at: 2008-02-15 17:31:26.564769 +09:00
-  position: 3
-circulation_status_00004: 
-  name: Claimed Returned Or Never Borrowed  
-  display_name: Claimed Returned Or Never Borrowed
-  updated_at: 2008-02-15 17:31:35.786404 +09:00
-  id: 4
+  position: 15
+circulation_status_00016: 
+  name: Removed
+  display_name: "en: Removed\r\n\
+    ja: 除籍済み"
+  id: 16
   note: ""
-  created_at: 2008-02-15 17:31:35.786404 +09:00
-  position: 4
-
-# == Schema Information
-#
-# Table name: circulation_statuses
-#
-#  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#
-
+  position: 16

data/spec/fixtures/exemplifies.yml

@@ -139,6 +139,12 @@ exemplify_00023:
   manifestation_id: 11
   id: 23
   created_at: 2008-01-11 02:44:37.135721 +09:00
+exemplify_00024: 
+  updated_at: 2008-01-11 02:44:37.135721 +09:00
+  item_id: 24
+  manifestation_id: 3
+  id: 24
+  created_at: 2008-01-11 02:44:37.135721 +09:00
 
 
 # == Schema Information

data/spec/fixtures/item_has_use_restrictions.yml

@@ -21,25 +21,31 @@ item_has_use_restriction_00004:
   item_id: 17
   updated_at: 2008-02-13 12:29:36.013448 +09:00
   id: 4
-  use_restriction_id: 6
+  use_restriction_id: 4
   created_at: 2008-02-13 12:29:36.013448 +09:00
 item_has_use_restriction_00005:
   item_id: 21
   updated_at: 2008-02-13 12:29:36.013448 +09:00
   id: 5
-  use_restriction_id: 6
+  use_restriction_id: 4
   created_at: 2008-02-13 12:29:36.013448 +09:00
 item_has_use_restriction_00006:
   item_id: 11
   updated_at: 2008-02-13 12:29:36.013448 +09:00
   id: 6
-  use_restriction_id: 6
+  use_restriction_id: 4
   created_at: 2008-02-13 12:29:36.013448 +09:00
 item_has_use_restriction_00007:
   item_id: 6
   updated_at: 2008-02-13 12:29:36.013448 +09:00
   id: 7
-  use_restriction_id: 6
+  use_restriction_id: 4
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+item_has_use_restriction_00008:
+  item_id: 24
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 8
+  use_restriction_id: 4
   created_at: 2008-02-13 12:29:36.013448 +09:00
 
 # == Schema Information

data/spec/fixtures/items.yml

@@ -229,6 +229,16 @@ item_00023:
   id: 23
   include_supplements: false
   created_at: 2007-08-24 23:46:20.484813 +09:00
+item_00024: 
+  updated_at: 2007-08-24 23:46:20.484813 +09:00
+  item_identifier: '00024'
+  circulation_status_id: 8
+  checkout_type_id: 3
+  shelf_id: 2
+  call_number: 
+  id: 24
+  include_supplements: false
+  created_at: 2007-08-24 23:46:20.484813 +09:00
 
 
 # == Schema Information

data/spec/fixtures/lending_policies.yml

@@ -72,6 +72,13 @@ lending_policy_00008:
   fixed_due_date: 
   renewal: 1
   fine: 10
+lending_policy_00009:
+  item_id: 24
+  user_group_id: 2
+  loan_period: 1
+  fixed_due_date: 
+  renewal: 1
+  fine: 10
 
 # == Schema Information
 #

data/spec/fixtures/manifestations.yml

@@ -1943,12 +1943,6 @@ manifestation_00216:
   repository_content: false
 
 
-
-
-
-
-
-
 # == Schema Information
 #
 # Table name: manifestations

data/spec/fixtures/reserves.yml

@@ -137,6 +137,7 @@ reserve_00015:
   expired_at: <%= 1.day.from_now %>
   state: requested
 
+
 # == Schema Information
 #
 # Table name: reserves

data/spec/fixtures/use_restrictions.yml

@@ -17,7 +17,7 @@ use_restriction_00003:
   id: 3
   position: 3
   note: ""
-use_restriction_00003: 
+use_restriction_00004: 
   name: Limited Circulation, Normal Loan Period  
   display_name: Limited Circulation, Normal Loan Period
   id: 4

data/spec/models/checked_item_spec.rb

@@ -7,6 +7,15 @@ describe CheckedItem do
   it "should respond to available_for_checkout?" do
     checked_items(:checked_item_00001).available_for_checkout?.should_not be_true
   end
+
+  it "should change circulation_status when a missing item is found" do
+    basket = FactoryGirl.create(:basket)
+    checked_item = CheckedItem.new
+    checked_item.item = items(:item_00024)
+    checked_item.basket = basket
+    checked_item.save!
+    items(:item_00024).circulation_status.name.should eq 'Available On Shelf'
+  end
 end
 
 # == Schema Information

data/spec/models/user_group_has_checkout_type_spec.rb

@@ -6,8 +6,8 @@ describe UserGroupHasCheckoutType do
 
   it "should create lending_policy" do
     old_count = LendingPolicy.count
-    user_group_has_checkout_types(:user_group_has_checkout_type_00004).create_lending_policy
-    user_group_has_checkout_types(:user_group_has_checkout_type_00004).checkout_type.items.count.should eq old_count
+    user_group_has_checkout_types(:user_group_has_checkout_type_00005).create_lending_policy
+    (user_group_has_checkout_types(:user_group_has_checkout_type_00005).checkout_type.items.count + old_count).should eq LendingPolicy.count
   end
 
   it "should update lending_policy" do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start 'rails'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre9
+  version: 0.1.0.pre10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Circulation management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -617,6 +633,7 @@ files:
 - spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
 - spec/dummy/db/migrate/20120224094141_create_delayed_jobs.rb
+- spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
 - spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
@@ -638,16 +655,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_db.fdt
-- spec/dummy/solr/data/test/index/_db.fdx
-- spec/dummy/solr/data/test/index/_db.fnm
-- spec/dummy/solr/data/test/index/_db.frq
-- spec/dummy/solr/data/test/index/_db.nrm
-- spec/dummy/solr/data/test/index/_db.prx
-- spec/dummy/solr/data/test/index/_db.tii
-- spec/dummy/solr/data/test/index/_db.tis
+- spec/dummy/solr/data/test/index/_m7.fdt
+- spec/dummy/solr/data/test/index/_m7.fdx
+- spec/dummy/solr/data/test/index/_m7.fnm
+- spec/dummy/solr/data/test/index/_m7.frq
+- spec/dummy/solr/data/test/index/_m7.nrm
+- spec/dummy/solr/data/test/index/_m7.prx
+- spec/dummy/solr/data/test/index/_m7.tii
+- spec/dummy/solr/data/test/index/_m7.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_rr
+- spec/dummy/solr/data/test/index/segments_19j
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -738,7 +755,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
-homepage: https://github.com/nabeta/enju_circulation
+homepage: https://github.com/next-l/enju_circulation
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -752,7 +769,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2391698968407064322
+      hash: -1256582313270003235
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -894,6 +911,7 @@ test_files:
 - spec/dummy/db/migrate/20120105074911_add_isil_to_library.rb
 - spec/dummy/db/migrate/20120125152919_add_title_subseries_transcription_to_series_statement.rb
 - spec/dummy/db/migrate/20120224094141_create_delayed_jobs.rb
+- spec/dummy/db/migrate/20121116033446_add_doi_to_manifestation.rb
 - spec/dummy/db/migrate/20121119153944_add_manifestation_id_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
@@ -915,16 +933,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_db.fdt
-- spec/dummy/solr/data/test/index/_db.fdx
-- spec/dummy/solr/data/test/index/_db.fnm
-- spec/dummy/solr/data/test/index/_db.frq
-- spec/dummy/solr/data/test/index/_db.nrm
-- spec/dummy/solr/data/test/index/_db.prx
-- spec/dummy/solr/data/test/index/_db.tii
-- spec/dummy/solr/data/test/index/_db.tis
+- spec/dummy/solr/data/test/index/_m7.fdt
+- spec/dummy/solr/data/test/index/_m7.fdx
+- spec/dummy/solr/data/test/index/_m7.fnm
+- spec/dummy/solr/data/test/index/_m7.frq
+- spec/dummy/solr/data/test/index/_m7.nrm
+- spec/dummy/solr/data/test/index/_m7.prx
+- spec/dummy/solr/data/test/index/_m7.tii
+- spec/dummy/solr/data/test/index/_m7.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_rr
+- spec/dummy/solr/data/test/index/segments_19j
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb