enju_inter_library_loan 0.1.0.pre10 → 0.1.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ad98df1ff527548599f101ff13ec69078f2960
-  data.tar.gz: 6faaceea2534561bb5de3b7ff471213a1cdbcaf1
+  metadata.gz: 65e0303bbd5ff4258673483151502b59bbec2c9c
+  data.tar.gz: 822719c78dcc0c2228b16a3de06fad8f1cd9d3ce
 SHA512:
-  metadata.gz: 80640f160466d2f6c893e7b2291e1bab8034350305cbcfe9b34ec59b8265f9cd09f4d2044c878ef61a14791abeac32f26018f8a34886e764a82cf70814bdfe4d
-  data.tar.gz: 0ef353d37ec37f50e36e3c19fdb5cf208d52b4145d40c5fd3a140c9cae89a8951e5ba0b83beb3cd18ad460e6a700e50ea4ea8c68c43a4de73c23acf1174d1e71
+  metadata.gz: 9c5205217df4646c79a9573680bca3409599509d950701488ccee819ea709814e9c536781c27df4755befedd3aa511b620fa5fa55d9940d3ab4b93524e14a731
+  data.tar.gz: 75876679a7b4a2e065ad5122914a98bacac8fd1e40749215d2b56e754e239315793334ca3b0dd023924a13d9e3ad61ed4cb389075546a0795c8f84731c2032ee

data/README.rdoc

@@ -1,3 +1,10 @@
 = EnjuInterLibraryLoan
+{<img src="https://secure.travis-ci.org/next-l/enju_inter_library_loan.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_inter_library_loan]
+{<img src="https://coveralls.io/repos/next-l/enju_inter_library_loan/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_inter_library_loan?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_inter_library_loan/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_inter_library_loan/1.1]
 
-This project rocks and uses MIT-LICENSE.
+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])

data/app/controllers/inter_library_loans_controller.rb

@@ -14,7 +14,7 @@ class InterLibraryLoansController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @inter_library_loans }
+      format.json { render json: @inter_library_loans }
       format.rss  { render :layout => false }
       format.atom
     end
@@ -27,7 +27,7 @@ class InterLibraryLoansController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @inter_library_loan }
+      format.json { render json: @inter_library_loan }
     end
   end
 
@@ -35,20 +35,18 @@ class InterLibraryLoansController < ApplicationController
   # GET /inter_library_loans/new.json
   def new
     @inter_library_loan = InterLibraryLoan.new
-    @libraries = LibraryGroup.first.real_libraries
-    @libraries.reject!{|library| library == current_user.library}
+    @libraries = Library.where('id != ?', current_user.profile.try(:library_id))
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @inter_library_loan }
+      format.json { render json: @inter_library_loan }
     end
   end
 
   # GET /inter_library_loans/1/edit
   def edit
     @inter_library_loan = InterLibraryLoan.find(params[:id])
-    @libraries = LibraryGroup.first.real_libraries
-    @libraries.reject!{|library| library == current_user.library}
+    @libraries = Library.where('id != ?', current_user.profile.try(:library_id))
   end
 
   # POST /inter_library_loans
@@ -63,12 +61,11 @@ class InterLibraryLoansController < ApplicationController
         @inter_library_loan.sm_request!
         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 = LibraryGroup.first.real_libraries
-        @libraries.reject!{|library| library == current_user.library}
-        format.html { render :action => "new" }
-        format.json { render :json => @inter_library_loan.errors, :status => :unprocessable_entity }
+        @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 }
       end
     end
   end
@@ -98,10 +95,9 @@ class InterLibraryLoansController < ApplicationController
         format.json { head :no_content }
       else
         @inter_library_loan.item = @item
-        @libraries = LibraryGroup.first.real_libraries
-        @libraries.reject!{|library| library == current_user.library}
-        format.html { render :action => "edit" }
-        format.json { render :json => @inter_library_loan.errors, :status => :unprocessable_entity }
+        @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 }
       end
     end
   end
@@ -122,4 +118,9 @@ class InterLibraryLoansController < ApplicationController
       end
     end
   end
+
+  private
+  def inter_library_loan_params
+    params.require(:inter_library_loan).permit(:item_id, :borrowing_library_id)
+  end
 end

data/app/models/inter_library_loan.rb

@@ -1,8 +1,7 @@
 class InterLibraryLoan < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :item_id, :borrowing_library_id
+  include Statesman::Adapters::ActiveRecordQueries
   scope :completed, -> {in_state(:return_received)}
-  scope :processing, lambda {|item, borrowing_library| {:conditions => ['item_id = ? AND borrowing_library_id = ?', item.id, borrowing_library.id]}}
+  scope :processing, lambda {|item, borrowing_library| where('item_id = ? AND borrowing_library_id = ?', item.id, borrowing_library.id)}
 
   belongs_to :item, validate: true
   #belongs_to :reserve
