enju_library 0.3.7 → 0.3.8.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6281daed741bd1cc79341eccf54fa5f12335277b8ca176ba932f4d80ece97552
-  data.tar.gz: acc7e4eb25d44495444425463c0b5f8e327c8d793d6f9788cfa5d4f058158c8a
+  metadata.gz: 83ce39d2995d4ffcafaf40c6ccdf98ff6490a6456a04b3a4613e3d564ec04296
+  data.tar.gz: 3b3077bca17ab0321ba8f3792127dd558fa7c74e147b6173cc174790d4365ebd
 SHA512:
-  metadata.gz: 1d5e70ea6107e81b239df5beea6a1e24dd5957ccadbe54cd2a5a81595577f904eb4737c5e97cfb095f19ea0b225359d1c361a7981b930b63a5cdc84ffd3bcfbb
-  data.tar.gz: 6c8fd058c37819d5a7a7f8aecd1064bb20bade05b17b39f41f63ccef4c9975aa83d4898a07b30ff2cd4d5827b640f9d3b766effd6f14fb8cc16b36db2f3d7ab4
+  metadata.gz: 15dc6a0c238aa98c462b83131bafa57fc528362bcef595416c52a9a2df30179bc54629d330ad1f702a6189f10cb3e7b626027b8e19d6e78a2096a6e63dd19ed4
+  data.tar.gz: 56af5c02f50402a74c0acb7752ebc0e5a078e4a265a8d1acebc18479bd37be05aeed4cb0dafb13862cff7cc1738fbc988467e1d71e8887fbe5abe555ed320fca

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 text: '{"error": "forbidden"}' }
+          format.json { render json: {"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 text: '{"error": "forbidden"}' }
+          format.json { render json: {"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 text: '{"error": "not_found"}' }
+        format.json { render json: {"error": "not_found"} }
         format.rss { render template: 'page/404.xml', status: :not_found }
       end
     end
@@ -57,7 +57,7 @@ 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 text: '{"error": "server_error"}' }
+        format.json { render json: {"error": "server_error"} }
         format.xml {render template: 'page/500.xml', status: :internal_server_error}
       end
     end
@@ -70,7 +70,7 @@ 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 text: '{"error": "server_error"}' }
+        format.json { render json: {"error": "server_error"} }
         format.xml {render template: 'page/500.xml', status: :internal_server_error}
       end
     end

data/app/models/library_group.rb

@@ -2,8 +2,8 @@ class LibraryGroup < ApplicationRecord
   #include Singleton
   include MasterModel
 
-  has_many :libraries
-  has_many :colors
+  has_many :libraries, dependent: :destroy
+  has_many :colors, dependent: :destroy
   belongs_to :country, optional: true
   belongs_to :user, optional: true
 
@@ -108,4 +108,7 @@ end
 #  header_logo_file_size         :integer
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
+#  library_group_id              :integer          not null
+#  login_banner                  :text
+#  footer_banner                 :text
 #

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_import_file.rb

@@ -62,14 +62,14 @@ class UserImportFile < ApplicationRecord
       next if row['dummy'].to_s.strip.present?
 
       username = row['username']
-      new_user = User.where(username: username).first
+      new_user = User.find_by(username: username)
       if new_user
         import_result.user = new_user
         import_result.save
         num[:user_found] += 1
       else
         new_user = User.new
-        new_user.role = Role.where(name: row['role']).first
+        new_user.role = Role.find_by(name: row['role'])
         if new_user.role
           unless user.has_role?(new_user.role.name)
             num[:failed] += 1
@@ -145,7 +145,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))
@@ -288,15 +288,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
 
@@ -318,7 +318,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

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/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/_form.html.erb

@@ -20,7 +20,7 @@
   <% unless @library.web? %>
   <div class="field">
     <%= f.label :isil -%><br />
-    <%= f.text_field :isil, class: 'resource_identifierr' -%>
+    <%= f.text_field :isil, class: 'resource_identifier' -%>
   </div>
 
   <div class="field">

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

@@ -1,25 +1,12 @@
-<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.localize %>'
-    });
-    var infowindow = new google.maps.InfoWindow({
-      content: '<%= library.display_name.localize %>'
-    });
-    google.maps.event.addListener(marker, 'click', function() {
-      infowindow.open(map,marker);
-    });
+<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.localize %>').openPopup();
+  jQuery(document).ready(function ($) {
+    mymap.invalidateSize();
   });
 </script>
-<div id="library_map" style="width: 500px; height: 500px;"></div>

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/config/locales/translation_en.yml

@@ -59,6 +59,8 @@ en:
         max_number_of_results: Max number of results
         book_jacket_source: Book jacket source
         header_logo: Header logo
+        default_custom_manifestation_label: Default custom properties (Manifestation)
+        default_custom_item_label: Default custom properties (Item)
       bookstore:
         name: Name
         zip_code: Zip code

data/config/locales/translation_ja.yml

@@ -59,6 +59,8 @@ ja:
         max_number_of_results: 検索結果の最大件数
         book_jacket_source: 書影の取得元
         header_logo: ヘッダーのロゴ
