enju_library 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518d6386e03d122a166917fc15a446fd49a9fbf2651c462b145750ddc67f848b
-  data.tar.gz: 79d27b3572eb819d9ded99e22b7ead5c44c02c7b9e6d4ba2caaec5b151da6170
+  metadata.gz: 7fb21f17b1dd4ad3e311123992f5359ff191470046c394268e51376453ef6995
+  data.tar.gz: 22a9b2ed2af70d276aad8323e53782f22f5a8794cd4b632c4043e43a5b19b4e3
 SHA512:
-  metadata.gz: e1f11e2a73dae41c407941907c3c367150125f067ec7f7dea9a06055ad6c3aa769091535af07ef73dfa6677a3f1a87a22b6abec8aafa091d4a1e63afa3d9aa92
-  data.tar.gz: 70fc2466822926ce04dfb8cca850ddc877c4b72e2def06f372db94de6cdb0fa97e71c1df410846a943a6b55063b09c3b59664a4482e755cbd12a323a79c5dcf9
+  metadata.gz: 392a2f02f6860a7f7da0a1ff67d4a6d276748385c4763bcd1bd1001fef9967add797390c491098974422cc8b3d47d86f87092fa05f5ad0b63730d42131e7a242
+  data.tar.gz: c22d984693895223120424adad3231c84ce959bd6f88a3196e9398134b04295ecd1ab42343de0f8339759685d589a8e3cc7c65776bf8099d50e414b5e12bc706

data/app/controllers/accepts_controller.rb

@@ -99,7 +99,7 @@ class AcceptsController < ApplicationController
   # PUT /accepts/1.json
   def update
     respond_to do |format|
-      if @accept.update_attributes(accept_params)
+      if @accept.update(accept_params)
         format.html { redirect_to @accept, notice: t('controller.successfully_updated', model: t('activerecord.models.accept')) }
         format.json { head :no_content }
       else

data/app/controllers/bookstores_controller.rb

@@ -62,7 +62,7 @@ class BookstoresController < ApplicationController
     end
 
     respond_to do |format|
-      if @bookstore.update_attributes(bookstore_params)
+      if @bookstore.update(bookstore_params)
         format.html { redirect_to @bookstore, notice: t('controller.successfully_updated', model: t('activerecord.models.bookstore')) }
         format.json { head :no_content }
       else

data/app/controllers/budget_types_controller.rb

@@ -62,7 +62,7 @@ class BudgetTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @budget_type.update_attributes(budget_type_params)
+      if @budget_type.update(budget_type_params)
         format.html { redirect_to @budget_type, notice: t('controller.successfully_updated', model: t('activerecord.models.budget_type')) }
         format.json { head :no_content }
       else

data/app/controllers/libraries_controller.rb

@@ -94,7 +94,7 @@ class LibrariesController < ApplicationController
     end
 
     respond_to do |format|
-      if @library.update_attributes(library_params)
+      if @library.update(library_params)
         format.html { redirect_to @library, notice: t('controller.successfully_updated', model: t('activerecord.models.library')) }
         format.json { head :no_content }
       else

data/app/controllers/library_groups_controller.rb

@@ -44,7 +44,7 @@ class LibraryGroupsController < ApplicationController
   # PUT /library_groups/1.json
   def update
     respond_to do |format|
-      if @library_group.update_attributes(library_group_params)
+      if @library_group.update(library_group_params)
         if @library_group.delete_header_logo == '1'
           @library_group.header_logo.destroy
         end

data/app/controllers/request_status_types_controller.rb

@@ -62,7 +62,7 @@ class RequestStatusTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @request_status_type.update_attributes(request_status_type_params)
+      if @request_status_type.update(request_status_type_params)
         format.html { redirect_to @request_status_type, notice: t('controller.successfully_updated', model: t('activerecord.models.request_status_type')) }
         format.json { head :no_content }
       else

data/app/controllers/request_types_controller.rb

@@ -62,7 +62,7 @@ class RequestTypesController < ApplicationController
     end
 
     respond_to do |format|
-      if @request_type.update_attributes(request_type_params)
+      if @request_type.update(request_type_params)
         format.html { redirect_to @request_type, notice: t('controller.successfully_updated', model: t('activerecord.models.request_type')) }
         format.json { head :no_content }
       else

data/app/controllers/search_engines_controller.rb

@@ -62,7 +62,7 @@ class SearchEnginesController < ApplicationController
     end
 
     respond_to do |format|
