enju_leaf 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 495a9c35f27e957fc76075bb6c9a65f2fe2ea27a
-  data.tar.gz: 2b7085c28d123459a30bad1ae16a3bfaf5de4084
+  metadata.gz: 689aa74d521ef467b8f7ffedf62d89e53a3eff85
+  data.tar.gz: 59d301030021945d636fa62b67dffec2039f8bb7
 SHA512:
-  metadata.gz: 92fc6f5a49e12b4117a55eb8ed87ec89e8007cdc940db4f9d37b776fc19c724a87b580007d371e19028247b44095fb0630c5b86f409fcb42c8a123e2e9dab02f
-  data.tar.gz: 81a037660b09b63f2e7a65a3199958e14625fbdcd7d53950d29bd4c0e2fc8c5b9c5817406399a2ef4776302bf481854b4a791d20c57f332edc12132ca569c6f3
+  metadata.gz: 68a128ad91643369d17f6fc06922c2a71099103eb3890128fe3cb44b5fc1aa6a40dbce1a12a176d4e2cb30979eb7d244bef42112395d683849ceaff76487ffe1
+  data.tar.gz: 1f4dc0718ee60d18382d966aede3747fbbfa69dab8ba06a3089981ef1af709bbe9a87e20fe8b1b9a75827820b85dc3107560ae65c76630dd75a7ad5de8fc4a40

data/app/models/user_import_file.rb

@@ -46,7 +46,7 @@ class UserImportFile < ActiveRecord::Base
   # 利用者情報をTSVファイルを用いて作成します。
   def import
     transition_to!(:started)
-    num = { user_imported: 0, user_found: 0, failed: 0 }
+    num = { user_imported: 0, user_found: 0, failed: 0, error: 0 }
     rows = open_import_file(create_import_temp_file(user_import))
     row_num = 1
 
@@ -57,10 +57,10 @@ class UserImportFile < ActiveRecord::Base
 
     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")
       )
+      next if row['dummy'].to_s.strip.present?
 
       username = row['username']
       new_user = User.where(username: username).first
@@ -84,31 +84,41 @@ class UserImportFile < ActiveRecord::Base
         profile = Profile.new
         profile.assign_attributes(set_profile_params(row))
 
-        if new_user.save
-          new_user.profile = profile
-          if profile.save
-            num[:user_imported] += 1
+        Profile.transaction do
+          if new_user.valid? and profile.valid?
+            new_user.profile = profile
             import_result.user = new_user
             import_result.save!
+            num[:user_imported] += 1
           else
-            num[:failed] += 1
+            error_message = "line #{row_num}: "
+            error_message += new_user.errors.full_messages.join(" ")
+            error_message += profile.errors.full_messages.join(" ")
+            import_result.error_message = error_message
+            import_result.save
+            num[:error] += 1
           end
-        else
-          import_result.error_message = new_user.errors.full_messages.join("\n")
-          import_result.save
-          num[:failed] += 1
         end
       end
     end
 
     Sunspot.commit
     rows.close
-    transition_to!(:completed)
+    error_messages = user_import_results.order(:id).pluck(:error_message).compact
+    unless error_messages.empty?
+      self.error_message = '' if error_message.nil?
+      self.error_message += "\n"
+      self.error_message += error_messages.join("\n")
+    end
+    save
+    if num[:error] >= 1
+      transition_to!(:failed)
+    else
+      transition_to!(:completed)
+    end
     send_message
     num
   rescue => e
-    self.error_message = "line #{row_num}: #{e.message}"
-    save
     transition_to!(:failed)
     raise e
   end

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

@@ -8,7 +8,10 @@
     <%= current_user.username -%>
   </h2>
 
-  <p><%= t('activerecord.attributes.profile.user_number') %>: <%= current_user.profile.user_number %></p>
+  <p><%= t('activerecord.attributes.profile.user_number') %>: <%= @profile.user_number %></p>
+  <% if defined?(EnjuOrcid) %>
+    <p><%= 'ORCID iD' %>: <%= link_to orcid_url(@profile), orcid_url(@profile) %></p>
+  <% end %>
 
   <% if defined?(EnjuCirculation) %>
     <%= render 'profiles/checkout_list', profile: current_user.profile %>
@@ -23,24 +26,24 @@
   <ul>
     <li><%= link_to t('page.edit'), edit_my_account_path -%></li>
     <li><%= link_to t('activerecord.models.registration'), edit_user_registration_path -%></li>
-    <%- if can? :destroy, current_user -%>
-      <li><%= link_to t('page.destroy'), curent_user, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
+    <%- if can?(:destroy, @profile) -%>
+      <li><%= link_to t('page.destroy'), @profile, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <%- end -%>
     <% if defined?(EnjuSearchLog) %>
       <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>
     <% end %>
     <% if defined?(EnjuCirculation) %>
-      <li><%= link_to t('activerecord.models.checkout'), checkouts_path %></li>
-      <li><%= link_to t('activerecord.models.reserve'), reserves_path %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.checkout')), checkouts_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuQuestion) %>
-      <li><%= link_to t('activerecord.models.question'), user_questions_path(current_user) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.question')), questions_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuBookmark) %>
-      <li><%= link_to t('activerecord.models.bookmark'), bookmarks_path %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuPurchaseRequest) %>
-      <li><%= link_to t('activerecord.models.purchase_request'), purchase_requests_path %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.purchase_request')), purchase_requests_path(user_id: @profile.user.username) %></li>
     <% end %>
   </ul>
 </div>

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

@@ -38,7 +38,9 @@
         <li><%= link_to t('page.edit'), edit_profile_path(@profile) -%></li>
       <% end %>
       <% if defined?(EnjuMessage) %>
-        <li><%= link_to t('message.send'), new_message_path(recipient: @profile.user.username) -%></li>
+        <% if can? :create, Message %>
+          <li><%= link_to t('message.send'), new_message_path(recipient: @profile.user.username) -%></li>
+        <% end %>
       <% end %>
       <%- if can? :create, Profile -%>
         <li><%= link_to t('page.new', model: t('activerecord.models.profile')), new_profile_path -%></li>
@@ -48,17 +50,17 @@
       <% end %>
     <%- end -%>
     <% if defined?(EnjuCirculation) %>
-      <li><%= link_to t('activerecord.models.checkout'), checkouts_path(user_id: @profile.user.username) %></li>
-      <li><%= link_to t('activerecord.models.reserve'), reserves_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.checkout')), checkouts_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.reserve')), reserves_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuQuestion) %>
-      <li><%= link_to t('activerecord.models.question'), questions_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.question')), questions_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuBookmark) %>
-      <li><%= link_to t('activerecord.models.bookmark'), bookmarks_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.bookmark')), bookmarks_path(user_id: @profile.user.username) %></li>
     <% end %>
     <% if defined?(EnjuPurchaseRequest) %>
-      <li><%= link_to t('activerecord.models.purchase_request'), purchase_requests_path(user_id: @profile.user.username) %></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.purchase_request')), purchase_requests_path(user_id: @profile.user.username) %></li>
     <% end %>
   </ul>
 </div>

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

@@ -58,7 +58,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.error_message') -%>:</strong>
-  <%= @user_import_file.error_message -%>
+  <%= simple_format(@user_import_file.error_message) -%>
 </p>
 
 <p>

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

@@ -14,8 +14,8 @@
   <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: :txt, locale: @locale.to_s)) -%>
-      (<%= link_to 'TSV', user_import_file_user_import_results_path(@user_import_file, format: :txt, locale: @locale.to_s) -%>)
+      <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s)) -%>
+      (<%= link_to 'TSV', user_import_results_path(user_import_file_id: @user_import_file.id, format: :txt, locale: @locale.to_s) -%>)
     <% else %>
       <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
       (<%= link_to 'TSV', user_import_results_path(format: :txt, locale: @locale.to_s) -%>)

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

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

data/config/routes.rb

@@ -7,22 +7,20 @@ Rails.application.routes.draw do
 
   resources :user_export_files
 
-  resources :user_import_results, :only => [:index, :show, :destroy]
+  resources :user_import_results, only: [:index, :show, :destroy]
 
-  resources :user_import_files do
-    resources :user_import_results, :only => [:index, :show, :destroy]
-  end
+  resources :user_import_files
 
   resource :my_account
 
-  resources :roles, :except => [:new, :create, :destroy]
+  resources :roles, except: [:new, :create, :destroy]
 
   resources :user_groups
 
   resources :accepts
 
   resources :baskets do
-    resources :accepts, :except => [:edit, :update]
+    resources :accepts, except: [:edit, :update]
   end
 
   as :user do

data/lib/enju_leaf/user.rb

@@ -8,19 +8,6 @@ module EnjuLeaf
       def enju_leaf_user_model
         include InstanceMethods
 
-        # Setup accessible (or protected) attributes for your model
-        #attr_accessible :email, :password, :password_confirmation, :current_password,
-        #  :remember_me, :email_confirmation,
-        #  :auto_generated_password,
-        #  :profile_attributes
-        #attr_accessible :email, :password, :password_confirmation, :username,
-        #  :current_password, :remember_me,
-        #  :email_confirmation,
-        #  :expired_at, :locked, :role_id,
-        #  :user_has_role_attributes, :auto_generated_password,
-        #  :profile_attributes,
-        #  as: :admin
-
         scope :administrators, -> { joins(:role).where('roles.name = ?', 'Administrator') }
         scope :librarians, -> { joins(:role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') }
         scope :suspended, -> { where('locked_at IS NOT NULL') }
@@ -78,7 +65,7 @@ module EnjuLeaf
 
         # ユーザの情報をエクスポートします。
         # @param [Hash] options
-        def export(options = {format: :txt})
+        def self.export(options = {format: :txt})
           header = %w(
             username
             full_name
@@ -96,48 +83,48 @@ module EnjuLeaf
             expired_at
             keyword_list
             note
-	  )
-	  header += %w(
+          )
+          header += %w(
             checkout_icalendar_token
             save_checkout_history
-	  ) if defined? EnjuCirculation
-	  header << "save_search_history" if defined? EnjuSearchLog
-	  header << "share_bookmarks" if defined? EnjuBookmark
-	  header = header.join("\t")
-          users = User.all.map{|u|
-            lines = []
-            lines << u.username
-            lines << u.try(:profile).try(:full_name)
-            lines << u.try(:profile).try(:full_name_transcription)
-            lines << u.email
-            lines << u.try(:profile).try(:user_number)
-            lines << u.role.name
-            lines << u.try(:profile).try(:user_group).try(:name)
-            lines << u.try(:profile).try(:library).try(:name)
-            lines << u.try(:profile).try(:locale)
-            lines << u.access_locked?
-            lines << u.try(:profile).try(:required_role).try(:name)
-            lines << u.created_at
-            lines << u.updated_at
-            lines << u.try(:profile).try(:expired_at)
-            lines << u.try(:profile).try(:keyword_list).try(:split).try(:join, "//")
-            lines << u.try(:profile).try(:note)
-	    if defined? EnjuCirculation
-              lines << u.try(:profile).try(:checkout_icalendar_token)
-              lines << u.try(:profile).try(:save_checkout_history)
-	    end
-	    if defined? EnjuSearchLog
-              lines << u.try(:profile).try(:save_search_history)
-	    end
-	    if defined? EnjuBookmark
-              lines << u.try(:profile).try(:share_bookmarks)
-	    end
-	    lines
+          ) if defined? EnjuCirculation
+          header << "save_search_history" if defined? EnjuSearchLog
+          header << "share_bookmarks" if defined? EnjuBookmark
+          lines = []
+          User.all.map{|u|
+            line = []
+            line << u.username
+            line << u.try(:profile).try(:full_name)
+            line << u.try(:profile).try(:full_name_transcription)
+            line << u.email
+            line << u.try(:profile).try(:user_number)
+            line << u.role.try(:name)
+            line << u.try(:profile).try(:user_group).try(:name)
+            line << u.try(:profile).try(:library).try(:name)
+            line << u.try(:profile).try(:locale)
+            line << u.access_locked?
+            line << u.try(:profile).try(:required_role).try(:name)
+            line << u.created_at
+            line << u.updated_at
+            line << u.try(:profile).try(:expired_at)
+            line << u.try(:profile).try(:keyword_list).try(:split).try(:join, "//")
+            line << u.try(:profile).try(:note)
+            if defined? EnjuCirculation
+              line << u.try(:profile).try(:checkout_icalendar_token)
+              line << u.try(:profile).try(:save_checkout_history)
+            end
+            if defined? EnjuSearchLog
+              line << u.try(:profile).try(:save_search_history)
+            end
+            if defined? EnjuBookmark
+              line << u.try(:profile).try(:share_bookmarks)
+            end
+            lines << line
           }
           if options[:format] == :txt
-            users.map{|u| u.join("\t")}.unshift(header).join("\r\n")
+            lines.map{|line| line.to_csv(col_sep: "\t")}.unshift(header.to_csv(col_sep: "\t")).join
           else
-            users
+            lines
           end
         end
       end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

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

@@ -8,6 +8,7 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
     copy_file("Procfile", "Procfile")
     copy_file("config/schedule.rb", "config/schedule.rb")
     copy_file("config/initializers/resque.rb", "config/initializers/resque.rb")
+    append_to_file("config/initializers/assets.rb", "Rails.application.config.assets.precompile += %w( *.png )")
     inject_into_file 'config/application.rb', after: /# config.i18n.default_locale = :de$\n/ do
       <<"EOS"
     config.i18n.available_locales = [:en, :ja]
@@ -42,6 +43,7 @@ EOS
     generate("sunspot_rails:install")
     generate("kaminari:config")
     generate("simple_form:install")
+    generate("geocoder:config")
     gsub_file "config/sunspot.yml",
       /path: \/solr\/production/,
       "path: /solr/default"

data/spec/dummy/config/initializers/assets.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( icons/*.png )

data/spec/models/user_import_file_spec.rb

@@ -18,7 +18,7 @@ describe UserImportFile do
       old_import_results_count = UserImportResult.count
       old_profiles_solr_count = Profile.search.total
       @file.current_state.should eq 'pending'
-      @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 1})
+      @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 0, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
       User.order('id DESC')[2].username.should eq 'user003'
       User.count.should eq old_users_count + 5
@@ -52,8 +52,10 @@ describe UserImportFile do
       user003.profile.save_search_history.should be_falsy
       user003.profile.share_bookmarks.should be_falsy
       User.where(username: 'user000').first.should be_nil
-      UserImportResult.count.should eq old_import_results_count + 7
-      UserImportResult.order(:id).last.error_message.should eq 'Password is too short (minimum is 6 characters)'
+      UserImportResult.count.should eq old_import_results_count + 10
+      UserImportResult.order('id DESC')[0].error_message.should eq 'line 10: User number has already been taken'
+      UserImportResult.order('id DESC')[1].error_message.should eq 'line 9: User number is invalid'
+      UserImportResult.order('id DESC')[2].error_message.should eq 'line 8: Password is too short (minimum is 6 characters)'
 
       user005 = User.where(username: 'user005').first
       user005.role.name.should eq 'User'
@@ -73,7 +75,8 @@ describe UserImportFile do
       @file.executed_at.should be_truthy
 
       @file.reload
-      @file.error_message.should eq "The following column(s) were ignored: invalid"
+      @file.error_message.should eq "The following column(s) were ignored: invalid\nline 8: Password is too short (minimum is 6 characters)\nline 9: User number is invalid\nline 10: User number has already been taken"
+      @file.current_state.should eq 'failed'
     end
 
     it "should send message when import is completed" do
@@ -88,7 +91,7 @@ describe UserImportFile do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
       @file.user = User.where(username: 'librarian1').first
-      @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 2})
+      @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 1, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
       User.count.should eq old_users_count + 4
     end

data/spec/models/user_spec.rb

@@ -140,9 +140,11 @@ describe User do
   describe ".export" do
     it "should export all user's information" do
       lines = User.export
+      CSV.parse(lines, col_sep: "\t")
       expect(lines).not_to be_empty
-      expect(lines.split(/\r\n/).size).to eq User.all.size + 1
+      expect(lines.split(/\n/).size).to eq User.count + 1
     end
+
     it "should export share_bookmarks and save_search_history" do
       user = FactoryGirl.create(:user,
         profile: FactoryGirl.create(:profile,
@@ -157,14 +159,16 @@ describe User do
         end
       end
     end
+
     it "should work even if EnjuBookmark module is undefined" do
       Object.send(:remove_const, :EnjuBookmark)
       lines = User.export
       expect(lines).not_to be_empty
-      expect(lines.split(/\r\n/).size).to eq User.all.size + 1
+      expect(lines.split(/\n/).size).to eq User.count + 1
     end
   end
 end
+
 # == Schema Information
 #
 # Table name: users

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_leaf
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -936,6 +936,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/friendly_id.rb
@@ -1339,7 +1340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Next-L Enju Leaf
@@ -1373,6 +1374,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/friendly_id.rb