enju_circulation 0.1.0.pre30 → 0.1.0.pre31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dbf3fb60c92de38186b82e95b2ea02ff3a112d1
-  data.tar.gz: 31b6b46ac20f36492f6bdb762d8eadb86e3e63ed
+  metadata.gz: dedd68808f1e7f2e922af5529be97237a6aeefe2
+  data.tar.gz: f4d2cb455f03830eb8059167a47762ecde58af11
 SHA512:
-  metadata.gz: bf67fb8f4655461cdd989df7fd2c59c786ea40f7a27d3afcdf53f15b8adaa76ad7801dcdf29a05a5dddd861a9349a7a89fac3c427538bebb39ba9c1b64728ae3
-  data.tar.gz: 1e183fb62ca465171cc45208e82b1d0e37681af276cb37dc42e066db054f4707aae494287234433262b239090be017fe232e0b0099a0bfffec7122780690c4cf
+  metadata.gz: 74e721f2f556d8cd3d760bf45defb81504693e1b99cf636c6d5355969513985f0bb8e44bc7bf8402d02fa12fcd261a1b47fbdcce9429ddb1d09f3820ebb2849d
+  data.tar.gz: 8fd577120312b000da5151c4120e18ddce9180060be9191660a3e9e3ee87eee81ee44014ace44c29afac6995eafd64e7055b53553f82cfb566353d2c61092afc

data/app/controllers/checked_items_controller.rb

@@ -6,10 +6,11 @@ class CheckedItemsController < ApplicationController
   # GET /checked_items.json
   def index
     if @basket
-      @checked_items = @basket.checked_items.page(params[:page])
+      @checked_items = @basket.checked_items.order('created_at DESC').page(params[:page])
     else
-      @checked_items = CheckedItem.page(params[:page])
+      @checked_items = CheckedItem.order('created_at DESC').page(params[:page])
     end
+    @checked_item = CheckedItem.new
 
     respond_to do |format|
       format.html # index.html.erb
@@ -35,7 +36,7 @@ class CheckedItemsController < ApplicationController
       return
     end
     @checked_item = CheckedItem.new
-    @checked_items = []
+    @checked_items = @basket.checked_items
 
     respond_to do |format|
       format.html # new.html.erb
@@ -67,7 +68,7 @@ class CheckedItemsController < ApplicationController
         format.json { render :json => @checked_item, :status => :created, :location => @checked_item }
         format.js { redirect_to(basket_checked_items_url(@basket, :format => :js)) }
       else
-        @checked_items = @basket.checked_items
+        @checked_items = @basket.checked_items.order('created_at DESC').page(1)
         format.html { render :action => "index" }
         format.json { render :json => @checked_item.errors, :status => :unprocessable_entity }
         format.js { render :action => "index" }

data/app/controllers/checkins_controller.rb

@@ -69,8 +69,12 @@ class CheckinsController < ApplicationController
 
     respond_to do |format|
       if @checkin.save
-        flash[:message] << t('checkin.successfully_checked_in', :model => t('activerecord.models.checkin'))
         message = @checkin.item_checkin(current_user)
+        if @checkin.checkout
+          flash[:message] << t('checkin.successfully_checked_in')
+        else
+          flash[:message] << t('checkin.not_checked_out')
+        end
         flash[:message] << message if message
         format.html { redirect_to basket_checkins_url(@checkin.basket) }
         format.json { render :json => @checkin, :status => :created, :location => @checkin }

data/app/models/checked_item.rb

@@ -60,12 +60,9 @@ class CheckedItem < ActiveRecord::Base
     end
 
     checkout_count = basket.user.checked_item_count
