enju_library 0.3.11 → 0.4.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dbb62ca68cff89a7a1cbe0bc7846ab68173e8935dc4ee727fbd47e61ef0a0d0
-  data.tar.gz: fdd0531c2f9ec6ee496755af0017ef7696a50efdbd00087c4b6b8bf477b25cfe
+  metadata.gz: e934beedc96dce953f9b68e7cb6d95bea1e0e4cb83454f03a5f2404797a52269
+  data.tar.gz: 0fc18a6416735b39a602e6389a6ccfe1b5410bab4ccf648d88a77ea76e1077ef
 SHA512:
-  metadata.gz: 6f85b0664a3aa469ff3308a597fd3f120119eca3476d816c8af653c3b62b20bb5b64df151a07556014d693188f97ac79e0a2a863b7af65fa2284b80bcb9dcb8f
-  data.tar.gz: 1dc33c9d09baf4918a42f7aba5d0a9c7d08fc7609f6bfcd3b68c17005ee3216f1da573c9e5ca4438cda36e899f306a63b8d983415c658ff40b55b617792be424
+  metadata.gz: 1ebd80409b9b708aaf8253f17276c4c250f5d743606d016332fbc639669a009c4b35359f22264f0f73a0b5f327cbe867a5067d0ae953b88461c77767fdaa7d99
+  data.tar.gz: 2c60aa8ecdecfe494380649894c571de5634024a10006b4b41067da1fde3e7aa40e218baa1bf64a858f31f79eefa4cfd0cb5b66b2e750bceb1b86711bc87228e

data/README.md

@@ -1,7 +1,6 @@
 # EnjuLibrary
