enju_biblio 0.1.0.pre13 → 0.1.0.pre14

data/app/models/manifestation.rb

@@ -206,7 +206,7 @@ class Manifestation < ActiveRecord::Base
   validates :isbn, :uniqueness => true, :allow_blank => true, :unless => proc{|manifestation| manifestation.series_statement}
   validates :nbn, :uniqueness => true, :allow_blank => true
   validates :manifestation_identifier, :uniqueness => true, :allow_blank => true
-  validates :pub_date, :format => {:with => /^\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}$/}, :allow_blank => true
+  validates :pub_date, :format => {:with => /\A\[{0,1}\d+([\/-]\d{0,2}){0,2}\]{0,1}\z/}, :allow_blank => true
   validates :access_address, :url => true, :allow_blank => true, :length => {:maximum => 255}
   validate :check_isbn, :check_issn, :check_lccn, :unless => :during_import
   validates :issue_number, :numericality => {:greater_than => 0}, :allow_blank => true

data/app/models/patron.rb

@@ -42,9 +42,9 @@ class Patron < ActiveRecord::Base
   validates_associated :language, :patron_type, :country
   validates :full_name, :presence => true, :length => {:maximum => 255}
   #validates :user_id, :uniqueness => true, :allow_nil => true
-  validates :birth_date, :format => {:with => /^\d+(-\d{0,2}){0,2}$/}, :allow_blank => true
-  validates :death_date, :format => {:with => /^\d+(-\d{0,2}){0,2}$/}, :allow_blank => true
-  validates :email, :format => {:with => /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i}, :allow_blank => true
+  validates :birth_date, :format => {:with => /\A\d+(-\d{0,2}){0,2}\z/}, :allow_blank => true
+  validates :death_date, :format => {:with => /\A\d+(-\d{0,2}){0,2}\z/}, :allow_blank => true
+  validates :email, :format => {:with => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i}, :allow_blank => true
   validate :check_birth_date
   before_validation :set_role_and_name, :on => :create
   before_save :set_date_of_birth, :set_date_of_death

data/app/models/resource_import_file.rb

@@ -70,7 +70,7 @@ class ResourceImportFile < ActiveRecord::Base
 
     field = rows.first
     if [field['isbn'], field['original_title']].reject{|field| field.to_s.strip == ""}.empty?
-      raise "You should specify isbn or original_tile in the first line"
+      raise "You should specify isbn or original_title in the first line"
     end
 
     rows.each do |row|
@@ -361,7 +361,7 @@ class ResourceImportFile < ActiveRecord::Base
 
   private
   def open_import_file
-    tempfile = Tempfile.new('patron_import_file')
+    tempfile = Tempfile.new('resource_import_file')
     if Setting.uploaded_file.storage == :s3
       uploaded_file_path = resource_import.expiring_url(10)
     else

data/app/views/items/_tooltip.html.erb

@@ -0,0 +1,20 @@
+<script>
+  $(function(){
+    $('a#shelf_item_<%=item.id%>').data(
+      'powertip',
+      'shelf:<%=item.shelf.name%>'
+    );
+    $('a#library_item_<%=item.id%>').data(
+      'powertip',
+      'library:<%=item.shelf.library.name%>'
+    );
+    $('a#shelf_item_<%=item.id%>').powerTip({
+      placement:'e',
+      mouseOnToPopup:true
+    });
+    $('a#library_item_<%=item.id%>').powerTip({
+      placement:'e',
+      mouseOnToPopup:true
+    });
+  });
+</script>

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

@@ -157,5 +157,5 @@
 </div>
 
 <% if can? :update, @item %>
-  <%= render 'qtip', :item => @item %>
+  <%= render 'tooltip', :item => @item %>
 <% end %>

data/app/views/manifestations/_show_holding.html.erb

@@ -42,20 +42,18 @@
     </tr>
     <% if can? :update, item %>
       <script>
