enju_library 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b53b9a80c2a2174f387021fb298c3e1baf6e36af488e4a926be0ebb5f9c433ba
-  data.tar.gz: 43e382458c63aaf670026c2acb592301c374da6762c5750084afe42e0f4292f1
+  metadata.gz: 4802d463a39344f22ebe0ee2c4b1450a2331eef57c580e30ea6d95591ee1dfb9
+  data.tar.gz: 60f7c600d830f4d00904a229499084ff9c5a4b2569bb6573219326aaa91d8952
 SHA512:
-  metadata.gz: 613890cb1966bf5a47144da01dc5abd51a9a586f7725dfa00eaef08923e444537f957c0b6cd86df6f0af1cb4c40034b9a206c68af6149ee065b04a4ef71e1914
-  data.tar.gz: 034e25b560b858a295a1371b3516d99611ca242bf9a7f328da80bb9be2b639e9503adeaee3fc850137802c6bab3251493e36c4288a5f04ae2290257baefcf300
+  metadata.gz: f165c06c251c2d2ec85647e7182c413604983d1016042195f72e2535f320788f7abd5c71d851c3f15bab49e6855614f3299820eefe83ed802b4f4597ca93e170
+  data.tar.gz: 0d8f350edd67f0bfa842c241dcac23cf90b0ef4f57af3797e3f9ebb6be2855067183888e0259c913af3f0c167d255f1b57da50f64a81707b5dfdd08cd4b3df09

data/README.md

@@ -0,0 +1,10 @@
+# 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)
+
+This project rocks and uses MIT-LICENSE.
+
+## 製作者・貢献者 (Authors and contributors)
+* [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
+* [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))

data/Rakefile

@@ -16,7 +16,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'EnjuLibrary'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/app/models/withdraw.rb

@@ -7,16 +7,10 @@ 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

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/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/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,5 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link icons/arrow_up.png
+//= link icons/arrow_down.png

data/spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddMemoToManifestation < ActiveRecord::Migration[5.2]
+  def change
+    add_column :manifestations, :memo, :text
+  end
+end

data/spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb

@@ -0,0 +1,5 @@
+class AddMemoToItem < ActiveRecord::Migration[5.2]
+  def change
+    add_column :items, :memo, :text
+  end
+end

data/spec/dummy/db/migrate/20191219122214_create_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :custom_properties do |t|
+      t.integer :resource_id, null: false
+      t.string :resource_type, null: false
+      t.text :label, null: false
+      t.text :value
+
+      t.timestamps
+    end
+  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: 2018_01_07_162048) do
+ActiveRecord::Schema.define(version: 2019_12_19_122214) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -433,6 +433,15 @@ ActiveRecord::Schema.define(version: 2018_01_07_162048) 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"
@@ -669,6 +678,7 @@ ActiveRecord::Schema.define(version: 2018_01_07_162048) do
     t.string "binding_call_number"
     t.datetime "binded_at"
     t.integer "manifestation_id", null: false
+    t.text "memo"
     t.index ["binding_item_identifier"], name: "index_items_on_binding_item_identifier"
     t.index ["bookstore_id"], name: "index_items_on_bookstore_id"
     t.index ["checkout_type_id"], name: "index_items_on_checkout_type_id"
@@ -919,6 +929,7 @@ ActiveRecord::Schema.define(version: 2018_01_07_162048) do
     t.text "publication_place"
     t.text "extent"
     t.text "dimensions"
+    t.text "memo"
     t.index ["access_address"], name: "index_manifestations_on_access_address"
     t.index ["date_of_publication"], name: "index_manifestations_on_date_of_publication"
     t.index ["doi"], name: "index_manifestations_on_doi"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -416,7 +416,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - app/assets/config/enju_library_manifest.js
 - app/controllers/accepts_controller.rb
@@ -685,6 +685,7 @@ files:
 - spec/controllers/withdraws_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -945,6 +946,9 @@ files:
 - spec/dummy/db/migrate/20180107162009_add_constraints_to_most_recent_for_user_reserve_stat_transitions.rb
 - spec/dummy/db/migrate/20180107162029_add_constraints_to_most_recent_for_manifestation_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20180107162048_add_constraints_to_most_recent_for_manifestation_reserve_stat_transitions.rb
+- spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb
+- spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb
+- spec/dummy/db/migrate/20191219122214_create_custom_properties.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1023,7 +1027,6 @@ files:
 - spec/fixtures/user_reserve_stats.yml
 - 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
@@ -1051,7 +1054,6 @@ files:
 - spec/routing/budget_types_routing_spec.rb
 - spec/routing/libraries_routing_spec.rb
 - spec/routing/withdraws_routing_spec.rb
