enju_leaf 1.1.0.rc10 → 1.1.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abf8301bf438bd48a00db3b8c08ed8892bb827cb
-  data.tar.gz: ece67d49714be04367a3fbf8e5ed8c7e41686d0c
+  metadata.gz: 0b0ced0c7c37efbcc18acbba33a9b271746cb4db
+  data.tar.gz: 248b5fa60c3f66e62c1e8d4990e9bcbe5852aec2
 SHA512:
-  metadata.gz: 5c854e5b0ee69714f5023aab0359aacf57ebb2fe2554ef61fc5d85209ff2aa9622859927b16c7cdb395912bfef36ae7f2f137c254a9c9fa59d5058e8f45660c4
-  data.tar.gz: ab3ed970a465ce237c9047752757589fb45fa9cd36bc45e77cf6874c7b9f6849e531397421196cd70f2ddcd4f6219919646f7ee580a6b7c2935ae886574d242b
+  metadata.gz: 430f7c4af4f3be4bc8010e9c73d106fd09d4d76dde7213f30c3678bc1b287f6ef7830fa3c6a2d32325e96cbe7e122aa3c65253f6d7b07947adad9aa22eb8f419
+  data.tar.gz: c858e6acea89946198177daf92149dc28b93cf046525fb7e8317c49b91c1cc993fd3615f4633ea232cc8accb73cdd4407242950e86edc48d8ca7db50c7ba3d16

data/app/assets/javascripts/enju_leaf.js

@@ -1,4 +1,4 @@
-//= require jquery.ui.all
+//= require jquery-ui
 //= require jquery.colorbox
 //= require jquery.highlight
 //= require jquery.shortcut

data/app/assets/javascripts/mobile.js

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

data/app/assets/stylesheets/enju.css

@@ -117,7 +117,6 @@ div#submenu{
   width: 190px;
   padding: 5px;
   float: left;
-  border: 1px solid #5970B2;
 }
 
 div#manifestation_book_jacket{
@@ -147,7 +146,6 @@ div#content_detail{
   width: 700px;
   float: left;
   margin-bottom: 5px;
-  border: 1px solid #5970B2;
 }
 
 div#content_list{

data/app/assets/stylesheets/enju_leaf.css

@@ -5,10 +5,10 @@
  *= require colorbox
  *= require pagination
  *= require jquery.powertip
- *= require jquery.ui.button
- *= require jquery.ui.tabs
- *= require jquery.ui.menu
+ *= require jquery-ui/button
+ *= require jquery-ui/tabs
+ *= require jquery-ui/menu
+ *= require jquery-ui/datepicker
  *= require jquery.ui.menubar
- *= require jquery.ui.datepicker
  *= require portlets
 */

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.2
+ *= require jquery.mobile-1.4.3
  *= require enju_mobile
 */

data/app/controllers/user_import_files_controller.rb

@@ -57,6 +57,9 @@ class UserImportFilesController < ApplicationController
 
     respond_to do |format|
       if @user_import_file.save
