enju_inter_library_loan 0.2.0 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f7f5bd108fbe02cf3c25d1807e9dda6db9162d9
-  data.tar.gz: ad2f073eba58cb32f640da9201f56bc3137855f0
+  metadata.gz: a26d2c2dd822b0edb331cae6479d7f467015f02a
+  data.tar.gz: ff2a2e30cee210641bbc4cf76ee8cc5f829b4d05
 SHA512:
-  metadata.gz: 89974ba6a5ab1a10509e320c8e0f5b810349bbcfb4619b0bf9f6063b812f75b4626021640d6471d79809aead37477d6fa1db3b241e8170ca52544abf50eb9f1e
-  data.tar.gz: a13e01dfcff626094b16faac72243e6b0a40d02fc23da661f4cdce7ba84f9b3463dcaf3fa2c956afddd8422e356d6ab60815cec18093f14acd2e267b596ce05c
+  metadata.gz: 84e1bd8c021988f8728daf3da139a394908631f8dd97eaffd1ec802bcf2d053d40ede9c88f36e8699573d086244dc8821aaefc9f8d2126db38bdba1c53f1d047
+  data.tar.gz: 87807c91d95bee81e803c1a7ecedf4f63ed10c6ba7ce8adb8f6c481a11786c65a390299c865005e5403a7aac66d3789fa03295743a7e7a4cc91f84cf464cb4b1

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuInterLibraryLoan
-{<img src="https://travis-ci.org/next-l/enju_inter_library_loan.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_inter_library_loan]
-{<img src="https://coveralls.io/repos/next-l/enju_inter_library_loan/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_inter_library_loan?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_inter_library_loan/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_inter_library_loan/1.2]
+{<img src="https://travis-ci.org/next-l/enju_inter_library_loan.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_inter_library_loan]
+{<img src="https://coveralls.io/repos/next-l/enju_inter_library_loan/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_inter_library_loan?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_inter_library_loan/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_inter_library_loan/1.3]
 
 This project rocks and uses MIT-LICENSE.
 
 == 製作者・貢献者 (Authors and contributors)
 * {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
-* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -42,4 +42,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec

data/app/controllers/inter_library_loans_controller.rb

@@ -16,7 +16,7 @@ class InterLibraryLoansController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @inter_library_loans }
-      format.rss  { render :layout => false }
+      format.rss  { render layout: false }
       format.atom
     end
   end
@@ -54,19 +54,19 @@ class InterLibraryLoansController < ApplicationController
   # POST /inter_library_loans.json
   def create
     @inter_library_loan = InterLibraryLoan.new(params[:inter_library_loan])
-    item = Item.where(:item_identifier => params[:inter_library_loan][:item_identifier]).first
+    item = Item.where(item_identifier: params[:inter_library_loan][:item_identifier]).first
     @inter_library_loan.item = item
 
     respond_to do |format|
       if @inter_library_loan.save
         @inter_library_loan.sm_request!
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.inter_library_loan'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.inter_library_loan'))
         format.html { redirect_to(@inter_library_loan) }
-        format.json { render json: @inter_library_loan, :status => :created, :location => @inter_library_loan }
+        format.json { render json: @inter_library_loan, status: :created, location: @inter_library_loan }
       else
         @libraries = Library.where('id != ?', current_user.profile.try(:library_id))
         format.html { render action: "new" }
-        format.json { render json: @inter_library_loan.errors, :status => :unprocessable_entity }
+        format.json { render json: @inter_library_loan.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -91,14 +91,14 @@ class InterLibraryLoansController < ApplicationController
 
     respond_to do |format|
       if @inter_library_loan.update_attributes(params[:inter_library_loan])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.inter_library_loan'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.inter_library_loan'))
         format.html { redirect_to(@inter_library_loan) }
         format.json { head :no_content }
       else
         @inter_library_loan.item = @item
         @libraries = Library.where('id != ?', current_user.profile.try(:library_id))
         format.html { render action: "edit" }
-        format.json { render json: @inter_library_loan.errors, :status => :unprocessable_entity }
+        format.json { render json: @inter_library_loan.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/inter_library_loan.rb

@@ -19,7 +19,7 @@ class InterLibraryLoan < ActiveRecord::Base
     InterLibraryLoanStateMachine.new(self, transition_class: InterLibraryLoanTransition)
   end
 
-  has_many :inter_library_loan_transitions
+  has_many :inter_library_loan_transitions, autosave: false
 
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
     to: :state_machine
@@ -35,37 +35,37 @@ class InterLibraryLoan < ActiveRecord::Base
 
   def do_request
     InterLibraryLoan.transaction do
-      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'Recalled').first})
-      update_attributes({:requested_at => Time.zone.now})
+      item.update_attributes({circulation_status: CirculationStatus.where(name: 'Recalled').first})
+      update_attributes({requested_at: Time.zone.now})
     end
   end
 
   def ship
     InterLibraryLoan.transaction do
