enju_library 0.4.0.beta.4 → 0.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe45c54c07a749094837b2e5d64b05c02d155aa024feeb44528fc474adf67c2
-  data.tar.gz: 3e6293caed7ef2a3133ea3cd84266e4de9dd2c030d888f93d982b1a83e41a41d
+  metadata.gz: 6e02d4568d0ebba73a6e192a03f02967e316948576fe92c354b252a1207a6fab
+  data.tar.gz: 5f636e16cae0839f342760ff305111ea2c64c66542bf9c1f3df71f8831f5b244
 SHA512:
-  metadata.gz: 012a3b4be7f5cb082bbbf62702cb7cdeb4e15887f26c79db53b27c7a1b2dc348ebb9bcbb994b146051fe7bf3bd8825eece6f609aaa5157393edcb3731a49f1c9
-  data.tar.gz: fedf2c70dbf9e8311af543bb74ff664b8c15fccf2a3b32e4969f125509cffa985a9bdb1b9b0dd4dd68c77c6d2da37b35f76e982591d77cadf799ee2eb2449ffd
+  metadata.gz: 5b27017e8be6fd505cca262eb24db031f56927d0bea438a9f63f047b805c3a0f802e90f71922fc6cfc6783cd6775dde04a4df39e3f2ba56e5a9b91c94a2cf82a
+  data.tar.gz: 97bca63336e0ff89d6db94bb87c68e0d2a67b9381a90424ad20a91e808ce5cc3414c2e354d80c99ddbf761366ed25e4c5db4a6f0daa7838066866b867db0f9aa

data/README.md

@@ -1,5 +1,5 @@
 # EnjuLibrary
-![](https://github.com/next-l/enju_library/workflows/Ruby/badge.svg?branch=2.x)
+[![CircleCI](https://circleci.com/gh/next-l/enju_library/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_library/tree/2.x)
 [![Coverage Status](https://coveralls.io/repos/github/next-l/enju_library/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_library?branch=2.x)
 
 This project rocks and uses MIT-LICENSE.

data/app/controllers/library_groups_controller.rb

@@ -91,10 +91,7 @@ class LibraryGroupsController < ApplicationController
       },
       {
         colors_attributes: [:id, :property, :code]
-      },
-      {
-        user_attributes: [:email]
-      },
+      }
     )
   end
 end

data/app/helpers/enju_library/application_helper.rb

@@ -7,10 +7,10 @@ module EnjuLibrary
       content_tag :li do
         if current
           content_tag :strong do
-            link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library_id: library.name, only_path: true)))
+            link_to("#{library.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library_id: library.name, only_path: true)))
           end
         else
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library_id: library.name, only_path: true)))
+          link_to("#{library.display_name} (" + facet.count.to_s + ")", url_for(filtered_params.merge(page: nil, library_id: library.name, only_path: true)))
         end
       end
     end

data/app/mailers/notifier.rb

@@ -2,7 +2,7 @@ class Notifier < ActionMailer::Base
   def message_notification(message_id)
     message = Message.find(message_id)
     I18n.locale = message.receiver.profile.locale.try(:to_sym) || I18n.default_locale
-    from = "#{LibraryGroup.system_name(message.receiver.profile.locale)} <#{LibraryGroup.site_config.user.email}>"
+    from = "#{LibraryGroup.system_name(message.receiver.profile.locale)} <#{LibraryGroup.site_config.email}>"
     if message.subject
       subject = message.subject
     else
@@ -21,7 +21,7 @@ class Notifier < ActionMailer::Base
   def manifestation_info(user_id, manifestation_id)
     user = User.find(user_id)
     manifestation = Manifestation.find(manifestation_id)
-    from = "#{LibraryGroup.system_name(user.profile.locale)} <#{LibraryGroup.site_config.user.email}>"
+    from = "#{LibraryGroup.system_name(user.profile.locale)} <#{LibraryGroup.site_config.email}>"
     subject = "#{manifestation.original_title} : #{LibraryGroup.system_name(user.profile.locale)}"
     @user = user
     @manifestation = manifestation

data/app/mailers/user_export_mailer.rb

@@ -2,7 +2,7 @@ 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}>"
+    from = "#{LibraryGroup.system_name(user_export_file.user.profile.locale)} <#{@library_group.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
@@ -10,7 +10,7 @@ class UserExportMailer < ApplicationMailer
   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}>"
+    from = "#{LibraryGroup.system_name(user_export_file.user.profile.locale)} <#{@library_group.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

data/app/mailers/user_import_mailer.rb

@@ -2,7 +2,7 @@ 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}>"
+    from = "#{LibraryGroup.system_name(user_import_file.user.profile.locale)} <#{@library_group.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
@@ -10,7 +10,7 @@ class UserImportMailer < ApplicationMailer
   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}>"