-[![Travis CI](https://travis-ci.com/next-l/enju_library.svg?branch=1.3)](https://travis-ci.com/next-l/enju_library)
-[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_library/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_library?branch=1.3)
-[![security](https://hakiri.io/github/next-l/enju_library/1.3.svg)](https://hakiri.io/github/next-l/enju_library/1.3)
+[![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/accepts_controller.rb

@@ -6,7 +6,7 @@ class AcceptsController < ApplicationController
   # GET /accepts
   # GET /accepts.json
   def index
-    if params[:format] == 'text'
+    if params[:format] == 'txt'
       @accepts = Accept.order('accepts.created_at DESC').page(params[:page]).per(65534)
     else
       if params[:accept]
@@ -29,7 +29,7 @@ class AcceptsController < ApplicationController
       format.html # index.html.erb
       format.json { render json: @accepts }
       format.js { @accept = Accept.new }
-      format.text
+      format.txt
     end
   end
 

data/app/controllers/concerns/enju_library/controller.rb

@@ -21,7 +21,7 @@ module EnjuLibrary
           format.html {render template: 'page/403', status: :forbidden}
           # format.html.phone {render template: 'page/403', status: 403}
           format.xml {render template: 'page/403', status: :forbidden}
-          format.json { render json: {"error": "forbidden"} }
+          format.json { render text: '{"error": "forbidden"}' }
           format.rss {render template: 'page/403.xml', status: :forbidden}
         end
       else
@@ -29,7 +29,7 @@ module EnjuLibrary
           format.html { redirect_to main_app.new_user_session_url }
           # format.html.phone { redirect_to new_user_session_url }
           format.xml { render template: 'page/403', status: :forbidden }
-          format.json { render json: {"error": "forbidden"} }
+          format.json { render text: '{"error": "forbidden"}' }
           format.rss { render template: 'page/403.xml', status: :forbidden }
         end
       end
@@ -41,7 +41,7 @@ module EnjuLibrary
         format.html { render template: 'page/404', status: :not_found }
         # format.html.phone { render template: 'page/404', status: 404 }
         format.xml { render template: 'page/404', status: :not_found }
-        format.json { render json: {"error": "not_found"} }
+        format.json { render text: '{"error": "not_found"}' }
         format.rss { render template: 'page/404.xml', status: :not_found }
       end
     end
@@ -57,8 +57,8 @@ module EnjuLibrary
         format.html {render file: "#{Rails.root}/public/500", layout: false, status: :internal_server_error}
         # format.html.phone {render file: "#{Rails.root}/public/500", layout: false, status: 500}
         format.xml {render template: 'page/500', status: :internal_server_error}
-        format.json { render json: {"error": "server_error"} }
-        format.rss {render template: 'page/500.xml', status: :internal_server_error}
+        format.json { render text: '{"error": "server_error"}' }
+        format.xml {render template: 'page/500.xml', status: :internal_server_error}
       end
     end
 
@@ -70,8 +70,8 @@ module EnjuLibrary
         format.html {render template: "page/500_nosolr", layout: false, status: :internal_server_error}
         # format.html.phone {render template: "page/500_nosolr", layout: false, status: 500}
         format.xml {render template: 'page/500', status: :internal_server_error}
-        format.json { render json: {"error": "server_error"} }
-        format.rss {render template: 'page/500.xml', status: :internal_server_error}
+        format.json { render text: '{"error": "server_error"}' }
+        format.xml {render template: 'page/500.xml', status: :internal_server_error}
       end
     end
 

data/app/controllers/libraries_controller.rb

@@ -133,7 +133,10 @@ class LibrariesController < ApplicationController
       :name, :display_name, :short_display_name, :zip_code, :street,
       :locality, :region, :telephone_number_1, :telephone_number_2, :fax_number,
       :note, :call_number_rows, :call_number_delimiter, :library_group_id,
-      :country_id, :opening_hour, :isil, :position, :latitude, :longitude
+      :country_id, :opening_hour, :isil, :position,
+      I18n.available_locales.map{|locale|
+        :"display_name_#{locale.to_s}"
+      }
     )
   end
 

data/app/controllers/library_groups_controller.rb

@@ -82,13 +82,19 @@ class LibraryGroupsController < ApplicationController
       :book_jacket_source, :screenshot_generator, :erms_url,
       :header_logo, :delete_header_logo,
       :allow_bookmark_external_url, # EnjuBookmark
+      I18n.available_locales.map{|locale|
+        [
+          :"display_name_#{locale.to_s}",
+          :"login_banner_#{locale.to_s}",
+          :"footer_banner_#{locale.to_s}"
+        ]
+      },
       {
         colors_attributes: [:id, :property, :code]
       },
       {
         user_attributes: [:email]
       },
-      *LibraryGroup.globalize_attribute_names,
     )
   end
 end

data/app/controllers/request_status_types_controller.rb

@@ -95,6 +95,11 @@ class RequestStatusTypesController < ApplicationController
   end
 
   def request_status_type_params
-    params.require(:request_status_type).permit(:name, :display_name, :note)
+    params.require(:request_status_type).permit(
+      :name, :display_name, :note,
+      I18n.available_locales.map{|locale|
+        :"display_name_#{locale.to_s}"
+      }
+    )
   end
 end

data/app/controllers/request_types_controller.rb

@@ -95,6 +95,11 @@ class RequestTypesController < ApplicationController
   end
 
   def request_type_params
-    params.require(:request_type).permit(:name, :display_name, :note)
+    params.require(:request_type).permit(
+      :name, :display_name, :note,
+      I18n.available_locales.map{|locale|
+        :"display_name_#{locale.to_s}"
+      }
+    )
   end
 end

data/app/controllers/shelves_controller.rb

@@ -149,7 +149,10 @@ class ShelvesController < ApplicationController
 
   def shelf_params
     params.require(:shelf).permit(
-      :name, :display_name, :note, :library_id, :closed
+      :name, :display_name, :note, :library_id, :closed,
+      I18n.available_locales.map{|locale|
+        :"display_name_#{locale.to_s}"
+      }
     )
   end
 end

data/app/controllers/user_groups_controller.rb

@@ -103,6 +103,9 @@ class UserGroupsController < ApplicationController
       :number_of_day_to_notify_overdue,
       :number_of_day_to_notify_due_date,
       :number_of_time_to_notify_overdue,
+      I18n.available_locales.map{|locale|
+        :"display_name_#{locale.to_s}"
+      },
       # EnjuCirculation
       {user_group_has_checkout_types_attributes: [
         :id, :checkout_type_id, :checkout_limit, :checkout_period, :checkout_renewal_limit,

data/app/controllers/user_import_results_controller.rb

@@ -15,7 +15,7 @@ class UserImportResultsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @user_import_results }
-      format.text
+      format.txt
     end
   end
 

data/app/controllers/withdraws_controller.rb

@@ -6,7 +6,7 @@ class WithdrawsController < ApplicationController
   # GET /withdraws
   # GET /withdraws.json
   def index
-    if params[:format] == 'text'
+    if params[:format] == 'txt'
       @withdraws = Withdraw.order('withdraws.created_at DESC').page(params[:page]).per(65534)
     else
       if params[:withdraw]
@@ -29,7 +29,7 @@ class WithdrawsController < ApplicationController
       format.html # index.html.erb
       format.json { render json: @withdraws }
       format.js { @withdraw = Withdraw.new }
-      format.text
+      format.txt
     end
   end
 

data/app/helpers/enju_library/application_helper.rb

@@ -0,0 +1,18 @@
+module EnjuLibrary
+  module ApplicationHelper
+    def library_shelf_facet(current_library, facet)
+      library = Library.where(name: facet.value).select([:name, :display_name_translations]).first
+      return nil unless library
+      current = true if current_library.try(:name) == library.name
+      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)))
+          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)))
+        end
+      end
+    end
+  end
+end