-        $(document).ready(function(){
-          $('a#item_identifier_item_<%= item.id %>').qtip({
-            position: {
-              my: 'bottom left',
-              at: 'top center'
-            },
-            content: 'item_identifier: <%= item.item_identifier %>',
-            hide: {
-              fixed: true
-            }
+        $(function(){
+          $('a#item_identifier_item_<%= item.id %>').data(
+            'powertip',
+            'item_identifier: <%= item.item_identifier %>'
+          );
+          $('a#item_identifier_item_<%= item.id %>').powerTip({
+            placement: 'e',
+            mouseOnToPopup: true
           });
         });
       </script>
-      <%= render 'items/qtip', :item => item %>
+      <%= render 'items/tooltip', :item => item %>
     <% end %>
   <%- end -%>
 </table>

data/app/views/series_statements/_periodical_facet.html.erb

@@ -4,12 +4,12 @@
     <% facet.value ? facet_periodical = true : facet_periodical = false %>
     <li>
       <%- if @periodical == facet_periodical -%><strong><%- end -%>
-      <%= link_to localized_boolean(facet.value), url_for(params.merge(:page => nil, :periodical => facet.value.to_s, :view => nil)) -%>
+      <%= link_to localized_boolean(facet.value), url_for(params.merge(:page => nil, :periodical => facet.value.to_s, :view => nil, :only_path => true)) -%>
       (<%= facet.count -%>)
       <%- if @periodical == facet_periodical -%></strong><%- end -%>
     </li>
   <%- end -%>
   <%- unless @periodical.nil? -%>
-    <li><%= link_to t('page.remove_this_facet'), params.merge(:periodical => nil, :page => nil, :view => nil) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:periodical => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
   <%- end -%>
 </ul>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre13"
+  VERSION = "0.1.0.pre14"
 end

data/spec/controllers/patron_import_files_controller_spec.rb

@@ -0,0 +1,321 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe PatronImportFilesController do
+  fixtures :all
+
+  describe "GET index" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns all patron_import_files as @patron_import_files" do
+        get :index
+        assigns(:patron_import_files).should eq(PatronImportFile.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns all patron_import_files as @patron_import_files" do
+        get :index
+        assigns(:patron_import_files).should eq(PatronImportFile.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns empty as @patron_import_files" do
+        get :index
+        assigns(:patron_import_files).should be_empty
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns empty as @patron_import_files" do
+        get :index
+        assigns(:patron_import_files).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
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        get :show, :id => 1
+        assigns(:patron_import_file).should eq(PatronImportFile.find(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        get :show, :id => 1
+        assigns(:patron_import_file).should eq(PatronImportFile.find(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        get :show, :id => 1
+        assigns(:patron_import_file).should eq(PatronImportFile.find(1))
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        get :show, :id => 1
+        assigns(:patron_import_file).should eq(PatronImportFile.find(1))
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET new" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        get :new
+        assigns(:patron_import_file).should_not be_valid
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "should not assign the requested patron_import_file as @patron_import_file" do
+        get :new
+        assigns(:patron_import_file).should_not be_valid
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "should not assign the requested patron_import_file as @patron_import_file" do
+        get :new
+        assigns(:patron_import_file).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested patron_import_file as @patron_import_file" do
+        get :new
+        assigns(:patron_import_file).should_not be_valid
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "POST create" do
+    describe "When logged in as Librarian" do
+      before(:each) do
+        @user = FactoryGirl.create(:librarian)
+        sign_in @user
+      end
+
+      it "should create patron_import_file" do
+        post :create, :patron_import_file => {:patron_import => fixture_file_upload("/../../examples/patron_import_file_sample1.tsv", 'text/csv') }
+        assigns(:patron_import_file).should be_valid
+        assigns(:patron_import_file).user.username.should eq @user.username
+        response.should redirect_to patron_import_file_url(assigns(:patron_import_file))
+      end
+
+      it "should import user" do
+        old_patrons_count = Patron.count
+        post :create, :patron_import_file => {:patron_import => fixture_file_upload("/../../examples/patron_import_file_sample2.tsv", 'text/csv') }
+        assigns(:patron_import_file).import_start
+        Patron.count.should eq old_patrons_count + 7
+        response.should redirect_to patron_import_file_url(assigns(:patron_import_file))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        @user = FactoryGirl.create(:user)
+        sign_in @user
+      end
+
+      it "should be forbidden" do
+        post :create, :patron_import_file => {:patron_import => fixture_file_upload("/../..//examples/patron_import_file_sample1.tsv", 'text/csv') }
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should be redirect to new session url" do
+        post :create, :patron_import_file => {:patron_import => fixture_file_upload("/../../examples/patron_import_file_sample1.tsv", 'text/csv') }
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "GET edit" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        patron_import_file = patron_import_files(:patron_import_file_00001)
+        get :edit, :id => patron_import_file.id
+        assigns(:patron_import_file).should eq(patron_import_file)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        patron_import_file = patron_import_files(:patron_import_file_00001)
+        get :edit, :id => patron_import_file.id
+        assigns(:patron_import_file).should eq(patron_import_file)
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns the requested patron_import_file as @patron_import_file" do
+        patron_import_file = patron_import_files(:patron_import_file_00001)
+        get :edit, :id => patron_import_file.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested patron_import_file as @patron_import_file" do
+        patron_import_file = patron_import_files(:patron_import_file_00001)
+        get :edit, :id => patron_import_file.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "should update patron_import_file" do
+        put :update, :id => patron_import_files(:patron_import_file_00003).id, :patron_import_file => { }
+        response.should redirect_to patron_import_file_url(assigns(:patron_import_file))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "should not update patron_import_file" do
+        put :update, :id => patron_import_files(:patron_import_file_00003).id, :patron_import_file => { }
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not update patron_import_file" do
+        put :update, :id => patron_import_files(:patron_import_file_00003).id, :patron_import_file => { }
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @patron_import_file = patron_import_files(:patron_import_file_00001)
+    end
+
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "destroys the requested patron_import_file" do
+        delete :destroy, :id => @patron_import_file.id
+      end
+
+      it "redirects to the patron_import_files list" do
+        delete :destroy, :id => @patron_import_file.id
+        response.should redirect_to(patron_import_files_url)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "destroys the requested patron_import_file" do
+        delete :destroy, :id => @patron_import_file.id
+      end
+
+      it "redirects to the patron_import_files list" do
+        delete :destroy, :id => @patron_import_file.id
+        response.should redirect_to(patron_import_files_url)
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "destroys the requested patron_import_file" do
+        delete :destroy, :id => @patron_import_file.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @patron_import_file.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested patron_import_file" do
+        delete :destroy, :id => @patron_import_file.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @patron_import_file.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end

data/spec/controllers/patron_import_results_controller_spec.rb

@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe PatronImportResultsController do
+  fixtures :all
+
+  describe "GET index" do
+    describe "When logged in as Administrator" do
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns all patron_import_results as @patron_import_results" do
+        get :index
+        assigns(:patron_import_results).should eq(PatronImportResult.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns all patron_import_results as @patron_import_results" do
+        get :index
+        assigns(:patron_import_results).should eq(PatronImportResult.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns empty as @patron_import_results" do
+        get :index
+        assigns(:patron_import_results).should be_empty
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns empty as @patron_import_results" do
+        get :index
+        assigns(:patron_import_results).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
+      before(:each) do
+        sign_in FactoryGirl.create(:admin)
+      end
+
+      it "assigns the requested patron_import_result as @patron_import_result" do
+        get :show, :id => 1
+        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      before(:each) do
+        sign_in FactoryGirl.create(:librarian)
+      end
+
+      it "assigns the requested patron_import_result as @patron_import_result" do
+        get :show, :id => 1
+        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        sign_in FactoryGirl.create(:user)
+      end
+
+      it "assigns the requested patron_import_result as @patron_import_result" do
+        get :show, :id => 1
+        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested patron_import_result as @patron_import_result" do
+        get :show, :id => 1
+        assigns(:patron_import_result).should eq(PatronImportResult.find(1))
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end

data/spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample2.tsv

@@ -0,0 +1,8 @@
+"full_name"	"username"	"email"	"library_short_name"	"user_group_name"	"user_number"	"note"
+"日本語の名前"	"tanabe"	"tanabe@library.example.jp"	"kamata"		100001	
+"kosuke"	"kosuke"				100001	"user_number重複"
+"tanabe"	"tanabe"				100002	"username重複"
+"tanabe2"	"tanabe2"		"kamata"		100002	"emailなし"
+"tanabe"	"tanabe3"				100003	"full_name重複"
+"tanabe"	"tanabe4"	"tanabe@library.example.jp"			100004	"email重複"
+"tanabe"	"tanabe5"					"user_numberなし"

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start 'rails'
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../spec/dummy/config/environment", __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre13
+  version: 0.1.0.pre14
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: paperclip-meta
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre
+        version: 0.1.1.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre
+        version: 0.1.1.pre2
 - !ruby/object:Gem::Dependency
   name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
@@ -354,7 +354,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
@@ -362,7 +362,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_library
   requirement: !ruby/object:Gem::Requirement
@@ -370,7 +370,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -378,7 +378,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.11.pre4
+        version: 0.1.11.pre5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -394,7 +394,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.11.pre4
+        version: 0.1.11.pre5
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +402,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre4
+        version: 0.1.2.pre7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -410,7 +410,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2.pre4
+        version: 0.1.2.pre7
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -418,7 +418,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre4
+        version: 0.1.17.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -426,23 +426,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.17.pre4
+        version: 0.1.17.pre6
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre3
 - !ruby/object:Gem::Dependency
   name: enju_book_jacket
   requirement: !ruby/object:Gem::Requirement
@@ -450,7 +450,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre2
+        version: 0.1.0.pre3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -458,7 +458,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre2
+        version: 0.1.0.pre3
 - !ruby/object:Gem::Dependency
   name: enju_export
   requirement: !ruby/object:Gem::Requirement
@@ -466,7 +466,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre
+        version: 0.1.1.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -474,7 +474,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre
+        version: 0.1.1.pre2
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
@@ -482,7 +482,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0.pre10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -490,7 +490,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre8
+        version: 0.1.0.pre10
 - !ruby/object:Gem::Dependency
   name: enju_oai
   requirement: !ruby/object:Gem::Requirement
@@ -498,7 +498,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -506,7 +506,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
@@ -514,7 +514,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -522,7 +522,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre5
+        version: 0.1.0.pre8
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 description: Bibliographic record module for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -678,9 +694,9 @@ files:
 - app/views/import_requests/show.html.erb
 - app/views/items/_form.html.erb
 - app/views/items/_observe_field.html.erb
-- app/views/items/_qtip.html.erb
 - app/views/items/_shelf_picture.html.erb
 - app/views/items/_shelf_picture.mobile.erb
+- app/views/items/_tooltip.html.erb
 - app/views/items/edit.html.erb
 - app/views/items/index.csv.erb
 - app/views/items/index.html.erb
@@ -1016,6 +1032,8 @@ files:
 - spec/controllers/manifestations_controller_spec.rb
 - spec/controllers/medium_of_performances_controller_spec.rb
 - spec/controllers/owns_controller_spec.rb
+- spec/controllers/patron_import_files_controller_spec.rb
+- spec/controllers/patron_import_results_controller_spec.rb
 - spec/controllers/patron_relationship_types_controller_spec.rb
 - spec/controllers/patron_relationships_controller_spec.rb
 - spec/controllers/patron_types_controller_spec.rb
@@ -1070,7 +1088,6 @@ files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/032_create_checkins.rb
 - spec/dummy/db/migrate/033_create_checkouts.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
@@ -1141,7 +1158,6 @@ files:
 - spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
-- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1153,6 +1169,7 @@ files:
 - spec/dummy/lib/plugins.rb
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_delete_file.tsv
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample1.tsv
+- spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample2.tsv
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample3.tsv
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_update_file.tsv
 - spec/dummy/private/system/picture_files/pictures/000/000/005/medium/spinner.gif
@@ -1164,12 +1181,6 @@ files:
 - spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv
 - spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv
 - spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/update_series_statement.tsv
-- spec/dummy/private/system/resource_imports/4/original/isbn_sample.txt
-- spec/dummy/private/system/resource_imports/4/original/item_delete_file.tsv
-- spec/dummy/private/system/resource_imports/4/original/item_update_file.tsv
-- spec/dummy/private/system/resource_imports/4/original/resource_import_file_sample1.tsv
-- spec/dummy/private/system/resource_imports/4/original/resource_import_file_sample2.tsv
-- spec/dummy/private/system/resource_imports/4/original/update_series_statement.tsv
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -1191,9 +1202,11 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_bf9
+- spec/dummy/solr/data/test/index/segments_hoi
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
+- spec/dummy/tmp/cache/4F7/F90/default_role
+- spec/dummy/tmp/cache/6E4/420/search_engine_all
 - spec/factories/accepts.rb
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb
@@ -1408,7 +1421,7 @@ files:
 - spec/views/series_statement_relationships/index.html.erb_spec.rb
 - spec/views/series_statement_relationships/new.html.erb_spec.rb
 - spec/views/series_statement_relationships/show.html.erb_spec.rb
-homepage: https://github.com/nabeta/enju_biblio
+homepage: https://github.com/next-l/enju_biblio
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -1420,6 +1433,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4212379406218920042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1455,6 +1471,8 @@ test_files:
 - spec/controllers/manifestations_controller_spec.rb
 - spec/controllers/medium_of_performances_controller_spec.rb
 - spec/controllers/owns_controller_spec.rb
+- spec/controllers/patron_import_files_controller_spec.rb
+- spec/controllers/patron_import_results_controller_spec.rb
 - spec/controllers/patron_relationship_types_controller_spec.rb
 - spec/controllers/patron_relationships_controller_spec.rb
 - spec/controllers/patron_types_controller_spec.rb
@@ -1509,7 +1527,6 @@ test_files:
 - spec/dummy/config/locales/ja.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/032_create_checkins.rb
 - spec/dummy/db/migrate/033_create_checkouts.rb
 - spec/dummy/db/migrate/035_create_reserves.rb
@@ -1580,7 +1597,6 @@ test_files:
 - spec/dummy/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb
 - spec/dummy/db/migrate/20120424103932_add_librarian_id_to_checked_item.rb
 - spec/dummy/db/migrate/20120510140958_add_closed_to_shelf.rb
-- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/plugins/ext/event-calendar.rb
@@ -1592,6 +1608,7 @@ test_files:
 - spec/dummy/lib/plugins.rb
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_delete_file.tsv
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample1.tsv
+- spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample2.tsv
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_import_file_sample3.tsv
 - spec/dummy/private/system/patron_import_files/patron_imports/000/000/004/original/patron_update_file.tsv
 - spec/dummy/private/system/picture_files/pictures/000/000/005/medium/spinner.gif
@@ -1603,12 +1620,6 @@ test_files:
 - spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample1.tsv
 - spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/resource_import_file_sample2.tsv
 - spec/dummy/private/system/resource_import_files/resource_imports/000/000/004/original/update_series_statement.tsv
-- spec/dummy/private/system/resource_imports/4/original/isbn_sample.txt
-- spec/dummy/private/system/resource_imports/4/original/item_delete_file.tsv
-- spec/dummy/private/system/resource_imports/4/original/item_update_file.tsv
-- spec/dummy/private/system/resource_imports/4/original/resource_import_file_sample1.tsv
-- spec/dummy/private/system/resource_imports/4/original/resource_import_file_sample2.tsv
-- spec/dummy/private/system/resource_imports/4/original/update_series_statement.tsv
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -1630,9 +1641,11 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_bf9
+- spec/dummy/solr/data/test/index/segments_hoi
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
+- spec/dummy/tmp/cache/4F7/F90/default_role
+- spec/dummy/tmp/cache/6E4/420/search_engine_all
 - spec/factories/accepts.rb
 - spec/factories/basket.rb
 - spec/factories/carrier_type.rb

data/app/views/items/_qtip.html.erb

@@ -1,25 +0,0 @@
-  <script>
-    $(document).ready(function(){
-      $('a#shelf_item_<%= item.id %>').qtip({
-        position: {
-          my: 'bottom left',
-          at: 'top center'
-        },
-        content: 'shelf: <%= item.shelf.name %>',
-        hide: {
-          fixed: true
-        }
-      });
-      $('a#library_item_<%= item.id %>').qtip({
-        position: {
-          my: 'bottom left',
-          at: 'top center'
-        },
-        content: 'library: <%= item.shelf.library.name %>',
-        hide: {
-          fixed: true
-        }
-      });
-    });
-  </script>
-

data/spec/dummy/private/system/resource_imports/4/original/isbn_sample.txt

@@ -1,3 +0,0 @@
-isbn	library_short_name
-invalid
-9784873113647

data/spec/dummy/private/system/resource_imports/4/original/item_delete_file.tsv

@@ -1,11 +0,0 @@
-"item_identifier"
-"00001"
-"00002"
-"00003"
-"00004"
-"00005"
-"00006"
-"00007"
-"00008"
-"00009"
-"00010"

data/spec/dummy/private/system/resource_imports/4/original/item_update_file.tsv

@@ -1,4 +0,0 @@
-item_identifier	original_title	creator	publisher	subject	acquired_at
-"00001"		たなべ// こうすけ	test1	test1// test2	
-"00002"			test2		
-"00003"	テスト3				2012-01-01

data/spec/dummy/private/system/resource_imports/4/original/resource_import_file_sample1.tsv

@@ -1,19 +0,0 @@
-manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
-資料ID	タイトル	注記	タイトルよみ	代替タイトル	定期刊行物フラグ	シリーズ番号	シリーズタイトル	シリーズタイトルよみ	著者	著者よみ	出版者	出版者よみ	出版日	巻	版	isbn	issn	販売価格	受入価格	高さ	書架名	個別資料ID	nbn	lccn	件名			インポート省略
-	test1	○ identifierなし、item_identifierなし							test	てすと	test2			invalid														
-	test2	○ identifierなし、item_identifierあり							test||author//test1||illustrator				2001									10101				Public fund	Example store	
-101	test3	× ダミー							test		test2															Public fund	Example store	適当な値
-101	test3	○ identifierあり、item_identifierなし					主シリーズ//副シリーズ//1	しゅしりーず//ふくしりーず//いち	test		test2																	
-102	test4	○ identifierあり、item_identifierあり							test1		test		2001-1									10102						
-101	“test 5”	△ identifier重複、item_identifier非重複							test1||author//test2||illustrator	てすと1//てすと2	test											10103					Example store	
-102	test6	× identifier重複、item_identifier重複							test		test3											10101						
-	test7	○ ISBN不正、タイトルあり、所蔵情報あり											2001-1-1			9000000000000					first_shelf	10104				Public fund		
-		× ISBN不正、タイトルなし														22222222						10105						
-	test8	○ ISBNなし、所蔵情報あり							test		test4//test5	てすと4//てすと5						1000	0		first_shelf	11111						
-	test9	× item_identifier重複																				11111						
-		○ ISBN重複（シリーズ情報あり）、item_identifierなし														4798002062												
-		△ ISBN重複（シリーズ情報なし）、item_identifier非重複														4798002062						11112						
-		× ISBN重複、item_identifier重複														4798002062						11111						
-		× ISBN重複（13桁）、item_identifierなし														978-4798002064												
-103	"ダブル""クォート""を含む資料"	○ ダブルクォートを含む資料																										
-104	test10	○ TSV中にタイトルがあれば他の項目もTSVファイル優先							test3		test4					4797327030												

data/spec/dummy/private/system/resource_imports/4/original/resource_import_file_sample2.tsv

@@ -1,19 +0,0 @@
-manifestation_identifier	original_title	note	title_transcription	title_alternative	periodical	series_statement_identifier	series_title	series_title_transcription	creator	creator_transcription	publisher	publisher_transcription	pub_date	volume_number_string	edition	isbn	issn	manifestation_price	item_price	height	shelf	item_identifier	nbn	lccn	subject	budget_type	bookstore	dummy
-����ID	�^�C�g��	���L	�^�C�g�����	��փ^�C�g��	������s���t���O	�V���[�Y�ԍ�	�V���[�Y�^�C�g��	�V���[�Y�^�C�g�����	����	���҂��	�o�Ŏ�	�o�Ŏ҂��	�o�œ�	��	��	isbn	issn	�̔����i	������i	����	���˖�	�•ʎ���ID	nbn	lccn	����			�C���|�[�g�ȗ�
-	test1	�� identifier�Ȃ��Aitem_identifier�Ȃ�							test	�Ă���	test2			invalid														
-	test2	�� identifier�Ȃ��Aitem_identifier����							test||author//test1||illustrator				2001									10101				Public fund	Example store	
-101	test3	�~ �_�~�[							test		test2															Public fund	Example store	�K���Ȓl
-101	test3	�� identifier����Aitem_identifier�Ȃ�					��V���[�Y//���V���[�Y//1	���サ��[��//�ӂ�����[��//����	test		test2																	
-102	test4	�� identifier����Aitem_identifier����							test1		test		2001-1									10102						
-101	�gtest 5�h	�� identifier�d���Aitem_identifier��d��							test1||author//test2||illustrator	����1//����2	test											10103					Example store	
-102	test6	�~ identifier�d���Aitem_identifier�d��							test		test3											10101						
-	test7	�� ISBN�s���A�^�C�g������A������񂠂�											2001-1-1			9000000000000					first_shelf	10104				Public fund		
-		�~ ISBN�s���A�^�C�g���Ȃ�														22222222						10105						
-	test8	�� ISBN�Ȃ��A������񂠂�							test		test4//test5	�Ă���4//�Ă���5						1000	0		first_shelf	11111						
-	test9	�~ item_identifier�d��																				11111						
-		�� ISBN�d���i�V���[�Y��񂠂�j�Aitem_identifier�Ȃ�														4798002062												
-		�� ISBN�d���i�V���[�Y���Ȃ��j�Aitem_identifier��d��														4798002062						11112						
-		�~ ISBN�d���Aitem_identifier�d��														4798002062						11111						
-		�~ ISBN�d���i13���j�Aitem_identifier�Ȃ�														978-4798002064												
-103	"�_�u��""�N�H�[�g""���܂ގ���"	�� �_�u���N�H�[�g���܂ގ���																										
-104	test10	�� TSV���Ƀ^�C�g��������Α��̍��ڂ�TSV�t�@�C���D��							test3		test4					4797327030												

data/spec/dummy/private/system/resource_imports/4/original/update_series_statement.tsv

@@ -1,2 +0,0 @@
-manifestation_id	series_statement_id
-10	2