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

data/app/models/user_export_file_state_machine.rb

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

data/app/models/user_export_file_transition.rb

@@ -10,12 +10,12 @@ end
 #
 # Table name: user_export_file_transitions
 #
-#  id                  :integer          not null, primary key
+#  id                  :bigint           not null, primary key
 #  to_state            :string
 #  metadata            :text             default({})
 #  sort_key            :integer
-#  user_export_file_id :integer
-#  created_at          :datetime
-#  updated_at          :datetime
+#  user_export_file_id :bigint
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #  most_recent         :boolean          not null
 #

data/app/models/user_group.rb

@@ -14,14 +14,13 @@ end
 #
 # Table name: user_groups
 #
-#  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
-#  deleted_at                       :datetime
+#  created_at                       :datetime         not null
+#  updated_at                       :datetime         not null
 #  valid_period_for_new_user        :integer          default(0), not null
 #  expired_at                       :datetime
 #  number_of_day_to_notify_overdue  :integer          default(7), not null

data/app/models/user_import_file.rb

@@ -48,7 +48,7 @@ class UserImportFile < ApplicationRecord
   # 利用者情報をTSVファイルを用いて作成します。
   def import
     transition_to!(:started)
-    num = { user_imported: 0, user_found: 0, error: 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
 
@@ -149,7 +149,7 @@ class UserImportFile < ApplicationRecord
       )
 
       username = row['username']
-      new_user = User.where(username: username).first
+      new_user = User.find_by(username: username)
       if new_user.try(:profile)
         new_user.assign_attributes(set_user_params(row))
         new_user.profile.assign_attributes(set_profile_params(row))
@@ -196,7 +196,7 @@ class UserImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       username = row['username'].to_s.strip
-      remove_user = User.where(username: username).first
+      remove_user = User.find_by(username: username)
       if remove_user.try(:deletable_by?, user)
         UserImportFile.transaction do
           remove_user.destroy
@@ -218,14 +218,6 @@ class UserImportFile < ApplicationRecord
 
   private
 
-  def self.transition_class
-    UserImportFileTransition
-  end
-
-  def self.initial_state
-    :pending
-  end
-
   # インポート作業用のファイルを読み込みます。
   # @param [File] tempfile 作業用のファイル
   def open_import_file(tempfile)
@@ -292,15 +284,15 @@ class UserImportFile < ApplicationRecord
   # @param [Hash] row 利用者情報のハッシュ
   def set_profile_params(row)
     params = {}
-    user_group = UserGroup.where(name: row['user_group']).first
+    user_group = UserGroup.find_by(name: row['user_group'])
     unless user_group
       user_group = default_user_group
     end
     params[:user_group_id] = user_group.id if user_group
 
-    required_role = Role.where(name: row['required_role']).first
+    required_role = Role.find_by(name: row['required_role'])
     unless required_role
-      required_role = Role.where(name: 'Librarian').first
+      required_role = Role.find_by(name: 'Librarian')
     end
     params[:required_role_id] = required_role.id if required_role
 
@@ -322,7 +314,7 @@ class UserImportFile < ApplicationRecord
       params[:locale] = row['locale']
     end
 
-    library = Library.where(name: row['library'].to_s.strip).first
+    library = Library.find_by(name: row['library'].to_s.strip)
     unless library
       library = default_library || Library.web
     end
@@ -346,8 +338,8 @@ end
 #
 # Table name: user_import_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
+#  id                       :bigint           not null, primary key
+#  user_id                  :bigint
 #  note                     :text
 #  executed_at              :datetime
 #  user_import_file_name    :string
@@ -357,9 +349,9 @@ end
 #  user_import_fingerprint  :string
 #  edit_mode                :string
 #  error_message            :text
-#  created_at               :datetime
-#  updated_at               :datetime
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
 #  user_encoding            :string
-#  default_library_id       :integer
-#  default_user_group_id    :integer
+#  default_library_id       :bigint
+#  default_user_group_id    :bigint
 #

data/app/models/user_import_file_state_machine.rb

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

data/app/models/user_import_file_transition.rb

@@ -9,12 +9,12 @@ end
 #
 # Table name: user_import_file_transitions
 #
-#  id                  :integer          not null, primary key
+#  id                  :bigint           not null, primary key
 #  to_state            :string
 #  metadata            :text             default({})
 #  sort_key            :integer
-#  user_import_file_id :integer
-#  created_at          :datetime
-#  updated_at          :datetime
+#  user_import_file_id :bigint
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #  most_recent         :boolean          not null
 #

data/app/models/user_import_result.rb

@@ -10,11 +10,11 @@ end
 #
 # Table name: user_import_results
 #
-#  id                  :integer          not null, primary key
-#  user_import_file_id :integer
-#  user_id             :integer
+#  id                  :bigint           not null, primary key
+#  user_import_file_id :bigint
+#  user_id             :bigint
 #  body                :text