data/app/models/budget_type.rb

@@ -2,6 +2,7 @@ class BudgetType < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   has_many :items
+  translates :display_name
 
   private
 
@@ -14,11 +15,12 @@ end
 #
 # Table name: budget_types
 #
-#  id           :integer          not null, primary key
-#  name         :string
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

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

@@ -0,0 +1,10 @@
+module EnjuLibrary
+  module EnjuUser
+    extend ActiveSupport::Concern
+
+    included do
+      include EnjuSeed::EnjuUser
+      has_many :basket, dependent: :destroy
+    end
+  end
+end

data/app/models/library.rb

@@ -10,6 +10,7 @@ class Library < ApplicationRecord
   extend FriendlyId
   friendly_id :name
   geocoded_by :address
+  translates :display_name
 
   searchable do
     text :name, :display_name, :note, :address
@@ -28,20 +29,6 @@ class Library < ApplicationRecord
   validates :isil, format: { with: /\A[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}\z/ }, allow_blank: true
   after_validation :geocode, if: :address_changed?
   after_create :create_shelf
-  after_save :clear_all_cache
-  after_destroy :clear_all_cache
-
-  def self.all_cache
-    if Rails.env == 'production'
-      Rails.cache.fetch('library_all'){ Library.all }
-    else
-      Library.all
-    end
-  end
-
-  def clear_all_cache
-    Rails.cache.delete('library_all')
-  end
 
   def create_shelf
     shelf = Shelf.new
@@ -62,12 +49,10 @@ class Library < ApplicationRecord
   def address(locale = I18n.locale)
     case locale.to_sym
     when :ja
-      "#{region.to_s.localize(locale)}#{locality.to_s.localize(locale)}#{street.to_s.localize(locale)}"
+      "#{region}#{locality}#{street}"
     else
-      "#{street.to_s.localize(locale)} #{locality.to_s.localize(locale)} #{region.to_s.localize(locale)}"
+      "#{street} #{locality} #{region}"
     end
-  rescue Psych::SyntaxError
-    nil
   end
 
   def address_changed?
@@ -94,29 +79,30 @@ end
 #
 # Table name: libraries
 #
