enju_biblio 0.4.0.beta.1 → 0.4.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f3dd27c99737a4cfbba700c0963f4352b7e237bf30bdea0bf9c446208906be
-  data.tar.gz: 544ee9521de65fb2cc918332e4c15ca88a89b346a021f7ca9a0bdabdb66841d5
+  metadata.gz: d1cdac00c9fb0f997f28937e780c89f0ca4d25c7d387afd33744410579f5f6e0
+  data.tar.gz: a5fc966b6ece6ad34d394f60664fa4661a9d9457b61360e5d8c50ad8e36c6d26
 SHA512:
-  metadata.gz: 139f55a88e3958bfe75f687fac126219a964d15485bde0e66e264f54244cd550c4b44d284130582026090267de93693fbdcbaf2cf117166e34c0b2c62ccddc54
-  data.tar.gz: 895a8713dea2a69800fd2aa0edf8842ef20f9c9ebae86c92aff7d6c014fb5f5f90f1e689471f13918ed671f304f09fa933027bf7752bcac765aed7c3b209f28c
+  metadata.gz: e6e3b600fc6d80533135caf4899abd643ff4074bf6721524370c0fccc05f693e5a38d858560cf985f327f1241b428541b4e9eb1d1cf517bf146f4eea3a717e54
+  data.tar.gz: c6e051a2096a87b167c15ba90c596dbccedb4e7d3afb195abfcb85c9a9fd9b989adb4476c0cbdfcffc8db92f844511c319ddecc5f31a777fb43802c8760dab8f

data/app/controllers/items_controller.rb

@@ -272,7 +272,7 @@ class ItemsController < ApplicationController
       :acquired_at, :bookstore_id, :missing_since, :budget_type_id,
       :lock_version, :manifestation_id, :library_id, :required_role_id,
       :binding_item_identifier, :binding_call_number, :binded_at,
-      :use_restriction_id,
+      :use_restriction_id, :memo,
       item_has_use_restriction_attributes: :use_restriction_id # EnjuCirculation
     )
   end

data/app/controllers/manifestations_controller.rb

@@ -489,7 +489,7 @@ class ManifestationsController < ApplicationController
       :valid_until, :date_submitted, :date_accepted, :date_captured,
       :ndl_bib_id, :pub_date, :edition_string, :volume_number, :issue_number,
       :serial_number, :content_type_id, :attachment, :lock_version,
-      :dimensions, :fulltext_content, :extent,
+      :dimensions, :fulltext_content, :extent, :memo,
       :parent_id,
       :serial, :statement_of_responsibility,
       {creators_attributes: [

data/app/controllers/picture_files_controller.rb

@@ -185,11 +185,15 @@ class PictureFilesController < ApplicationController
       @attachable = @agent
       return
     end
-    get_event
-    if @event
-      @attachable = @event
-      return
+
+    if defined?(EnjuEvent)
+      get_event
+      if @event
+        @attachable = @event
+        return
+      end
     end
+
     get_shelf
     if @shelf
       @attachable = @shelf

data/app/models/agent_import_file.rb

@@ -1,5 +1,8 @@
 class AgentImportFile < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: AgentImportFileTransition,
+    initial_state: :pending
+  ]
   include ImportFile
   default_scope { order('agent_import_files.id DESC') }
   scope :not_imported, -> { in_state(:pending) }

data/app/models/import_request.rb

@@ -1,5 +1,8 @@
 class ImportRequest < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: ImportRequestTransition,
+    initial_state: :pending
+  ]
   default_scope { order('import_requests.id DESC') }
   belongs_to :manifestation, optional: true
   belongs_to :user

data/app/models/item.rb

@@ -125,4 +125,5 @@ end
 #  binding_call_number     :string
 #  binded_at               :datetime
 #  manifestation_id        :integer          not null
+#  memo                    :text
 #

data/app/models/manifestation.rb

@@ -873,4 +873,5 @@ end
 #  publication_place               :text
 #  extent                          :text
 #  dimensions                      :text
+#  memo                            :text
 #

data/app/models/resource_export_file.rb

@@ -1,5 +1,8 @@
 class ResourceExportFile < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: ResourceExportFileTransition,
+    initial_state: :pending
+  ]
   include ExportFile
 
   if ENV['ENJU_STORAGE'] == 's3'

data/app/models/resource_import_file.rb

@@ -1,5 +1,8 @@
 class ResourceImportFile < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: ResourceImportFileTransition,
+    initial_state: :pending
+  ]
   include ImportFile
   default_scope { order('resource_import_files.id DESC') }
   scope :not_imported, -> { in_state(:pending) }

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

@@ -92,6 +92,11 @@
     <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :memo -%><br />
+    <%= f.text_area :memo, class: 'resource_textarea' -%>
+  </div>
+
   <div class="field">
     <%= f.label :item_identifier -%>
     <%= f.text_field :item_identifier, class: 'resource_identifier' -%>

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

@@ -54,14 +54,16 @@
 </p>
 
 <% if current_user.try(:has_role?, 'Librarian') %>
-  <p>
-    <strong><%= t('activerecord.models.use_restriction') -%>:</strong>
-    <% if @item.use_restriction %>
-      <ul>
-        <li><%= @item.use_restriction.display_name %></li>
-      </ul>
-    <% end %>
-  </p>
+  <% if defined?(EnjuCirculation) %>
+    <p>
+      <strong><%= t('activerecord.models.use_restriction') -%>:</strong>
+      <% if @item.use_restriction %>
+        <ul>
+          <li><%= @item.use_restriction.display_name %></li>
+        </ul>
+      <% end %>
+    </p>
+  <% end %>
 
   <p>
     <strong><%= t('activerecord.attributes.item.required_role_id') -%>:</strong>
@@ -109,6 +111,13 @@
   <%= simple_format(@item.note) %>
 </p>
 
+<% if current_user.try(:has_role?, 'Librarian') %>
+  <p>
+    <strong><%= t('activerecord.attributes.item.memo') -%>:</strong>
+    <%= simple_format(@item.memo) %>
+  </p>
+<% end %>
+
 <p>
   <strong><%= t('item.accepted_at') -%>:</strong>
   <%= l(@item.accept.created_at) if @item.accept -%>

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

@@ -197,6 +197,11 @@
     <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
+  <div class="field">
+    <%= f.label :memo -%><br />
+    <%= f.text_area :memo, class: 'resource_textarea' -%>
+  </div>
+
   <div class="actions">
     <%= f.hidden_field :parent_id %>
     <%= f.hidden_field :lock_version %>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -107,6 +107,12 @@
             <%= raw simple_format(h(manifestation.note)) -%>
           </td>
         </tr>
+        <tr>
+          <td><%= t('activerecord.attributes.manifestation.memo') -%>:</td>
+          <td>
+            <%= simple_format(manifestation.memo) -%>
+          </td>
+        </tr>
       </table>
     <% end %>
     <% if defined?(EnjuCirculation) %>

data/config/locales/translation_en.yml

@@ -75,6 +75,7 @@ en:
         edition: Edition (integer)
         edition_string: Edition
         note: Note
+        memo: Memo
         repository_content: Repository content
         lock_version: Lock version
         carrier_type: Manifestation form
@@ -110,6 +111,7 @@ en:
         deleted_at: Deleted at
         include_supplements: Include supplements
         note: Note
+        memo: Memo
         url: URL
         price: Price
         lock_version: Lock version

data/config/locales/translation_ja.yml

@@ -75,6 +75,7 @@ ja:
         edition: 版（数字）
         edition_string: 版
         note: 注記
+        memo: 業務メモ
         repository_content: リポジトリのコンテンツ
         lock_version: ロックバージョン
         carrier_type: 資料の形態
@@ -110,6 +111,7 @@ ja:
         deleted_at: 削除時刻
         include_supplements: 付録を含む
         note: 注記
+        memo: 業務メモ
         url: URL
         price: 購入価格
         lock_version: ロックバージョン

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

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.4.0.beta.1"
+  VERSION = "0.4.0.beta.2"
 end

data/lib/tasks/enju_biblio_tasks.rake

@@ -24,8 +24,8 @@ namespace :enju_biblio do
     AgentImportFile.import
   end
 
-  desc "upgrade enju_biblio"
-  task upgrade: :environment do
+  desc "upgrade enju_biblio to 1.3"
+  task upgrade_to_13: :environment do
     Rake::Task['statesman:backfill_most_recent'].invoke('AgentImportFile')
     Rake::Task['statesman:backfill_most_recent'].invoke('ImportRequest')
     Rake::Task['statesman:backfill_most_recent'].invoke('ResourceExportFile')
@@ -33,4 +33,23 @@ namespace :enju_biblio do
     update_carrier_type
     puts 'enju_biblio: The upgrade completed successfully.'
   end
+
+  desc "upgrade enju_biblio to 2.0"
+  task upgrade: :environment do
+    class_names = [
+      AgentRelationshipType, AgentType, CarrierType, ContentType,
+      CreateType, FormOfWork, Frequency, Language, License,
+      ManifestationRelationshipType, MediumOfPerformance, ProduceType,
+      RealizeType
+    ]
+    class_names.each do |klass|
+      klass.find_each do |record|
+        I18n.available_locales.each do |locale|
+          next unless record.respond_to?("display_name_#{locale}")
+          record.update("display_name_#{locale}": YAML.safe_load(record[:display_name])[locale.to_s])
+        end
+      end
+    end
+    puts 'enju_biblio: The upgrade completed successfully.'
+  end
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -3,7 +3,6 @@ class ApplicationController < ActionController::Base
 
   include EnjuLibrary::Controller
   include EnjuBiblio::Controller
-  include EnjuEvent::Controller
   include EnjuSubject::Controller
   #include EnjuInventory::Controller
   before_action :set_paper_trail_whodunnit

data/spec/dummy/config/application.rb

@@ -6,6 +6,7 @@ Bundler.require(*Rails.groups)
 require "enju_biblio"
 require "enju_leaf"
 require "enju_manifestation_viewer"
+require "enju_message"
 require "enju_ndl"
 require 'resque/server'
 

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_07_12_163038) do
+ActiveRecord::Schema.define(version: 2019_08_18_075628) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -711,6 +711,7 @@ ActiveRecord::Schema.define(version: 2019_07_12_163038) 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"
@@ -965,6 +966,7 @@ ActiveRecord::Schema.define(version: 2019_07_12_163038) 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 ["manifestation_identifier"], name: "index_manifestations_on_manifestation_identifier"

data/spec/fixtures/items.yml

@@ -304,4 +304,5 @@ item_00025:
 #  binding_call_number     :string
 #  binded_at               :datetime
 #  manifestation_id        :integer          not null
+#  memo                    :text
 #

data/spec/fixtures/manifestations.yml

@@ -1890,4 +1890,5 @@ manifestation_00217:
 #  publication_place               :text
 #  extent                          :text
 #  dimensions                      :text
+#  memo                            :text
 #

data/spec/models/item_spec.rb

@@ -36,4 +36,5 @@ end
 #  binding_call_number     :string
 #  binded_at               :datetime
 #  manifestation_id        :integer          not null
+#  memo                    :text
 #

data/spec/models/manifestation_spec.rb

@@ -366,4 +366,5 @@ end
 #  publication_place               :text
 #  extent                          :text
 #  dimensions                      :text
+#  memo                            :text
 #

data/spec/system/items_spec.rb

@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+RSpec.describe 'Manifestations', type: :system do
+  include Devise::Test::IntegrationHelpers
+  fixtures :all
+  before do
+    @item = FactoryBot.create(:item, shelf: shelves(:shelf_00002))
+    CarrierType.find_by(name: 'volume').update(attachment: File.open("#{Rails.root.to_s}/../../app/assets/images/icons/book.png"))
+    FactoryBot.create(:withdraw, item: @item)
+  end
+
+  describe 'When logged in as Librarian' do
+    before do
+      sign_in users(:librarian1)
+    end
+
+    it 'should show memo' do
+      @item.update(memo: 'memo')
+      visit item_path(@item.id, locale: :ja)
+      expect(page).to have_content @item.memo
+    end
+  end
+
+  describe 'When logged in as User' do
+    before do
+      sign_in users(:user1)
+    end
+
+    it 'should not show memo' do
+      @item.update(memo: 'memo')
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content @item.memo
+    end
+  end
+
+  describe 'When not logged in' do
+    it 'should not show memo' do
+      @item.update(memo: 'memo')
+      visit item_path(@item.id, locale: :ja)
+      expect(page).not_to have_content @item.memo
+    end
+  end
+end

data/spec/system/manifestations_spec.rb

@@ -18,6 +18,12 @@ RSpec.describe 'Manifestations', type: :system do
       visit manifestation_path(@item.manifestation.id, locale: :ja)
       expect(page).to have_content @item.item_identifier
     end
+
+    it 'should show memo' do
+      @item.manifestation.update(memo: 'memo')
+      visit manifestation_path(@item.manifestation.id, locale: :ja)
+      expect(page).to have_content @item.manifestation.memo
+    end
   end
 
   describe 'When logged in as User' do
@@ -29,6 +35,12 @@ RSpec.describe 'Manifestations', type: :system do
       visit manifestation_path(@item.manifestation.id, locale: :ja)
       expect(page).to have_content @item.item_identifier
     end
+
+    it 'should not show memo' do
+      @item.manifestation.update(memo: 'memo')
+      visit manifestation_path(@item.manifestation.id, locale: :ja)
+      expect(page).not_to have_content @item.manifestation.memo
+    end
   end
 
   describe 'When not logged in' do
@@ -36,5 +48,11 @@ RSpec.describe 'Manifestations', type: :system do
       visit manifestation_path(@item.manifestation.id, locale: :ja)
       expect(page).to have_content @item.item_identifier
     end
+
+    it 'should not show memo' do
+      @item.manifestation.update(memo: 'memo')
+      visit manifestation_path(@item.manifestation.id, locale: :ja)
+      expect(page).not_to have_content @item.manifestation.memo
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta.1
+  version: 0.4.0.beta.2
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_library
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.beta.3
 - !ruby/object:Gem::Dependency
   name: marc
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0.beta.1
+        version: 2.0.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0.beta.1
+        version: 2.0.0.beta.1
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_message
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0.beta.1
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement
@@ -982,6 +996,8 @@ files:
 - db/migrate/20190311154610_create_periodicals.rb
 - db/migrate/20190312033839_create_periodical_and_manifestations.rb
 - db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb
+- db/migrate/20190818075603_add_memo_to_manifestation.rb
+- db/migrate/20190818075628_add_memo_to_item.rb
 - lib/enju_biblio.rb
 - lib/enju_biblio/engine.rb
 - lib/enju_biblio/openurl.rb
@@ -1488,6 +1504,7 @@ files:
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
 - spec/support/vcr.rb
+- spec/system/items_spec.rb
 - spec/system/manifestations_spec.rb
 - spec/views/agent_types/edit.html.erb_spec.rb
 - spec/views/agent_types/index.html.erb_spec.rb
@@ -1877,6 +1894,7 @@ test_files:
 - spec/requests/series_statement_merge_lists_spec.rb
 - spec/requests/items_spec.rb
 - spec/system/manifestations_spec.rb
+- spec/system/items_spec.rb
 - spec/support/controller_macros.rb
 - spec/support/vcr.rb
 - spec/support/devise.rb