-      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Transit Between Library Locations').first})
-      update_attributes({:shipped_at => Time.zone.now})
+      item.update_attributes({circulation_status: CirculationStatus.where(name: 'In Transit Between Library Locations').first})
+      update_attributes({shipped_at: Time.zone.now})
     end
   end
 
   def receive
     InterLibraryLoan.transaction do
-      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Process').first})
-      update_attributes({:received_at => Time.zone.now})
+      item.update_attributes({circulation_status: CirculationStatus.where(name: 'In Process').first})
+      update_attributes({received_at: Time.zone.now})
     end
   end
 
   def return_ship
     InterLibraryLoan.transaction do
-      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'In Transit Between Library Locations').first})
-      update_attributes({:return_shipped_at => Time.zone.now})
+      item.update_attributes({circulation_status: CirculationStatus.where(name: 'In Transit Between Library Locations').first})
+      update_attributes({return_shipped_at: Time.zone.now})
     end
   end
 
   def return_receive
     InterLibraryLoan.transaction do
       # TODO: 'Waiting To Be Reshelved'
-      item.update_attributes({:circulation_status => CirculationStatus.where(:name => 'Available On Shelf').first})
-      update_attributes({:return_received_at => Time.zone.now})
+      item.update_attributes({circulation_status: CirculationStatus.where(name: 'Available On Shelf').first})
+      update_attributes({return_received_at: Time.zone.now})
     end
   end
 

data/app/views/inter_library_loans/index.atom.builder

@@ -1,5 +1,5 @@
-atom_feed(:url => inter_library_loans_url(:format => :atom)) do |feed|
-  feed.title t('inter_library_loan.library_group_inter_library_loan', :library_group_name => @library_group.display_name.localize)
+atom_feed(url: inter_library_loans_url(format: :atom)) do |feed|
+  feed.title t('inter_library_loan.library_group_inter_library_loan', library_group_name: @library_group.display_name.localize)
   feed.updated(@inter_library_loans.first ? @inter_library_loans.first.created_at : Time.zone.now)
 
   @inter_library_loans.each do |inter_library_loan|

data/app/views/inter_library_loans/index.rss.builder

@@ -1,15 +1,15 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
   'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('inter_library_loan.library_group_inter_library_loan', :library_group_name => @library_group.display_name.localize)
+    xml.title t('inter_library_loan.library_group_inter_library_loan', library_group_name: @library_group.display_name.localize)
     xml.link inter_library_loans_url
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => inter_library_loans_url(:format => :rss)
-    xml.tag! "atom:link", :rel => 'alternate', :href => inter_library_loans_url
+    xml.tag! "atom:link", rel: 'self', href: inter_library_loans_url(format: :rss)
+    xml.tag! "atom:link", rel: 'alternate', href: inter_library_loans_url
     #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
     #unless params[:query].blank?
     #  xml.tag! "opensearch:totalResults", @count[:query_result]
@@ -24,7 +24,7 @@ xml.rss('version' => "2.0",
         # rfc822
         xml.pubDate inter_library_loan.created_at.utc.rfc822
         xml.link inter_library_loan_url(inter_library_loan)
-        xml.guid inter_library_loan_url(inter_library_loan), :isPermaLink => "true"
+        xml.guid inter_library_loan_url(inter_library_loan), isPermaLink: "true"
       end
     end
   }

data/db/migrate/148_create_inter_library_loans.rb

@@ -1,8 +1,8 @@
-class CreateInterLibraryLoans < ActiveRecord::Migration
+class CreateInterLibraryLoans < ActiveRecord::Migration[4.2]
   def self.up
     create_table :inter_library_loans do |t|