@@ -74,6 +73,10 @@ class InterLibraryLoan < ActiveRecord::Base
   def self.transition_class
     InterLibraryLoanTransition
   end
+
+  def self.initial_state
+    OrderStateMachine.initial_state
+  end
 end
 
 # == Schema Information

data/app/models/inter_library_loan_transition.rb

@@ -3,7 +3,7 @@ class InterLibraryLoanTransition < ActiveRecord::Base
 
   
   belongs_to :inter_library_loan, inverse_of: :inter_library_loan_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/db/migrate/20140607100507_create_inter_library_loan_transitions.rb

@@ -2,7 +2,11 @@ class CreateInterLibraryLoanTransitions < ActiveRecord::Migration
   def change
     create_table :inter_library_loan_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :inter_library_loan_id
       t.timestamps

data/lib/enju_inter_library_loan/version.rb

@@ -1,3 +1,3 @@
 module EnjuInterLibraryLoan
-  VERSION = "0.1.0.pre10"
+  VERSION = "0.1.0.pre11"
 end

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

@@ -5,7 +5,6 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
 
   enju_leaf_user_model
   enju_circulation_user_model

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

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

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  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"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/database.yml

@@ -1,25 +1,30 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.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
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# 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:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :access_address
       t.integer :language_id, :default => 1, :null => false
       t.integer :carrier_type_id, :default => 1, :null => false
-      t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
       t.integer :height

data/spec/dummy/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end

data/spec/dummy/db/migrate/20110627035057_create_series_statement_merges.rb

@@ -7,6 +7,6 @@ class CreateSeriesStatementMerges < ActiveRecord::Migration
       t.timestamps
     end
     add_index :series_statement_merges, :series_statement_id
-    add_index :series_statement_merges, :series_statement_merge_list_id
+    add_index :series_statement_merges, :series_statement_merge_list_id, name: "index_series_statement_merges_on_list_id"
   end
 end

data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb

@@ -2,7 +2,11 @@ class CreateReserveTransitions < ActiveRecord::Migration
   def change
     create_table :reserve_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :reserve_id
       t.timestamps

data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateResourceImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :resource_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :resource_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb

@@ -2,7 +2,11 @@ class CreateImportRequestTransitions < ActiveRecord::Migration
   def change
     create_table :import_request_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :import_request_id
       t.timestamps

data/spec/dummy/db/migrate/20140524020735_create_agent_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateAgentImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :agent_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :agent_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :user_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140528045518_create_user_checkout_stat_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserCheckoutStatTransitions < ActiveRecord::Migration
   def change
     create_table :user_checkout_stat_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_checkout_stat_id
       t.timestamps

data/spec/dummy/db/migrate/20140528045539_create_user_reserve_stat_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserReserveStatTransitions < ActiveRecord::Migration
   def change
     create_table :user_reserve_stat_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_reserve_stat_id
       t.timestamps

data/spec/dummy/db/migrate/20140528045600_create_manifestation_checkout_stat_transitions.rb

@@ -2,7 +2,11 @@ class CreateManifestationCheckoutStatTransitions < ActiveRecord::Migration
   def change
     create_table :manifestation_checkout_stat_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :manifestation_checkout_stat_id
       t.timestamps

data/spec/dummy/db/migrate/20140528045617_create_manifestation_reserve_stat_transitions.rb

@@ -2,7 +2,11 @@ class CreateManifestationReserveStatTransitions < ActiveRecord::Migration
   def change
     create_table :manifestation_reserve_stat_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :manifestation_reserve_stat_id
       t.timestamps

data/spec/dummy/db/migrate/20140614141500_create_resource_export_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateResourceExportFileTransitions < ActiveRecord::Migration
   def change
     create_table :resource_export_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :resource_export_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateUserExportFileTransitions < ActiveRecord::Migration
   def change
     create_table :user_export_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :user_export_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToResourceImportResult < ActiveRecord::Migration
+  def change
+    add_column :resource_import_results, :error_message, :text
+  end
+end

data/spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddExtentToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :extent, :text
+  end
+end

data/spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddDimensionsToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :dimensions, :text
+  end
+end

data/spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb

@@ -0,0 +1,9 @@
+class RenameManifestationPeriodicalToSerial < ActiveRecord::Migration
+  def up
+    rename_column :manifestations, :periodical, :serial
+  end
+
+  def down
+    rename_column :manifestations, :serial, :periodical
+  end
+end

data/spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb

@@ -0,0 +1,5 @@
+class AddFullNameTranscriptionToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :full_name_transcription, :text
+  end
+end

data/spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb

@@ -0,0 +1,5 @@
+class AddDateOfBirthToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :date_of_birth, :datetime
+  end
+end

data/spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb

@@ -0,0 +1,6 @@
+class AddShelfIdToCheckout < ActiveRecord::Migration
+  def change
+    add_column :checkouts, :shelf_id, :integer
+    add_index :checkouts, :shelf_id
+  end
+end