enju_circulation 0.0.16 → 0.0.17

data/app/controllers/checkins_controller.rb

@@ -2,14 +2,13 @@ class CheckinsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
   before_filter :get_user
-  helper_method :get_basket
+  before_filter :get_basket, :only => [:index, :create]
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
 
   # GET /checkins
   # GET /checkins.json
   def index
     # かごがない場合、自動的に作成する
-    get_basket
     unless @basket
       @basket = Basket.create!(:user => current_user)
       redirect_to basket_checkins_url(@basket)
@@ -51,12 +50,12 @@ class CheckinsController < ApplicationController
   # POST /checkins
   # POST /checkins.json
   def create
-    get_basket
     unless @basket
       @basket = Basket.new(:user => current_user)
       @basket.save(:validate => false)
     end
     @checkin = @basket.checkins.new(params[:checkin])
+    @checkin.librarian = current_user
 
     flash[:message] = ''
     if @checkin.item_identifier.blank?
@@ -67,10 +66,10 @@ class CheckinsController < ApplicationController
 
     if item.blank?
       flash[:message] << t('checkin.item_not_found')
-    end
-
-    if @basket.checkins.collect(&:item).include?(item)
-      flash[:message] << t('checkin.already_checked_in')
+    else
+      if @basket.checkins.collect(&:item).include?(item)
+        flash[:message] << t('checkin.already_checked_in')
+      end
     end
 
     respond_to do |format|
@@ -89,7 +88,7 @@ class CheckinsController < ApplicationController
           message = @checkin.item_checkin(current_user)
           flash[:message] << message if message
           format.html { redirect_to basket_checkins_url(@checkin.basket) }
-          format.json { render :json => @checkin, :status => :created, :location => checkin_url(@checkin) }
+          format.json { render :json => @checkin, :status => :created, :location => @checkin }
           format.js {
             redirect_to basket_checkins_url(@checkin.basket, :mode => 'list', :format => :js)
           }

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

@@ -1,24 +1,15 @@
-<%= form_for(@checkin) do |f| %>
-  <% if @checkin.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%= pluralize(@checkin.errors.count, "error") %> prohibited this checkin from being saved:</h2>
-    <ul>
-    <% @checkin.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
+<%= simple_form_for(@checkin) do |f| %>
+  <%= f.error_notification %>
 
-  <div class="field">
-    <%= f.label :item_id %><br />
-    <%= f.text_field :item_id %>
+  <div class="form-inputs">
+    <%= f.input :item_id %>
   </div>
-  <div class="field">
-    <%= f.label :librarian_id %><br />
-    <%= f.text_field :librarian_id %>
+
+  <div class="form-inputs">
+    <%= f.input :librarian_id %>
   </div>
-  <div class="actions">
-    <%= f.submit %>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
   </div>
 <% end %>

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

@@ -3,10 +3,11 @@
 <div class="search_form">
 <%= form_for @checkin, :html => {:method => :post}, :url => basket_checkins_path(@basket, :mode => 'list'), :remote => true do |f| -%>
 
-  <p><%= t('activerecord.attributes.item.item_identifier') -%>:
+  <p>
+    <%= t('activerecord.attributes.item.item_identifier') -%>:
     <%= f.text_field :item_identifier, :class => 'resource_item_identifier' -%>
-    <%= f.hidden_field :librarian_id, :value => current_user.id -%>
-    <%= submit_tag t('checkin.checkin') -%></p>
+    <%= f.submit t('checkin.checkin') -%>
+  </p>
 <%- end -%>
 </div>
 

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

@@ -1,26 +1,13 @@
 <div id="content_detail" class="ui-corner-all">
 <h1 class="title"><%= t('page.editing', :model => t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
-
-<%= form_for(@checkin) do |f| -%>
-  <%= f.error_messages -%>
-
-  <div class="field">
-  <%= f.label t('activerecord.models.item') -%><br />
-    <%= f.text_field :item_identifier -%>
-  </div>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>
-
+  <%= render 'form' %>
 </div>
 </div>
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.show'), checkin_path(@checkin) -%></li>
+    <li><%= link_to t('page.show'), @checkin -%></li>
     <li><%= link_to t('page.back'), checkins_path -%></li>
   </ul>
 </div>

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

@@ -1,14 +1,12 @@
+<div id="content_detail" class="ui-corner-all">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.checkin')) -%></h1>
-
-<%= form_for(@checkin) do |f| -%>
-  <%= f.error_messages -%>
-
-  <div class="field">
-    <%= f.label t('activerecord.models.item') -%><br />
-    <%= f.text_field :item_id -%>
-  </div>
-
-  <%= f.submit %>
-<%- end -%>
-
-<%= link_to t('page.back'), checkins_path -%>
+<div id="content_list">
+  <%= render 'form' %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.back'), checkins_path -%></li>
+  </ul>
+</div>

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

@@ -4,12 +4,12 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-<strong><%= t('activerecord.models.item') -%>:</strong>
+  <strong><%= t('activerecord.models.item') -%>:</strong>
   <%= link_to @checkin.item.manifestation.original_title, @checkin.item -%>
 </p>
 
 <p>
-<strong><%= ('Librarian') -%>:</strong>
+  <strong><%= t('activerecord.models.user') -%>:</strong>
   <%= link_to @checkin.librarian.username, @checkin.librarian -%>
 </p>
 

data/config/locales/translation_en.yml

@@ -165,4 +165,3 @@ en:
     canceled: "Canceled"
     expired: "Expired"
     completed: "Completed"
-

data/config/locales/translation_ja.yml

@@ -163,4 +163,3 @@ ja:
     canceled: "取消済み"
     expired: "期限切れ"
     completed: "貸出済み"
-

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/{app → spec/dummy/app}/models/basket.rb

@@ -2,10 +2,7 @@ class Basket < ActiveRecord::Base
   default_scope :order => 'id DESC'
   scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}}
   belongs_to :user, :validate => true
-  has_many :checked_items, :dependent => :destroy
-  has_many :items, :through => :checked_items
-  has_many :checkouts
-  has_many :checkins
+  has_many :accepts
 
   validates_associated :user, :on => :create
   # 貸出完了後にかごのユーザidは破棄する
@@ -23,24 +20,30 @@ class Basket < ActiveRecord::Base
     end
   end
 
-  def basket_checkout(librarian)
-    return nil if self.checked_items.size == 0
-    Item.transaction do
-      self.checked_items.each do |checked_item|
-        checkout = self.user.checkouts.new(:librarian_id => librarian.id, :item_id => checked_item.item.id, :basket_id => self.id, :due_date => checked_item.due_date)
-        if checked_item.item.checkout!(self.user)
-          checkout.save!
-        end
-      end
-      CheckedItem.destroy_all(:basket_id => self.id)
-    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 self.checked_items.size == 0
+      Item.transaction do
+        self.checked_items.each do |checked_item|
+          checkout = self.user.checkouts.new(:librarian_id => librarian.id, :item_id => checked_item.item.id, :basket_id => self.id, :due_date => checked_item.due_date)
+          if checked_item.item.checkout!(self.user)
+            checkout.save!
+          end
+        end
+        CheckedItem.destroy_all(:basket_id => self.id)
+      end
+    end
+  end
 end
 
 # == Schema Information

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70093669315100 !ruby/object:Gem::Requirement
+  requirement: &70307215747020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669315100
+  version_requirements: *70307215747020
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70093669314680 !ruby/object:Gem::Requirement
+  requirement: &70307215746420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669314680
+  version_requirements: *70307215746420
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70093669314220 !ruby/object:Gem::Requirement
+  requirement: &70307215745760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669314220
+  version_requirements: *70307215745760
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70093669313800 !ruby/object:Gem::Requirement
+  requirement: &70307215745160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669313800
+  version_requirements: *70307215745160
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
-  requirement: &70093669313380 !ruby/object:Gem::Requirement
+  requirement: &70307215744480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669313380
+  version_requirements: *70307215744480
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70093669312880 !ruby/object:Gem::Requirement
+  requirement: &70307215743720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669312880
+  version_requirements: *70307215743720
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70093669312460 !ruby/object:Gem::Requirement
+  requirement: &70307215743300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669312460
+  version_requirements: *70307215743300
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70093669312000 !ruby/object:Gem::Requirement
+  requirement: &70307215742840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669312000
+  version_requirements: *70307215742840
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70093669311500 !ruby/object:Gem::Requirement
+  requirement: &70307215742300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669311500
+  version_requirements: *70307215742300
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70093669311080 !ruby/object:Gem::Requirement
+  requirement: &70307215741880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669311080
+  version_requirements: *70307215741880
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70093669310620 !ruby/object:Gem::Requirement
+  requirement: &70307215741420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669310620
+  version_requirements: *70307215741420
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70093669310120 !ruby/object:Gem::Requirement
+  requirement: &70307215740920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70093669310120
+  version_requirements: *70307215740920
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70093669309620 !ruby/object:Gem::Requirement
+  requirement: &70307215740420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70093669309620
+  version_requirements: *70307215740420
 - !ruby/object:Gem::Dependency
   name: enju_message