-    CheckoutType.all.each do |checkout_type|
-      #carrier_type = self.item.manifestation.carrier_type
-      if checkout_count[:"#{checkout_type.name}"] + self.basket.checked_items.count(:id) >= self.item_checkout_type.checkout_limit
-        errors[:base] << I18n.t('activerecord.errors.messages.checked_item.excessed_checkout_limit')
-        break
-      end
+    checkout_type = item_checkout_type.checkout_type
+    if checkout_count[:"#{checkout_type.name}"] >= item_checkout_type.checkout_limit
+      errors[:base] << I18n.t('activerecord.errors.messages.checked_item.excessed_checkout_limit')
     end
     
     if errors[:base].empty?

data/app/views/checked_items/_list.html.erb

@@ -7,12 +7,17 @@
     <%= f.label :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier -%>
     <%= f.submit t('page.read'), 'data-disable-with' => t('page.saving') -%><br />
     <%= f.label :due_date %>
-    <%= f.text_field :due_date_string, :class => 'date_text_field', :placeholder => "#{t('page.example')}: #{1.month.from_now.strftime('%Y-%m-%d')}" %>
+    <%= f.text_field :due_date_string, :class => 'datepicker' %>
     <%= t('checked_item.ignore_restriction') -%>: <%= f.check_box :ignore_restriction -%>
   </p>
 <%- end -%>
 
-<%= javascript_tag("$(function(){$('#checked_item_item_identifier').focus().select()})") %>
+<script type="text/javascript">
+$(document).ready(function(){
+  $('.datepicker').datepicker({dateFormat: 'yy-mm-dd'});
+  $('#checked_item_item_identifier').focus().select();
+});
+</script>
 </div>
 
 <%= render 'checked_item' %>

data/app/views/checkins/_checkin.html.erb

@@ -9,7 +9,7 @@
 <%- @checkins.each_with_index do |checkin, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%= render 'manifestations/show_index', :manifestation => checkin.item.manifestation -%>
+      <%= render 'manifestations/show_index', :manifestation => checkin.item.manifestation if checkin.item.manifestation -%>
     </td>
     <td>
       <%= link_to checkin.item.item_identifier, checkin.item -%>

data/app/views/checkouts/show.html.erb

@@ -12,7 +12,7 @@
     <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
     <%= l(@checkout.due_date, :format => :only_date) if @checkout.due_date -%>
   </p>
-  <%- if can? :delete, @checkout -%>
+  <%- if can? :update, @checkout -%>
     <p>
       <strong><%= t('checkout.current_user') -%></strong><br />
       <%= link_to @checkout.user_username, @checkout.user if @checkout.user -%>

data/config/locales/translation_en.yml

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

data/config/locales/translation_ja.yml

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

data/lib/enju_circulation/item.rb

@@ -114,6 +114,14 @@ module EnjuCirculation
         end
       end
 
+      def retained?
+        if manifestation.next_reservation.try(:state) == 'retained' and  manifestation.next_reservation.item == self
+          return true
+        else
+          false
+        end
+      end
+
       def lending_rule(user)
         lending_policies.where(:user_group_id => user.user_group.id).first
       end
@@ -139,6 +147,10 @@ module EnjuCirculation
       def next_reservation
         Reserve.waiting.where(:item_id => id).first
       end
+
+      def latest_checkout
+        checkouts.order('checkouts.id').first
+      end
     end
   end
 end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre30"
+  VERSION = "0.1.0.pre31"
 end

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,7 +1,6 @@
 class CreateLibraries < ActiveRecord::Migration
   def self.up
     create_table :libraries do |t|
-      t.references :agent, :polymorphic => true
       t.string :name, :null => false
       t.text :display_name
       t.string :short_display_name, :null => false
@@ -23,7 +22,6 @@ class CreateLibraries < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :agent_id, :unique => true
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end

data/spec/dummy/db/schema.rb

@@ -412,8 +412,6 @@ ActiveRecord::Schema.define(:version => 20130519065837) do
   add_index "lending_policies", ["item_id", "user_group_id"], :name => "index_lending_policies_on_item_id_and_user_group_id", :unique => true
 
   create_table "libraries", :force => true do |t|
-    t.integer  "agent_id"
-    t.string   "agent_type"
     t.string   "name",                                   :null => false
     t.text     "display_name"
     t.string   "short_display_name",                     :null => false
@@ -437,7 +435,6 @@ ActiveRecord::Schema.define(:version => 20130519065837) do
     t.string   "isil"
   end
 
-  add_index "libraries", ["agent_id"], :name => "index_libraries_on_agent_id", :unique => true
   add_index "libraries", ["library_group_id"], :name => "index_libraries_on_library_group_id"
   add_index "libraries", ["name"], :name => "index_libraries_on_name", :unique => true
 

data/spec/fixtures/libraries.yml

@@ -14,7 +14,6 @@ library_00001:
   street: 
   created_at: 2007-08-13 18:10:00 +09:00
   library_group_id: 1
-  agent_id: 1
   call_number_delimiter: "|"
   position: 1
 library_00002: 
@@ -32,7 +31,6 @@ library_00002:
   street: 
   created_at: 2007-08-13 18:10:00 +09:00
   library_group_id: 1
-  agent_id: 2
   call_number_delimiter: "|"
   position: 2
   isil: "JP-0000000"
@@ -51,7 +49,6 @@ library_00003:
   street: 
   created_at: 2007-08-14 16:37:00 +09:00
   library_group_id: 1
-  agent_id: 3
   call_number_delimiter: "|"
   position: 3
 library_00004: 
@@ -69,7 +66,6 @@ library_00004:
   street: 
   created_at: 2007-08-23 19:51:00 +09:00
   library_group_id: 1
-  agent_id: 4
   call_number_delimiter: "|"
   position: 4
 
@@ -78,8 +74,6 @@ library_00004:
 # Table name: libraries
 #
 #  id                          :integer         not null, primary key
-#  agent_id                   :integer
-#  agent_type                 :string(255)
 #  name                        :string(255)     not null
 #  display_name                :text
 #  short_display_name          :string(255)     not null

data/spec/models/reserve_spec.rb

@@ -74,14 +74,16 @@ describe Reserve do
     old_count = MessageRequest.count
 
     reservation.item = old_reservation.item
+    reservation.item.retained?.should be_false
     reservation.sm_retain!
     old_reservation.reload
-    assert old_reservation.item.should be_nil
-    assert reservation.retained_at.should be_true
-    assert old_reservation.retained_at.should be_nil
-    assert old_reservation.postponed_at.should be_true
-    assert old_reservation.state.should eq 'postponed'
-    assert MessageRequest.count.should eq old_count + 4
+    old_reservation.item.should be_nil
+    reservation.retained_at.should be_true
+    old_reservation.retained_at.should be_nil
+    old_reservation.postponed_at.should be_true
+    old_reservation.state.should eq 'postponed'
+    MessageRequest.count.should eq old_count + 4
+    reservation.item.retained?.should be_true
   end
 
   it "should not be valid if item_identifier is invalid" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre30
+  version: 0.1.0.pre31
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre43
+        version: 0.1.0.pre47
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre43
+        version: 0.1.0.pre47
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre25
+        version: 0.1.0.pre26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre25
+        version: 0.1.0.pre26
 - !ruby/object:Gem::Dependency
   name: enju_message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre10
+        version: 0.1.14.pre11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre10
+        version: 0.1.14.pre11
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc3
+        version: 1.1.0.rc5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc3
+        version: 1.1.0.rc5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/baskets_controller.rb
 - app/controllers/carrier_type_has_checkout_types_controller.rb
 - app/controllers/checked_items_controller.rb
 - app/controllers/checkins_controller.rb
@@ -241,10 +240,6 @@ files:
 - app/models/user_checkout_stat.rb
 - app/models/user_group_has_checkout_type.rb
 - app/models/user_reserve_stat.rb
