enju_circulation 0.1.0.pre10 → 0.1.0.pre11

data/config/routes.rb

@@ -40,9 +40,4 @@ Rails.application.routes.draw do
   resources :checkout_stat_has_users
   resources :reserve_stat_has_manifestations
   resources :reserve_stat_has_users
-
-  resources :baskets do
-    resources :accepts, :except => [:edit, :update]
-  end
-  resources :accepts, :except => [:edit, :update]
 end

data/lib/enju_circulation/version.rb

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

data/spec/dummy/config/application.rb

@@ -57,5 +57,4 @@ end
 require 'nkf'
 require 'enju_biblio'
 require 'enju_library'
-require 'enju_manifestation_viewer'
-require 'mobile-fu'
+require 'mobylette'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre10
+  version: 0.1.0.pre11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120925
+        version: 2.0.0.pre.130115
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120925
+        version: 2.0.0.pre.130115
 - !ruby/object:Gem::Dependency
   name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre13
+        version: 0.1.0.pre17
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre6
+        version: 0.1.0.pre8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre6
+        version: 0.1.0.pre8
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
@@ -236,23 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.1.pre
 - !ruby/object:Gem::Dependency
-  name: enju_manifestation_viewer
-  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'
-- !ruby/object:Gem::Dependency
-  name: mobile-fu
+  name: mobylette
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -311,7 +295,6 @@ files:
 - app/controllers/user_group_has_checkout_types_controller.rb
 - app/controllers/user_reserve_stats_controller.rb
 - app/helpers/reserves_helper.rb
-- app/models/basket.rb
 - app/models/carrier_type_has_checkout_type.rb
 - app/models/checked_item.rb
 - app/models/checkin.rb
@@ -655,18 +638,6 @@ 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/_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_19j
-- spec/dummy/solr/data/test/spellchecker/segments.gen
-- spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/carrier_type_has_checkout_type.rb
@@ -769,7 +740,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1256582313270003235
+      hash: -4520022407013796121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -933,18 +904,6 @@ 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/_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_19j
-- spec/dummy/solr/data/test/spellchecker/segments.gen
-- spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
 - spec/factories/carrier_type_has_checkout_type.rb

data/app/models/basket.rb

@@ -1,63 +0,0 @@
-class Basket < ActiveRecord::Base
-  attr_accessible :note, :user_number
-  default_scope :order => 'baskets.id DESC'
-  scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}}
-  belongs_to :user, :validate => true
-  has_many :accepts
-
-  validates_associated :user, :on => :create
-  # 貸出完了後にかごのユーザidは破棄する
-  validates_presence_of :user, :on => :create
-  validate :check_suspended
-
-  attr_accessor :user_number
-
-  def check_suspended
-    if user
-      errors[:base] << I18n.t('basket.this_account_is_suspended') if user.locked_at
-    else
-      errors[:base] << I18n.t('user.not_found')
-    end
-  end
-
-  def self.expire
-    Basket.will_expire(Time.zone.now.beginning_of_day).destroy_all
-    logger.info "#{Time.zone.now} baskets expired!"
-  end
-
-  if defined?(EnjuCirculation)
-    has_many :checked_items, :dependent => :destroy
-    has_many :items, :through => :checked_items
-    has_many :checkouts
-    has_many :checkins
-
-    def basket_checkout(librarian)
-      return nil if checked_items.size == 0
-      Item.transaction do
-        checked_items.each do |checked_item|
-          checkout = user.checkouts.new
-          checkout.librarian = librarian
-          checkout.item = checked_item.item
-          checkout.basket = self
-          checkout.due_date = checked_item.due_date
-          checked_item.item.checkout!(user)
-          checkout.save!
-        end
-        CheckedItem.destroy_all(:basket_id => id)
-      end
-    end
-  end
-end
-
-# == Schema Information
-#
-# Table name: baskets
-#
-#  id           :integer          not null, primary key
-#  user_id      :integer
-#  note         :text
-#  lock_version :integer          default(0), not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#
-

data/spec/dummy/solr/data/test/index/_m7.fnm

@@ -1,6 +0,0 @@
-����
-idtype
-class_name
-username_s
-due_date_dcreated_at_d
-reserved_bchecked_in_at_d

data/spec/dummy/solr/data/test/index/_m7.frq

@@ -1 +0,0 @@
-

	

data/spec/dummy/solr/data/test/index/_m7.nrm

@@ -1 +0,0 @@
-NRM