enju_leaf 1.1.0.rc3 → 1.1.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e3eea98167932846eaf29fa7605d9f0a64e34e5
-  data.tar.gz: fddd833c6f35a45a55b59063018a53cbf121a40f
+  metadata.gz: baefdbbfe33d9dec160ba06c822e62bdf204e019
+  data.tar.gz: 014dc99c9485bf5a02a84014f0100e4a8291f5ff
 SHA512:
-  metadata.gz: f748cf7b69cd91563fcf07b1dd7879cb358a5d82bd9b6dd22e260d550d581ee7810608e682fdaccfaa7e648db8c5043ef2b1d41d1696625a70c7950f53d3d1ac
-  data.tar.gz: 97e8b29bc6765aae5d6ef1e890e4a2a344bf44d71ccbdfa7497aa485cc1c720b4352c91d90fa0a9ecbaa9cc296efbf77b5ce011b1f314da5ef7a479773b2d0c7
+  metadata.gz: fa869125065c2bb8979e0c094adcba997848447cd68f96033668ea628552df6e3d2b656ac42e1a70a76604d69a1cf6d9e7761dfa9501366ff40050a6aed58e8e
+  data.tar.gz: 63ad27f3d4c5b0e2bafdc3bbcba3f013fd462280c3c9a37aa3b3f92d123c914d13e20cc94b0cdaeec5790691647ae4631b45ba25f486223a98367ae9dbe24a2c

data/app/assets/javascripts/enju_leaf.js

@@ -1,5 +1,3 @@
-//= require jquery
-//= require jquery_ujs
 //= require jquery.ui.all
 //= require jquery.colorbox
 //= require jquery.highlight

data/app/controllers/page_controller.rb

@@ -8,8 +8,8 @@ class PageController < ApplicationController
   def index
     if user_signed_in?
       session[:user_return_to] = nil
-      #unless current_user.patron
-      #  redirect_to new_user_patron_url(current_user); return
+      #unless current_user.agent
+      #  redirect_to new_user_agent_url(current_user); return
       #end
       if defined?(EnjuBookmark)
         @tags = current_user.bookmarks.tag_counts.sort{|a,b| a.count <=> b.count}.reverse

data/app/controllers/users_controller.rb

@@ -2,7 +2,7 @@
 class UsersController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_patron, :only => :new
+  before_filter :get_agent, :only => :new
   before_filter :store_location, :only => [:index]
   before_filter :clear_search_sessions, :only => [:show]
   after_filter :solr_commit, :only => [:create, :update, :destroy]
@@ -56,8 +56,8 @@ class UsersController < ApplicationController
     end
 
     session[:user_return_to] = nil
-    #unless @user.patron
-    #  redirect_to new_user_patron_url(@user); return
+    #unless @user.agent
+    #  redirect_to new_user_agent_url(@user); return
     #end
     if defined?(EnjuBookmark)
       @tags = @user.bookmarks.tag_counts.sort{|a,b| a.count <=> b.count}.reverse
@@ -80,17 +80,17 @@ class UsersController < ApplicationController
     @user = User.new
     prepare_options
     @user_groups = UserGroup.all
-    if @patron.try(:user)
+    if @agent.try(:user)
       flash[:notice] = t('page.already_activated')
-      redirect_to @patron
+      redirect_to @agent
       return
     end
-    @user.patron_id = @patron.id if @patron
+    @user.agent_id = @agent.id if @agent
     @user.library = current_user.library
     @user.locale = current_user.locale
   end
 
-  # GET /patrons/1/edit
+  # GET /agents/1/edit
   def edit
     if @user == current_user
       redirect_to edit_my_account_url

data/app/views/layouts/patrons.html.erb

@@ -5,8 +5,8 @@
   <title><%= title(controller.controller_name) %></title>
   <%= render 'page/include' %>
   <%- if controller.action_name == 'index' -%>