-      if @search_engine.update_attributes(search_engine_params)
+      if @search_engine.update(search_engine_params)
         format.html { redirect_to @search_engine, notice: t('controller.successfully_updated', model: t('activerecord.models.search_engine')) }
         format.json { head :no_content }
       else

data/app/controllers/shelves_controller.rb

@@ -16,7 +16,7 @@ class ShelvesController < ApplicationController
       render partial: 'select_form'
       return
     else
-      sort = {sort_by: 'name', order: 'asc'}
+      sort = {sort_by: 'shelf_name', order: 'asc'}
       # case params[:sort_by]
       # when 'name'
       #  sort[:sort_by] = 'name'
@@ -114,7 +114,7 @@ class ShelvesController < ApplicationController
     end
 
     respond_to do |format|
-      if @shelf.update_attributes(shelf_params)
+      if @shelf.update(shelf_params)
         format.html { redirect_to @shelf, notice: t('controller.successfully_updated', model: t('activerecord.models.shelf')) }
         format.json { head :no_content }
       else

data/app/controllers/subscribes_controller.rb

@@ -60,7 +60,7 @@ class SubscribesController < ApplicationController
   # PUT /subscribes/1.json
   def update
     respond_to do |format|
-      if @subscribe.update_attributes(subscribe_params)
+      if @subscribe.update(subscribe_params)
         format.html { redirect_to @subscribe, notice: t('controller.successfully_updated', model: t('activerecord.models.subscribe')) }
         format.json { head :no_content }
       else

data/app/controllers/user_export_files_controller.rb

@@ -76,7 +76,7 @@ class UserExportFilesController < ApplicationController
   # PUT /user_export_files/1.json
   def update
     respond_to do |format|
-      if @user_export_file.update_attributes(user_export_file_params)
+      if @user_export_file.update(user_export_file_params)
         if @user_export_file.mode == 'export'
           UserExportFileJob.perform_later(@user_export_file)
         end

data/app/controllers/user_groups_controller.rb

@@ -63,7 +63,7 @@ class UserGroupsController < ApplicationController
     end
 
     respond_to do |format|
-      if @user_group.update_attributes(user_group_params)
+      if @user_group.update(user_group_params)
         format.html { redirect_to @user_group, notice: t('controller.successfully_updated', model: t('activerecord.models.user_group')) }
         format.json { head :no_content }
       else

data/app/controllers/user_import_files_controller.rb

@@ -80,7 +80,7 @@ class UserImportFilesController < ApplicationController
   # PUT /user_import_files/1.json
   def update
     respond_to do |format|
-      if @user_import_file.update_attributes(user_import_file_params)
+      if @user_import_file.update(user_import_file_params)
         if @user_import_file.mode == 'import'
           UserImportFileJob.perform_later(@user_import_file)
         end

data/app/controllers/withdraws_controller.rb

@@ -100,7 +100,7 @@ class WithdrawsController < ApplicationController
   # PUT /withdraws/1.json
   def update
     respond_to do |format|
-      if @withdraw.update_attributes(withdraw_params)
+      if @withdraw.update(withdraw_params)
         format.html { redirect_to @withdraw, notice: t('controller.successfully_updated', model: t('activerecord.models.withdraw')) }
         format.json { head :no_content }
       else

data/app/jobs/user_export_file_job.rb

@@ -1,4 +1,4 @@
-class UserExportFileJob < ActiveJob::Base
+class UserExportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(user_export_file)

data/app/jobs/user_import_file_job.rb

@@ -1,4 +1,4 @@
-class UserImportFileJob < ActiveJob::Base
+class UserImportFileJob < ApplicationJob
   queue_as :enju_leaf
 
   def perform(user_import_file)

data/app/models/accept.rb

@@ -1,4 +1,4 @@
-class Accept < ActiveRecord::Base
+class Accept < ApplicationRecord
   default_scope { order('accepts.id DESC') }
   belongs_to :basket
   belongs_to :item, touch: true

data/app/models/basket.rb

@@ -1,4 +1,4 @@
-class Basket < ActiveRecord::Base
+class Basket < ApplicationRecord
   default_scope { order('baskets.id DESC') }
   scope :will_expire, lambda {|date| where('created_at < ?', date)}
   belongs_to :user, validate: true

data/app/models/bookstore.rb