+        default_custom_manifestation_label: 既定のカスタム項目（書誌）
+        default_custom_item_label: 既定のカスタム項目（所蔵）
       bookstore:
         name: 名前
         zip_code: 郵便番号

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.7"
+  VERSION = "0.3.8.rc.1".freeze
 end

data/spec/dummy/db/migrate/20200425072340_create_manifestation_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425072349_create_item_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425074758_create_manifestation_custom_values.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomValues < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_values do |t|
+      t.references :manifestation_custom_property, null: false, foreign_key: true, index: {name: 'index_manifestation_custom_values_on_custom_property_id'}
+      t.references :manifestation, null: false, foreign_key: true
+      t.text :value
+
+      t.timestamps
+    end
+    add_index :manifestation_custom_values, [:manifestation_custom_property_id, :manifestation_id], unique: true, name: 'index_manifestation_custom_values_on_property_manifestation'
+  end
+end

data/spec/dummy/db/migrate/20200425074822_create_item_custom_values.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomValues < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_values do |t|
+      t.references :item_custom_property, null: false, foreign_key: true, index: {name: 'index_item_custom_values_on_custom_property_id'}
+      t.references :item, null: false, foreign_key: true
+      t.text :value
+
+      t.timestamps
+    end
+    add_index :item_custom_values, [:item_custom_property_id, :item_id], unique: true, name: 'index_item_custom_values_on_custom_item_property_and_item_id'
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_12_19_122214) do
+ActiveRecord::Schema.define(version: 2020_04_25_074822) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -433,15 +433,6 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
     t.index ["work_id"], name: "index_creates_on_work_id"
   end
 
-  create_table "custom_properties", force: :cascade do |t|
-    t.integer "resource_id", null: false
-    t.string "resource_type", null: false
-    t.text "label", null: false
-    t.text "value"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
   create_table "demands", force: :cascade do |t|
     t.integer "user_id"
     t.integer "item_id"
@@ -646,6 +637,27 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
     t.index ["user_id"], name: "index_import_requests_on_user_id"
   end
 
+  create_table "item_custom_properties", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "display_name", null: false
+    t.text "note"
+    t.integer "position", default: 1, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_item_custom_properties_on_name", unique: true
+  end
+
+  create_table "item_custom_values", force: :cascade do |t|
+    t.integer "item_custom_property_id", null: false
+    t.integer "item_id", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["item_custom_property_id", "item_id"], name: "index_item_custom_values_on_custom_item_property_and_item_id", unique: true
+    t.index ["item_custom_property_id"], name: "index_item_custom_values_on_custom_property_id"
+    t.index ["item_id"], name: "index_item_custom_values_on_item_id"
+  end
+
   create_table "item_has_use_restrictions", force: :cascade do |t|
     t.integer "item_id", null: false
     t.integer "use_restriction_id", null: false
@@ -824,6 +836,27 @@ ActiveRecord::Schema.define(version: 2019_12_19_122214) do
     t.index ["user_id"], name: "index_manifestation_checkout_stats_on_user_id"
   end
 
+  create_table "manifestation_custom_properties", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "display_name", null: false
+    t.text "note"
+    t.integer "position", default: 1, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["name"], name: "index_manifestation_custom_properties_on_name", unique: true
+  end
+
+  create_table "manifestation_custom_values", force: :cascade do |t|
+    t.integer "manifestation_custom_property_id", null: false
+    t.integer "manifestation_id", null: false
+    t.text "value"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["manifestation_custom_property_id", "manifestation_id"], name: "index_manifestation_custom_values_on_property_manifestation", unique: true
+    t.index ["manifestation_custom_property_id"], name: "index_manifestation_custom_values_on_custom_property_id"
+    t.index ["manifestation_id"], name: "index_manifestation_custom_values_on_manifestation_id"
+  end
+
   create_table "manifestation_relationship_types", force: :cascade do |t|
     t.string "name", null: false
     t.text "display_name"

data/spec/fixtures/library_groups.yml

@@ -47,4 +47,7 @@ one:
 #  header_logo_file_size         :integer
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
+#  library_group_id              :integer          not null
+#  login_banner                  :text
+#  footer_banner                 :text
 #

data/spec/models/library_group_spec.rb

@@ -46,4 +46,7 @@ end
 #  header_logo_file_size         :integer
 #  header_logo_updated_at        :datetime
 #  header_logo_meta              :text
+#  library_group_id              :integer          not null
+#  login_banner                  :text
+#  footer_banner                 :text
 #

data/spec/system/libraries_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Libraries', type: :system do
       sign_in users(:admin)
     end
 
-    it 'should show library config' do
+    xit 'should show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
       expect(page).to have_content '設定'
     end
@@ -20,9 +20,9 @@ RSpec.describe 'Libraries', type: :system do
       sign_in users(:librarian1)
     end
 
-    it 'should not show library config' do
+    xit 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_content '設定'
+      expect(page).not_to have_link '設定'
     end
   end
 
@@ -33,14 +33,14 @@ RSpec.describe 'Libraries', type: :system do
 
     it 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_content '設定'
+      expect(page).not_to have_link '設定'
     end
   end
 
   describe 'When not logged in' do
     it 'should not show library config' do
       visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_content '設定'
+      expect(page).not_to have_link '設定'
     end
   end
 end