-#  created_at          :datetime
-#  updated_at          :datetime
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
 #  error_message       :text
 #

data/app/models/withdraw.rb

@@ -7,26 +7,20 @@ class Withdraw < ApplicationRecord
     uniqueness: true, #{ message: I18n.t('withdraw.already_withdrawn', locale: I18n.default_locale) },
     presence: true #, { message: I18n.translate('withdraw.item_not_found', locale: I18n.default_locale) }
   validates_presence_of :basket_id
-  validate :check_item
 
   attr_accessor :item_identifier
 
   paginates_per 10
-
-  def check_item
-    errors.add(:item) if item.try(:rent?)
-    errors.add(:item) if item.try(:reserved?)
-  end
 end
 
 # == Schema Information
 #
 # Table name: withdraws
 #
-#  id           :integer          not null, primary key
-#  basket_id    :integer
-#  item_id      :integer
-#  librarian_id :integer
+#  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/policies/shelf_policy.rb

@@ -17,7 +17,7 @@ class ShelfPolicy < ApplicationPolicy
 
   def destroy?
     if user.try(:has_role?, 'Administrator')
-      true if record.items.empty? && !record.web_shelf?
+      true if record.items.count == 0 && !record.web_shelf?
     end
   end
 end

data/app/views/layouts/libraries.html.erb

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @locale.to_s -%>" lang="<%= @locale.to_s -%>">
+<head>
+  <meta charset="UTF-8" />
+  <%= render 'page/include' %>
+  <title><%= title(controller.controller_name) %></title>
+  <%- if controller.controller_name == 'manifestations' and controller.action_name == 'index' -%>
+    <%= auto_discovery_link_tag(:rss, url_for(params.permit.merge(format: 'rss', page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.permit.merge(format: 'atom', page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name) + " (Atom)")) %>
+    <% if defined?(EnjuNews) %>
+      <%= auto_discovery_link_tag(:rss, news_posts_url(format: :rss, locale: @locale), title: (t('news_post.library_group_news_post', library_group_name: @library_group.display_name) + " (RSS)")) %>
+      <%= auto_discovery_link_tag(:atom, news_posts_url(format: :atom, locale: @locale), title: (t('news_post.library_group_news_post', library_group_name: @library_group.display_name) + " (Atom)")) %>
+    <% end %>
+  <% end %>
+  <%= render 'libraries/map_header' %>
+</head>
+<body itemscope itemtype="http://schema.org/WebPage">
+
+<%= render 'page/header' %>
+<%= render 'page/menu' %>
+
+<div id="content">
+
+<%= yield %>
+
+</div>
+
+<%= render 'page/footer' %>
+
+</body>
+</html>

data/app/views/libraries/_map.html.erb

@@ -1,25 +1,9 @@
-<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
-<script type="text/javascript">
-  google.maps.event.addDomListener(window, 'load', function() {
-    var latlng = new google.maps.LatLng(<%= library.latitude %>, <%= library.longitude %>);
-    var options = {
-      zoom: 16,
-      center: latlng,
-      mapTypeId: google.maps.MapTypeId.ROADMAP,
-      scaleControl: true
-    };
-    var map = new google.maps.Map(document.getElementById("library_map"), options);
-    var marker = new google.maps.Marker({
-position: latlng,
-      map: map,
-      title: '<%= library.display_name %>'
-    });
-    var infowindow = new google.maps.InfoWindow({
-      content: '<%= library.display_name %>'
-    });
-    google.maps.event.addListener(marker, 'click', function() {
-      infowindow.open(map,marker);
-    });
-  });
-</script>
 <div id="library_map" style="width: 500px; height: 500px;"></div>
+<script>
+  var mymap = L.map('library_map').setView([<%= @library.latitude %>, <%= @library.longitude %>], 13);
+  L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+    maxZoom: 18
+}).addTo(mymap);
+  L.marker([<%= @library.latitude %>, <%= @library.longitude %>]).addTo(mymap).bindPopup('<%= @library.display_name %>').openPopup();
+</script>

data/app/views/libraries/_map_header.html.erb

@@ -0,0 +1,6 @@
+<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
+   integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
+   crossorigin=""/>
+<script src="https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"
+   integrity="sha512-gZwIG9x3wUXg2hdXF6+rVkLF/0Vi9U8D2Ntg4Ga5I5BZpVkVxlJWbSQtXPSiUTtC0TjtGOmxa1AJPuV0CPthew=="
+   crossorigin=""></script>

data/app/views/library_groups/_form.html.erb

@@ -24,9 +24,7 @@
 
   <div class="field">
     <%= f.label :email -%><br />
-    <%= f.fields_for :user do |user_form| %>
-      <%= user_form.email_field :email, class: 'resource_email' -%>
-    <% end %>
+    <%= f.email_field :email, class: 'resource_email' -%>
   </div>
 
   <div class="field">

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