+        if @user_import_file.mode == 'import'
+          Resque.enqueue(UserImportFileQueue, @user_import_file.id)
+        end
         format.html { redirect_to @user_import_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_import_file')) }
         format.json { render :json => @user_import_file, :status => :created, :location => @user_import_file }
       else
@@ -71,6 +74,9 @@ class UserImportFilesController < ApplicationController
   def update
     respond_to do |format|
       if @user_import_file.update_attributes(params[:user_import_file])
+        if @user_import_file.mode == 'import'
+          Resque.enqueue(UserImportFileQueue, @user_import_file.id)
+        end
         format.html { redirect_to @user_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_import_file')) }
         format.json { head :no_content }
       else

data/app/controllers/user_import_results_controller.rb

@@ -1,5 +1,5 @@
 class UserImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :csv
+  respond_to :html, :json, :tsv
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy

data/app/mailers/notifier.rb

@@ -11,7 +11,7 @@ class Notifier < ActionMailer::Base
       subject = I18n.t('message.new_message_from_library', :library => LibraryGroup.system_name(message.receiver.user.locale))
     end
     if message.sender
-      @sender_name = message.sender.agent.full_name
+      @sender_name = message.sender.username
     else
       @sender_name = LibraryGroup.system_name(message.receiver.locale)
     end

data/app/models/profile.rb

@@ -13,3 +13,21 @@ class Profile < ActiveRecord::Base
     string :user_number
   end
 end
+
+# == Schema Information
+#
+# Table name: profiles
+#
+#  id               :integer          not null, primary key
+#  user_id          :integer
+#  user_group_id    :integer
+#  library_id       :integer
+#  locale           :string(255)
+#  user_number      :string(255)
+#  full_name        :text
+#  note             :text
+#  keyword_list     :text
+#  required_role_id :integer
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#

data/app/models/user_import_file.rb

@@ -1,5 +1,5 @@
 class UserImportFile < ActiveRecord::Base
-  attr_accessible :user_import, :edit_mode
+  attr_accessible :user_import, :edit_mode, :user_encoding, :mode
   include Statesman::Adapters::ActiveRecordModel
   include ImportFile
   default_scope {order('user_import_files.id DESC')}
@@ -27,6 +27,9 @@ class UserImportFile < ActiveRecord::Base
 
   has_many :user_import_file_transitions
 
+  enju_import_file_model
+  attr_accessor :mode
+
   def state_machine
     @state_machine ||= UserImportFileStateMachine.new(self, transition_class: UserImportFileTransition)
   end
@@ -34,24 +37,11 @@ class UserImportFile < ActiveRecord::Base
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
     to: :state_machine
 
-  def import_start
-    case edit_mode
-    when 'create'
-      import
-    when 'update'
-      modify
-    when 'destroy'
-      remove
-    else
-      import
-    end
-  end
-
   def import
     transition_to!(:started)
     num = {:user_imported => 0, :user_found => 0, :failed => 0}
-    rows = open_import_file
-    row_num = 2
+    rows = open_import_file(create_import_temp_file)
+    row_num = 1
 
     field = rows.first
     if [field['username']].reject{|f| f.to_s.strip == ""}.empty?
@@ -59,6 +49,7 @@ class UserImportFile < ActiveRecord::Base
     end
 
     rows.each do |row|
+      row_num += 1
       next if row['dummy'].to_s.strip.present?
       import_result = UserImportResult.create!(
         :user_import_file_id => id, :body => row.fields.join("\t")
@@ -129,12 +120,17 @@ class UserImportFile < ActiveRecord::Base
   def modify
     transition_to!(:started)
     transition_to!(:completed)
+    row_num = 1
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    transition_to!(:failed)
+    raise e
   end
 
   def remove
     transition_to!(:started)
-    reload
-    rows = open_import_file
+    row_num = 1
+    rows = open_import_file(create_import_temp_file)
 
     field = rows.first
     if [field['username']].reject{|field| field.to_s.strip == ""}.empty?
@@ -142,11 +138,16 @@ class UserImportFile < ActiveRecord::Base
     end
 
     rows.each do |row|
+      row_num += 1
       username = row['username'].to_s.strip
       user = User.where(:username => username).first
       user.destroy if user
     end
     transition_to!(:completed)
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    transition_to!(:failed)
+    raise e
   end
 
   private
@@ -154,8 +155,8 @@ class UserImportFile < ActiveRecord::Base
     UserImportFileTransition
   end
 
-  def open_import_file
-    tempfile = Tempfile.new('user_import_file')
+  def create_import_temp_file
+    tempfile = Tempfile.new(self.class.name.underscore)
     if Setting.uploaded_file.storage == :s3
       uploaded_file_path = user_import.expiring_url(10)
     else
@@ -163,20 +164,14 @@ class UserImportFile < ActiveRecord::Base
     end
     open(uploaded_file_path){|f|
       f.each{|line|
-        if defined?(CharlockHolmes::EncodingDetector)
-          begin
-            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding], universal_newline: true)
-          rescue StandardError
-            string = NKF.nkf('-w -Lu', line)
-          end
-        else
-          string = NKF.nkf('-w -Lu', line)
-        end
-        tempfile.puts(string)
+        tempfile.puts(convert_encoding(line))
       }
     }
     tempfile.close
+    tempfile
+  end
 
+  def open_import_file(tempfile)
     file = CSV.open(tempfile.path, 'r:utf-8', :col_sep => "\t")
     header = file.first
     rows = CSV.open(tempfile.path, 'r:utf-8', :headers => header, :col_sep => "\t")
@@ -194,3 +189,24 @@ class UserImportFile < ActiveRecord::Base
     Rails.logger.info "#{Time.zone.now} importing resources failed!"
   end
 end
+
+# == Schema Information
+#
+# Table name: user_import_files
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  note                     :text
+#  executed_at              :datetime
+#  state                    :string(255)
+#  user_import_file_name    :string(255)
+#  user_import_content_type :string(255)
+#  user_import_file_size    :string(255)
+#  user_import_updated_at   :datetime
+#  user_import_fingerprint  :string(255)
+#  edit_mode                :string(255)
+#  error_message            :text
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  user_encoding            :string(255)
+#

data/app/models/user_import_file_state_machine.rb

@@ -9,8 +9,8 @@ class UserImportFileStateMachine
   transition from: :pending, to: :started
   transition from: :started, to: [:completed, :failed]
 
-  before_transition(from: :pending, to: :started) do |user_import_file|
-    user_import_file.executed_at = Time.zone.now
+  after_transition(from: :pending, to: :started) do |user_import_file|
+    user_import_file.update_column(:executed_at, Time.zone.now)
   end
 
   before_transition(from: :started, to: :completed) do |user_import_file|

data/app/models/user_import_file_transition.rb

@@ -5,3 +5,16 @@ class UserImportFileTransition < ActiveRecord::Base
   belongs_to :user_import_file, inverse_of: :user_import_file_transitions
   attr_accessible :to_state, :sort_key, :metadata
 end
+
+# == Schema Information
+#
+# Table name: user_import_file_transitions
+#
+#  id                  :integer          not null, primary key
+#  to_state            :string(255)
+#  metadata            :text             default("{}")
+#  sort_key            :integer
+#  user_import_file_id :integer
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#

data/app/models/user_import_result.rb

@@ -7,3 +7,15 @@ class UserImportResult < ActiveRecord::Base
   belongs_to :user_import_file
   belongs_to :user
 end
+
+# == Schema Information
+#
+# Table name: user_import_results
+#
+#  id                  :integer          not null, primary key
+#  user_import_file_id :integer
+#  user_id             :integer
+#  body                :text
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#

data/app/views/devise/sessions/new.html.erb

@@ -1,5 +1,5 @@
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.sign_in') -%> : Next-L Enju</h1>
 <div id="content_list">
   <%= f.error_messages -%>
@@ -9,7 +9,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <p>
     <%= f.label t('activerecord.attributes.user.username') %><br />
     <%= f.text_field :username, :class => 'login_password', :autofocus => true %>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.edit_user_profile', :login_name => @user.username) -%></h1>
 <div id="content_list">
 <%= render 'page/required_field' %>
@@ -63,7 +63,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), my_account_path -%></li>
     <% if current_user.has_role?('Librarian') %>

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

