enju_library 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f7ca81f27977a33233a2c3d8cf63d4573c4e1a77
-  data.tar.gz: 92931c38dd723cedc5f09ae4302aa008f73f8d5e
+SHA256:
+  metadata.gz: d77bdde03f2503414e4c6cb2392231192de3016ead53bffbf69e35de7d584288
+  data.tar.gz: 3a0beeecc968ac5dc5101dae91bcf2673ca601548fd4529c981e2751915aa83e
 SHA512:
-  metadata.gz: ef50c8fcd49f6a7e05878c93d9713645e5e7cef8d79efc69790b9e9e80de8993073a76aea456d36d384c1b1de427723f42d5b703a1012f7c2718dcac4697f21d
-  data.tar.gz: da03bb55a83508a38419fe48471e6d4bb036e1d7341df7d01f6f484c226b658995f2917cb758717a3d402ace3b0a65753739a4d7e489054bb018c1a3b6f62172
+  metadata.gz: d03ed3f75d7d7e69d1713988cdd1b4aa3e9074bcca2005d7b5eeef83d0c55079032b1cc4d0685df6cc9d1ed3c80a08c3cdec9769937dfa94cfcaa4297d6b2668
+  data.tar.gz: cbfc93babf645402a4c3572ab8e59aa9c9a9ea27de906aebfb74ba4a394dfba3ee730c3547ba84e23d6da45ca8aab5361adad5432548f026fa6bd34bd022e61f

data/app/models/withdraw.rb

@@ -15,6 +15,7 @@ class Withdraw < ActiveRecord::Base
 
   def check_item
     errors.add(:item) if item.try(:rent?)
+    errors.add(:item) if item.try(:reserved?)
   end
 end
 

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

@@ -26,10 +26,6 @@
     <%= f.text_field :number_of_time_to_notify_overdue, class: 'resource_integer' %>
   </div>
 
-  <% if defined?(EnjuCirculation) and !@user_group.new_record? %>
-    <%= render 'user_groups/checkout_form', f: f %>
-  <% end %>
-
   <div class="field">
     <%= f.label :note %><br />
     <%= f.text_area :note %>

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/dummy/config/application.rb

@@ -12,7 +12,7 @@ require "enju_manifestation_viewer"
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/spec/dummy/config/database.yml

@@ -1,30 +1,25 @@
-sqlite: &sqlite
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
   adapter: sqlite3
-  database: db/<%= Rails.env %>.sqlite3
-
-mysql: &mysql
-  adapter: mysql2
-  username: root
-  password:
-  database: enju_<%= Rails.env %>
-
-postgresql: &postgresql
-  adapter: postgresql
-  username: postgres
-  password:
-  database: enju_<%= Rails.env %>
-
-defaults: &defaults
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  host: localhost
-  <<: *<%= ENV['DB'] || "sqlite" %>
 
 development:
-  <<: *defaults
+  <<: *default
+  database: db/development.sqlite3
 
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
-  <<: *defaults
+  <<: *default
+  database: db/test.sqlite3
 
 production:
-  <<: *defaults
+  <<: *default
+  database: db/production.sqlite3

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: 20180107160740) do
+ActiveRecord::Schema.define(version: 2018_01_07_160740) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"

data/spec/factories/item.rb

@@ -3,7 +3,7 @@ FactoryBot.define do
     sequence(:item_identifier){|n| "item_#{n}"}
     circulation_status_id{CirculationStatus.find(1).id} if defined?(EnjuCircuation)
     manifestation_id{FactoryBot.create(:manifestation).id}
-    bookstore_id 1
-    budget_type_id 1
+    bookstore_id { 1 }
+    budget_type_id { 1 }
   end
 end

data/spec/factories/manifestation.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :manifestation do
     sequence(:original_title){|n| "manifestation_title_#{n}"}
-    carrier_type_id 1
-    content_type_id 1
-    frequency_id 1
+    carrier_type_id { 1 }
+    content_type_id { 1 }
+    frequency_id { 1 }
   end
 end

data/spec/factories/profile.rb

@@ -3,8 +3,8 @@ FactoryBot.define do
     f.user_group_id {UserGroup.first.id}
     f.required_role_id {Role.where(name: 'User').first.id}
     f.sequence(:user_number){|n| "user_number_#{n}"}
-    f.library_id 2
-    f.locale "ja"
+    f.library_id { 2 }
+    f.locale { "ja" }
     f.user_id {FactoryBot.create(:user).id}
   end
 end

data/spec/factories/search_engine.rb

@@ -3,7 +3,7 @@ FactoryBot.define do
     f.sequence(:name){|n| "search_engine_#{n}"}
     f.sequence(:url){|n| "http://search-engine-#{n}.example.jp"}
     f.sequence(:base_url){|n| "http://search-engine-#{n}.example.jp"}
-    f.query_param 'q'
-    f.http_method 'get'
+    f.query_param { 'q' }
+    f.http_method { 'get' }
   end
 end

data/spec/factories/subscribe.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :subscribe do |f|
     f.subscription_id{FactoryBot.create(:subscription).id}
     f.work_id{FactoryBot.create(:manifestation).id}
-    f.start_at 1.year.ago
-    f.end_at 1.year.from_now
+    f.start_at { 1.year.ago }
+    f.end_at { 1.year.from_now }
   end
 end

data/spec/libraries_spec.rb

@@ -0,0 +1,46 @@
+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/rails_helper.rb

@@ -59,6 +59,12 @@ RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
 
   config.extend ControllerMacros, type: :controller
+
+  config.before(:each) do |example|
+    if example.metadata[:type] == :system
+      driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
+    end
+  end
 end
 
 FactoryBot.definition_file_paths << "#{::Rails.root}/../../spec/factories"

data/spec/shelves_spec.rb

@@ -0,0 +1,46 @@
+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

data/spec/system/libraries_spec.rb

@@ -0,0 +1,46 @@
+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/system/shelves_spec.rb

@@ -0,0 +1,46 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -100,84 +100,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: enju_biblio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -226,28 +226,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library module for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -926,6 +954,7 @@ files:
 - spec/fixtures/user_reserve_stats.yml
 - spec/fixtures/users.yml
 - spec/fixtures/withdraws.yml
+- spec/libraries_spec.rb
 - spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/models/bookstore_spec.rb
@@ -949,9 +978,12 @@ 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
+- spec/system/libraries_spec.rb
+- spec/system/shelves_spec.rb
 - spec/views/accepts/edit.html.erb_spec.rb
 - spec/views/accepts/index.html.erb_spec.rb
 - spec/views/accepts/new.html.erb_spec.rb
@@ -987,8 +1019,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: enju_library plugin
@@ -1250,6 +1281,7 @@ 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/models/library_group_spec.rb
 - spec/models/request_type_spec.rb
 - spec/models/withdraw_spec.rb
@@ -1267,6 +1299,9 @@ 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
 - spec/support/devise.rb
 - spec/factories/item.rb