@@ -21,7 +21,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.library_group.email') -%>:</strong>
-  <%= @library_group.user.email -%>
+  <%= @library_group.email -%>
 </p>
 
 <p>

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

@@ -61,8 +61,10 @@
       <li><%= link_to t('page.edit'), edit_user_group_path(@user_group) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <%- if policy(UserGroupHasCheckoutType).create? -%>
-      <li><%= link_to t('page.new', model: t('activerecord.models.checkout_type')), new_user_group_user_group_has_checkout_type_path(@user_group) -%></li>
-    <%- end -%>
+    <% if defined?(EnjuCirculation) %>
+      <%- if policy(UserGroupHasCheckoutType).create? -%>
+        <li><%= link_to t('page.new', model: t('activerecord.models.checkout_type')), new_user_group_user_group_has_checkout_type_path(@user_group) -%></li>
+      <%- end -%>
+    <% end %>
   </ul>
 </div>

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

@@ -1,4 +1,9 @@
 <h2><%= t('activerecord.models.user_import_result') %></h2>
+<p>
+  <%= link_to((image_tag 'icons/page_white_excel.png', size: '16x16', class: 'enju_icon', alt: 'TSV'), 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) -%>)
+</p>
+
 <table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.user_import_result.lineno') %></th>

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

@@ -11,15 +11,4 @@
 </div>
 
 <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', class: 'enju_icon', alt: 'TSV'), 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', class: 'enju_icon', alt: 'TSV'), user_import_results_path(format: :txt, locale: @locale.to_s)) -%>
-      (<%= link_to 'TSV', user_import_results_path(format: :txt, locale: @locale.to_s) -%>)
-    <% end %>
-    </li>
-  </ul>
 </div>

data/db/migrate/059_create_libraries.rb

@@ -1,4 +1,4 @@
-class CreateLibraries < ActiveRecord::Migration[4.2]
+class CreateLibraries < ActiveRecord::Migration[5.2]
   def change
     create_table :libraries do |t|
       t.string :name, index: true, null: false
@@ -20,7 +20,6 @@ class CreateLibraries < ActiveRecord::Migration[4.2]
       t.references :country
 
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/db/migrate/069_create_shelves.rb

@@ -1,4 +1,4 @@
-class CreateShelves < ActiveRecord::Migration[4.2]
+class CreateShelves < ActiveRecord::Migration[5.2]
   def change
     create_table :shelves do |t|
       t.string :name, null: false
@@ -8,7 +8,6 @@ class CreateShelves < ActiveRecord::Migration[4.2]
       t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/db/migrate/077_create_user_groups.rb

@@ -1,4 +1,4 @@
-class CreateUserGroups < ActiveRecord::Migration[4.2]
+class CreateUserGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :user_groups do |t|
       t.string :name, not_null: true
@@ -6,7 +6,6 @@ class CreateUserGroups < ActiveRecord::Migration[4.2]
       t.text :note
       t.integer :position
       t.timestamps
-      t.datetime :deleted_at
     end
   end
 end

data/db/migrate/080_create_library_groups.rb

@@ -1,4 +1,4 @@
-class CreateLibraryGroups < ActiveRecord::Migration[4.2]
+class CreateLibraryGroups < ActiveRecord::Migration[5.2]
   def change
     create_table :library_groups do |t|
       t.string :name, null: false

data/db/migrate/120_create_baskets.rb

@@ -1,4 +1,4 @@
-class CreateBaskets < ActiveRecord::Migration[4.2]
+class CreateBaskets < ActiveRecord::Migration[5.2]
   def change
     create_table :baskets do |t|
       t.references :user, index: true

data/db/migrate/124_create_bookstores.rb

@@ -1,4 +1,4 @@
-class CreateBookstores < ActiveRecord::Migration[4.2]
+class CreateBookstores < ActiveRecord::Migration[5.2]
   def change
     create_table :bookstores do |t|
       t.text :name, null: false
@@ -9,7 +9,6 @@ class CreateBookstores < ActiveRecord::Migration[4.2]
       t.string :fax_number
       t.string :url
       t.integer :position
-      t.datetime :deleted_at
 
       t.timestamps
     end

data/db/migrate/130_create_request_status_types.rb

@@ -1,4 +1,4 @@
-class CreateRequestStatusTypes < ActiveRecord::Migration[4.2]
+class CreateRequestStatusTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :request_status_types do |t|
       t.string :name, null: false

data/db/migrate/131_create_request_types.rb

@@ -1,4 +1,4 @@
-class CreateRequestTypes < ActiveRecord::Migration[4.2]
+class CreateRequestTypes < ActiveRecord::Migration[5.2]
   def change
     create_table :request_types do |t|
       t.string :name, null: false