-      t.integer :item_id, :null => false
-      t.integer :borrowing_library_id, :null => false
+      t.integer :item_id, null: false
+      t.integer :borrowing_library_id, null: false
       t.timestamp :requested_at
       t.timestamp :shipped_at
       t.timestamp :received_at

data/db/migrate/20140607100507_create_inter_library_loan_transitions.rb

@@ -1,4 +1,4 @@
-class CreateInterLibraryLoanTransitions < ActiveRecord::Migration
+class CreateInterLibraryLoanTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :inter_library_loan_transitions do |t|
       t.string :to_state

data/db/migrate/20160703190932_add_most_recent_to_inter_library_loan_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToInterLibraryLoanTransitions < ActiveRecord::Migration
+class AddMostRecentToInterLibraryLoanTransitions < ActiveRecord::Migration[4.2]
   def up
     add_column :inter_library_loan_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20180107164929_add_constraints_to_most_recent_for_inter_library_loan_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForInterLibraryLoanTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForInterLibraryLoanTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up

data/lib/enju_inter_library_loan/item.rb

@@ -7,7 +7,7 @@ module EnjuInterLibraryLoan
     module ClassMethods
       def enju_inter_library_loan_item_model
         include InstanceMethods
-        has_many :inter_library_loans, :dependent => :destroy
+        has_many :inter_library_loans, dependent: :destroy
       end
     end
 

data/lib/enju_inter_library_loan/version.rb

@@ -1,3 +1,3 @@
 module EnjuInterLibraryLoan
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.beta.1"
 end

data/spec/controllers/inter_library_loans_controller_spec.rb

@@ -55,7 +55,7 @@ describe InterLibraryLoansController do
 
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :show, :id => inter_library_loan.id
+        get :show, params: { id: inter_library_loan.id }
         assigns(:inter_library_loan).should eq(inter_library_loan)
       end
     end
@@ -67,7 +67,7 @@ describe InterLibraryLoansController do
 
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :show, :id => inter_library_loan.id
+        get :show, params: { id: inter_library_loan.id }
         assigns(:inter_library_loan).should eq(inter_library_loan)
       end
     end
@@ -79,7 +79,7 @@ describe InterLibraryLoansController do
 
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :show, :id => inter_library_loan.id
+        get :show, params: { id: inter_library_loan.id }
         assigns(:inter_library_loan).should eq(inter_library_loan)
       end
     end
@@ -87,7 +87,7 @@ describe InterLibraryLoansController do
     describe "When not logged in" do
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :show, :id => inter_library_loan.id
+        get :show, params: { id: inter_library_loan.id }
         assigns(:inter_library_loan).should eq(inter_library_loan)
       end
     end
@@ -145,7 +145,7 @@ describe InterLibraryLoansController do
 
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :edit, :id => inter_library_loan.id
+        get :edit, params: { id: inter_library_loan.id }
         assigns(:inter_library_loan).should eq(inter_library_loan)
       end
     end
@@ -157,7 +157,7 @@ describe InterLibraryLoansController do
 
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :edit, :id => inter_library_loan.id
+        get :edit, params: { id: inter_library_loan.id }
         assigns(:inter_library_loan).should eq(inter_library_loan)
       end
     end
@@ -169,7 +169,7 @@ describe InterLibraryLoansController do
 
       it "assigns the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :edit, :id => inter_library_loan.id
+        get :edit, params: { id: inter_library_loan.id }
         response.should be_forbidden
       end
     end
@@ -177,7 +177,7 @@ describe InterLibraryLoansController do
     describe "When not logged in" do
       it "should not assign the requested inter_library_loan as @inter_library_loan" do
         inter_library_loan = FactoryBot.create(:inter_library_loan)
-        get :edit, :id => inter_library_loan.id
+        get :edit, params: { id: inter_library_loan.id }
         response.should redirect_to(new_user_session_url)
       end
     end

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/bin/setup

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/spec/dummy/bin/update

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/spec/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(" ")}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/spec/dummy/config/application.rb

@@ -1,30 +1,19 @@
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require 'enju_inter_library_loan'
-require 'enju_leaf'
-require 'enju_circulation'
-require 'globalize'
-require 'globalize-accessors'
+require "enju_inter_library_loan"
+require "enju_leaf"
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.1
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
+# Load the Rails application.
+require_relative 'application'
 
-# Initialize the rails application
-Dummy::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!