-- spec/shelves_spec.rb
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
@@ -1103,6 +1105,7 @@ test_files:
 - spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/helpers/application_helper.rb
@@ -1248,6 +1251,7 @@ test_files:
 - spec/dummy/db/migrate/20081215094955_create_checkout_stat_has_users.rb
 - spec/dummy/db/migrate/20100129142347_create_import_requests.rb
 - spec/dummy/db/migrate/125_create_donates.rb
+- spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb
 - spec/dummy/db/migrate/20180107162029_add_constraints_to_most_recent_for_manifestation_checkout_stat_transitions.rb
 - spec/dummy/db/migrate/20120129020544_add_budget_type_id_to_item.rb
 - spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb
@@ -1305,6 +1309,7 @@ test_files:
 - spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb
 - spec/dummy/db/migrate/20130421155019_add_creator_string_to_series_statement.rb
 - spec/dummy/db/migrate/20100814091104_add_position_to_agent_relationship.rb
+- spec/dummy/db/migrate/20191219122214_create_custom_properties.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
 - spec/dummy/db/migrate/117_create_form_of_works.rb
 - spec/dummy/db/migrate/20080819181903_create_message_requests.rb
@@ -1349,6 +1354,7 @@ test_files:
 - spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb
 - spec/dummy/db/migrate/20090705133942_add_attachments_picture_to_picture_file.rb
 - spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb
+- spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb
 - spec/dummy/db/migrate/145_create_subject_heading_types.rb
 - spec/dummy/db/migrate/20120511072422_add_agent_identifier_to_agent.rb
 - spec/dummy/db/migrate/20110301121550_add_birth_date_and_death_date_to_agent.rb
@@ -1365,7 +1371,6 @@ test_files:
 - spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
 - 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
@@ -1387,7 +1392,6 @@ test_files:
 - spec/models/subscribe_spec.rb
 - spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
-- spec/shelves_spec.rb
 - spec/system/libraries_spec.rb
 - spec/system/shelves_spec.rb
 - spec/support/controller_macros.rb

data/README.rdoc

@@ -1,10 +0,0 @@
-= EnjuLibrary
-{<img src="https://travis-ci.org/next-l/enju_library.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_library]
-{<img src="https://coveralls.io/repos/next-l/enju_library/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_library?branch=1.3]
-{<img src="https://hakiri.io/github/next-l/enju_library/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_library/1.3]
-
-This project rocks and uses MIT-LICENSE.
-
-== 製作者・貢献者 (Authors and contributors)
-* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
-* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/spec/libraries_spec.rb

@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Libraries', type: :system do
-  include Devise::Test::IntegrationHelpers
-  fixtures :all
-
-  describe 'When logged in as Administrator' do
-    before do
-      sign_in users(:admin)
-    end
-
-    it 'should show library config' do
-      visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).to have_content '設定'
-    end
-  end
-
-  describe 'When logged in as Librarian' do
-    before do
-      sign_in users(:librarian1)
-    end
-
-    it 'should not show library config' do
-      visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_content '設定'
-    end
-  end
-
-  describe 'When logged in as User' do
-    before do
-      sign_in users(:user1)
-    end
-
-    it 'should not show library config' do
-      visit library_path(libraries(:library_00002).id, locale: :ja)
-      expect(page).not_to have_content '設定'
-    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 '設定'
-    end
-  end
-end

data/spec/shelves_spec.rb

@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Shelves', type: :system do
-  include Devise::Test::IntegrationHelpers
-  fixtures :all
-
-  describe 'When logged in as Administrator' do
-    before do
-      sign_in users(:admin)
-    end
-
-    it 'should show shelf config' do
-      visit shelf_path(shelves(:shelf_00002).id, locale: :ja)
-      expect(page).to have_content '新規作成'
-    end
-  end
-
-  describe 'When logged in as Librarian' do
-    before do
-      sign_in users(:librarian1)
-    end
-
-    it 'should not show shelf config' do
-      visit shelf_path(shelves(:shelf_00002).id, locale: :ja)
-      expect(page).not_to have_content '新規作成'
-    end
-  end
-
-  describe 'When logged in as User' do
-    before do
-      sign_in users(:user1)
-    end
-
-    it 'should not show shelf config' do
-      visit shelf_path(shelves(:shelf_00002).id, locale: :ja)
-      expect(page).not_to have_content '新規作成'
-    end
-  end
-
-  describe 'When not logged in' do
-    it 'should not show shelf config' do
-      visit shelf_path(shelves(:shelf_00002).id, locale: :ja)
-      expect(page).not_to have_content '新規作成'
-    end
-  end
-end