-    <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss', :page => nil, :commit => nil, :only_path => true)), :title => (t('patron.library_group_patron', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
-    <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom', :page => nil, :commit => nil, :only_path => true)), :title => (t('patron.library_group_patron', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
+    <%= auto_discovery_link_tag(:rss, url_for(params.merge(:format => 'rss', :page => nil, :commit => nil, :only_path => true)), :title => (t('agent.library_group_agent', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.merge(:format => 'atom', :page => nil, :commit => nil, :only_path => true)), :title => (t('agent.library_group_agent', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
   <%- end -%>
 </head>
 <body>

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

@@ -28,7 +28,15 @@
             <%= link_to checkout.item.item_identifier, checkout.item %><br />
             (<%= link_to checkout.item.manifestation.original_title, checkout.item.manifestation %>)
           </td>
-          <td><%=l checkout.due_date, :formats => :only_date %></td>
+          <td>
+            <%=l checkout.due_date, :formats => :only_date %>
+            <br />
+            <%- if can? :update, checkout -%>
+              <% unless checkout.checkin %>
+                (<%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>)
+              <% end %>
+            <%- end -%>
+          </td>
         </tr>
       <% end %>
     </table>

data/app/views/page/_menu.html.erb

@@ -106,7 +106,7 @@
         <%- if user_signed_in? -%>
           <%- if current_user.has_role?('Librarian') -%>
             <li><%= link_to t('user.management'), users_path -%></li>
-            <li><%= link_to t('page.patron_management'), patrons_path -%></li>
+            <li><%= link_to t('page.agent_management'), agents_path -%></li>
             <li><%= link_to t('page.import'), page_import_path -%></li>
            <!--
             <li><%= link_to t('page.export'), 'page/export' -%></li>

data/app/views/page/advanced_search.html.erb

@@ -13,11 +13,11 @@
       <td><%= text_field_tag 'tag' -%></td>
     </tr>
     <tr>
-      <td><label><%= t('patron.creator') -%>:</label></td>
+      <td><label><%= t('agent.creator') -%>:</label></td>
       <td><%= text_field_tag 'creator' -%></td>
     </tr>
     <tr>
-      <td><label><%= t('patron.publisher') -%>:</label></td>
+      <td><label><%= t('agent.publisher') -%>:</label></td>
       <td><%= text_field_tag 'publisher' -%></td>
     </tr>
     <tr>

data/app/views/page/configuration.html.erb

@@ -63,7 +63,7 @@
           <li><%= link_to t('activerecord.models.inventory'), inventory_files_path -%></li>
         <% end %>
         <% if defined?(EnjuResourceMerge) %>
-          <li><%= link_to t('activerecord.models.patron_merge_list'), patron_merge_lists_path -%></li>
+          <li><%= link_to t('activerecord.models.agent_merge_list'), agent_merge_lists_path -%></li>
           <li><%= link_to t('activerecord.models.series_statement_merge_list'), series_statement_merge_lists_path -%></li>
         <% end %>
       </ul>
@@ -97,11 +97,11 @@
           <li><%= link_to t('activerecord.models.circulation_status'), circulation_statuses_path -%></li>
           <li><%= link_to t('activerecord.models.use_restriction'), use_restrictions_path -%></li>
         <% end %>
-        <li><%= link_to t('activerecord.models.patron_type'), patron_types_path -%></li>
+        <li><%= link_to t('activerecord.models.agent_type'), agent_types_path -%></li>
         <li><%= link_to t('activerecord.models.language'), languages_path -%></li>
         <li><%= link_to t('activerecord.models.country'), countries_path -%></li>
         <li><%= link_to t('activerecord.models.frequency'), frequencies_path -%></li>
-        <li><%= link_to t('activerecord.models.patron_relationship_type'), patron_relationship_types_path -%></li>
+        <li><%= link_to t('activerecord.models.agent_relationship_type'), agent_relationship_types_path -%></li>
         <li><%= link_to t('activerecord.models.manifestation_relationship_type'), manifestation_relationship_types_path -%></li>
         <li><%= link_to t('activerecord.models.license'), licenses_path -%></li>
         <!--

data/app/views/page/export.html.erb

@@ -4,8 +4,8 @@
 
 <ul>
   <li>
-    <%= t('activerecord.models.patron') -%>
-    (<%= link_to 'CSV', patrons_path(:format => :csv) -%>)
+    <%= t('activerecord.models.agent') -%>
+    (<%= link_to 'CSV', agents_path(:format => :csv) -%>)
   </li>
   <% if defined?(EnjuEvent) %>
     <li>

data/app/views/page/import.html.erb

@@ -3,7 +3,7 @@
 <div id="content_list">
 
 <ul>
-  <li><%= link_to t('activerecord.models.patron'), patron_import_files_path -%>
+  <li><%= link_to t('activerecord.models.agent'), agent_import_files_path -%>
   (<%= t('activerecord.models.user') -%>)</li>
 
   <li><%= link_to t('activerecord.models.event'), event_import_files_path -%></li>

data/app/views/page/statistics.html.erb

@@ -8,8 +8,8 @@
       <th><%= t('page.note') -%></th>
     </tr>
     <tr>
-      <td><%= link_to t('activerecord.models.patron'), patrons_path -%></td>
-      <td><%= Patron.count -%></td>
+      <td><%= link_to t('activerecord.models.agent'), agents_path -%></td>
+      <td><%= Agent.count -%></td>
       <td></td>
     </tr>
     <tr>

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

@@ -24,10 +24,6 @@
       <%= link_to image_tag('icons/arrow_up.png', :size => '16x16', :alt => t('page.asc')), url_for(params.merge(:sort_by => 'created_at', :order => 'asc', :only_path => true)) -%>
       <%= link_to image_tag('icons/arrow_down.png', :size => '16x16', :alt => t('page.desc')), url_for(params.merge(:sort_by => 'created_at', :order => 'desc', :only_path => true)) -%>
     </th>
-    <% if defined?(EnjuCirculation) %>
-      <th><%= t('activerecord.models.checkout') -%></th>
-      <th><%= t('activerecord.models.reserve') -%></th>
-    <% end %>
     <th></th>
   </tr>
 
@@ -38,13 +34,6 @@
     </td>
     <td><%= user.user_number -%></td>
     <td><%= l(user.created_at) if user.created_at -%></td>
-    <% if defined?(EnjuCirculation) %>
-      <td>
-        <%= link_to t('activerecord.models.checkout'), new_basket_path(:user_number => user.user_number) unless user.user_number.blank? -%>
-        (<%= link_to t('page.checkout_history'), user_checkouts_path(user) -%>)
-      </td>
-      <td><%= link_to t('activerecord.models.reserve'), user_reserves_path(user) -%></td>
-    <% end %>
     <td>
       <%= link_to t('user.edit_account'), edit_user_path(user) -%>
     </td>

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

@@ -5,12 +5,12 @@
 <%= simple_form_for(@user, :validate => true) do |f| -%>
   <%= f.error_messages -%>
 
-  <%- if @patron -%>
+  <%- if @agent -%>
     <h2 class="resource_title">
       [P]
-      <%= link_to @patron.full_name, @patron -%>
+      <%= link_to @agent.full_name, @agent -%>
     </h2>
-    <%= f.hidden_field :patron_id -%>
+    <%= f.hidden_field :agent_id -%>
   <%- end -%>
 
   <div class="field">
@@ -80,6 +80,6 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <li><%= link_to t('page.listing', :model => t('activerecord.models.user')), users_path -%></li>
-    <li><%= link_to t('page.import'), new_patron_import_file_path -%></li>
+    <li><%= link_to t('page.import'), new_agent_import_file_path -%></li>
   </ul>
 </div>

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

@@ -30,7 +30,15 @@
             <%= link_to checkout.item.item_identifier, checkout.item %><br />
             (<%= link_to checkout.item.manifestation.original_title, checkout.item.manifestation %>)
           </td>
-          <td><%=l checkout.due_date, :formats => :only_date %></td>
+          <td>
+            <%=l checkout.due_date, :formats => :only_date %>
+            <br />
+            <%- if can? :update, checkout -%>
+              <% unless checkout.checkin %>
+                (<%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>)
+              <% end %>
+            <%- end -%>
+          </td>
         </tr>
       <% end %>
     </table>

data/config/locales/translation_en.yml

@@ -37,7 +37,7 @@ en:
         keyword_list: Keyword list
         user_number: User number
         state: State
-        patron: Patron
+        agent: Agent
         library: Library
         user_group: User group
         full_name: Full name
@@ -149,7 +149,7 @@ en:
     remove_this_facet: "Remove this facet"
     no_subject: "No subjects."
     no_tag: "No tags."
-    add_patron: "Add a patron"
+    add_agent: "Add a agent"
     total: "Total"
     sort_by: "Sort by"
     bookmarklet: "Bookmarklet"
@@ -182,7 +182,7 @@ en:
     new: "New %{model}"
     editing: "Editing %{model}"
     showing: "Showing %{model}"
-    patron_management: "Patron management"
+    agent_management: "Agent management"
     user_management: "User management"
     back_to: "Back to %{model} index"
     picture: "Picture"
@@ -265,11 +265,11 @@ en:
     from_to: "-"
     all_libraries: "All libraries"
   work:
-    patrons_work: "%{patron_name}'s works"
+    agents_work: "%{agent_name}'s works"
     library_group_work: "Works in %{library_group_name}"
     add: "Add a work"
   expression:
-    patrons_expression: "%{patron_name}'s expressions"
+    agents_expression: "%{agent_name}'s expressions"
     manifestations_expression: "Expressions in %{manifestation_title}"
     library_group_expression: "Expressions in %{library_group_name}"
     add: "Add an expression"
@@ -325,14 +325,14 @@ en:
     add_lending_policy: "Add a new lending policy"
     edit_exemplification: "Edit exemplification"
     accepted_at: "Accepted at"
-  patron:
-    library_group_patron: "Patrons of %{library_group_name}"
-    work_patron: "Creaters of %{work_title}"
-    expression_patron: "Realizers of %{expression_title}"
-    manifestation_patron: "Producers of %{manifestation_title}"
+  agent:
+    library_group_agent: "Agents of %{library_group_name}"
+    work_agent: "Creaters of %{work_title}"
+    expression_agent: "Realizers of %{expression_title}"
+    manifestation_agent: "Producers of %{manifestation_title}"
     activate_as_user: "Activate as an user"
     deactivate: "Deactivate this user"
-    add: "Add a patron"
+    add: "Add a agent"
     publication: "Publications"
     recent_publication: "Recent publications"
     all_publication: "All publications"
@@ -363,7 +363,7 @@ en:
     edit_profile: "Edit profile"
     edit_account: "Edit account"
     already_activated: "Already activated."
-    specify_patron: "Specify the patron."
+    specify_agent: "Specify the agent."
     wrong_password: "Wrong password."
     password_mismatch: "Password mismatch."
     cannot_destroy_myself: "You can't destroy yourself."
@@ -371,7 +371,7 @@ en:
     last_librarian: "This user is the last librarian in this system."
     only_administrator_can_destroy: "Only administrators can destroy this user."
     this_user_has_checked_out_item: "This user has checked-out items."
-    patron_profile: "Patron profile"
+    agent_profile: "Agent profile"
     set_auto_generated_password: "Set auto-generated password"
     history: "History"
     account_management: "Account management"

data/config/locales/translation_ja.yml

@@ -33,7 +33,7 @@ ja:
         keyword_list: キーワードリスト
         user_number: 利用者番号
         state: 状態
-        patron: 人物・団体
+        agent: 人物・団体
         library: 所属館
         user_group: ユーザグループ
         full_name: 氏名
@@ -134,7 +134,7 @@ ja:
     remove_this_facet: "この絞り込みを解除する"
     no_subject: "件名はついていません。"
     no_tag: "タグはついていません。"
-    add_patron: "人物・団体を追加する"
+    add_agent: "人物・団体を追加する"
     total: "合計"
     sort_by: "次の項目で並べ替える"
     bookmarklet: "ブックマークレット"
@@ -166,7 +166,7 @@ ja:
     new: "%{model}の新規作成"
     editing: "%{model}の編集"
     showing: "%{model}の表示"
-    patron_management: "人物・団体の管理"
+    agent_management: "人物・団体の管理"
     user_management: "利用者の管理"
     back_to: "%{model}の一覧に戻る"
     picture: "画像"
@@ -243,11 +243,11 @@ ja:
     to: "から"
     all_libraries: "全ての図書館"
   work:
-    patron_work: "%{patron_name} の書いた資料"
+    agent_work: "%{agent_name} の書いた資料"
     library_group_work: "%{library_group_name} にある書いた資料"
     add: "書いた資料を追加する"
   expression:
-    patron_expression: "%{patron_name} の協力した資料"
+    agent_expression: "%{agent_name} の協力した資料"
     manifestations_expression: "%{manifestation_title} に含まれる協力した資料"
     library_group_expression: "%{library_group_name} にある協力した資料"
     add: "協力した資料を追加する"
@@ -262,7 +262,7 @@ ja:
     edit_publisher: "出版者を編集"
     edit_expression: "協力した資料を編集"
     edit_item: "所蔵を編集"
-    patron_manifestation: "%{patron_name} の資料"
+    agent_manifestation: "%{agent_name} の資料"
     expressions_manifestation: "%{expression_title} の出版した資料"
     library_group_manifestation: "%{library_group_name} にある資料"
     reserve_this: "この資料を予約する"
@@ -303,11 +303,11 @@ ja:
     add_lending_policy: "貸出規則の追加"
     edit_exemplification: "書誌の付け替え"
     accepted_at: "受入時刻"
-  patron:
-    library_group_patron: "%{library_group_name} の人物・団体"
-    work_patron: "%{work_title} の著作者"
-    expression_patron: "%{expression_title} の編者"
-    manifestation_patron: "%{manifestation_title} の出版者"
+  agent:
+    library_group_agent: "%{library_group_name} の人物・団体"
+    work_agent: "%{work_title} の著作者"
+    expression_agent: "%{expression_title} の編者"
+    manifestation_agent: "%{manifestation_title} の出版者"
     activate_as_user: "利用者として登録する"
     deactivate: "利用者登録を解除する"
     add: "人物・団体を追加する"
@@ -339,7 +339,7 @@ ja:
     edit_profile: "プロフィールの編集"
     edit_account: "アカウント情報の編集"
     already_activated: "すでに利用者として登録されています。"
-    specify_patron: "人物・団体を指定してください。"
+    specify_agent: "人物・団体を指定してください。"
     wrong_password: "パスワードが間違っています。"
     password_mismatch: "パスワードが一致しません。"
     cannot_destroy_myself: "自分自身を削除することはできません。"
@@ -347,7 +347,7 @@ ja:
     last_librarian: "この利用者はシステム上の最後の図書館員です。"
     only_administrator_can_destroy: "この利用者は管理者でなければ削除できません。"
     this_user_has_checked_out_item: "この利用者は貸出中の資料があります。"
-    patron_profile: "人物・団体のプロフィール"
+    agent_profile: "人物・団体のプロフィール"
     set_auto_generated_password: "自動生成したパスワードを設定する"
     history: "履歴"
     account_management: "アカウント管理"

data/lib/enju_leaf/user.rb

@@ -22,7 +22,7 @@ module EnjuLeaf
         scope :administrators, where('roles.name = ?', 'Administrator').includes(:role)
         scope :librarians, where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian').includes(:role)
         scope :suspended, where('locked_at IS NOT NULL')
-        #has_one :patron, :dependent => :destroy
+        #has_one :agent, :dependent => :destroy
         if defined?(EnjuBiblio)
           has_many :import_requests
           has_many :picture_files, :as => :picture_attachable, :dependent => :destroy
@@ -33,7 +33,7 @@ module EnjuLeaf
         belongs_to :user_group
         belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id' #, :validate => true
         has_many :export_files if defined?(EnjuExport)
-        #has_one :patron_import_result
+        #has_one :agent_import_result
         accepts_nested_attributes_for :user_has_role
 
         validates :username, :presence => true, :uniqueness => true, :format => {:with => /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\Z/}, :allow_blank => true
@@ -49,12 +49,12 @@ module EnjuLeaf
         end
 
         validates_presence_of     :email, :email_confirmation, :on => :create, :if => proc{|user| !user.operator.try(:has_role?, 'Librarian')}
-        validates_associated :user_group, :library #, :patron
+        validates_associated :user_group, :library #, :agent
         validates_presence_of :user_group, :library, :locale #, :user_number
         validates :user_number, :uniqueness => true, :format => {:with => /\A[0-9A-Za-z_]+\Z/}, :allow_blank => true
         validates_confirmation_of :email, :on => :create, :if => proc{|user| !user.operator.try(:has_role?, 'Librarian')}
 
-        before_validation :set_role_and_patron, :on => :create
+        before_validation :set_role_and_agent, :on => :create
         before_validation :set_lock_information
         before_destroy :check_role_before_destroy
         before_save :check_expiration
@@ -70,7 +70,7 @@ module EnjuLeaf
         searchable do
           text :username, :email, :note, :user_number
           text :name do
-            #patron.name if patron
+            #agent.name if agent
           end
           string :username
           string :email
@@ -90,7 +90,7 @@ module EnjuLeaf
           :zip_code, :address, :telephone_number, :fax_number, :address_note,
           :operator, :password_not_verified,
           :update_own_account, :auto_generated_password,
-          :locked, :current_password #, :patron_id
+          :locked, :current_password #, :agent_id
 
         paginates_per 10
 
@@ -120,11 +120,11 @@ module EnjuLeaf
         end
       end
 
-      def set_role_and_patron
+      def set_role_and_agent
         self.required_role = Role.where(:name => 'Librarian').first
         self.locale = I18n.default_locale.to_s
-        #unless self.patron
-        #  self.patron = Patron.create(:full_name => self.username) if self.username
+        #unless self.agent
+        #  self.agent = Agent.create(:full_name => self.username) if self.username
         #end
       end
 
@@ -226,9 +226,9 @@ module EnjuLeaf
         end
       end
 
-      #def patron
-      #  LocalPatron.new({:username => username})
-      #end
+      def patron
+        LocalPatron.new({:username => username})
+      end
 
       def full_name
         username

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc3"
+  VERSION = "1.1.0.rc4"
 end

data/lib/enju_leaf.rb

@@ -166,7 +166,7 @@ module EnjuLeaf
 
       unless params[:mode] == "add"
         expression = @expression
-        patron = @patron
+        agent = @agent
         manifestation = @manifestation
         reservable = @reservable
         carrier_type = params[:carrier_type]
@@ -179,7 +179,7 @@ module EnjuLeaf
         end
 
         search.build do
-          with(:publisher_ids).equal_to patron.id if patron
+          with(:publisher_ids).equal_to agent.id if agent
           with(:original_manifestation_ids).equal_to manifestation.id if manifestation
           with(:reservable).equal_to reservable unless reservable.nil?
           unless carrier_type.blank?

data/lib/generators/enju_leaf/setup/setup_generator.rb

@@ -21,10 +21,13 @@ ActiveSupport::Inflector.inflections do |inflect|
 end
 EOS
     inject_into_file 'config/environments/development.rb',
-      " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
+      "  config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
+      :after => "::Application.configure do\n"
+    inject_into_file 'config/environments/test.rb',
+      "  config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
       :after => "::Application.configure do\n"
     inject_into_file 'config/environments/production.rb',
-      " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
+      "  config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
       :after => "::Application.configure do\n"
     generate("devise:install")
     generate("devise", "User")
@@ -39,7 +42,7 @@ EOS
     gsub_file 'app/models/user.rb', /, :registerable,$/, ', #:registerable,'
     gsub_file 'app/models/user.rb', /, :trackable, :validatable$/, <<EOS
 , :trackable, #:validatable, 
-    :lockable, :lock_strategy => :none, :unlock_strategy => :none
+      :lockable, :lock_strategy => :none, :unlock_strategy => :none
   enju_leaf_user_model
 EOS
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
@@ -79,6 +82,10 @@ use Rack::Protection, :except => [:escaped_params, :json_csrf, :http_origin, :se
 EOS
     end
     generate("sunspot_rails:install")
+    generate("kaminari:config")
+    gsub_file 'config/initializers/kaminari_config.rb',
+      /# config.default_per_page = 25$/,
+      "config.default_per_page = 10"
     remove_file "public/index.html"
     remove_file "app/views/layouts/application.html.erb"
   end

data/spec/dummy/db/migrate/001_create_patrons.rb

@@ -1,6 +1,6 @@
 class CreatePatrons < ActiveRecord::Migration
   def change
-    create_table :patrons do |t|
+    create_table :agents do |t|
       t.integer :user_id
       t.string :last_name
       t.string :middle_name
@@ -35,7 +35,7 @@ class CreatePatrons < ActiveRecord::Migration
       t.datetime :date_of_death
       t.integer :language_id, :default => 1, :null => false
       t.integer :country_id, :default => 1, :null => false
-      t.integer :patron_type_id, :default => 1, :null => false
+      t.integer :agent_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
@@ -44,10 +44,10 @@ class CreatePatrons < ActiveRecord::Migration
       t.text :email
       t.text :url
     end
-    add_index :patrons, :user_id, :unique => true
-    add_index :patrons, :language_id
-    add_index :patrons, :country_id
-    add_index :patrons, :required_role_id
-    add_index :patrons, :full_name
+    add_index :agents, :user_id, :unique => true
+    add_index :agents, :language_id
+    add_index :agents, :country_id
+    add_index :agents, :required_role_id
+    add_index :agents, :full_name
   end
 end

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -1,12 +1,12 @@
 class CreateOwns < ActiveRecord::Migration
   def change
     create_table :owns do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :item, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :patron_id
+    add_index :owns, :agent_id
     add_index :owns, :item_id
   end
 end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -1,12 +1,12 @@
 class CreateCreates < ActiveRecord::Migration
   def change
     create_table :creates do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :work, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :patron_id
+    add_index :creates, :agent_id
     add_index :creates, :work_id
   end
 end

data/spec/dummy/db/migrate/047_create_produces.rb

@@ -1,12 +1,12 @@
 class CreateProduces < ActiveRecord::Migration
   def change
     create_table :produces do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :manifestation, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :produces, :patron_id
+    add_index :produces, :agent_id
     add_index :produces, :manifestation_id
   end
 end