enju_circulation 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bf9fbe5abcd9d47bea31504e6c9e0e156a794af0
-  data.tar.gz: 1753a6261b11c688652c5fcff97230b4d40ffc4f
+SHA256:
+  metadata.gz: 6b71a1452b3731a885beeb265f9f5d3db20604cb7f4397cdddd9269b4e235a7c
+  data.tar.gz: 79273b205450724cc144ac839d09d82069755f5f84fc78f37948ce396ea292a2
 SHA512:
-  metadata.gz: 5fdabe08d9d697c68fec4b1ba867dfec33665366e38d17fd4d9a40eb2c357767be2197dc625ef954dbda26f25797935447d728994ecde4cd2571f937c2204ddf
-  data.tar.gz: 318106fd1014a711022d2334679662c0eb4da05bdfe0916e5cf64918db6801e95b257d4bcafedbcba6528e3b8100af8666e3c91e8ac91fd86061077d64faf2c8
+  metadata.gz: 4df0bfd6a17b48bdbdf08177ee991c0f8dcebbe1d6e7237e9f41b7eb39e65b32e7d38c9c0b08bfa41add718bc8f5ec26e29dc364003ef4ef9518d8ca8864f246
+  data.tar.gz: f5e812a6fa13aebc8b642d44d78cbb7a303ca761df3afeef33650fdd9820dc3c9cec390b7a551135088d7fa027244d23b4010b1bf70f83f4c4092e3c3e2c9e0c

data/app/models/concerns/enju_circulation/enju_item.rb

@@ -27,7 +27,10 @@ module EnjuCirculation
           'use_restrictions.name' => FOR_CHECKOUT_USE_RESTRICTION
         ).where(identifier_conditions)
       }
+      scope :on_shelf, -> { includes(:shelf).references(:shelf).where('shelves.name != ?', 'web').where.not(circulation_status_id: CirculationStatus.find_by(name: 'Removed').id) }
+      scope :available, -> { includes(:circulation_status).where.not('circulation_statuses.name' => 'Removed') }
       scope :removed, -> { includes(:circulation_status).where('circulation_statuses.name' => 'Removed') }
+
       has_many :checkouts
       has_many :reserves
       has_many :checked_items

data/app/models/reserve.rb

@@ -137,7 +137,7 @@ class Reserve < ActiveRecord::Base
   def retained_by_other_user?
     return nil if force_retaining == '1'
     if item && !retained?
-      if Reserve.retained.where(item_id: item.item_identifier).count > 0
+      if Reserve.retained.where(item_id: item.id).count > 0
         errors[:base] << I18n.t('reserve.attempt_to_update_retained_reservation')
       end
     end

data/app/views/checkouts/index.txt.ruby

@@ -3,7 +3,7 @@ CSV.generate(col_sep: "\t", row_sep: "\r\n") do |csv|
   @checkouts.each do |checkout|
     csv << [
       checkout.user.try(:username),
-      checkout.user.try(:user_number),
+      checkout.user.try(:profile).try(:user_number),
       checkout.item.item_identifier,
       checkout.item.manifestation.original_title,
       checkout.created_at,

data/lib/enju_circulation/version.rb

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

data/spec/concerns/enju_accept_spec.rb

@@ -6,6 +6,7 @@ end
 
 describe EnjuCirculation::EnjuAccept do
   fixtures :all
+
   it "should successfully accept" do
     accept = MyAccept.new(FactoryBot.attributes_for(:accept))
     expect(accept.item).to be_truthy
@@ -14,6 +15,7 @@ describe EnjuCirculation::EnjuAccept do
     expect(accept.item.circulation_status.name).to eq "Available On Shelf"
     expect(accept.item.use_restriction.name).to eq "Limited Circulation, Normal Loan Period"
   end
+
   it "should reflect to items list", solr: true do
     FactoryBot.create(:item)
     FactoryBot.create(:item)

data/spec/dummy/app/helpers/application_helper.rb

@@ -2,4 +2,6 @@
 module ApplicationHelper
   include EnjuLeaf::ApplicationHelper
   include EnjuBiblio::ApplicationHelper
+  include EnjuManifestationViewer::ManifestationViewerHelper
+  include EnjuManifestationViewer::BookJacketHelper
 end

data/spec/dummy/app/models/user.rb

@@ -15,3 +15,4 @@ Item.include(EnjuCirculation::EnjuItem)
 Profile.include(EnjuCirculation::EnjuProfile)
 Item.include(EnjuLibrary::EnjuItem)
 UserGroup.include(EnjuCirculation::EnjuUserGroup)
+Withdraw.include(EnjuCirculation::EnjuWithdraw)

data/spec/dummy/config/application.rb

@@ -4,6 +4,7 @@ require 'rails/all'
 
 Bundler.require(*Rails.groups)
 require "enju_circulation"
+require "enju_manifestation_viewer"
 require "enju_leaf"
 
 module Dummy

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/migrate/20160813191533_add_book_jacket_source_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddBookJacketSourceToLibraryGroup < ActiveRecord::Migration[4.2]
+  def change
+    add_column :library_groups, :book_jacket_source, :string
+  end
+end

data/spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddScreenshotGeneratorToLibraryGroup < ActiveRecord::Migration[4.2]
+  def change
+    add_column :library_groups, :screenshot_generator, :string
+  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: 20180107162048) do
+ActiveRecord::Schema.define(version: 2018_01_07_162048) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer "basket_id"
@@ -669,8 +669,10 @@ ActiveRecord::Schema.define(version: 20180107162048) do
     t.string "url", default: "http://localhost:3000/"
     t.text "settings"
     t.text "html_snippet"
+    t.string "book_jacket_source"
     t.integer "max_number_of_results", default: 500
     t.boolean "family_name_first", default: true
+    t.string "screenshot_generator"
     t.integer "pub_year_facet_range_interval", default: 10
     t.integer "user_id"
     t.boolean "csv_charset_conversion", default: false, null: false

data/spec/factories/withdraw.rb

@@ -0,0 +1,21 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryBot.define do
+  factory :withdraw do
+    item_id{FactoryBot.create(:item).id}
+    librarian_id{FactoryBot.create(:librarian).id}
+    basket_id{FactoryBot.create(:basket, user_id: librarian_id).id}
+  end
+end
+
+# == Schema Information
+#
+# Table name: withdraws
+#
+#  id           :integer          not null, primary key
+#  basket_id    :integer
+#  item_id      :integer
+#  librarian_id :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/models/withdraw_spec.rb

@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe Withdraw, type: :model do
+  fixtures :all
+
+  it "should change circulation_status" do
+    withdraw = FactoryBot.create(:withdraw)
+    withdraw.item.circulation_status.name.should eq 'Removed'
+    withdraw.item.use_restriction.name.should eq 'Not For Loan'
+  end
+
+  it "should not withdraw rented item" do
+    withdraw = Withdraw.new(librarian: users(:librarian1))
+    withdraw.item = items(:item_00013)
+    withdraw.valid?.should be_falsy
+  end
+
+  it "should not withdraw reserved item" do
+    reserve = FactoryBot.create(:reserve)
+    withdraw = FactoryBot.build(:withdraw, item: reserve.manifestation.items.first)
+    withdraw.valid?.should be_falsy
+  end
+end
+
+# == Schema Information
+#
+# Table name: withdraws
+#
+#  id           :integer          not null, primary key
+#  basket_id    :integer
+#  item_id      :integer
+#  librarian_id :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#

data/spec/rails_helper.rb

@@ -36,6 +36,12 @@ RSpec.configure do |config|
   config.extend ControllerMacros, type: :controller
 
   config.infer_spec_type_from_file_location!
+
+  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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 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-21 00:00:00.000000000 Z
+date: 2019-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,42 +16,56 @@ 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: enju_manifestation_viewer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ 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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !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: Circulation management for Next-L Enju
 email:
 - nabeta@fastmail.fm
@@ -731,8 +773,10 @@ files:
 - spec/dummy/db/migrate/20160801080637_add_most_recent_to_resource_export_file_transitions.rb
 - spec/dummy/db/migrate/20160801080643_add_most_recent_to_agent_import_file_transitions.rb
 - spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb
+- spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb
 - spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
 - spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
+- spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb
 - spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
 - spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb
@@ -782,6 +826,7 @@ files:
 - spec/factories/user_group.rb
 - spec/factories/user_group_has_checkout_type.rb
 - spec/factories/user_reserve_stat.rb
+- spec/factories/withdraw.rb
 - spec/fixtures/agent_types.yml
 - spec/fixtures/agents.yml
 - spec/fixtures/baskets.yml
@@ -849,6 +894,7 @@ files:
 - spec/models/user_group_has_checkout_type_spec.rb
 - spec/models/user_reserve_stat_spec.rb
 - spec/models/user_spec.rb
+- spec/models/withdraw_spec.rb
 - spec/rails_helper.rb
 - spec/routing/checked_items_routing_spec.rb
 - spec/spec_helper.rb
@@ -890,8 +936,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_circulation plugin
@@ -1106,6 +1151,7 @@ test_files:
 - spec/dummy/db/migrate/20090705212043_add_attachments_attachment_to_manifestation.rb
 - spec/dummy/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb
 - spec/dummy/db/migrate/012_create_owns.rb
+- spec/dummy/db/migrate/20160813191533_add_book_jacket_source_to_library_group.rb
 - spec/dummy/db/migrate/20160820004638_add_attachment_attachment_to_carrier_types.rb
 - spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb
 - spec/dummy/db/migrate/002_devise_create_users.rb
@@ -1128,6 +1174,7 @@ test_files:
 - spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
 - spec/dummy/db/migrate/20130506175303_create_identifier_types.rb
 - spec/dummy/db/migrate/20130509185724_add_statement_of_responsibility_to_manifestation.rb
+- spec/dummy/db/migrate/20160813191820_add_screenshot_generator_to_library_group.rb
 - spec/dummy/db/migrate/113_create_events.rb
 - spec/dummy/db/migrate/20110916103953_add_manifestaiton_id_to_series_statement.rb
 - spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
@@ -1135,6 +1182,7 @@ test_files:
 - spec/models/item_has_use_resetriction_spec.rb
 - spec/models/reserve_spec.rb
 - spec/models/carrier_type_has_checkout_type_spec.rb
+- spec/models/withdraw_spec.rb
 - spec/models/user_reserve_stat_spec.rb
 - spec/models/checkout_type_spec.rb
 - spec/models/checkout_stat_has_manifestation_spec.rb
@@ -1178,6 +1226,7 @@ test_files:
 - spec/factories/circulation_status.rb
 - spec/factories/item_has_use_restriction.rb
 - spec/factories/profile.rb
+- spec/factories/withdraw.rb
 - spec/factories/user_reserve_stat.rb
 - spec/factories/reserve_stat_has_user.rb
 - spec/factories/user_group.rb