-#  id                    :integer          not null, primary key
-#  name                  :string           not null
-#  display_name          :text
-#  short_display_name    :string           not null
-#  zip_code              :string
-#  street                :text
-#  locality              :text
-#  region                :text
-#  telephone_number_1    :string
-#  telephone_number_2    :string
-#  fax_number            :string
-#  note                  :text
-#  call_number_rows      :integer          default(1), not null
-#  call_number_delimiter :string           default("|"), not null
-#  library_group_id      :integer          not null
-#  users_count           :integer          default(0), not null
-#  position              :integer
-#  country_id            :integer
-#  created_at            :datetime
-#  updated_at            :datetime
-#  deleted_at            :datetime
-#  opening_hour          :text
-#  isil                  :string
-#  latitude              :float
-#  longitude             :float
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  short_display_name        :string           not null
+#  zip_code                  :string
+#  street                    :text
+#  locality                  :text
+#  region                    :text
+#  telephone_number_1        :string
+#  telephone_number_2        :string
+#  fax_number                :string
+#  note                      :text
+#  call_number_rows          :integer          default(1), not null
+#  call_number_delimiter     :string           default("|"), not null
+#  library_group_id          :integer          not null
+#  users_count               :integer          default(0), not null
+#  position                  :integer
+#  country_id                :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  deleted_at                :datetime
+#  opening_hour              :text
+#  isil                      :string
+#  latitude                  :float
+#  longitude                 :float
+#  display_name_translations :jsonb            not null
 #

data/app/models/library_group.rb

@@ -2,14 +2,14 @@ class LibraryGroup < ApplicationRecord
   #include Singleton
   include MasterModel
 
-  has_many :libraries, dependent: :destroy
-  has_many :colors, dependent: :destroy
+  has_many :libraries
+  has_many :colors
   belongs_to :country, optional: true
   belongs_to :user, optional: true
 
   validates :url, presence: true, url: true
   validates :max_number_of_results, numericality: {
-      greater_than_or_equal_to: 0
+      greater_than_or_equal_to: 1
     }
   accepts_nested_attributes_for :colors, update_only: true
   accepts_nested_attributes_for :user, update_only: true
@@ -18,8 +18,7 @@ class LibraryGroup < ApplicationRecord
     :erms_url
   ], coder: JSON
 
-  translates :login_banner, :footer_banner
-  globalize_accessors
+  translates :login_banner, :footer_banner, :display_name
 
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :header_logo, storage: :s3, styles: { medium: 'x80'},
@@ -44,7 +43,7 @@ class LibraryGroup < ApplicationRecord
   end
 
   def self.system_name(locale = I18n.locale)
-    LibraryGroup.site_config.display_name.localize(locale)
+    LibraryGroup.site_config.send(:"display_name_#{locale.to_s}")
   end
 
   def config?
@@ -97,7 +96,7 @@ end
 #  settings                      :text
 #  html_snippet                  :text
 #  book_jacket_source            :string
-#  max_number_of_results         :integer          default(1000)
+#  max_number_of_results         :integer          default(500)
 #  family_name_first             :boolean          default(TRUE)
 #  screenshot_generator          :string
 #  pub_year_facet_range_interval :integer          default(10)
@@ -105,10 +104,10 @@ end
 #  csv_charset_conversion        :boolean          default(FALSE), not null
 #  header_logo_file_name         :string
 #  header_logo_content_type      :string
-#  header_logo_file_size         :integer
+#  header_logo_file_size         :bigint
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
-#  library_group_id              :integer          not null
-#  login_banner                  :text
-#  footer_banner                 :text
+#  display_name_translations     :jsonb            not null
+#  login_banner_translations     :jsonb            not null
+#  footer_banner_translations    :jsonb            not null
 #

data/app/models/request_status_type.rb

@@ -2,6 +2,7 @@ class RequestStatusType < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   has_many :reserves
+  translates :display_name
 
   private
 
@@ -14,11 +15,12 @@ end
 #
 # Table name: request_status_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/request_type.rb

@@ -1,6 +1,7 @@
 class RequestType < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
+  translates :display_name
 
   private
 
@@ -13,11 +14,12 @@ end
 #
 # Table name: request_types
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/search_engine.rb