-  requirement: &70093669309160 !ruby/object:Gem::Requirement
+  requirement: &70307215739940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70093669309160
+  version_requirements: *70307215739940
 - !ruby/object:Gem::Dependency
   name: enju_event
-  requirement: &70093669308700 !ruby/object:Gem::Requirement
+  requirement: &70307215739480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70093669308700
+  version_requirements: *70307215739480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70093669308320 !ruby/object:Gem::Requirement
+  requirement: &70307215739100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093669308320
+  version_requirements: *70307215739100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70093669307860 !ruby/object:Gem::Requirement
+  requirement: &70307215738640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093669307860
+  version_requirements: *70307215738640
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70093669307360 !ruby/object:Gem::Requirement
+  requirement: &70307215738140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70093669307360
+  version_requirements: *70307215738140
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70093669306940 !ruby/object:Gem::Requirement
+  requirement: &70307215737720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,7 +219,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70093669306940
+  version_requirements: *70307215737720
 description: Circulation management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -248,7 +248,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
@@ -398,7 +397,6 @@ files:
 - db/migrate/032_create_checkins.rb
 - db/migrate/033_create_checkouts.rb
 - db/migrate/035_create_reserves.rb
-- db/migrate/120_create_baskets.rb
 - db/migrate/121_create_checked_items.rb
 - db/migrate/127_create_use_restrictions.rb
 - db/migrate/129_create_item_has_use_restrictions.rb
@@ -455,6 +453,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/basket.rb
 - spec/dummy/app/models/carrier_type.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/event_category.rb
@@ -510,6 +509,7 @@ files:
 - spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/113_create_events.rb
 - spec/dummy/db/migrate/114_create_event_categories.rb
+- spec/dummy/db/migrate/120_create_baskets.rb
 - spec/dummy/db/migrate/130_create_request_status_types.rb
 - spec/dummy/db/migrate/131_create_request_types.rb
 - spec/dummy/db/migrate/149_create_message_templates.rb
@@ -681,6 +681,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
+- spec/dummy/app/models/basket.rb
 - spec/dummy/app/models/carrier_type.rb
 - spec/dummy/app/models/event.rb
 - spec/dummy/app/models/event_category.rb
@@ -736,6 +737,7 @@ test_files:
 - spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/113_create_events.rb
 - spec/dummy/db/migrate/114_create_event_categories.rb
+- spec/dummy/db/migrate/120_create_baskets.rb
 - spec/dummy/db/migrate/130_create_request_status_types.rb
 - spec/dummy/db/migrate/131_create_request_types.rb
 - spec/dummy/db/migrate/149_create_message_templates.rb