enju_leaf 1.1.0.rc8 → 1.1.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95c3fa981db703247be47e617af09748f881e0fb
-  data.tar.gz: 5b30d91bba0f73868770386ed1bf134f8de1785a
+  metadata.gz: 8dd72d60431ce017b6e0338731f59395a3bd0e6d
+  data.tar.gz: 44a890255ac3e0d19eddd9ecea9e11ece3c94482
 SHA512:
-  metadata.gz: ecadaccd2485fc27abb73d6207f57d10735daa262cc201fe623096f341c9c01999e5805a33477f630bcad7e33ca8df73e807507df2923016485b9ca190ac9469
-  data.tar.gz: ee5d4c22f1ff9126f8148796125c551c556caca31f371252745ac7207e5af5a51bfb2a559a56a2decbd79eae5bb1ae6235d2897f92f14fc1d02d70681869c1e0
+  metadata.gz: 337ff6f9b61732c1ab2154bb8710dd4cc3e48c303d8ab0291e5011a7519c35150e78609d42dbcf4ae30e903fff0f80f9275d243952232d4901994a44aaa94a18
+  data.tar.gz: 9698e2603a8815bd5e47ff35343776990c7125e6f18882a781acad7f2bfdd3a5d094ded545c54586f00c1ff9ded54f489e71c1d96bd81579dd85bacf7022b60d

data/app/models/user_import_file.rb

@@ -105,12 +105,22 @@ class UserImportFile < ActiveRecord::Base
 
         if new_user.save!
           num[:user_imported] += 1
+          import_result.user = new_user
+          import_result.save!
         else
           num[:failed] += 1
         end
       end
     end
+
+    rows.close
+    sm_complete!
+    Sunspot.commit
     num
+  rescue => e
+    self.error_message = "line #{row_num}: #{e.message}"
+    sm_fail!
+    raise e
   end
 
   def modify
@@ -148,7 +158,7 @@ class UserImportFile < ActiveRecord::Base
       f.each{|line|
         if defined?(CharlockHolmes::EncodingDetector)
           begin
-            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding])
+            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding], universal_newline: true)
           rescue StandardError
             string = NKF.nkf('-w -Lu', line)
           end
@@ -168,4 +178,12 @@ class UserImportFile < ActiveRecord::Base
     file.close
     rows
   end
+
+  def self.import
+    UserImportFile.not_imported.each do |file|
+      file.import_start
+    end
+  rescue
+    Rails.logger.info "#{Time.zone.now} importing resources failed!"
+  end
 end

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

@@ -4,7 +4,7 @@
 
 <ul>
   <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('page.resource'), resource_import_files_path -%></li>
   <li><%= link_to t('activerecord.models.event'), event_import_files_path -%></li>
   <!--
   <li><%= link_to t('activerecord.models.agent'), agent_import_files_path -%></li>

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

@@ -1,32 +1,33 @@
-<div id="content_detail" class="ui-corner-all">
+<div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_import_file')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
   <thead>
     <tr>
+      <th>ID</th>
       <th><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%></th>
       <th><%= t('activerecord.attributes.user_import_file.executed_at') -%></th>
       <th><%= t('activerecord.models.user') -%></th>
       <th><%= t('activerecord.attributes.user_import_file.edit_mode') -%></th>
       <th><%= t('activerecord.attributes.user_import_file.state') -%></th>
       <th></th>
-      <th></th>
-      <th></th>
     </tr>
   </thead>
 
   <tbody>
     <% @user_import_files.each do |user_import_file| %>
-      <tr>
-        <td><%= user_import_file.user_import_file_name %></td>
-        <td><%= user_import_file.executed_at %></td>
-        <td><%= link_to user_import_file.user.username, user_import_file.user if user_import_file.user %></td>
-        <td><%= user_import_file.edit_mode %></td>
-        <td><%= user_import_file.state %></td>
-        <td><%= link_to 'Show', user_import_file %></td>
-        <td><%= link_to 'Edit', edit_user_import_file_path(user_import_file) %></td>
-        <td><%= link_to 'Destroy', user_import_file, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      <tr class="line<%= cycle("0", "1") -%>">
+        <td><%= link_to user_import_file.id, user_import_file -%></td>
+        <td><%= link_to user_import_file.user_import_file_name, user_import_file -%></td>
+        <td><%= l(user_import_file.executed_at) if user_import_file.executed_at -%></td>
+        <td><%= link_to user_import_file.user.username, user_import_file.user -%></td>
+        <td><%= user_import_file.edit_mode -%></td>
+        <td><%= localized_state(user_import_file.state) -%></td>
+        <td>
+          <%= link_to t('page.show'), user_import_file -%>
+          <%= link_to t('page.destroy'), user_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        </td>
       </tr>
     <% end %>
   </tbody>
@@ -36,7 +37,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.new', :model => t('activerecord.models.user_import_file')), new_user_import_file_path -%></li>
   </ul>

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

@@ -1,5 +1,5 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.resource_import_file')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_import_file')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@user_import_file, :html => { :multipart => true }) do |f| %>
@@ -28,7 +28,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= back_to_index(flash[:page_info]) %></li>
   </ul>

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

@@ -1,59 +1,69 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_import_file')) -%></h1>
+<div id="content_list">
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong>User:</strong>
-  <%= @user_import_file.user_id %>
+  <strong>Id:</strong>
+  <%= @user_import_file.id -%>
 </p>
 
 <p>
-  <strong>Note:</strong>
-  <%= @user_import_file.note %>
+  <strong><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%>:</strong>
+  <%= link_to @user_import_file.user_import_file_name, user_import_file_path(@user_import_file, :format => :download) -%>
 </p>
 
 <p>
-  <strong>Executed at:</strong>
-  <%= @user_import_file.executed_at %>
+  <strong><%= t('activerecord.attributes.user_import_file.user_import_content_type') -%>:</strong>
+  <%= @user_import_file.user_import_content_type -%>
 </p>
 
 <p>
-  <strong>State:</strong>
-  <%= @user_import_file.state %>
+  <strong><%= t('activerecord.attributes.user_import_file.user_import_file_size') -%>:</strong>
+  <%= @user_import_file.user_import_file_size -%>
 </p>
 
 <p>
-  <strong>User import file name:</strong>
-  <%= @user_import_file.user_import_file_name %>
+  <strong><%= t('activerecord.attributes.user_import_file.user_import_fingerprint') -%>:</strong>
+  <%= @user_import_file.user_import_fingerprint -%>
 </p>
 
 <p>
-  <strong>User import content type:</strong>
-  <%= @user_import_file.user_import_content_type %>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%= l(@user_import_file.created_at) if @user_import_file.created_at -%>
 </p>
 
 <p>
-  <strong>User import file size:</strong>
-  <%= @user_import_file.user_import_file_size %>
+  <strong><%= t('activerecord.attributes.user_import_file.executed_at') -%>:</strong>
+  <%= l(@user_import_file.executed_at) if @user_import_file.executed_at -%>
 </p>
 
 <p>
-  <strong>User import updated at:</strong>
-  <%= @user_import_file.user_import_updated_at %>
+  <strong><%= t('activerecord.attributes.user_import_file.edit_mode') -%>:</strong>
+  <%= @user_import_file.edit_mode -%>
 </p>
 
 <p>
-  <strong>User import fingerprint:</strong>
-  <%= @user_import_file.user_import_fingerprint %>
+  <strong><%= t('activerecord.attributes.user_import_file.state') -%>:</strong>
+  <%= localized_state(@user_import_file.state) -%>
 </p>
 
 <p>
-  <strong>Edit mode:</strong>
-  <%= @user_import_file.edit_mode %>
+  <strong><%= t('activerecord.attributes.user_import_file.error_message') -%>:</strong>
+  <%= @user_import_file.error_message -%>
 </p>
 
 <p>
-  <strong>Error message:</strong>
-  <%= @user_import_file.error_message %>
+  <strong><%= t('activerecord.models.user') -%>:</strong>
+  <%= link_to @user_import_file.user.username, @user_import_file.user -%>
 </p>
 
-<%= link_to 'Edit', edit_user_import_file_path(@user_import_file) %> |
-<%= link_to 'Back', user_import_files_path %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('activerecord.models.user_import_result'), user_import_file_user_import_results_path(@user_import_file) -%></li>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+</div>

data/app/views/user_import_results/index.csv.erb

@@ -0,0 +1,4 @@
+username
+<%- @user_import_results.each do |user_import_result| -%>
+<%= user_import_result.user.try(:username) %>	<%= user_import_result.body %>
+<%- end -%>

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

@@ -1,31 +1,50 @@
-<h1>Listing user_import_results</h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_import_result')) -%></h1>
+<div id="content_list">
+  <% if @user_import_file %>
+    <h2 class="resource_title">
+      <%= link_to @user_import_file.user_import_file_name, @user_import_file %>
+    </h2>
+  <% end %>
 
-<table>
-  <thead>
-    <tr>
-      <th>User import file</th>
-      <th>User</th>
-      <th>Body</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.models.user_import_file') %></th>
+    <th><%= t('activerecord.models.user') %></th>
+    <th></th>
+  </tr>
 
-  <tbody>
-    <% @user_import_results.each do |user_import_result| %>
-      <tr>
-        <td><%= user_import_result.user_import_file_id %></td>
-        <td><%= user_import_result.user_id %></td>
-        <td><%= user_import_result.body %></td>
-        <td><%= link_to 'Show', user_import_result %></td>
-        <td><%= link_to 'Edit', edit_user_import_result_path(user_import_result) %></td>
-        <td><%= link_to 'Destroy', user_import_result, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
+<% @user_import_results.each do |user_import_result| %>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td>
+      <%= link_to user_import_result.user_import_file.user_import_file_name, user_import_result.user_import_file %>
+      <br />
+      <%=l user_import_result.created_at %>
+    </td>
+    <td><%= link_to user_import_result.user.username, user_import_result.user if user_import_result.user %></td>
+    <td>
+      <%= link_to t('page.show'), user_import_result %>
+      <%= link_to t('page.destroy'), user_import_result, :data => {:confirm => t('page.are_you_sure')}, :method => :delete %>
+    </td>
+  </tr>
+<% end %>
 </table>
 
-<br>
+<%= paginate(@user_import_results) %>
+
+</div>
+</div>
 
-<%= link_to 'New User import result', new_user_import_result_path %>
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li>
+    <% if @user_import_file %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_file_user_import_results_path(@user_import_file, :format => :csv, :locale => @locale.to_s)) -%>
+      (<%= link_to 'CSV', user_import_file_user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+    <% else %>
+      <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_import_results_path(:format => :csv, :locale => @locale.to_s)) -%>
+      (<%= link_to 'CSV', user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+    <% end %>
+    </li>
+  </ul>
+</div>

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

@@ -1,19 +1,33 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_import_result')) -%></h1>
+<div id="content_list">
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong>User import file:</strong>
-  <%= @user_import_result.user_import_file_id %>
+  <b><%= t('activerecord.models.user_import_file') %></b>
+  <%= @user_import_result.user_import_file.user_import_file_name %>
 </p>
 
 <p>
-  <strong>User:</strong>
-  <%= @user_import_result.user_id %>
+  <b><%= t('activerecord.models.user') %></b>
+  <%= link_to @user_import_result.user.username, @user_import_result.user if @user_import_result.user %>
 </p>
 
 <p>
-  <strong>Body:</strong>
+  <b><%= t('activerecord.attributes.agent_import_result.body') %></b>
   <%= @user_import_result.body %>
 </p>
 
-<%= link_to 'Edit', edit_user_import_result_path(@user_import_result) %> |
-<%= link_to 'Back', user_import_results_path %>
+<p>
+  <b><%= t('page.created_at') %></b>
+  <%=l @user_import_result.created_at %>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+</div>

data/config/routes.rb

@@ -3,9 +3,11 @@ Rails.application.routes.draw do
     mount Resque::Server.new, :at => "/resque", :as => :resque
   end
 
-  resources :user_import_results
+  resources :user_import_results, :only => [:index, :show, :destroy]
 
-  resources :user_import_files
+  resources :user_import_files do
+    resources :user_import_results, :only => [:index, :show, :destroy]
+  end
 
   resource :my_account
 

data/lib/enju_leaf/engine.rb

@@ -9,7 +9,7 @@ require 'sitemap_generator'
 require 'redis-rails'
 require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'resque_scheduler/server'
+require 'resque/scheduler/server'
 
 module EnjuLeaf
   class Engine < ::Rails::Engine

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc8"
+  VERSION = "1.1.0.rc9"
 end

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

@@ -14,7 +14,7 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
       "config.time_zone = 'Tokyo'"
     gsub_file 'config/schedule.rb', /\/path\/to\/enju_leaf/, Rails.root.to_s
     append_to_file("Rakefile", "require 'resque/tasks'\n")
-    append_to_file("Rakefile", "require 'resque_scheduler/tasks'")
+    append_to_file("Rakefile", "require 'resque/scheduler/tasks'")
     append_to_file("db/seeds.rb", File.open(File.expand_path('../templates', __FILE__) + '/db/seeds.rb').read)
     append_to_file 'config/initializers/inflections.rb',  <<EOS
 ActiveSupport::Inflector.inflections do |inflect|
@@ -40,6 +40,7 @@ EOS
     gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, :path => 'accounts'"
     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 'app/models/user.rb', /, :registerable,$/, ', #:registerable,'
     gsub_file 'app/models/user.rb', /, :trackable, :validatable$/, <<EOS
 , :trackable, #:validatable, 

data/lib/tasks/enju_leaf_tasks.rake

@@ -20,4 +20,9 @@ namespace :enju_leaf do
 
     puts 'indexing completed.'
   end
+
+  desc "import users from a TSV file"
+  task :user_import => :environment do
+    UserImportFile.import
+  end
 end