enju_leaf 1.1.0.rc15 → 1.1.0.rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2c36786a4d1988f1d7e97b655ee4a1a8b691ed
-  data.tar.gz: 7b96331440eff81045e4d5ca5c2d1513b0a08439
+  metadata.gz: 39450aed8ab4e4e97cf12f78408cbda1141aa118
+  data.tar.gz: f5b50dc4938bb00e16a9e998e0d58c387984f34b
 SHA512:
-  metadata.gz: a623d4c880c5c7e65bb302bdf2073aa1cffb5a7ade091b493aa134f85f0a00004dc1b6851987b7742b4e86cd75934c616d46dc50c30b3b59e2ef566917d5e9c8
-  data.tar.gz: 19069d34b47a78767df3ab5cd0ccc082e3194654eced6ca385d37608ee33ed708cc952f514c1a339be7e3592db2498cbac227f67b97890eae8b4c830fb935aa3
+  metadata.gz: db43ab43a91a071fe6fc284e07878be2197ea5f629016c78eafc84d91d6b7b2bdf2197cfe0b6b0bb14f39ce2c07f4aac3f87d615cec7f48048c6f7b07cb7f9f8
+  data.tar.gz: d217264a96f8976dcb0c746b22d33f3e1d8054b82137a7a51afdb01662d6de8d67d1d02d593f4ff4c3571e37b7c3c05cd0b06beab0749da2c0a3215d9963c870

data/README.rdoc

@@ -1,7 +1,7 @@
 = Next-L Enju Leaf
-
 {<img src="https://travis-ci.org/next-l/enju_leaf.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_leaf]
-{<img src="https://gemnasium.com/next-l/enju_leaf.png" alt="Dependency Status" />}[https://gemnasium.com/next-l/enju_leaf]
+{<img src="https://coveralls.io/repos/next-l/enju_leaf/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_leaf?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_leaf/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_leaf/1.1]
 
 Next-L Enju Leaf は、{Project Next-L}[http://www.next-l.jp] で開発している図書館管理システムです。
 

data/app/assets/javascripts/mobile.js

@@ -1,4 +1,4 @@
 //= require jquery
 //= require jquery_ujs
-//= require jquery.mobile-1.4.3
+//= require jquery.mobile-1.4.4
 //= require jquery.colorbox

data/app/assets/stylesheets/mobile.css

@@ -3,6 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require jquery.mobile-1.4.3
+ *= require jquery.mobile-1.4.4
  *= require enju_mobile
 */

data/app/controllers/my_accounts_controller.rb

@@ -40,7 +40,7 @@ class MyAccountsController < ApplicationController
 
       if saved
         if @profile.save
-          sign_in(current_user, :bypass => true)
+          sign_in(current_user, bypass: true)
           format.html { redirect_to my_account_url, notice: t('controller.successfully_updated', model: t('activerecord.models.user')) }
           format.json { head :no_content }
         else
@@ -69,10 +69,10 @@ class MyAccountsController < ApplicationController
 
   private
   def prepare_options
-    @user_groups = UserGroup.all
-    @roles = Role.all
-    @libraries = Library.all_cache
-    @languages = Language.all_cache
+    @user_groups = UserGroup.order(:position)
+    @roles = Role.order(:position)
+    @libraries = Library.order(:position)
+    @languages = Language.order(:position)
     if current_user.active_for_authentication?
       current_user.locked = '0'
     else

data/app/controllers/page_controller.rb

@@ -14,11 +14,15 @@ class PageController < ApplicationController
       if defined?(EnjuBookmark)
         @tags = current_user.bookmarks.tag_counts.sort{|a,b| a.count <=> b.count}.reverse
       end
-      @manifestation = Manifestation.pickup(current_user.keyword_list.to_s.split.sort_by{rand}.first) rescue nil
+      if current_user.profile
+        @manifestation = Manifestation.pickup(current_user.profile.keyword_list.to_s.split.sort_by{rand}.first, current_user)
+      else
+        @manifestation = nil
+      end
     else
       if defined?(EnjuBookmark)
         # TODO: タグ下限の設定
-        #@tags = Tag.all(:limit => 50, :order => 'taggings_count DESC')
+        #@tags = Tag.all(limit: 50, order: 'taggings_count DESC')
         @tags = Bookmark.tag_counts.sort{|a,b| a.count <=> b.count}.reverse[0..49]
       end
       @manifestation = Manifestation.pickup rescue nil
@@ -56,6 +60,10 @@ class PageController < ApplicationController
     @title = t('page.configuration')
   end
 
+  def system_information
+    @specs = Bundler.load.specs.sort
+  end
+
   def import
     @title = t('page.import')
   end

data/app/models/profile.rb

@@ -1,9 +1,10 @@
 class Profile < ActiveRecord::Base
-  attr_accessible :full_name, :keyword_list, :locale
-  attr_accessible :full_name, :user_number, :library_id, :keyword_list, :note,
+  attr_accessible :full_name, :full_name_transcription, :keyword_list, :locale
+  attr_accessible :full_name, :full_name_transcription, :user_number,
+    :library_id, :keyword_list, :note,
     :user_group_id, :user_id, :locale, :required_role_id, :expired_at,
     :user_attributes,
-    :save_checkout_history,
+    :save_checkout_history, :birth_date,
     as: :admin
 
   enju_circulation_profile_model if defined?(EnjuCirculation)
@@ -20,9 +21,12 @@ class Profile < ActiveRecord::Base
   validates_associated :user
   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 :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\Z/ }, allow_blank: true
+
+  attr_accessor :birth_date
 
   searchable do
-    text :user_number, :full_name, :note
+    text :user_number, :full_name, :full_name_transcription, :note
     string :user_number
     text :username do
       user.try(:username)
@@ -44,7 +48,7 @@ class Profile < ActiveRecord::Base
   end
 
   before_validation :set_role_and_agent, on: :create
-  before_save :set_expired_at
+  before_save :set_expired_at, :set_date_of_birth
   accepts_nested_attributes_for :user
 
   def set_role_and_agent
@@ -59,6 +63,12 @@ class Profile < ActiveRecord::Base
       end
     end
   end
+
+  def set_date_of_birth
+    self.date_of_birth = Time.zone.parse(birth_date) if birth_date
+  rescue ArgumentError
+    nil
+  end
 end
 
 # == Schema Information

data/app/models/user_export_file.rb

@@ -4,7 +4,7 @@ class UserExportFile < ActiveRecord::Base
   include ExportFile
   enju_export_file_model
   has_attached_file :user_export
-  validates_attachment_content_type :user_export, :content_type => /\Atext\/plain\Z/
+  validates_attachment_content_type :user_export, content_type: /\Atext\/plain\Z/
 
   has_many :user_export_file_transitions
 

data/app/models/user_import_file.rb

@@ -42,7 +42,7 @@ class UserImportFile < ActiveRecord::Base
 
   def import
     transition_to!(:started)
-    num = {:user_imported => 0, :user_found => 0, :failed => 0}
+    num = { user_imported: 0, user_found: 0, failed: 0 }
     rows = open_import_file(create_import_temp_file(user_import))
     row_num = 1
 
@@ -110,7 +110,7 @@ class UserImportFile < ActiveRecord::Base
 
   def modify
     transition_to!(:started)
-    num = {:user_updated => 0, :user_not_found => 0, :failed => 0}
+    num = { user_updated: 0, user_not_found: 0, failed: 0 }
     rows = open_import_file(create_import_temp_file(user_import))
     row_num = 1
 

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

@@ -60,6 +60,16 @@
   </div>
 
   <div id="right_pane_detail">
+    <div class="field">
+      <%= f.label :full_name -%><br />
+      <%= f.text_field :full_name -%>
+    </div>
+
+    <div class="field">
+      <%= f.label :full_name_transcription -%><br />
+      <%= f.text_field :full_name_transcription -%>
+    </div>
+
     <%- if current_user.has_role?('Librarian') -%>
       <div class="field">
         <%= f.label t('activerecord.models.user_group') -%><br />

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

@@ -7,18 +7,16 @@
 
   <%= render partial: 'edit_credential', locals: {f: f, profile: @profile} -%>
 
-  <div class="actions">
+  <div class="actions" style="clear: both">
     <%= f.submit %>
   </div>
-<div style="clear: both">
   <div class="field">
     <%= f.label :keyword_list -%><br />
     <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
   </div>
 
   <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
-</div>
-  <%- end -%>
+<%- end -%>
 
 </div>
 </div>

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

@@ -14,10 +14,10 @@
         <br />
         <% if defined?(EnjuMessage) %>
           <%= link_to image_tag('icons/email.png', size: '16x16', alt: t('activerecord.models.message')), messages_path %>
-          <% if current_user.received_messages.unread.size > 0 %>
-            <%= link_to "(#{h(current_user.received_messages.unread.size)})", messages_path %>
+          <% if messages_count(current_user) > 0 %>
+            <%= link_to "(#{messages_count(current_user)})", messages_path %>
           <% else %>
-            (<%= current_user.received_messages.unread.size %>)
+            (<%= messages_count(current_user) %>)
           <% end %>
         <% end %>
         <%= link_to t('page.account'), my_account_path -%>

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

@@ -40,6 +40,9 @@
             <% if defined?(EnjuNdl) %>
               <li><%= link_to t('enju_ndl.import_from_ndl_search'), ndl_books_path -%></li>
             <% end %>
+	    <% if defined?(EnjuNii) %>
+	      <li><%= link_to t('enju_nii.import_from_cinii_books'), cinii_books_path -%></li>
+	    <% end %>
 	    <% if defined?(EnjuLoc) %>
 	      <li><%= link_to t('enju_loc.import_from_loc_search'), loc_search_index_path -%></li>
 	    <% end %>

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

@@ -99,7 +99,9 @@
     <h2 class="title"><%= t('page.form') -%></h2>
     <div class="config_box">
       <ul>
+        <!--
         <li><%= link_to t('activerecord.models.form_of_work'), form_of_works_path -%></li>
+        -->
         <li><%= link_to t('activerecord.models.carrier_type'), carrier_types_path -%></li>
         <li><%= link_to t('activerecord.models.content_type'), content_types_path -%></li>
         <% if defined?(EnjuCirculation) %>
@@ -128,6 +130,7 @@
       <ul>
         <% if current_user.has_role?('Administrator') %>
           <li><%= link_to 'Resque', resque_path %></li>
+          <li><%= link_to t('page.system_information'), page_system_information_path %></li>
         <% end %>
       </ul>
     </div>

data/app/views/page/opensearch.xml.builder

@@ -8,7 +8,7 @@ xml.OpenSearchDescription(
   xml.Contact @library_group.user.email
   xml.Url type: 'text/html', template: "#{manifestations_url}?query={searchTerms}"
   xml.Url type: 'application/rss+xml', template: "#{manifestations_url(format: :rss)}?query={searchTerms}"
-  xml.Query :role => 'example', :searchTerms => 'enju'
+  xml.Query role: 'example', searchTerms: 'enju'
   xml.Language @locale.to_s
   xml.OutputEncoding 'UTF-8'
   xml.InputEncoding 'UTF-8'

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

@@ -0,0 +1,23 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.system_information') %></h1>
+<div id="content_list">
+
+  <ul>
+    <li>Environment: <%= Rails.env %></li>
+    <li>Gems:
+    <ul>
+      <% @specs.each do |spec| %>
+        <li><%= spec.name %>: <%= spec.version.to_s %></li>
+      <% end %>
+    </ul>
+    </li>
+  </ul>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.configuration'), page_configuration_path %></li>
+  </ul>
+</div>

data/app/views/profiles/_edit_credential.html.erb

@@ -43,6 +43,16 @@
   </div>
 
   <div id="right_pane_detail">
+    <div class="field">
+      <%= f.label :full_name -%><br />
+      <%= f.text_field :full_name -%>
+    </div>
+
+    <div class="field">
+      <%= f.label :full_name_transcription -%><br />
+      <%= f.text_field :full_name_transcription -%>
+    </div>
+
     <%- if current_user.has_role?('Librarian') -%>
       <div class="field">
         <%= f.label t('activerecord.models.user_group') -%><br />

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

@@ -7,18 +7,17 @@
 
   <%= render partial: 'profiles/edit_credential', locals: {f: f, profile: @profile} -%>
 
-  <div class="actions">
+  <div class="actions" style="clear: both">
     <%= f.submit %>
   </div>
-<div style="clear: both">
+
   <div class="field">
     <%= f.label :keyword_list -%><br />
     <%= f.text_area :keyword_list, class: 'resource_textarea' -%>
   </div>
 
   <%= render partial: 'profiles/edit_profile', locals: {f: f, profile: @profile} -%>
-</div>
-  <%- end -%>
+<%- end -%>
 
 </div>
 </div>

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

@@ -14,11 +14,11 @@
 
 <table class="table table-striped index">
   <tr>
+    <th><%= t('activerecord.attributes.profile.user_number') -%></th>
     <th><%= t('activerecord.attributes.user.username') -%>
       <%= link_to image_tag('icons/arrow_up.png', size: '16x16', alt: t('page.asc')), url_for(params.merge(sort_by: 'username', 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: 'username', order: 'desc', only_path: true)) -%>
     </th>
-    <th><%= t('activerecord.attributes.profile.user_number') -%></th>
     <th>
       <%= t('page.created_at') -%>
       <%= 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)) -%>
@@ -29,9 +29,6 @@
 
 <%- @profiles.each_with_index do |profile, i| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td>
-      <%= profile.user.try(:username) -%>
-    </td>
     <td>
       <% if profile.user_number %>
         <%= link_to profile.user_number, profile -%>
@@ -39,6 +36,9 @@
         <%= link_to t('profile.no_number'), profile -%>
       <% end %>
     </td>
+    <td>
+      <%= profile.user.try(:username) -%>
+    </td>
     <td><%= l(profile.created_at) -%></td>
     <td>
       <%= link_to t('page.show'), profile -%>

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

@@ -27,6 +27,16 @@
     <%= f.text_field :expired_at, class: 'date_text_field', placeholder: "#{t('page.example')}: 2011-04-12"-%>
   </div>
 
+  <div class="field">
+    <%= f.label :full_name -%><br />
+    <%= f.text_field :full_name -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :full_name_transcription -%><br />
+    <%= f.text_field :full_name_transcription -%>
+  </div>
+
   <div class="field">
     <%= f.label :user_group_id -%>
     <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>

data/config/locales/translation_en.yml

@@ -90,6 +90,8 @@ en:
         full_name: Full name
         user_number: User number
         expired_at: Expired at
+        full_name_transcription: Full name transcription
+        date_of_birth: Date of birth
 
   page:
     user_title: "Welcome %{login_name}"
@@ -283,6 +285,7 @@ en:
     manual: Manual
     cannot_parse_yaml_header: "has an invalid YAML header. You must add a space after the header's colon."
     notice: Notice
+    system_information: System information
   title:
     index: "index"
     show: "show"

data/config/locales/translation_ja.yml

@@ -90,6 +90,8 @@ ja:
         full_name: フルネーム
         user_number: 利用者番号
         expired_at: 有効期限
+        full_name_transcription: フルネーム（ヨミ）
+        date_of_birth: 生年月日
 
   page:
     user_title: "ようこそ %{login_name} さん"
@@ -268,6 +270,7 @@ ja:
     manual: マニュアル
     cannot_parse_yaml_header: "のYAMLヘッダを読み込めません。ヘッダのコロンの後には、半角スペースを含める必要があります。"
     notice: 注意
+    system_information: システムの基本的な情報の表示
   title:
     index: "一覧"
     show: "表示"

data/config/routes.rb

@@ -36,5 +36,6 @@ Rails.application.routes.draw do
   get '/page/msie_acceralator' => 'page#msie_acceralator'
   get '/page/opensearch' => 'page#opensearch'
   get '/page/statistics' => 'page#statistics'
+  get '/page/system_information' => 'page#system_information'
   get '/page/routing_error' => 'page#routing_error'
 end

data/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :user_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_import_file_id
       t.timestamps

data/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserExportFileTransitions < ActiveRecord::Migration
   def change
     create_table :user_export_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_export_file_id
       t.timestamps

data/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb

@@ -0,0 +1,5 @@
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :full_name_transcription, :text
+  end
+end

data/db/migrate/20141003182825_add_date_of_birth_to_profile.rb

@@ -0,0 +1,5 @@
+class AddDateOfBirthToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :date_of_birth, :datetime
+  end
+end

data/lib/enju_leaf/controller.rb

@@ -8,10 +8,10 @@ module EnjuLeaf
 
     private
     def set_error_template
-      rescue_from CanCan::AccessDenied, :with => :render_403
-      #rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-      rescue_from Errno::ECONNREFUSED, :with => :render_500
-      #rescue_from ActionView::MissingTemplate, :with => :render_404_invalid_format
+      rescue_from CanCan::AccessDenied, with: :render_403
+      #rescue_from ActiveRecord::RecordNotFound, with: :render_404
+      rescue_from Errno::ECONNREFUSED, with: :render_500
+      #rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
     end
   end
 

data/lib/enju_leaf/helper.rb

@@ -112,5 +112,12 @@ module EnjuLeaf
         markdown.render(string.to_s).html_safe
       end
     end
+
+    def messages_count(user)
+      Message.search do
+        with(:receiver_id).equal_to user.id
+        with(:is_read).equal_to false
+      end.hits.total_entries
+    end
   end
 end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc15"
+  VERSION = "1.1.0.rc16"
 end

data/lib/enju_leaf.rb

@@ -4,7 +4,6 @@ require "enju_leaf/controller"
 require "enju_leaf/user"
 require "enju_leaf/helper"
 require "enju_leaf/calculate_stat"
-require "enju_leaf/bookmark_url"
 require "enju_leaf/calculate_stat"
 require "enju_leaf/import_file"
 require "enju_leaf/export_file"
@@ -172,53 +171,6 @@ module EnjuLeaf
       end
     end
 
-    def make_internal_query(search)
-      # 内部的なクエリ
-      set_role_query(current_user, search)
-
-      unless params[:mode] == "add"
-        expression = @expression
-        agent = @agent
-        manifestation = @manifestation
-        reservable = @reservable
-        carrier_type = params[:carrier_type]
-        library = params[:library]
-        language = params[:language]
-        if defined?(EnjuSubject)
-          subject = params[:subject]
-          subject_by_term = Subject.where(term: params[:subject]).first
-          @subject_by_term = subject_by_term
-        end
-
-        search.build do
-          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?
-            with(:carrier_type).equal_to carrier_type
-          end
-          unless library.blank?
-            library_list = library.split.uniq
-            library_list.each do |library|
-              with(:library).equal_to library
-            end
-          end
-          unless language.blank?
-            language_list = language.split.uniq
-            language_list.each do |language|
-              with(:language).equal_to language
-            end
-          end
-          if defined?(EnjuSubject)
-            unless subject.blank?
-              with(:subject).equal_to subject_by_term.term
-            end
-          end
-        end
-      end
-      return search
-    end
-
     def solr_commit
       Sunspot.commit
     end

data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb

@@ -30,7 +30,7 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
     else
       rake("sunspot:solr:start", env: environment)
       sleep 5
-      rake("environment sunspot:reindex", env: environment)
+      rake("environment enju_leaf:reindex", env: environment)
       rake("sunspot:solr:stop", env: environment)
     end
   end

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

@@ -49,6 +49,9 @@ EOS
     gsub_file 'config/initializers/devise.rb', '# config.email_regexp = /\A[^@]+@[^@]+\z/', 'config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\Z/i'
     gsub_file 'config/initializers/devise.rb', '# config.authentication_keys = [ :email ]', 'config.authentication_keys = [ :username ]'
     gsub_file 'config/initializers/devise.rb', '# config.secret_key', 'config.secret_key'
+    gsub_file 'config/initializers/devise.rb',
+      "# config.navigational_formats = ['*/*', :html]",
+      "config.navigational_formats = ['*/*', :html, :mobile]"
     gsub_file 'app/models/user.rb', /, :registerable,$/, ', #:registerable,'
     gsub_file 'app/models/user.rb', /, :trackable, :validatable$/, <<EOS
 , :trackable, #:validatable, 
@@ -101,6 +104,12 @@ EOS
     gsub_file 'config/initializers/kaminari_config.rb',
       /# config.default_per_page = 25$/,
       "config.default_per_page = 10"
+    create_file 'config/initializers/mobile.rb' do <<"EOS"
+ActionController::Responder.class_eval do
+  alias :to_mobile :to_html
+end
+EOS
+    end
     remove_file "public/index.html"
     remove_file "app/views/layouts/application.html.erb"
   end

data/lib/generators/enju_leaf/setup/templates/Procfile

@@ -1,3 +1,3 @@
 solr: bundle exec rake sunspot:solr:run
-resque: bundle exec rake environment resque:work QUEUE=*
+resque: bundle exec rake environment resque:work QUEUE=* TERM_CHILD=1
 web: bundle exec rails s

data/lib/tasks/enju_leaf_tasks.rake

@@ -31,4 +31,10 @@ namespace :enju_leaf do
     end
     puts 'enju_leaf: The upgrade completed successfully.'
   end
+
+  desc "reindex all models"
+  task :reindex, [:batch_size, :models, :silence] => :environment do |t, args|
+    Rails::Engine.subclasses.each{|engine| engine.instance.eager_load!}
+    Rake::Task['sunspot:reindex'].execute(args)
+  end
 end

data/lib/tasks/profile.rb

@@ -10,6 +10,6 @@ def update_profile
     profile.keyword_list = user.keyword_list
     profile.locale = user.locale
     profile.note = user.note
-    profile.save
+    profile.save!
   end
 end