+    from = "#{LibraryGroup.system_name(user_import_file.user.profile.locale)} <#{@library_group.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

data/app/models/accept.rb

@@ -17,10 +17,10 @@ end
 #
 # Table name: accepts
 #
-#  id           :integer          not null, primary key
-#  basket_id    :integer
-#  item_id      :integer
-#  librarian_id :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id           :bigint           not null, primary key
+#  basket_id    :bigint
+#  item_id      :bigint
+#  librarian_id :bigint
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/basket.rb

@@ -30,10 +30,10 @@ end
 #
 # Table name: baskets
 #
-#  id           :integer          not null, primary key
-#  user_id      :integer
+#  id           :bigint           not null, primary key
+#  user_id      :bigint
 #  note         :text
 #  lock_version :integer          default(0), not null
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #

data/app/models/bookstore.rb

@@ -17,7 +17,7 @@ end
 #
 # Table name: bookstores
 #
-#  id               :integer          not null, primary key
+#  id               :bigint           not null, primary key
 #  name             :text             not null
 #  zip_code         :string
 #  address          :text
@@ -26,7 +26,6 @@ end
 #  fax_number       :string
 #  url              :string
 #  position         :integer
-#  deleted_at       :datetime
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #

data/app/models/budget_type.rb

@@ -15,12 +15,12 @@ end
 #
 # Table name: budget_types
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/color.rb

@@ -12,11 +12,11 @@ end
 #
 # Table name: colors
 #
-#  id               :integer          not null, primary key
-#  library_group_id :integer
+#  id               :bigint           not null, primary key
+#  library_group_id :bigint
 #  property         :string
 #  code             :string
 #  position         :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #

data/app/models/concerns/enju_library/enju_user.rb

@@ -5,6 +5,68 @@ module EnjuLibrary
     included do
       include EnjuSeed::EnjuUser
       has_many :basket, dependent: :destroy
+
+      def self.csv_header(role: 'Librarian')
+        User.new.to_hash(role: 'Librarian').keys
+      end
+
+      # ユーザの情報をエクスポートします。
+      # @param [Hash] options
+      def to_hash(role: 'Librarian')
+        record = {
+          username: username,
+          full_name: profile.try(:full_name),
+          full_name_transcription: profile.try(:full_name_transcription),
+          email: email,
+          user_number: profile.try(:user_number),
+          role: send(:role).try(:name),
+          user_group: profile.try(:user_group).try(:name),
+          library: profile.try(:library).try(:name),
+          locale: profile.try(:locale),
+          locked: access_locked?,
+          required_role: profile.try(:required_role).try(:name),
+          created_at: created_at,
+          updated_at: updated_at,
+          expired_at: profile.try(:expired_at),
+          keyword_list: profile.try(:keyword_list),
+          note: profile.try(:note)
+        }
+
+        if defined?(EnjuCirculation)
+          record.merge!(
+            checkout_icalendar_token: checkout_icalendar_token,
+            save_checkout_history: save_checkout_history
+          )
+        end
+
+        if defined?(EnjuSearchLog)
+          record.merge!(
+            save_search_history: save_checkout_history
+          )
+        end
+
+        if defined?(EnjuBookmark)
+          record.merge!(
+            share_bookmarks: share_bookmarks
+          )
+        end
+
+        record
+      end
+
+      def self.export(role: 'Librarian', col_sep: "\t")
+        file = Tempfile.create do |f|
+          f.write User.csv_header(role: role).to_csv(col_sep: col_sep)
+          User.find_each do |user|
+          #  f.write user.to_hash(role: role).values.to_csv(col_sep: col_sep)
+          end
+
+          f.rewind
+          f.read
+        end
+
+        file
+      end
     end
   end
 end

data/app/models/library.rb

@@ -79,7 +79,7 @@ end
 #
 # Table name: libraries
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  short_display_name        :string           not null
@@ -93,13 +93,12 @@ end
 #  note                      :text
 #  call_number_rows          :integer          default(1), not null
 #  call_number_delimiter     :string           default("|"), not null
-#  library_group_id          :integer          not null
+#  library_group_id          :bigint           not null
 #  users_count               :integer          default(0), not null
 #  position                  :integer
-#  country_id                :integer
-#  created_at                :datetime
-#  updated_at                :datetime
-#  deleted_at                :datetime
+#  country_id                :bigint
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  opening_hour              :text
 #  isil                      :string
 #  latitude                  :float

data/app/models/library_group.rb

@@ -79,7 +79,7 @@ end
 #
 # Table name: library_groups
 #
-#  id                            :integer          not null, primary key
+#  id                            :bigint           not null, primary key
 #  name                          :string           not null
 #  display_name                  :text
 #  short_name                    :string           not null
@@ -88,8 +88,8 @@ end
 #  note                          :text
 #  country_id                    :integer
 #  position                      :integer
