enju_library 0.1.0.pre38 → 0.1.0.pre39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da7e421bdf2cdce81552af80572af9ed81eab021
-  data.tar.gz: f2f65789832c45e843b23b6d753eb02b45085114
+  metadata.gz: 0eb95937df49250022c8fa869d621a055aee64ea
+  data.tar.gz: f79f75f76a9c942e58080e518ff17ff9d7c77793
 SHA512:
-  metadata.gz: 6f36f883a1d110611fba8382e9d2f56e0517d30b85079d1484dc08a0c5966a709894f2a7b3988b026888e9e857136a856f55acb89504d4a31c604c5decbd84d5
-  data.tar.gz: 4e017ebc908ee99903eb603ca97da627a4c84a19ac83b30da97b74468dbfb4f4af81426e8e57036534d002002593d9a16946585c72b8b2ae8413d9916d154955
+  metadata.gz: 3e57afb48c4d56db84dcafef4048723221436c416557e31ea6578add5b0c4b346d511e7ea6925f83d6166b3bbf8aef2653ed856e7101ee6fa6c652f0581faaac
+  data.tar.gz: f261b8c0a726b360341f520f6bfccf2817695870938eb703acf16f3092abdba96abbe433cd9d07d1b5c0bd106c49230bee4387c1759ecc6b9c79f5d6c2fc1850

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuLibrary {<img src="https://secure.travis-ci.org/next-l/enju_library.png?branch=master" alt="Build Status" />}[http://travis-ci.org/next-l/enju_library]
+= EnjuLibrary
+{<img src="https://travis-ci.org/next-l/enju_library.png?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_library]
+{<img src="https://coveralls.io/repos/next-l/enju_library/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_library?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_library/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_library/1.1]
 
 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/shelves_controller.rb

@@ -10,7 +10,7 @@ class ShelvesController < ApplicationController
       if @library
         @shelves = @library.shelves
       else
-        @shelves = Shelf.real
+        @shelves = Shelf.real.order(:position)
       end
       render partial: 'select_form'
       return

data/app/models/accept.rb

@@ -5,6 +5,8 @@ class Accept < ActiveRecord::Base
   belongs_to :item, touch: true
   belongs_to :librarian, class_name: 'User'
 
+  enju_circulation_accept_model if defined?(EnjuCirculation)
+
   validates_uniqueness_of :item_id, message:  I18n.t('accept.already_accepted')
   validates_presence_of :item_id, message:  I18n.t('accept.item_not_found')
   validates_presence_of :basket_id
@@ -14,15 +16,6 @@ class Accept < ActiveRecord::Base
   attr_accessor :item_identifier
 
   paginates_per 10
-
-  def accept!
-    if defined?(EnjuCirculation)
-      circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
-      item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
-      use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
-      item.use_restriction = use_restriction if use_restriction
-    end
-  end
 end
 
 # == Schema Information

data/app/models/basket.rb

@@ -5,6 +5,8 @@ class Basket < ActiveRecord::Base
   belongs_to :user, validate: true
   has_many :accepts
 
+  enju_circulation_basket_model if defined?(EnjuCirculation)
+
   validates_associated :user, on: :create
   # 貸出完了後にかごのユーザidは破棄する
   validates_presence_of :user, on: :create
@@ -24,29 +26,6 @@ class Basket < ActiveRecord::Base
     Basket.will_expire(Time.zone.now.beginning_of_day).destroy_all
     logger.info "#{Time.zone.now} baskets expired!"
   end
-
-  if defined?(EnjuCirculation)
-    has_many :checked_items, dependent: :destroy
-    has_many :items, through: :checked_items
-    has_many :checkouts
-    has_many :checkins
-
-    def basket_checkout(librarian)
-      return nil if checked_items.size == 0
-      Item.transaction do
-        checked_items.each do |checked_item|
-          checkout = user.checkouts.new
-          checkout.librarian = librarian
-          checkout.item = checked_item.item
-          checkout.basket = self
-          checkout.due_date = checked_item.due_date
-          checked_item.item.checkout!(user)
-          checkout.save!
-        end
-        CheckedItem.destroy_all(:basket_id => id)
-      end
-    end
-  end
 end
 
 # == Schema Information

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre38"
+  VERSION = "0.1.0.pre39"
 end

data/spec/controllers/shelves_controller_spec.rb

@@ -48,13 +48,13 @@ describe ShelvesController do
 
       it "assigns all shelves as @shelves with library_id" do
         get :index, :library_id => 'kamata'
-        assigns(:shelves).should eq(Library.find('kamata').shelves.page(1))
+        assigns(:shelves).map(&:id).should eq(Library.find('kamata').shelves.order(:position).page(1).pluck(:id))
         response.should be_success
       end
 
       it "assigns all shelves as @shelves with select mode" do
         get :index, :mode => 'select'
-        assigns(:shelves).should eq(Shelf.real)
+        assigns(:shelves).should eq(Shelf.real.order(:position))
         response.should be_success
       end
     end

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/035_create_reserves.rb

@@ -10,7 +10,6 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :canceled_at
       t.datetime :expired_at
       t.datetime :deleted_at
-      t.string :state
       t.boolean :expiration_notice_to_patron, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end

data/spec/dummy/db/migrate/113_create_events.rb

@@ -1,8 +1,8 @@
 class CreateEvents < ActiveRecord::Migration
   def self.up
     create_table :events do |t|
-      t.integer :library_id, :default => 1, :null => false
-      t.integer :event_category_id, :default => 1, :null => false
+      t.integer :library_id, :null => false
+      t.integer :event_category_id, :null => false
       t.string :name
       t.text :note
       t.datetime :start_at

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/20100925074559_create_agent_import_results.rb

@@ -3,7 +3,6 @@ class CreateAgentImportResults < ActiveRecord::Migration
     create_table :agent_import_results do |t|
       t.integer :agent_import_file_id
       t.integer :agent_id
-      t.integer :user_id
       t.text :body
 
       t.timestamps

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/20140518111006_create_message_transitions.rb

@@ -2,7 +2,11 @@ class CreateMessageTransitions < ActiveRecord::Migration
   def change
     create_table :message_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 :message_id
       t.timestamps

data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb

@@ -2,7 +2,11 @@ class CreateMessageRequestTransitions < ActiveRecord::Migration
   def change
     create_table :message_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 :message_request_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/20140523171309_create_event_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateEventImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :event_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 :event_import_file_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/20140812152348_create_event_export_files.rb

@@ -0,0 +1,11 @@
+class CreateEventExportFiles < ActiveRecord::Migration
+  def change
+    create_table :event_export_files do |t|
+      t.integer :user_id
+      t.attachment :event_export
+      t.datetime :executed_at
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20140812153137_create_event_export_file_transitions.rb

@@ -0,0 +1,18 @@
+class CreateEventExportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :event_export_file_transitions do |t|
+      t.string :to_state
+      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 :event_export_file_id
+      t.timestamps
+    end
+
+    add_index :event_export_file_transitions, :event_export_file_id, name: "index_event_export_file_transitions_on_file_id"
+    add_index :event_export_file_transitions, [:sort_key, :event_export_file_id], unique: true, name: "index_event_export_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/spec/dummy/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :default_event_category_id, :integer
+  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

data/spec/dummy/db/migrate/20141020120523_add_library_id_to_checkout.rb

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