-- app/views/baskets/edit.html.erb
-- app/views/baskets/index.html.erb
-- app/views/baskets/new.html.erb
-- app/views/baskets/show.html.erb
 - app/views/carrier_type_has_checkout_types/_form.html.erb
 - app/views/carrier_type_has_checkout_types/edit.html.erb
 - app/views/carrier_type_has_checkout_types/index.html.erb
@@ -432,7 +427,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- spec/controllers/baskets_controller_spec.rb
 - spec/controllers/carrier_type_has_checkout_types_controller_spec.rb
 - spec/controllers/checked_items_controller_spec.rb
 - spec/controllers/checkins_controller_spec.rb
@@ -455,7 +449,6 @@ files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/baskets_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
@@ -583,16 +576,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/_2hv.fdt
-- spec/dummy/solr/data/test/index/_2hv.fdx
-- spec/dummy/solr/data/test/index/_2hv.fnm
-- spec/dummy/solr/data/test/index/_2hv.frq
-- spec/dummy/solr/data/test/index/_2hv.nrm
-- spec/dummy/solr/data/test/index/_2hv.prx
-- spec/dummy/solr/data/test/index/_2hv.tii
-- spec/dummy/solr/data/test/index/_2hv.tis
+- spec/dummy/solr/data/test/index/_3ed.fdt
+- spec/dummy/solr/data/test/index/_3ed.fdx
+- spec/dummy/solr/data/test/index/_3ed.fnm
+- spec/dummy/solr/data/test/index/_3ed.frq
+- spec/dummy/solr/data/test/index/_3ed.nrm
+- spec/dummy/solr/data/test/index/_3ed.prx
+- spec/dummy/solr/data/test/index/_3ed.tii
+- spec/dummy/solr/data/test/index/_3ed.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_4zj
+- spec/dummy/solr/data/test/index/segments_6sj
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -678,7 +671,6 @@ files:
 - spec/models/user_checkout_stat_spec.rb
 - spec/models/user_group_has_checkout_type_spec.rb
 - spec/models/user_reserve_stat_spec.rb
-- spec/routing/baskets_routing_spec.rb
 - spec/routing/checked_items_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
@@ -707,7 +699,6 @@ signing_key:
 specification_version: 4
 summary: enju_circulation plugin
 test_files:
-- spec/controllers/baskets_controller_spec.rb
 - spec/controllers/carrier_type_has_checkout_types_controller_spec.rb
 - spec/controllers/checked_items_controller_spec.rb
 - spec/controllers/checkins_controller_spec.rb
@@ -730,7 +721,6 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/baskets_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
@@ -858,16 +848,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/_2hv.fdt
-- spec/dummy/solr/data/test/index/_2hv.fdx
-- spec/dummy/solr/data/test/index/_2hv.fnm
-- spec/dummy/solr/data/test/index/_2hv.frq
-- spec/dummy/solr/data/test/index/_2hv.nrm
-- spec/dummy/solr/data/test/index/_2hv.prx
-- spec/dummy/solr/data/test/index/_2hv.tii
-- spec/dummy/solr/data/test/index/_2hv.tis
+- spec/dummy/solr/data/test/index/_3ed.fdt
+- spec/dummy/solr/data/test/index/_3ed.fdx
+- spec/dummy/solr/data/test/index/_3ed.fnm
+- spec/dummy/solr/data/test/index/_3ed.frq
+- spec/dummy/solr/data/test/index/_3ed.nrm
+- spec/dummy/solr/data/test/index/_3ed.prx
+- spec/dummy/solr/data/test/index/_3ed.tii
+- spec/dummy/solr/data/test/index/_3ed.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_4zj
+- spec/dummy/solr/data/test/index/segments_6sj
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -953,7 +943,6 @@ test_files:
 - spec/models/user_checkout_stat_spec.rb
 - spec/models/user_group_has_checkout_type_spec.rb
 - spec/models/user_reserve_stat_spec.rb