-#  created_at                    :datetime
-#  updated_at                    :datetime
+#  created_at                    :datetime         not null
+#  updated_at                    :datetime         not null
 #  admin_networks                :text
 #  allow_bookmark_external_url   :boolean          default(FALSE), not null
 #  url                           :string           default("http://localhost:3000/")
@@ -100,7 +100,7 @@ end
 #  family_name_first             :boolean          default(TRUE)
 #  screenshot_generator          :string
 #  pub_year_facet_range_interval :integer          default(10)
-#  user_id                       :integer
+#  user_id                       :bigint
 #  csv_charset_conversion        :boolean          default(FALSE), not null
 #  header_logo_file_name         :string
 #  header_logo_content_type      :string
@@ -110,4 +110,5 @@ end
 #  display_name_translations     :jsonb            not null
 #  login_banner_translations     :jsonb            not null
 #  footer_banner_translations    :jsonb            not null
+#  email                         :string
 #

data/app/models/request_status_type.rb

@@ -15,12 +15,12 @@ end
 #
 # Table name: request_status_types
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/request_type.rb

@@ -14,12 +14,12 @@ end
 #
 # Table name: request_types
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/search_engine.rb

@@ -26,7 +26,7 @@ end
 #
 # Table name: search_engines
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  url                       :string           not null
@@ -36,7 +36,7 @@ end
 #  additional_param          :text
 #  note                      :text
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/shelf.rb

@@ -39,7 +39,7 @@ class Shelf < ApplicationRecord
   end
 
   def localized_display_name
-    display_name.localize
+    display_name
   end
 
   # http://stackoverflow.com/a/12437606
@@ -54,16 +54,15 @@ end
 #
 # Table name: shelves
 #
-#  id                        :integer          not null, primary key
+#  id                        :bigint           not null, primary key
 #  name                      :string           not null
 #  display_name              :text
 #  note                      :text
-#  library_id                :integer          not null
+#  library_id                :bigint           not null
 #  items_count               :integer          default(0), not null
 #  position                  :integer
-#  created_at                :datetime
-#  updated_at                :datetime
-#  deleted_at                :datetime
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
 #  closed                    :boolean          default(FALSE), not null
 #  display_name_translations :jsonb            not null
 #

data/app/models/subscribe.rb

@@ -11,11 +11,11 @@ end
 #
 # Table name: subscribes
 #
-#  id              :integer          not null, primary key
-#  subscription_id :integer          not null
+#  id              :bigint           not null, primary key
+#  subscription_id :bigint           not null
 #  work_id         :integer          not null
 #  start_at        :datetime         not null
 #  end_at          :datetime         not null
-#  created_at      :datetime
-#  updated_at      :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
 #

data/app/models/subscription.rb

@@ -28,13 +28,12 @@ end
 #
 # Table name: subscriptions
 #
-#  id               :integer          not null, primary key
+#  id               :bigint           not null, primary key
 #  title            :text             not null
 #  note             :text
-#  user_id          :integer
-#  order_list_id    :integer
-#  deleted_at       :datetime
+#  user_id          :bigint
+#  order_list_id    :bigint
 #  subscribes_count :integer          default(0), not null
-#  created_at       :datetime
-#  updated_at       :datetime
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
 #

data/app/models/user_export_file.rb

@@ -31,14 +31,16 @@ class UserExportFile < ApplicationRecord
 
   # エクスポートの処理を実行します。
   def export!
-    transition_to!(:started)
-    tempfile = Tempfile.new(['user_export_file_', '.txt'])
-    file = User.export(format: :txt)
-    tempfile.puts(file)
-    tempfile.close
-    self.user_export = File.new(tempfile.path, 'r')
-    save!
-    transition_to!(:completed)
+    UserExportFile.transaction do
+      transition_to!(:started)
+      role_name = user.try(:role).try(:name)
+      tsv = User.export(role: role_name)
+      self.user_export = StringIO.new(tsv)
+      self.user_export.instance_write(:filename, "user_export.txt")
+      save!
+      transition_to!(:completed)
+    end
+
     mailer = UserExportMailer.completed(self)
     send_message(mailer)
   rescue => e
@@ -46,27 +48,19 @@ class UserExportFile < ApplicationRecord
     mailer = UserExportMailer.failed(self)
     raise e
   end
-
-  def self.transition_class
-    UserExportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
 end
 
 # == Schema Information
 #
 # Table name: user_export_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
+#  id                       :bigint           not null, primary key
+#  user_id                  :bigint
 #  user_export_file_name    :string
 #  user_export_content_type :string
 #  user_export_file_size    :bigint
 #  user_export_updated_at   :datetime
 #  executed_at              :datetime
-#  created_at               :datetime
-#  updated_at               :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #