enju_circulation 0.4.0.beta.2 → 0.4.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee71223ba0f27699750432bf7e8774bf5bff25fed58580e235ef66e20979ff95
-  data.tar.gz: 5c22855394daeae8c129c79589eb4da20a6bb810bfdf5e50be9463ac2fed7b69
+  metadata.gz: f8001e1100fd98ad9e9add777f6d37d4cb1a666e6ffd39c49f807f91137d4925
+  data.tar.gz: 8999dd13fc093409a448c997a0781f9ba49e715e569e6b33f2f46c33e3f82da8
 SHA512:
-  metadata.gz: f6fa2f76cd44df019ee604d30435bda3bb70d756270954de18efd372994f43e3a54e6e3b392521eb47973abf6ccf46eda7ffc07ebbfd4645d7e822200587b5a3
-  data.tar.gz: '0883d232402ea5cd43249e774fc179aab8d149e6dfcbf533fe3aeb3e13091f77fad7e3ed26c5cb600ecffde456dd89f4e50be70099b28b28fd564ab927bbe3b6'
+  metadata.gz: 5d03d25ba16f1705333eb1043f1a143d65584efef4876c0327baaba17926f8dbb6a01215704b2ddb828d7859f620c439dc4a4901eb9152e5ea426d98ed270298
+  data.tar.gz: 692f9d4df457829e3d0298a59cde582030449a9a6b8ca676bcbc27135ac0e251d16f93fefdd0d5bf26f411afaef77979f2c90f7a254e9d5fb01d4cba5785c09b

data/README.md

@@ -1,5 +1,5 @@
 # EnjuCirculation