-- spec/routing/baskets_routing_spec.rb
 - spec/routing/checked_items_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb

data/app/controllers/baskets_controller.rb

@@ -1,109 +0,0 @@
-class BasketsController < ApplicationController
-  load_and_authorize_resource
-  cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
-
-  # GET /baskets
-  # GET /baskets.json
-  def index
-    if current_user.has_role?('Librarian')
-     @baskets = Basket.page(params[:page])
-    else
-      redirect_to new_basket_url
-      return
-    end
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @baskets }
-    end
-  end
-
-  # GET /baskets/1
-  # GET /baskets/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @basket }
-    end
-  end
-
-  # GET /baskets/new
-  # GET /baskets/new.json
-  def new
-    @basket = Basket.new
-    @basket.user_number = params[:user_number]
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render :json => @basket }
-    end
-  end
-
-  # GET /baskets/1/edit
-  def edit
-  end
-
-  # POST /baskets
-  # POST /baskets.json
-  def create
-    @basket = Basket.new(params[:basket])
-    @user = User.where(:user_number => @basket.user_number).first if @basket.user_number
-    if @user
-      if @user.user_number?
-        @basket.user = @user
-      end
-    end
-
-    respond_to do |format|
-      if @basket.save
-        format.html { redirect_to new_basket_checked_item_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
-        format.json { render :json => @basket, :status => :created, :location => @basket }
-      else
-        format.html { render :action => "new" }
-        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /baskets/1
-  # PUT /baskets/1.json
-  def update
-    librarian = current_user
-    begin
-      unless @basket.basket_checkout(librarian)
-        redirect_to new_basket_checked_item_url(@basket)
-        return
-      end
-    rescue ActiveRecord::RecordInvalid
-      flash[:message] = t('checked_item.already_checked_out_try_again')
-      @basket.checked_items.delete_all
-      redirect_to new_basket_checked_item_url(@basket)
-      return
-    end
-
-    respond_to do |format|
-      #if @basket.update_attributes({})
-      if @basket.save(:validate => false)
-        # 貸出完了時
-        format.html { redirect_to user_checkouts_url(@basket.user), :notice => t('basket.checkout_completed') }
-        format.json { head :no_content }
-      else
-        format.html { redirect_to basket_checked_items_url(@basket) }
-        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
-      end
-    end
-
-  end
-
-  # DELETE /baskets/1
-  # DELETE /baskets/1.json
-  def destroy
-    @basket.destroy
-
-    respond_to do |format|
-      #format.html { redirect_to(user_baskets_url(@user)) }
-      format.html { redirect_to user_checkouts_url(@basket.user) }
-      format.json { head :no_content }
-    end
-  end
-end

data/app/views/baskets/edit.html.erb

@@ -1,30 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_list">
-
-<%= form_for(@basket) do |f| -%>
-  <%= f.error_messages -%>
-  <div class="field">
-    <%= f.label t('activerecord.models.user') -%><br />
-    <%= @basket.user.username -%>
-    <%= f.hidden_field :user_id -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
-  </div>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.show'), basket_path(@basket) -%></li>
-    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
-  </ul>
-</div>

data/app/views/baskets/index.html.erb

@@ -1,31 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_list">
-
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.models.user') -%></th>
-    <th><%= t('activerecord.attributes.basket.note') -%></th>
-    <th><%= t('page.updated_at') -%></th>
-  </tr>
-
-<%- @baskets.each do |basket| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= basket.user.username -%></td>
-    <td><%= basket.note -%></td>
-    <td><%= basket.updated_at -%></td>
-    <td><%= link_to t('page.show'), basket -%></td>
-  </tr>
-<%- end -%>
-</table>
-
-<%= paginate(@baskets) -%>
-
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.basket')), new_basket_path -%></li>
-  </ul>
-</div>

data/app/views/baskets/new.html.erb

@@ -1,29 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_list">
-
-<%= form_for(@basket, :html => {:name => 'basket_form'}) do |f| -%>
-  <%= f.error_messages -%>
-  <div class="field">
-    <%= f.label t('activerecord.attributes.user.user_number') -%>
-    <%= f.search_field :user_number, :class => 'resource_user_number' -%>
-
-  <!--
-  <div class="field">
-  <%= f.label :note -%><br />
-  <%= f.text_area :note, :class => 'resource_textarea' -%>
-  </div>
-  -->
-    <%= f.submit t('page.read') -%>
-  </div>
-<%- end -%>
-<%= javascript_tag("$(function(){$('#basket_user_number').focus().select()})") %>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('activerecord.models.checkin'), new_checkin_path -%></li>
-    <li><%= link_to t('page.search_resource', :model => t('activerecord.models.user')), users_path -%></li>
-  </ul>
-</div>

data/app/views/baskets/show.html.erb

@@ -1,23 +0,0 @@
-<div id="content_list">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_detail" class="ui-corner-all">
-<p id="notice"><%= notice %></p>
-
-  <p>
-    <strong><%= t('activerecord.models.user') -%>:</strong>
-    <%= @basket.user.username -%>
-  </p>
-
-  <p>
-    <strong><%= t('activerecord.attributes.basket.note') -%>:</strong>
-    <%= @basket.note -%>
-  </p>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.edit'), edit_basket_path(@basket) -%></li>
-    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
-  </ul>
-</div>

data/spec/controllers/baskets_controller_spec.rb

@@ -1,379 +0,0 @@
-require 'spec_helper'
-
-describe BasketsController do
-  fixtures :all
-
-  describe "GET index" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should_not be_empty
-        response.should be_success
-      end
-
-      it "should get index without user_id" do
-        get :index
-        response.should be_success
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should_not be_empty
-        response.should be_success
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should be_empty
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "assigns all baskets as @baskets" do
-        get :index, :user_id => users(:user1).username
-        assigns(:baskets).should be_empty
-        response.should redirect_to(new_user_session_url)
-      end
-    end
-  end
-
-  describe "GET show" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "assigns the requested basket as @basket" do
-        get :show, :id => 1, :user_id => users(:admin).username
-        assigns(:basket).should eq(Basket.find(1))
-        response.should redirect_to(new_user_session_url)
-      end
-    end
-  end
-
-  describe "GET new" do
-    describe "When logged in as Administrator" do
-      login_admin
-
-      it "assigns the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      it "assigns the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      it "should not assign the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      it "should not assign the requested basket as @basket" do
-        get :new
-        assigns(:basket).should_not be_valid
-        response.should redirect_to(new_user_session_url)
-      end
-    end
-  end
-
-  describe "GET edit" do
-    describe "When logged in as Administrator" do
-      login_admin
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "assigns the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "assigns the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "should not assign the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      before(:each) do
-        @basket = baskets(:basket_00001)
-      end
-
-      it "should not assign the requested basket as @basket" do
-        get :edit, :id => @basket.id
-        assigns(:basket).should eq(@basket)
-        response.should redirect_to new_user_session_url
-      end
-    end
-  end
-
-  describe "POST create" do
-    before(:each) do
-      @attrs = {:user_number => users(:user1).user_number }
-      @invalid_attrs = {:user_number => 'invalid'}
-    end
-
-    describe "When logged in as Administrator" do
-      login_admin
-
-      describe "with valid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          assigns(:basket).should be_valid
-        end
-      end
-
-      describe "with blank params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => @invalid_attrs
-          assigns(:basket).should_not be_valid
-        end
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      describe "with valid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          assigns(:basket).should be_valid
-        end
-      end
-
-      describe "with blank params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-        end
-      end
-
-      describe "with invalid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => @invalid_attrs
-          assigns(:basket).should_not be_valid
-        end
-      end
-
-      it "should not create basket when user is suspended" do
-        post :create, :basket => {:user_number => users(:user4).user_number }
-        assigns(:basket).should_not be_valid
-        assigns(:basket).errors["base"].include?(I18n.t('basket.this_account_is_suspended')).should be_true
-        response.should be_success
-      end
-
-      it "should not create basket when user is not found" do
-        post :create, :basket => {:user_number => 'not found' }
-        assigns(:basket).should_not be_valid
-        assigns(:basket).errors["base"].include?(I18n.t('user.not_found')).should be_true
-        response.should be_success
-      end
-
-      it "should not create basket without user_number" do
-        post :create, :basket => { }
-        assigns(:basket).should_not be_valid
-        response.should be_success
-      end
-
-      it "should create basket" do
-        post :create, :basket => {:user_number => users(:user1).user_number }
-        assigns(:basket).should be_valid
-        response.should redirect_to new_basket_checked_item_url(assigns(:basket))
-      end
-
-      it "should not create basket without user_number" do
-        post :create, :basket => { }
-        assigns(:basket).should_not be_valid
-        response.should be_success
-      end
-    end
-
-    describe "When logged in as User" do
-      login_user
-
-      describe "with valid params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          assigns(:basket).should_not be_valid
-        end
-
-        it "should be forbidden" do
-          post :create, :basket => {:user_number => users(:user1).user_number }
-          response.should be_forbidden
-        end
-      end
-
-      it "should not create basket" do
-        post :create, :basket => {:user_number => users(:user1).user_number }
-        response.should be_forbidden
-      end
-    end
-
-    describe "When not logged in" do
-      describe "with blank params" do
-        it "assigns a newly created basket as @basket" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-        end
-
-        it "should be redirected to new_user_session_url" do
-          post :create, :basket => { }
-          assigns(:basket).should_not be_valid
-          assert_response :redirect
-          response.should redirect_to new_user_session_url
-        end
-      end
-    end
-  end
-
-  describe "PUT update" do
-    before(:each) do
-      @attrs = {:user_id => users(:user1).username}
-    end
-
-    describe "When logged in as Librarian" do
-      login_librarian
-
-      describe "with valid params" do
-        it "updates the requested basket" do
-          put :update, :id => 8, :basket => @attrs
-        end
-
-        it "assigns the requested basket as @basket" do
-          put :update, :id => 8, :basket => @attrs
-          assigns(:basket).checkouts.first.item.circulation_status.name.should eq 'On Loan'
-          response.should redirect_to(user_checkouts_url(assigns(:basket).user))
-        end
-      end
-    end
-  end
-
-  describe "DELETE destroy" do
-    before(:each) do
-      @basket = FactoryGirl.create(:basket)
-    end
-
-    describe "When logged in as Administrator" do
-      login_fixture_admin
-
-      it "should destroy basket without user_id" do
-        delete :destroy, :id => 1, :basket => {:user_id => nil}, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-
-      it "should destroy basket" do
-        delete :destroy, :id => 1, :basket => { }, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-    end
-
-    describe "When logged in as Librarian" do
-      login_fixture_librarian
-
-      it "should destroy basket without user_id" do
-        delete :destroy, :id => 1, :basket => {:user_id => nil}, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-
-      it "should destroy basket" do
-        delete :destroy, :id => 1, :basket => { }, :user_id => users(:user1).username
-        response.should redirect_to user_checkouts_url(assigns(:basket).user)
-      end
-    end
-
-    describe "When logged in as User" do
-      login_fixture_user
-
-      it "should not destroy basket" do
-        delete :destroy, :id => 3, :user_id => users(:user1).username
-        response.should be_forbidden
-      end
-    end
-  
-    describe "When not logged in" do
-      it "destroys the requested basket" do
-        delete :destroy, :id => @basket.id
-      end
-
-      it "should be forbidden" do
-        delete :destroy, :id => @basket.id
-        response.should redirect_to new_user_session_url
-      end
-    end
-  end
-end

data/spec/dummy/app/controllers/baskets_controller.rb

@@ -1,103 +0,0 @@
-class BasketsController < ApplicationController
-  load_and_authorize_resource
-  cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
-
-  # GET /baskets
-  # GET /baskets.json
-  def index
-    if current_user.has_role?('Librarian')
-     @baskets = Basket.page(params[:page])
-    else
-      redirect_to new_basket_url
-      return
-    end
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @baskets }
-    end
-  end
-
-  # GET /baskets/1
-  # GET /baskets/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @basket }
-    end
-  end
-
-  # GET /baskets/new
-  # GET /baskets/new.json
-  def new
-    @basket = Basket.new
-    @basket.user_number = params[:user_number]
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render :json => @basket }
-    end
-  end
-
-  # GET /baskets/1/edit
-  def edit
-  end
-
-  # POST /baskets
-  # POST /baskets.json
-  def create
-    @basket = Basket.new
-    @user = User.where(:user_number => params[:basket][:user_number]).first rescue nil
-    if @user
-      if @user.user_number?
-        @basket.user = @user
-      end
-    end
-
-    respond_to do |format|
-      if @basket.save
-        format.html { redirect_to new_basket_checked_item_url(@basket), :notice => t('controller.successfully_created', :model => t('activerecord.models.basket')) }
-        format.json { render :json => @basket, :status => :created, :location => @basket }
-      else
-        format.html { render :action => "new" }
-        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /baskets/1
-  # PUT /baskets/1.json
-  def update
-    librarian = current_user
-    unless @basket.basket_checkout(librarian)
-      redirect_to basket_checked_items_url(@basket)
-      return
-    end
-
-    #@checkout_count = @basket.user.checkouts.count
-    respond_to do |format|
-      #if @basket.update_attributes({})
-      if @basket.save(:validate => false)
-        # 貸出完了時
-        format.html { redirect_to user_checkouts_url(@basket.user), :notice => t('basket.checkout_completed') }
-        format.json { head :no_content }
-      else
-        format.html { redirect_to basket_checked_items_url(@basket) }
-        format.json { render :json => @basket.errors, :status => :unprocessable_entity }
-      end
-    end
-
-  end
-
-  # DELETE /baskets/1
-  # DELETE /baskets/1.json
-  def destroy
-    @basket.destroy
-
-    respond_to do |format|
-      #format.html { redirect_to(user_baskets_url(@user)) }
-      format.html { redirect_to user_checkouts_url(@basket.user) }
-      format.json { head :no_content }
-    end
-  end
-end

data/spec/routing/baskets_routing_spec.rb

@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe BasketsController do
-  describe "routing" do
-
-    it "recognizes and generates #index" do
-      { :get => "/baskets" }.should route_to(:controller => "baskets", :action => "index")
-    end
-
-    it "recognizes and generates #new" do
-      { :get => "/baskets/new" }.should route_to(:controller => "baskets", :action => "new")
-    end
-
-    it "recognizes and generates #show" do
-      { :get => "/baskets/1" }.should route_to(:controller => "baskets", :action => "show", :id => "1")
-    end
-
-    it "recognizes and generates #edit" do
-      { :get => "/baskets/1/edit" }.should route_to(:controller => "baskets", :action => "edit", :id => "1")
-    end
-
-    it "recognizes and generates #create" do
-      { :post => "/baskets" }.should route_to(:controller => "baskets", :action => "create")
-    end
-
-    it "recognizes and generates #update" do
-      { :put => "/baskets/1" }.should route_to(:controller => "baskets", :action => "update", :id => "1")
-    end
-
-    it "recognizes and generates #destroy" do
-      { :delete => "/baskets/1" }.should route_to(:controller => "baskets", :action => "destroy", :id => "1")
-    end
-
-  end
-end