@@ -6,14 +6,9 @@ class SearchEngine < ApplicationRecord
   validates :http_method, presence: true, inclusion: %w(get post)
   validates :url, presence: true, url: true, length: { maximum: 255 }
   validates :base_url, presence: true, url: true, length: { maximum: 255 }
-  after_save :clear_all_cache
-  after_destroy :clear_all_cache
 
   paginates_per 10
-
-  def clear_all_cache
-    Rails.cache.delete('search_engine_all')
-  end
+  translates :display_name
 
   def search_params(query)
     params = {}
@@ -31,16 +26,17 @@ end
 #
 # Table name: search_engines
 #
-#  id               :integer          not null, primary key
-#  name             :string           not null
-#  display_name     :text
-#  url              :string           not null
-#  base_url         :text             not null
-#  http_method      :text             not null
-#  query_param      :text             not null
-#  additional_param :text
-#  note             :text
-#  position         :integer
-#  created_at       :datetime
-#  updated_at       :datetime
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  url                       :string           not null
+#  base_url                  :text             not null
+#  http_method               :text             not null
+#  query_param               :text             not null
+#  additional_param          :text
+#  note                      :text
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  display_name_translations :jsonb            not null
 #

data/app/models/shelf.rb

@@ -12,6 +12,7 @@ class Shelf < ApplicationRecord
   before_update :reset_position
 
   acts_as_list scope: :library
+  translates :display_name
 
   searchable do
     string :shelf_name do
@@ -53,15 +54,16 @@ end
 #
 # Table name: shelves
 #
-#  id           :integer          not null, primary key
-#  name         :string           not null
-#  display_name :text
-#  note         :text
-#  library_id   :integer          not null
-#  items_count  :integer          default(0), not null
-#  position     :integer
-#  created_at   :datetime
-#  updated_at   :datetime
-#  deleted_at   :datetime
-#  closed       :boolean          default(FALSE), not null
+#  id                        :integer          not null, primary key
+#  name                      :string           not null
+#  display_name              :text
+#  note                      :text
+#  library_id                :integer          not null
+#  items_count               :integer          default(0), not null
+#  position                  :integer
+#  created_at                :datetime
+#  updated_at                :datetime
+#  deleted_at                :datetime
+#  closed                    :boolean          default(FALSE), not null
+#  display_name_translations :jsonb            not null
 #

data/app/models/user_export_file.rb

@@ -30,7 +30,7 @@ class UserExportFile < ApplicationRecord
   def export!
     transition_to!(:started)
     tempfile = Tempfile.new(['user_export_file_', '.txt'])
-    file = User.export(format: :text)
+    file = User.export(format: :txt)
     tempfile.puts(file)
     tempfile.close
     self.user_export = File.new(tempfile.path, 'r')
@@ -61,7 +61,7 @@ end
 #  user_id                  :integer
 #  user_export_file_name    :string
 #  user_export_content_type :string
-#  user_export_file_size    :integer
+#  user_export_file_size    :bigint
 #  user_export_updated_at   :datetime
 #  executed_at              :datetime
 #  created_at               :datetime

data/app/models/user_export_file_state_machine.rb

@@ -6,7 +6,7 @@ class UserExportFileStateMachine
   state :completed
   state :failed
 
-  transition from: :pending, to: [:started, :failed]
+  transition from: :pending, to: :started
   transition from: :started, to: [:completed, :failed]
 
   after_transition(from: :pending, to: :started) do |user_export_file|

data/app/models/user_group.rb

@@ -5,6 +5,7 @@ class UserGroup < ApplicationRecord
   validates_numericality_of :valid_period_for_new_user,
     greater_than_or_equal_to: 0,
     allow_blank: true
+  translates :display_name
 
   paginates_per 10
 end
@@ -26,4 +27,5 @@ end
 #  number_of_day_to_notify_overdue  :integer          default(7), not null
 #  number_of_day_to_notify_due_date :integer          default(3), not null
 #  number_of_time_to_notify_overdue :integer          default(3), not null
+#  display_name_translations        :jsonb            not null
 #