-[![CircleCI](https://circleci.com/gh/next-l/enju_circulation/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_circulation/tree/2.x)
+![](https://github.com/next-l/enju_circulation/workflows/Ruby/badge.svg?branch=2.x)
 [![Coverage Status](https://coveralls.io/repos/github/next-l/enju_circulation/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_circulation?branch=2.x)
 
 This project rocks and uses MIT-LICENSE.

data/app/models/manifestation_checkout_stat.rb

@@ -1,5 +1,8 @@
 class ManifestationCheckoutStat < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: ManifestationCheckoutStatTransition,
+    initial_state: :pending
+  ]
   include CalculateStat
   default_scope {order('manifestation_checkout_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}

data/app/models/manifestation_reserve_stat.rb

@@ -1,5 +1,8 @@
 class ManifestationReserveStat < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: ManifestationReserveStatTransition,
+    initial_state: :pending
+  ]
   include CalculateStat
   default_scope {order('manifestation_reserve_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}

data/app/models/reserve.rb

@@ -1,5 +1,8 @@
 class Reserve < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: ReserveTransition,
+    initial_state: :pending
+  ]
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }
   scope :waiting, -> {not_in_state(:completed, :expired, :retained).where('canceled_at IS NULL AND (expired_at > ? OR expired_at IS NULL)', Time.zone.now).order('reserves.id DESC')}

data/app/models/user_checkout_stat.rb

@@ -1,5 +1,8 @@
 class UserCheckoutStat < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: UserCheckoutStatTransition,
+    initial_state: :pending
+  ]
   include CalculateStat
   default_scope {order('user_checkout_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}

data/app/models/user_reserve_stat.rb

@@ -1,5 +1,8 @@
 class UserReserveStat < ApplicationRecord
-  include Statesman::Adapters::ActiveRecordQueries
+  include Statesman::Adapters::ActiveRecordQueries[
+    transition_class: UserReserveStatTransition,
+    initial_state: :pending
+  ]
   include CalculateStat
   default_scope {order('user_reserve_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}

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

@@ -12,7 +12,7 @@
       <br />
       (
         <%= t('activerecord.attributes.checkout.due_date') -%>:
-        <%= l(item.latest_checkout.due_date, format: :short) -%>
+        <%= l(item.latest_checkout.due_date, format: :only_date) -%>
       )
     <% end %>
   <% end %>

data/lib/enju_circulation/version.rb

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

data/lib/tasks/auto_annotate_models.rake

@@ -0,0 +1,57 @@
+# NOTE: only doing this in development as some production environments (Heroku)
+# NOTE: are sensitive to local FS writes, and besides -- it's just not proper
+# NOTE: to have a dev-mode tool do its thing in production.
+if Rails.env.development?
+  require 'annotate'
+  task :set_annotation_options do
+    # You can override any of these by setting an environment variable of the
+    # same name.
+    Annotate.set_defaults(
+      'additional_file_patterns'    => [],
+      'routes'                      => 'false',
+      'models'                      => 'true',
+      'position_in_routes'          => 'after',
+      'position_in_class'           => 'after',
+      'position_in_test'            => 'after',
+      'position_in_fixture'         => 'after',
+      'position_in_factory'         => 'after',
+      'position_in_serializer'      => 'after',
+      'show_foreign_keys'           => 'true',
+      'show_complete_foreign_keys'  => 'false',
+      'show_indexes'                => 'true',
+      'simple_indexes'              => 'false',
+      'model_dir'                   => 'app/models',
+      'root_dir'                    => '',
+      'include_version'             => 'false',
+      'require'                     => '',
+      'exclude_tests'               => 'false',
+      'exclude_fixtures'            => 'false',
+      'exclude_factories'           => 'false',
+      'exclude_serializers'         => 'false',
+      'exclude_scaffolds'           => 'true',
+      'exclude_controllers'         => 'true',
+      'exclude_helpers'             => 'true',
+      'exclude_sti_subclasses'      => 'false',
+      'ignore_model_sub_dir'        => 'false',
+      'ignore_columns'              => nil,
+      'ignore_routes'               => nil,
+      'ignore_unknown_models'       => 'false',
+      'hide_limit_column_types'     => 'integer,bigint,boolean',
+      'hide_default_column_types'   => 'json,jsonb,hstore',
+      'skip_on_db_migrate'          => 'false',
+      'format_bare'                 => 'true',
+      'format_rdoc'                 => 'false',
+      'format_markdown'             => 'false',
+      'sort'                        => 'false',
+      'force'                       => 'false',
+      'frozen'                      => 'false',
+      'classified_sort'             => 'true',
+      'trace'                       => 'false',
+      'wrapper_open'                => nil,
+      'wrapper_close'               => nil,
+      'with_comment'                => 'true'
+    )
+  end
+
+  Annotate.load_tasks
+end

data/lib/tasks/enju_circulation_tasks.rake

@@ -38,8 +38,8 @@ namespace :enju_circulation do
     Checkout.send_overdue_notification
   end
 
-  desc "upgrade enju_circulation"
-  task upgrade: :environment do
+  desc "upgrade enju_circulation to 1.3"
+  task upgrade_to_13: :environment do
     Rake::Task['statesman:backfill_most_recent'].invoke('ManifestationCheckoutStat')
     Rake::Task['statesman:backfill_most_recent'].invoke('ManifestationReserveStat')
     Rake::Task['statesman:backfill_most_recent'].invoke('UserCheckoutStat')
@@ -78,4 +78,23 @@ namespace :enju_circulation do
       end
     end
   end
+
+  desc "upgrade enju_circulation to 2.0"
+  task upgrade: :environment do
+    sql = 'UPDATE checkins SET checkout_id = checkouts.id FROM checkouts WHERE checkouts.checkin_id = checkins.id;'
+    ActiveRecord::Base.connection.execute(sql)
+
+    class_names = [
+      CheckoutType, CirculationStatus, UseRestriction
+    ]
+    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_circulation: The upgrade completed successfully.'
+  end
 end

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/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_08_16_102803) 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 "plpgsql"
@@ -599,6 +599,7 @@ ActiveRecord::Schema.define(version: 2019_08_16_102803) 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"
@@ -829,6 +830,7 @@ ActiveRecord::Schema.define(version: 2019_08_16_102803) 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"
@@ -852,7 +854,8 @@ ActiveRecord::Schema.define(version: 2019_08_16_102803) do
     t.integer "message_request_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean "most_recent"
+    t.boolean "most_recent", null: false
+    t.index ["message_request_id", "most_recent"], name: "index_message_request_transitions_parent_most_recent", unique: true, where: "most_recent"
     t.index ["message_request_id"], name: "index_message_request_transitions_on_message_request_id"
     t.index ["sort_key", "message_request_id"], name: "index_message_request_transitions_on_sort_key_and_request_id", unique: true
   end
@@ -886,7 +889,8 @@ ActiveRecord::Schema.define(version: 2019_08_16_102803) do
     t.integer "message_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean "most_recent"
+    t.boolean "most_recent", null: false
+    t.index ["message_id", "most_recent"], name: "index_message_transitions_parent_most_recent", unique: true, where: "most_recent"
     t.index ["message_id"], name: "index_message_transitions_on_message_id"
     t.index ["sort_key", "message_id"], name: "index_message_transitions_on_sort_key_and_message_id", unique: true
   end

data/spec/system/user_group_has_checkout_types.rb

@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe 'UserGroupHasCheckoutType', type: :system do
+  include Devise::Test::IntegrationHelpers
+  fixtures :all
+
+  describe 'When logged in as Librarian' do
+    it 'should render' do
+      sign_in users(:librarian1)
+      visit edit_user_group_has_checkout_path(user_group_has_checkout_types(:user_group_has_checkout_type_00001))
+      expect(page).to have_field :user_group_id
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta.2
+  version: 0.4.0.beta.3
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.beta.2
   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.2
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0.beta.1
+        version: 0.4.0.beta.2
   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.2
 - !ruby/object:Gem::Dependency
   name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
@@ -528,6 +528,7 @@ files:
 - lib/generators/enju_circulation/setup/templates/db/fixtures/checkout_types.yml
 - lib/generators/enju_circulation/setup/templates/db/fixtures/circulation_statuses.yml
 - lib/generators/enju_circulation/setup/templates/db/fixtures/use_restrictions.yml
+- lib/tasks/auto_annotate_models.rake
 - lib/tasks/checkout.rb
 - lib/tasks/circulation_status.rb
 - lib/tasks/enju_circulation_tasks.rake
@@ -800,6 +801,8 @@ files:
 - spec/dummy/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb
 - spec/dummy/db/migrate/20190713114940_add_profile_id_to_user.rb
 - spec/dummy/db/migrate/20190713115451_add_full_name_translations_to_profile.rb
+- spec/dummy/db/migrate/20190818075603_add_memo_to_manifestation.rb
+- spec/dummy/db/migrate/20190818075628_add_memo_to_item.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -916,6 +919,7 @@ files:
 - spec/system/checkouts_spec.rb
 - spec/system/manifestations_spec.rb
 - spec/system/reserves_spec.rb
+- spec/system/user_group_has_checkout_types.rb
 - spec/tasks/export_checkout_spec.rb
 - spec/views/checked_items/new.html.erb_spec.rb
 - spec/views/checkout_types/edit.html.erb_spec.rb
@@ -1111,6 +1115,7 @@ test_files:
 - spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.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/20120129020544_add_budget_type_id_to_item.rb
 - spec/dummy/db/migrate/20180107161331_add_constraints_to_most_recent_for_resource_import_file_transitions.rb
 - spec/dummy/db/migrate/20081028083142_create_agent_import_files.rb
@@ -1195,6 +1200,7 @@ test_files:
 - spec/dummy/db/migrate/20160811102604_add_picture_width_to_picture_file.rb
 - 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/20190818075603_add_memo_to_manifestation.rb
 - spec/dummy/db/migrate/20110222073537_add_url_to_library_group.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
@@ -1241,6 +1247,7 @@ test_files:
 - spec/models/accept_spec.rb
 - spec/models/basket_spec.rb
 - spec/policies/manifestation_policy_spec.rb
+- spec/system/user_group_has_checkout_types.rb
 - spec/system/manifestations_spec.rb
 - spec/system/checkouts_spec.rb
 - spec/system/reserves_spec.rb