enju_leaf 1.1.0.rc7 → 1.1.0.rc8

data/app/controllers/user_import_results_controller.rb

@@ -0,0 +1,15 @@
+class UserImportResultsController < InheritedResources::Base
+  respond_to :html, :json, :csv
+  load_and_authorize_resource
+  has_scope :file_id
+  actions :index, :show, :destroy
+
+  def index
+    @user_import_file = UserImportFile.where(:id => params[:user_import_file_id]).first
+    if @user_import_file
+      @user_import_results = @user_import_file.user_import_results.page(params[:page])
+    else
+      @user_import_results = UserImportResult.page(params[:page])
+    end
+  end
+end

data/app/controllers/users_controller.rb

@@ -81,7 +81,7 @@ class UsersController < ApplicationController
     prepare_options
     @user_groups = UserGroup.all
     if @agent.try(:user)
-      flash[:notice] = t('page.already_activated')
+      flash[:notice] = t('user.already_activated')
       redirect_to @agent
       return
     end
@@ -126,7 +126,7 @@ class UsersController < ApplicationController
         user_has_role.assign_attributes({:user_id => @user.id, :role_id => role.id}, :as => :admin)
         user_has_role.save
         flash[:temporary_password] = @user.password
-        format.html { redirect_to @user, :notice => t('controller.successfully_created.', :model => t('activerecord.models.user')) }
+        format.html { redirect_to @user, :notice => t('controller.successfully_created', :model => t('activerecord.models.user')) }
         format.json { render :json => @user, :status => :created, :location => @user }
       else
         prepare_options

data/app/helpers/profiles_helper.rb

@@ -0,0 +1,2 @@
+module ProfilesHelper
+end

data/app/models/enju_leaf/ability.rb

@@ -24,12 +24,16 @@ module EnjuLeaf
         can :manage, [
           UserHasRole
         ]
+        can :manage, [
+          UserImportFile
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can :update, [
           Role
         ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can :read, [
-          Role
-        ]
+          Role,
+          UserImportResult
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
       when 'Librarian'
         can [:read, :create, :update], User
         can :destroy, User do |u|
@@ -41,10 +45,16 @@ module EnjuLeaf
             end
           end
         end
+        can :manage, [
+          UserImportFile
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
         can :read, [
           Role,
           UserGroup
         ]
+        can :read, [
+          UserImportResult
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
       when 'User'
         can :show, User
         can :update, User do |u|

data/app/models/profile.rb

@@ -0,0 +1,15 @@
+class Profile < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :library, :validate => true
+  belongs_to :user_group
+  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id' #, :validate => true
+
+  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
+
+  searchable do
+    text :user_number, :full_name, :note
+    string :user_number
+  end
+end

data/app/models/user_import_file.rb

@@ -0,0 +1,171 @@
+class UserImportFile < ActiveRecord::Base
+  attr_accessible :user_import, :edit_mode
+  include ImportFile
+  default_scope {order('user_import_files.id DESC')}
+  scope :not_imported, -> {where(:state => 'pending')}
+  scope :stucked, -> {where('created_at < ? AND state = ?', 1.hour.ago, 'pending')}
+
+  if Setting.uploaded_file.storage == :s3
+    has_attached_file :user_import, :storage => :s3,
+      :s3_credentials => "#{Setting.amazon}",
+      :s3_permissions => :private
+  else
+    has_attached_file :user_import,
+      :path => ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+  end
+  validates_attachment_content_type :user_import, :content_type => [
+    'text/csv',
+    'text/plain',
+    'text/tab-separated-values',
+    'application/octet-stream',
+    'application/vnd.ms-excel'
+  ]
+  validates_attachment_presence :user_import
+  belongs_to :user, :validate => true
+  has_many :user_import_results
+
+  state_machine :initial => :pending do
+    event :sm_start do
+      transition [:pending, :started] => :started
+    end
+
+    event :sm_complete do
+      transition :started => :completed
+    end
+
+    event :sm_fail do
+      transition :started => :failed
+    end
+
+    before_transition any => :started do |user_import_file|
+      user_import_file.executed_at = Time.zone.now
+    end
+
+    before_transition any => :completed do |user_import_file|
+      user_import_file.error_message = nil
+    end
+  end
+
+  def import_start
+    case edit_mode
+    when 'create'
+      import
+    when 'update'
+      modify
+    when 'destroy'
+      remove
+    else
+      import
+    end
+  end
+
+  def import
+    sm_start!
+    reload
+    num = {:user_imported => 0, :user_found => 0, :failed => 0}
+    rows = open_import_file
+    row_num = 2
+
+    field = rows.first
+    if [field['username']].reject{|field| field.to_s.strip == ""}.empty?
+      raise "username column is not found"
+    end
+
+    rows.each do |row|
+      next if row['dummy'].to_s.strip.present?
+      import_result = UserImportResult.create!(
+        :user_import_file_id => id, :body => row.fields.join("\t")
+      )
+
+      username = row['username']
+      new_user = User.where(:username => username).first
+      if new_user
+        import_result.user = new_user
+        import_result.save
+        num[:user_found] += 1
+      else
+        new_user = User.new
+        new_user.operator = user
+        new_user.username = username
+        new_user.email = row['email'] if row['email'].present?
+        new_user.role = Role.where(:name => row['role']).first
+        if row['user_group'].present?
+          new_user.user_group = UserGroup.where(:name => row['user_group']).first
+        end
+        new_user.user_number = row['user_number']
+        if row['expired_at'].present?
+          new_user.expired_at = Time.zone.parse(row['expired_at']).end_of_day
+        end
+        new_user.note = row['note']
+        if row['password'].present?
+          new_user.password = row['password']
+        else
+          new_user.set_auto_generated_password
+        end
+
+        if new_user.save!
+          num[:user_imported] += 1
+        else
+          num[:failed] += 1
+        end
+      end
+    end
+    num
+  end
+
+  def modify
+    sm_start!
+    sm_complete!
+  end
+
+  def remove
+    sm_start!
+    reload
+    rows = open_import_file
+
+    field = rows.first
+    if [field['username']].reject{|field| field.to_s.strip == ""}.empty?
+      raise "username column is not found"
+    end
+
+    rows.each do |row|
+      username = row['username'].to_s.strip
+      user = User.where(:username => username).first
+      user.destroy if user
+    end
+    sm_complete!
+  end
+
+  private
+  def open_import_file
+    tempfile = Tempfile.new('user_import_file')
+    if Setting.uploaded_file.storage == :s3
+      uploaded_file_path = user_import.expiring_url(10)
+    else
+      uploaded_file_path = user_import.path
+    end
+    open(uploaded_file_path){|f|
+      f.each{|line|
+        if defined?(CharlockHolmes::EncodingDetector)
+          begin
+            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding])
+          rescue StandardError
+            string = NKF.nkf('-w -Lu', line)
+          end
+        else
+          string = NKF.nkf('-w -Lu', line)
+        end
+        tempfile.puts(string)
+      }
+    }
+    tempfile.close
+
+    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")
+    UserImportResult.create!(:user_import_file_id => self.id, :body => header.join("\t"))
+    tempfile.close(true)
+    file.close
+    rows
+  end
+end

data/app/models/user_import_result.rb

@@ -0,0 +1,9 @@
+class UserImportResult < ActiveRecord::Base
+  attr_accessible :user_import_file_id, :user_id, :body
+  default_scope {order('user_import_results.id')}
+  scope :file_id, proc{|file_id| where(:user_import_file_id => file_id)}
+  scope :failed, -> {where(:user_id => nil)}
+
+  belongs_to :user_import_file
+  belongs_to :user
+end

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

@@ -1,13 +1,13 @@
 <div class="header_and_footer">
   <div id="footer">
-    <a href="https://github.com/nabeta/enju_leaf">Next-L Enju Leaf <%= EnjuLeaf::VERSION %></a>,
+    <a href="https://github.com/next-l/enju_leaf">Next-L Enju Leaf <%= EnjuLeaf::VERSION %></a>,
     <%= t('page.open_source_integrated_library_system') -%> |
     <%= link_to t('page.about_this_system'), page_about_path -%> |
-    <%= link_to t('page.report_bugs'), "https://github.com/nabeta/enju_leaf/issues" -%>
+    <%= link_to t('page.report_bugs'), "https://github.com/next-l/enju_leaf/issues" -%>
     <% if is_mobile_request? %>
       | <%= link_to t('page.mobile_view'), url_for(:mobile_view => 'true') %>
     <% end %>
     <br />
-    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>.
+    Developed by <a href="https://github.com/nabeta">Kosuke Tanabe</a> and <a href="http://www.next-l.jp/">Project Next-L</a>.
   </div>
 </div>

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

@@ -40,7 +40,7 @@
             <% if defined?(EnjuNdl) %>
               <li><%= link_to t('enju_ndl.import_from_ndl_search'), ndl_books_path -%></li>
             <% end %>
-            <li><%= link_to t('page.add_manually'), new_manifestation_path -%></li>
+            <li><%= link_to t('page.add_resource_manually'), new_manifestation_path -%></li>
             <li><%= link_to t('page.serial'), manifestations_path(:periodical => true) -%></li>
             <li><%= link_to t('page.import_from_file'), new_resource_import_file_path -%></li>
             <li><%= link_to t('activerecord.models.accept'), new_accept_path -%></li>

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

@@ -4,7 +4,7 @@
 
 <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>Next-L Enju Leaf is released under MIT license. For more information, visit <a href="https://github.com/nabeta/enju_leaf">our project website</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>
@@ -52,7 +52,7 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <li><a href="http://www.next-l.jp/">Project Next-L</a></li>
-    <li><a href="https://github.com/nabeta/enju_leaf">this project on GitHub</a></li>
+    <li><a href="https://github.com/next-l/enju_leaf">this project on GitHub</a></li>
     <li><a href="http://www.next-l.jp/?page=%A5%E1%A1%BC%A5%EA%A5%F3%A5%B0%A5%EA%A5%B9%A5%C8">Mailing list</a> (in Japanese)</li>
   </ul>
 </div>

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

@@ -4,7 +4,7 @@
 
 <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はMITライセンスのもとに公開されています。詳しくは<a href="https://github.com/nabeta/enju_leaf">プロジェクトのホームページ</a>をごらんください。</li>
+  <li>Next-L Enju LeafはMITライセンスのもとに公開されています。詳しくは<a href="https://github.com/next-l/enju_leaf">プロジェクトのホームページ</a>をごらんください。</li>
 </ul>
 
 <h2>連絡先</h2>
@@ -51,7 +51,7 @@
 <div id="submenu" class="ui-corner-all">
   <ul>
     <li><a href="http://www.next-l.jp/">Project Next-L</a></li>
-    <li><a href="https://github.com/nabeta/enju_leaf">GitHubでのプロジェクトのページ</a></li>
+    <li><a href="https://github.com/next-l/enju_leaf">GitHubでのプロジェクトのページ</a></li>
     <li><a href="http://www.next-l.jp/?page=%A5%E1%A1%BC%A5%EA%A5%F3%A5%B0%A5%EA%A5%B9%A5%C8">メーリングリスト</a></li>
   </ul>
 </div>

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

@@ -7,9 +7,12 @@
         <li><%= link_to t('activerecord.models.library'), libraries_path -%>
           <ul>
             <li><%= link_to t('activerecord.models.shelf'), shelves_path -%></li>
+            <li><%= link_to t('activerecord.models.event'), events_path -%></li>
           </ul>
         </li>
         <li><%= link_to t('activerecord.models.user_group'), user_groups_path -%></li>
+        <li><%= link_to t('activerecord.models.user'), users_path -%></li>
+        <li><%= link_to t('activerecord.models.user_import_file'), user_import_files_path -%></li>
         <% if defined?(EnjuCirculation) %>
           <li><%= link_to t('activerecord.models.checkout_type'), checkout_types_path -%>
             <ul>
@@ -112,4 +115,13 @@
       </ul>
     </div>
   </div>
+
+  <div class="portlet" id="system">
+    <h2 class="title"><%= t('page.system') -%></h2>
+    <div class="config_box">
+      <ul>
+        <li><%= link_to 'Resque', resque_path %></li>
+      </ul>
+    </div>
+  </div>
 </div>

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

@@ -3,17 +3,18 @@
 <div id="content_list">
 
 <ul>
-  <li><%= link_to t('activerecord.models.agent'), agent_import_files_path -%>
-  (<%= t('activerecord.models.user') -%>)</li>
-
+  <li><%= link_to t('activerecord.models.user'), user_import_files_path -%>
+  <li><%= link_to t('page.resource'), new_resource_import_file_path -%></li>
   <li><%= link_to t('activerecord.models.event'), event_import_files_path -%></li>
-  <li><%= link_to t('page.resource'), new_resource_import_file_path -%> (MARC, TSV)</li>
+  <!--
+  <li><%= link_to t('activerecord.models.agent'), agent_import_files_path -%></li>
+  -->
 </ul>
 </div>
 </div>
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.add_manually'), new_import_request_path -%></li>
+    <li><%= link_to t('page.add_resource_manually'), new_import_request_path -%></li>
   </ul>
 </div>

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

@@ -0,0 +1,53 @@
+<%= form_for(@profile) do |f| %>
+  <% if @profile.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@profile.errors.count, "error") %> prohibited this profile from being saved:</h2>
+
+      <ul>
+      <% @profile.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= f.number_field :user_id %>
+  </div>
+  <div class="field">
+    <%= f.label :user_group_id %><br>
+    <%= f.select :user_group_id, @user_groups.map{|u| [u.display_name.localize, u.id]} %>
+  </div>
+  <div class="field">
+    <%= f.label :library_id %><br>
+    <%= f.select :library_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
+  </div>
+  <div class="field">
+    <%= f.label :locale %><br>
+    <%= f.text_field :locale %>
+  </div>
+  <div class="field">
+    <%= f.label :user_number %><br>
+    <%= f.text_field :user_number %>
+  </div>
+  <div class="field">
+    <%= f.label :full_name %><br>
+    <%= f.text_area :full_name %>
+  </div>
+  <div class="field">
+    <%= f.label :note %><br>
+    <%= f.text_area :note %>
+  </div>
+  <div class="field">
+    <%= f.label :keyword_list %><br>
+    <%= f.text_area :keyword_list %>
+  </div>
+  <div class="field">
+    <%= f.label :required_role_id %><br>
+    <%= f.number_field :required_role_id %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>