enju_circulation 0.0.33 → 0.0.34

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'EnjuSubject'
+  rdoc.title    = 'EnjuCirculation'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')

data/app/models/reserve.rb

@@ -19,7 +19,6 @@ class Reserve < ActiveRecord::Base
   belongs_to :manifestation, :validate => true
   belongs_to :librarian, :class_name => 'User', :validate => true
   belongs_to :item, :validate => true
-  has_one :inter_library_loan
   belongs_to :request_status_type
 
   validates_associated :user, :librarian, :item, :request_status_type, :manifestation
@@ -247,6 +246,10 @@ class Reserve < ActiveRecord::Base
   def checkout
     self.update_attributes!({:request_status_type => RequestStatusType.where(:name => 'Available For Pickup').first, :checked_out_at => Time.zone.now})
   end
+
+  if defined?(EnjuInterLibraryLoan)
+    has_one :inter_library_loan
+  end
 end
 
 # == Schema Information

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

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

@@ -61,15 +61,13 @@ class Item < ActiveRecord::Base
       'User Signature Required',
       'Limited Circulation, Normal Loan Period'
     ]
-    scope :for_checkout, includes(:circulation_status, :use_restriction)
-      .where(
+    scope :for_checkout, includes(:circulation_status, :use_restriction).where(
         'circulation_statuses.name' => FOR_CHECKOUT_CIRCULATION_STATUS,
         'use_restrictions.name' => FOR_CHECKOUT_USE_RESTRICTION
       ).where('item_identifier IS NOT NULL')
     scope :removed, includes(:circulation_status).where('circulation_statuses.name' => 'Removed')
     has_many :checkouts
     has_many :reserves
-    has_many :reserved_patrons, :through => :reserves, :class_name => 'Patron'
     has_many :checked_items, :dependent => :destroy
     has_many :baskets, :through => :checked_items
     belongs_to :circulation_status, :validate => true

data/spec/dummy/config/initializers/devise.rb

@@ -92,10 +92,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/spec/fixtures/manifestations.yml

@@ -195,7 +195,7 @@ manifestation_00022:
 manifestation_00023: 
   carrier_type_id: 1
   isbn: 
-  created_at: 2008-04-17 00:34:01 +09:00
+  updated_at: 2008-04-17 00:34:01 +09:00
   original_title: "世界の美しい図書館集めてみた【第一弾】"
   price: 
   manifestation_identifier: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails