enju_library 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77bdde03f2503414e4c6cb2392231192de3016ead53bffbf69e35de7d584288
-  data.tar.gz: 3a0beeecc968ac5dc5101dae91bcf2673ca601548fd4529c981e2751915aa83e
+  metadata.gz: 518d6386e03d122a166917fc15a446fd49a9fbf2651c462b145750ddc67f848b
+  data.tar.gz: 79d27b3572eb819d9ded99e22b7ead5c44c02c7b9e6d4ba2caaec5b151da6170
 SHA512:
-  metadata.gz: d03ed3f75d7d7e69d1713988cdd1b4aa3e9074bcca2005d7b5eeef83d0c55079032b1cc4d0685df6cc9d1ed3c80a08c3cdec9769937dfa94cfcaa4297d6b2668
-  data.tar.gz: cbfc93babf645402a4c3572ab8e59aa9c9a9ea27de906aebfb74ba4a394dfba3ee730c3547ba84e23d6da45ca8aab5361adad5432548f026fa6bd34bd022e61f
+  metadata.gz: e1f11e2a73dae41c407941907c3c367150125f067ec7f7dea9a06055ad6c3aa769091535af07ef73dfa6677a3f1a87a22b6abec8aafa091d4a1e63afa3d9aa92
+  data.tar.gz: 70fc2466822926ce04dfb8cca850ddc877c4b72e2def06f372db94de6cdb0fa97e71c1df410846a943a6b55063b09c3b59664a4482e755cbd12a323a79c5dcf9

data/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+end
+

data/app/mailers/user_export_mailer.rb

@@ -0,0 +1,17 @@
+class UserExportMailer < ApplicationMailer
+  def completed(user_export_file)
+    @user_export_file = user_export_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(user_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('user_export_mailer.completed.subject')}: #{@user_export_file.id}"
+    mail(from: from, to: user_export_file.user.email, subject: subject)
+  end
+
+  def failed(user_export_file)
+    @user_export_file = user_export_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(user_export_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('user_export_mailer.failed.subject')}: #{@user_export_file.id}"
+    mail(from: from, to: user_export_file.user.email, subject: subject)
+  end
+end

data/app/mailers/user_import_mailer.rb

@@ -0,0 +1,17 @@
+class UserImportMailer < ApplicationMailer
+  def completed(user_import_file)
+    @user_import_file = user_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(user_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('user_import_mailer.completed.subject')}: #{@user_import_file.id}"
+    mail(from: from, to: user_import_file.user.email, subject: subject)
+  end
+
+  def failed(user_import_file)
+    @user_import_file = user_import_file
+    @library_group = LibraryGroup.site_config
+    from = "#{LibraryGroup.system_name(user_import_file.user.profile.locale)} <#{@library_group.user.email}>"
+    subject = "#{I18n.t('user_import_mailer.failed.subject')}: #{@user_import_file.id}"
+    mail(from: from, to: user_import_file.user.email, subject: subject)
+  end
+end

data/app/models/concerns/export_file.rb

@@ -7,14 +7,13 @@ module ExportFile
     attr_accessor :mode
   end
 
-  def send_message
-    sender = User.find(1) #system
-    locale = user.profile.try(:locale) || I18n.default_locale.to_s
-    message_template = MessageTemplate.localized_template('export_completed', locale)
-    request = MessageRequest.new
-    request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
-    request.save_message_body
-    request.save!
-    request.transition_to!(:sent)
+  def send_message(mailer)
+    sender = User.find(1)
+    message = Message.create!(
+      recipient: user.username,
+      sender: sender,
+      body: mailer.body.raw_source,
+      subject: mailer.subject
+    )
   end
 end

data/app/models/concerns/import_file.rb

@@ -44,14 +44,14 @@ module ImportFile
   end
 
   # インポート完了時のメッセージを送信します。
-  def send_message
+  def send_message(mailer)
     sender = User.find(1)
-    locale = user.profile.try(:locale) || I18n.default_locale.to_s
-    message_template = MessageTemplate.localized_template('import_completed', locale)
-    request = MessageRequest.new
-    request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
-    request.save_message_body
-    request.transition_to!(:sent)
+    message = Message.create!(
+      recipient: user.username,
+      sender: sender,
+      body: mailer.body.raw_source,
+      subject: mailer.subject
+    )
   end
 
   private

data/app/models/user_export_file.rb

@@ -34,12 +34,13 @@ class UserExportFile < ActiveRecord::Base
     tempfile.puts(file)
     tempfile.close
     self.user_export = File.new(tempfile.path, 'r')
-    if save
-      send_message
-    end
+    save!
     transition_to!(:completed)
+    mailer = UserExportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     transition_to!(:failed)
+    mailer = UserExportMailer.failed(self)
     raise e
   end
 

data/app/models/user_import_file.rb

@@ -115,10 +115,13 @@ class UserImportFile < ActiveRecord::Base
     else
       transition_to!(:completed)
     end
-    send_message
+    mailer = UserImportMailer.completed(self)
+    send_message(mailer)
     num
   rescue => e
     transition_to!(:failed)
+    mailer = UserImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -161,14 +164,17 @@ class UserImportFile < ActiveRecord::Base
     end
 
     rows.close
-    transition_to!(:completed)
     Sunspot.commit
-    send_message
+    transition_to!(:completed)
+    mailer = UserImportMailer.completed(self)
+    send_message(mailer)
     num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = UserImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 
@@ -195,11 +201,14 @@ class UserImportFile < ActiveRecord::Base
       end
     end
     transition_to!(:completed)
-    send_message
+    mailer = UserImportMailer.completed(self)
+    send_message(mailer)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     save
     transition_to!(:failed)
+    mailer = UserImportMailer.failed(self)
+    send_message(mailer)
     raise e
   end
 

data/app/views/user_export_mailer/completed.en.text.erb

@@ -0,0 +1,9 @@
+The following export task is completed.
+
+ID: <%= @user_export_file.id %>
+Created at: <%= @user_export_file.created_at %>
+Detail: <%= user_export_file_url(@user_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_export_mailer/completed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートが完了しました。
+
+ID: <%= @user_export_file.id %>
+作成時刻: <%= @user_export_file.created_at %>
+詳細: <%= user_export_file_url(@user_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_export_mailer/failed.en.text.erb

@@ -0,0 +1,9 @@
+The following export task failed.
+
+ID: <%= @user_export_file.id %>
+Created at: <%= @user_export_file.created_at %>
+Detail: <%= user_export_file_url(@user_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_export_mailer/failed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートに失敗しました。
+
+ID: <%= @user_export_file.id %>
+作成時刻: <%= @user_export_file.created_at %>
+詳細: <%= user_export_file_url(@user_export_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_import_mailer/completed.en.text.erb

@@ -0,0 +1,9 @@
+The following import task is completed.
+
+ID: <%= @user_import_file.id %>
+Created at: <%= @user_import_file.created_at %>
+Detail: <%= user_import_file_url(@user_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_import_mailer/completed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートが完了しました。
+
+ID: <%= @user_import_file.id %>
+作成時刻: <%= @user_import_file.created_at %>
+詳細: <%= user_import_file_url(@user_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_import_mailer/failed.en.text.erb

@@ -0,0 +1,9 @@
+The following import task failed.
+
+ID: <%= @user_import_file.id %>
+Created at: <%= @user_import_file.created_at %>
+Detail: <%= user_import_file_url(@user_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/app/views/user_import_mailer/failed.ja.text.erb

@@ -0,0 +1,9 @@
+以下の資料のインポートに失敗しました。
+
+ID: <%= @user_import_file.id %>
+作成時刻: <%= @user_import_file.created_at %>
+詳細: <%= user_import_file_url(@user_import_file) %>
+
+--  
+<%= @library_group.display_name %>
+<%= root_url %>

data/config/locales/translation_en.yml

@@ -131,3 +131,14 @@ en:
     google: Google Books
     openbd: openBD
     hanmotocom: Hanmoto.com
+
+  user_import_mailer:
+    completed:
+      subject: 'Import completed'
+    failed:
+      subject: 'Import failed'
+  user_export_mailer:
+    completed:
+      subject: 'Export completed'
+    failed:
+      subject: 'Export failed'

data/config/locales/translation_ja.yml

@@ -131,3 +131,14 @@ ja:
     google: Googleブックス
     openbd: openBD
     hanmotocom: 版元ドットコム
+
+  user_import_mailer:
+    completed:
+      subject: 'インポートが完了しました'
+    failed:
+      subject: 'インポートに失敗しました'
+  user_export_mailer:
+    completed:
+      subject: 'エクスポートが完了しました'
+    failed:
+      subject: 'エクスポートに失敗しました'

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/mailers/previews/user_export_preview.rb

@@ -0,0 +1,4 @@
+# Preview all emails at http://localhost:3000/rails/mailers/user_export
+class UserExportPreview < ActionMailer::Preview
+
+end

data/spec/mailers/previews/user_import_preview.rb

@@ -0,0 +1,4 @@
+# Preview all emails at http://localhost:3000/rails/mailers/user_import
+class UserImportPreview < ActionMailer::Preview
+
+end

data/spec/mailers/user_export_spec.rb

@@ -0,0 +1,5 @@
+require "rails_helper"
+
+RSpec.describe UserExportMailer, type: :mailer do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/spec/mailers/user_import_spec.rb

@@ -0,0 +1,5 @@
+require "rails_helper"
+
+RSpec.describe UserImportMailer, type: :mailer do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/spec/models/basket_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe Basket do

data/spec/models/library_group_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe LibraryGroup do

data/spec/models/library_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe Library do

data/spec/models/request_status_type_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe RequestStatusType do

data/spec/models/request_type_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe RequestType do

data/spec/models/search_engine_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe SearchEngine do

data/spec/models/shelf_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe Shelf do

data/spec/models/subscribe_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe Subscribe do

data/spec/models/user_export_file_spec.rb

@@ -9,7 +9,7 @@ describe UserExportFile do
     file.export!
     #UserExportFileJob.perform_later(file).should be_truthy
     Message.count.should eq message_count + 1
-    Message.order(:id).last.subject.should eq 'エクスポートが完了しました'
+    Message.order(:created_at).last.subject.should eq "エクスポートが完了しました: #{file.id}"
   end
 end
 

data/spec/models/user_group_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe UserGroup do

data/spec/models/user_import_file_spec.rb

@@ -86,7 +86,7 @@ describe UserImportFile do
       @file.user = User.where(username: 'librarian1').first
       @file.import_start
       Message.count.should eq old_message_count + 1
-      Message.order(:id).last.subject.should eq 'インポートが完了しました'
+      Message.order(:created_at).last.subject.should eq "インポートが完了しました: #{@file.id}"
     end
 
     it "should not import users that have higher roles than current user's role" do

data/spec/models/user_import_result_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe UserImportResult do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -360,6 +360,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: annotate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library module for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -392,7 +406,10 @@ files:
 - app/helpers/shelves_helper.rb
 - app/jobs/user_export_file_job.rb
 - app/jobs/user_import_file_job.rb
+- app/mailers/application_mailer.rb
 - app/mailers/notifier.rb
+- app/mailers/user_export_mailer.rb
+- app/mailers/user_import_mailer.rb
 - app/models/accept.rb
 - app/models/basket.rb
 - app/models/bookstore.rb
@@ -517,6 +534,10 @@ files:
 - app/views/user_export_files/index.html.erb
 - app/views/user_export_files/new.html.erb
 - app/views/user_export_files/show.html.erb
+- app/views/user_export_mailer/completed.en.text.erb
+- app/views/user_export_mailer/completed.ja.text.erb
+- app/views/user_export_mailer/failed.en.text.erb
+- app/views/user_export_mailer/failed.ja.text.erb
 - app/views/user_groups/_form.html.erb
 - app/views/user_groups/edit.html.erb
 - app/views/user_groups/index.html.erb
@@ -528,6 +549,10 @@ files:
 - app/views/user_import_files/index.html.erb
 - app/views/user_import_files/new.html.erb
 - app/views/user_import_files/show.html.erb
+- app/views/user_import_mailer/completed.en.text.erb
+- app/views/user_import_mailer/completed.ja.text.erb
+- app/views/user_import_mailer/failed.en.text.erb
+- app/views/user_import_mailer/failed.ja.text.erb
 - app/views/user_import_results/_form.html.erb
 - app/views/user_import_results/_list.html.erb
 - app/views/user_import_results/_list_lines.html.erb
@@ -955,6 +980,10 @@ files:
 - spec/fixtures/users.yml
 - spec/fixtures/withdraws.yml
 - spec/libraries_spec.rb
+- spec/mailers/previews/user_export_preview.rb
+- spec/mailers/previews/user_import_preview.rb
+- spec/mailers/user_export_spec.rb
+- spec/mailers/user_import_spec.rb
 - spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/models/bookstore_spec.rb
@@ -1282,6 +1311,10 @@ test_files:
 - spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb
 - spec/dummy/README.rdoc
 - spec/libraries_spec.rb
+- spec/mailers/user_export_spec.rb
+- spec/mailers/user_import_spec.rb
+- spec/mailers/previews/user_import_preview.rb
+- spec/mailers/previews/user_export_preview.rb
 - spec/models/library_group_spec.rb
 - spec/models/request_type_spec.rb
 - spec/models/withdraw_spec.rb