enju_circulation 0.0.70 → 0.0.71

data/README.rdoc

@@ -1,3 +1,3 @@
-= EnjuCirculation
+= EnjuCirculation {<img src="https://secure.travis-ci.org/nabeta/enju_circulation.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_circulation]
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.

data/app/controllers/checkins_controller.rb

@@ -1,7 +1,6 @@
 class CheckinsController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_user
   before_filter :get_basket, :only => [:index, :create]
   cache_sweeper :circulation_sweeper, :only => [:create, :update, :destroy]
 
@@ -17,7 +16,7 @@ class CheckinsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render :json => @checkins }
-      format.js { @checkin = Checkin.new }
+      format.js
     end
   end
 
@@ -43,7 +42,7 @@ class CheckinsController < ApplicationController
       @basket.save!
     end
     @checkin = Checkin.new
-    @checkins = []
+    @checkins = [].paginate(:page => 1)
     flash[:checkin_basket_id] = @basket.id
 
     respond_to do |format|
@@ -67,12 +66,11 @@ class CheckinsController < ApplicationController
     @checkin.librarian = current_user
 
     flash[:message] = ''
-    if @checkin.item_identifier.blank?
-      flash[:message] << t('checkin.enter_item_identifier') if @checkin.item_identifier.blank?
-    else
-      item = Item.where(:item_identifier => @checkin.item_identifier.to_s.strip).first
+    item_identifier = @checkin.item_identifier.to_s.strip
+    unless item_identifier.blank?
+      item = Item.where(:item_identifier => item_identifier).first
     end
-    @checkin.item = item
+    @checkin.item = item if item
 
     respond_to do |format|
       if @checkin.save
@@ -83,7 +81,7 @@ class CheckinsController < ApplicationController
         format.json { render :json => @checkin, :status => :created, :location => @checkin }
         format.js { redirect_to basket_checkins_url(@basket, :format => :js) }
       else
-        @checkins = @basket.checkins
+        @checkins = @basket.checkins.paginate(:page => 1)
         format.html { render :action => "new" }
         format.json { render :json => @checkin.errors, :status => :unprocessable_entity }
         format.js { render :action => "index" }

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

@@ -1,6 +1,6 @@
-<div id="content_list">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.basket')) -%></h1>
 <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>

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

@@ -1,9 +1,9 @@
 <div id="content_detail" class="ui-corner-all">
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.checked_item')) -%></h1>
 <div id="content_list">
-  <p id="notice"><%= notice %></p>
 
   <div id="checked_item_list">
+    <p id="notice"><%= notice %></p>
     <%= render 'list' -%>
   </div>
   <%= render 'checkout' -%>

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

@@ -1,7 +1,7 @@
 <div style="color: red"><%= flash[:message] -%></div>
 
 <div class="search_form">
-<%= form_for @checkin, :html => {:method => :post}, :url => basket_checkins_path(@basket), :remote => true do |f| -%>
+<%= form_for :checkin, :html => {:method => :post}, :url => basket_checkins_path(@basket), :remote => true do |f| -%>
   <%= f.error_messages %>
   <p>
     <%= t('activerecord.attributes.item.item_identifier') -%>:
@@ -9,6 +9,7 @@
     <%= f.submit t('checkin.checkin'), 'data-disable-with' => t('page.saving') -%>
   </p>
 <%- end -%>
+<%= javascript_tag("$('#checkin_item_identifier').focus().select();") %>
 </div>
 
 <%= render 'checkin' %>

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

@@ -2,6 +2,7 @@
 <h1 class="title"><%= t('page.new', :model => t('activerecord.models.checkin')) -%></h1>
 <div id="content_list">
   <div id="checkin_list">
+    <p id="notice"><%= notice %></p>
     <%= render 'list' -%>
   </div>
 </div>

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.70"
+  VERSION = "0.0.71"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -4,6 +4,10 @@ describe CheckoutsController do
   fixtures :all
 
   describe "GET index", :solr => true do
+    before do
+      Checkout.reindex
+    end
+
     before(:each) do
       FactoryGirl.create(:admin)
     end

data/spec/controllers/reserves_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ReservesController do
   fixtures :all
 
-  describe "GET index", :solr => true do
+  describe "GET index" do
     describe "When logged in as Administrator" do
       login_fixture_admin
 

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

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

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

@@ -0,0 +1 @@
+

	

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

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

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ RSpec.configure do |config|
   config.before :each, :solr => true do
     Sunspot::Rails::Tester.start_original_sunspot_session
     Sunspot.session = $original_sunspot_session
-    #Sunspot.remove_all!
+    Sunspot.remove_all!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: 0.0.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.23
+        version: 0.0.24
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.24
+        version: 0.0.27
 - !ruby/object:Gem::Dependency
   name: enju_core
   requirement: !ruby/object:Gem::Requirement
@@ -612,8 +612,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/_2r.fdt
+- spec/dummy/solr/data/test/index/_2r.fdx
+- spec/dummy/solr/data/test/index/_2r.fnm
+- spec/dummy/solr/data/test/index/_2r.frq
+- spec/dummy/solr/data/test/index/_2r.nrm
+- spec/dummy/solr/data/test/index/_2r.prx
+- spec/dummy/solr/data/test/index/_2r.tii
+- spec/dummy/solr/data/test/index/_2r.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_6n
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/accepts.rb
@@ -890,8 +898,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/_2r.fdt
+- spec/dummy/solr/data/test/index/_2r.fdx
+- spec/dummy/solr/data/test/index/_2r.fnm
+- spec/dummy/solr/data/test/index/_2r.frq
+- spec/dummy/solr/data/test/index/_2r.nrm
+- spec/dummy/solr/data/test/index/_2r.prx
+- spec/dummy/solr/data/test/index/_2r.tii
+- spec/dummy/solr/data/test/index/_2r.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_6n
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/accepts.rb