@@ -1,4 +1,4 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
@@ -44,7 +44,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <% if defined?(EnjuCirculation) %>
     <ul>
       <%- current_user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>

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

@@ -1,9 +1,9 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.access_denied') -%></h1>
   <div id="content_list">
     <%= render 'page/search_form' %>
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
 </div>

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

@@ -1,9 +1,9 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.not_found') -%></h1>
   <div id="content_list">
     <%= render 'page/search_form' %>
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
 </div>

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

@@ -1,9 +1,9 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
   <h1 class="title"><%= t('page.internal_server_error') -%></h1>
   <div id="content_list">
     <%= render 'page/search_form' %>
   </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
 </div>

data/app/views/page/about.en.html.erb

@@ -1,16 +1,16 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title">About this system</h1>
 <div id="content_list">
 
 <ul>
-  <li>This integrated library system software "Next-L Enju Leaf" is developed by <a href="http://mwr.mediacom.keio.ac.jp/~tanabe/">Kosuke Tanabe</a> and <a href="http://www.next-l.jp/">Project Next-L</a>.</li>
+  <li>This integrated library system software "Next-L Enju Leaf" is developed by <a href="https://github.com/nabeta">Kosuke Tanabe</a> and <a href="http://www.next-l.jp/">Project Next-L</a>.</li>
   <li>Next-L Enju Leaf is released under MIT license. For more information, visit <a href="https://github.com/next-l/enju_leaf">our project website</a>.</li>
 </ul>
 
 <h2>Contact information</h2>
 
 <ul>
-  <li>Kosuke Tanabe: <%= mail_to 'tanabe@mwr.mediacom.keio.ac.jp', nil, :replace_at => '_at_' -%></li>
+  <li>Kosuke Tanabe: <%= mail_to 'nabeta@fastmail.fm', nil, :replace_at => '_at_' -%></li>
   <li>Project Next-L: <%= mail_to 'info@next-l.jp', nil, :replace_at => '_at_' -%></li>
 </ul>
 
@@ -49,7 +49,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><a href="http://www.next-l.jp/">Project Next-L</a></li>
     <li><a href="https://github.com/next-l/enju_leaf">this project on GitHub</a></li>

data/app/views/page/about.ja.html.erb

@@ -1,16 +1,16 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title">このシステムについて</h1>
 <div id="content_list">
 
 <ul>
-  <li>この図書館システム"Next-L Enju Leaf"は、<a href="http://mwr.mediacom.keio.ac.jp/~tanabe/">田辺浩介</a>と<a href="http://www.next-l.jp/">Project Next-L</a>によって開発されています。</li>
+  <li>この図書館システム"Next-L Enju Leaf"は、<a href="https://github.com/nabeta">田辺浩介</a>と<a href="http://www.next-l.jp/">Project Next-L</a>によって開発されています。</li>
   <li>Next-L Enju LeafはMITライセンスのもとに公開されています。詳しくは<a href="https://github.com/next-l/enju_leaf">プロジェクトのホームページ</a>をごらんください。</li>
 </ul>
 
 <h2>連絡先</h2>
 
 <ul>
-  <li>田辺浩介: <%= mail_to 'tanabe@mwr.mediacom.keio.ac.jp', nil, :replace_at => '_at_' -%></li>
+  <li>田辺浩介: <%= mail_to 'nabeta@fastmail.fm', nil, :replace_at => '_at_' -%></li>
   <li>Project Next-L: <%= mail_to 'info@next-l.jp', nil, :replace_at => '_at_' -%></li>
 </ul>
 
@@ -48,7 +48,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><a href="http://www.next-l.jp/">Project Next-L</a></li>
     <li><a href="https://github.com/next-l/enju_leaf">GitHubでのプロジェクトのページ</a></li>