@@ -1,4 +1,4 @@
-class Bookstore < ActiveRecord::Base
+class Bookstore < ApplicationRecord
   default_scope { order('bookstores.position') }
   has_many :items
 

data/app/models/budget_type.rb

@@ -1,4 +1,4 @@
-class BudgetType < ActiveRecord::Base
+class BudgetType < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   has_many :items

data/app/models/color.rb

@@ -1,4 +1,4 @@
-class Color < ActiveRecord::Base
+class Color < ApplicationRecord
   #attr_accessible :code, :property
 
   belongs_to :library_group

data/app/models/library.rb

@@ -1,4 +1,4 @@
-class Library < ActiveRecord::Base
+class Library < ApplicationRecord
   include MasterModel
   default_scope { order('libraries.position') }
   scope :real, -> { where('id != 1') }

data/app/models/library_group.rb

@@ -1,4 +1,4 @@
-class LibraryGroup < ActiveRecord::Base
+class LibraryGroup < ApplicationRecord
   #include Singleton
   include MasterModel
 

data/app/models/request_status_type.rb

@@ -1,4 +1,4 @@
-class RequestStatusType < ActiveRecord::Base
+class RequestStatusType < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
   has_many :reserves

data/app/models/request_type.rb

@@ -1,4 +1,4 @@
-class RequestType < ActiveRecord::Base
+class RequestType < ApplicationRecord
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 

data/app/models/search_engine.rb

@@ -1,4 +1,4 @@
-class SearchEngine < ActiveRecord::Base
+class SearchEngine < ApplicationRecord
   acts_as_list
 
   validates :name, presence: true

data/app/models/shelf.rb

@@ -1,4 +1,4 @@
-class Shelf < ActiveRecord::Base
+class Shelf < ApplicationRecord
   include MasterModel
   scope :real, -> { where('library_id != 1') }
   belongs_to :library, validate: true
@@ -14,7 +14,9 @@ class Shelf < ActiveRecord::Base
   acts_as_list scope: :library
 
   searchable do
-    string :name
+    string :shelf_name do
+      name
+    end
     string :library do
       library.name
     end

data/app/models/subscribe.rb

@@ -1,4 +1,4 @@
-class Subscribe < ActiveRecord::Base
+class Subscribe < ApplicationRecord
   belongs_to :subscription, counter_cache: true, validate: true
   belongs_to :work, class_name: 'Manifestation', validate: true
 

data/app/models/subscription.rb

@@ -1,4 +1,4 @@
-class Subscription < ActiveRecord::Base
+class Subscription < ApplicationRecord
   has_many :subscribes, dependent: :destroy
   has_many :works, through: :subscribes
   belongs_to :user, validate: true

data/app/models/user_export_file.rb

@@ -1,4 +1,4 @@
-class UserExportFile < ActiveRecord::Base
+class UserExportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
 

data/app/models/user_export_file_transition.rb

@@ -1,4 +1,4 @@
-class UserExportFileTransition < ActiveRecord::Base
+class UserExportFileTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/user_group.rb

@@ -1,4 +1,4 @@
-class UserGroup < ActiveRecord::Base
+class UserGroup < ApplicationRecord
   include MasterModel
   has_many :profiles
 
@@ -23,7 +23,7 @@ end
 #  deleted_at                       :datetime
 #  valid_period_for_new_user        :integer          default(0), not null
 #  expired_at                       :datetime
-#  number_of_day_to_notify_overdue  :integer          default(1), not null
-#  number_of_day_to_notify_due_date :integer          default(7), not null
+#  number_of_day_to_notify_overdue  :integer          default(7), not null
+#  number_of_day_to_notify_due_date :integer          default(3), not null
 #  number_of_time_to_notify_overdue :integer          default(3), not null
 #

data/app/models/user_import_file.rb

@@ -1,4 +1,4 @@
-class UserImportFile < ActiveRecord::Base
+class UserImportFile < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
   include ImportFile
   default_scope {order('user_import_files.id DESC')}
@@ -192,7 +192,7 @@ class UserImportFile < ActiveRecord::Base
     rows.each do |row|
       row_num += 1
       username = row['username'].to_s.strip
-      remove_user = User.where(username: username).first
+      remove_user = User.find_by(username: username)
       if remove_user.try(:deletable_by?, user)
         UserImportFile.transaction do
           remove_user.destroy

data/app/models/user_import_file_transition.rb

@@ -1,4 +1,4 @@
-class UserImportFileTransition < ActiveRecord::Base
+class UserImportFileTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
   

data/app/models/user_import_result.rb

@@ -1,4 +1,4 @@
-class UserImportResult < ActiveRecord::Base
+class UserImportResult < ApplicationRecord
   scope :file_id, proc{ |file_id| where(user_import_file_id: file_id) }
   scope :failed, -> { where(user_id: nil) }
 

data/app/models/withdraw.rb

@@ -1,4 +1,4 @@
-class Withdraw < ActiveRecord::Base
+class Withdraw < ApplicationRecord
   belongs_to :basket
   belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'

data/app/views/libraries/_map.html+phone.erb

@@ -1,4 +1,4 @@
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
 <script type="text/javascript">
   google.maps.event.addDomListener(window, 'load', function() {
     var latlng = new google.maps.LatLng(<%= library.latitude %>, <%= library.longitude %>);

data/app/views/libraries/_map.html.erb

@@ -1,4 +1,4 @@
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
+<script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
 <script type="text/javascript">
   google.maps.event.addDomListener(window, 'load', function() {
     var latlng = new google.maps.LatLng(<%= library.latitude %>, <%= library.longitude %>);

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/user_groups.yml

@@ -0,0 +1,6 @@
+--- 
+user_group_00001: 
+  name: "first_group"
+  display_name: "First group"
+  note: ""
+  position: 1

data/lib/tasks/enju_library_tasks.rake

@@ -13,6 +13,8 @@ namespace :enju_library do
       next if basename == 'library_groups'
       ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_library', basename)
     end
+    Shelf.create!(name: 'web', library: Library.find_by(name: 'web'))
+    Shelf.create!(name: 'first_shelf', library: Library.find_by(name: 'yours'))
   end
 
   desc "upgrade enju_library"

data/spec/controllers/budget_types_controller_spec.rb

@@ -103,9 +103,9 @@ describe BudgetTypesController do
         budget_type = BudgetType.create! valid_attributes
         # Assuming there are no other budget_types in the database, this
         # specifies that the BudgetType created on the previous line
-        # receives the :update_attributes message with whatever params are
+        # receives the :update message with whatever params are
         # submitted in the request.
-        BudgetType.any_instance.should_receive(:update_attributes).with('note' => 'test')
+        BudgetType.any_instance.should_receive(:update).with('note' => 'test')
         put :update, params: { id: budget_type.id, budget_type: { note: 'test' } }
       end
 

data/spec/dummy/app/jobs/application_job.rb

@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

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

@@ -1,10 +1,11 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, lock_strategy: :none, unlock_strategy: :none
 
   include EnjuSeed::EnjuUser
   include EnjuCirculation::EnjuUser
+      has_one :profile, dependent: :nullify
 end
 
 Accept.include(EnjuCirculation::EnjuAccept)

data/spec/dummy/db/migrate/032_create_checkins.rb

@@ -1,14 +1,11 @@
 class CreateCheckins < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkins do |t|
-      t.integer :item_id, null: false
-      t.integer :librarian_id
-      t.integer :basket_id
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :librarian, index: true
+      t.references :basket, index: true
       t.timestamps
     end
-    add_index :checkins, :item_id
-    add_index :checkins, :librarian_id
-    add_index :checkins, :basket_id
   end
 
   def self.down

data/spec/dummy/db/migrate/033_create_checkouts.rb

@@ -1,22 +1,17 @@
 class CreateCheckouts < ActiveRecord::Migration[4.2]
   def self.up
     create_table :checkouts do |t|
-      t.integer :user_id
-      t.integer :item_id, null: false
-      t.integer :checkin_id
-      t.integer :librarian_id
-      t.integer :basket_id
+      t.references :user, index: true, foreign_key: true
+      t.references :item, index: true, foreign_key: true, null: false
+      t.references :checkin, index: true, foreign_key: true
+      t.references :librarian, index: true
+      t.references :basket, index: true
       t.datetime :due_date
       t.integer :checkout_renewal_count, default: 0, null: false
       t.integer :lock_version, default: 0, null: false
       t.timestamps
     end
-    add_index :checkouts, :user_id
-    add_index :checkouts, :item_id
-    add_index :checkouts, :basket_id
     add_index :checkouts, [:item_id, :basket_id], unique: true
-    add_index :checkouts, :librarian_id
-    add_index :checkouts, :checkin_id
   end
 
   def self.down