enju_leaf 1.2.0.beta.1 → 1.2.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddebc600e5d6d8fb8f3a0117cbd5bdaab34c711
-  data.tar.gz: ab1f301430da8166e9ac10b9d7b94c39dc607ffb
+  metadata.gz: 9e4355899ff711bb6fc0a762a9b541940b6754b5
+  data.tar.gz: f5d746c0756b0ffafbb767149a0d1dd216564e89
 SHA512:
-  metadata.gz: 5b2285b9dfdb9d0ecd2e6abdb888d9694336645b16d29369c73a45e29345f53ed9db4db4d2fd3496407d7abe6dfb87344ba3b5fb6ab923c69ac19f3319c33e1f
-  data.tar.gz: d31402743602b18a903e83c0ada8a6c33124cfc5a7561089e08c3b0666986fe441d999e94e12b2560cf8c322411d980e76e2b8546eb58df10a531de0480d3126
+  metadata.gz: 87467540f453196ed22bee978ffbc37fb883a9456bbfe78e517decaa6c5b587061f56a3c52632456e814330b761e52397400e08dc2eed593ff070a1678bd4c08
+  data.tar.gz: 92cb8990273542be0406a604a32eefaffba3ecbd268c66bb3500c9cf60ca6356f2d5b2ff88acb324149cf560b70b2d89de8100d226210a2342cc67058383a0cb

data/lib/enju_leaf/engine.rb

@@ -1,21 +1,7 @@
-require 'kaminari'
-require 'devise'
-require 'pundit'
-require 'acts_as_list'
-require 'strip_attributes'
-require 'friendly_id'
-require 'addressable/uri'
-require 'sunspot_rails'
-require 'cocoon'
 require 'enju_biblio'
 require 'enju_library'
-require 'enju_manifestation_viewer'
-require 'kramdown'
-require 'rails_autolink'
-require 'sitemap_generator'
+#require 'enju_manifestation_viewer'
 require 'jquery-ui-rails'
-require 'statesman'
-require 'browser'
 
 module EnjuLeaf
   class Engine < ::Rails::Engine

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.2.0.beta.1"
+  VERSION = "1.2.0.beta.2"
 end

data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb

@@ -5,12 +5,12 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
     environment = ENV['RAILS_ENV'] || 'development'
     gsub_file 'config/schedule.rb', /^set :environment, :development$/,
       "set :environment, :#{environment}"
-    rake("enju_leaf_engine:install:migrations")
-    rake("enju_biblio_engine:install:migrations")
+    rake("enju_seed_engine:install:migrations")
     rake("enju_library_engine:install:migrations")
+    rake("enju_biblio_engine:install:migrations")
     if !ENV['ENJU_SKIP_CONFIG']
-      generate("enju_biblio:setup")
       generate("enju_library:setup")
+      generate("enju_biblio:setup")
       generate("enju_circulation:setup")
       generate("enju_subject:setup")
     end

data/lib/generators/enju_leaf/setup/setup_generator.rb

@@ -70,7 +70,6 @@ EOS
 
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       <<"EOS"
-  include EnjuLeaf::Controller
   include EnjuBiblio::Controller
   include EnjuLibrary::Controller
 

data/spec/controllers/page_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PageController do
   fixtures :all

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,5 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  include EnjuLeaf::Controller
   include EnjuBiblio::Controller
   include EnjuLibrary::Controller
   before_action :set_paper_trail_whodunnit

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,4 +1,5 @@
 module ApplicationHelper
   include EnjuLeaf::EnjuLeafHelper
-  include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
+  include EnjuBiblio::BiblioHelper
+  include EnjuManifestationViewer::BookJacketHelper
 end

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

@@ -6,5 +6,4 @@ class User < ActiveRecord::Base
   include EnjuLeaf::EnjuUser
   include EnjuMessage::EnjuUser
   include EnjuCirculation::EnjuUser
-  include EnjuBookmark::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -5,9 +5,8 @@ require 'rails/all'
 Bundler.require
 require 'enju_leaf'
 require 'resque/server'
+require 'enju_manifestation_viewer'
 require 'enju_circulation'
-require 'enju_bookmark'
-require 'enju_search_log'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,5 +1,5 @@
 class CreateLibraries < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :libraries do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -25,8 +25,4 @@ class CreateLibraries < ActiveRecord::Migration
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end
-
-  def self.down
-    drop_table :libraries
-  end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,5 +1,5 @@
 class CreateShelves < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :shelves do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -12,8 +12,4 @@ class CreateShelves < ActiveRecord::Migration
     end
     add_index :shelves, :library_id
   end
-
-  def self.down
-    drop_table :shelves
-  end
 end

data/spec/dummy/db/migrate/130_create_request_status_types.rb

@@ -1,5 +1,5 @@
 class CreateRequestStatusTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :request_status_types do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -9,8 +9,4 @@ class CreateRequestStatusTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :request_status_types
-  end
 end

data/spec/dummy/db/migrate/131_create_request_types.rb

@@ -1,5 +1,5 @@
 class CreateRequestTypes < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :request_types do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -9,8 +9,4 @@ class CreateRequestTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :request_types
-  end
 end

data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -0,0 +1,9 @@
+class AddOpeningHourToLibrary < ActiveRecord::Migration
+  def self.up
+    add_column :libraries, :opening_hour, :text
+  end
+
+  def self.down
+    remove_column :libraries, :opening_hour
+  end
+end

data/spec/dummy/db/migrate/20111129044509_add_pickup_location_to_reserve.rb

@@ -0,0 +1,6 @@
+class AddPickupLocationToReserve < ActiveRecord::Migration
+  def change
+    add_column :reserves, :pickup_location_id, :integer
+    add_index :reserves, :pickup_location_id
+  end
+end

data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb

@@ -0,0 +1,6 @@
+class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration
+  def change
+    add_column :libraries, :latitude, :float
+    add_column :libraries, :longitude, :float
+  end
+end

data/spec/dummy/db/migrate/20140821151023_create_colors.rb

@@ -0,0 +1,14 @@
+class CreateColors < ActiveRecord::Migration
+  def change
+    create_table :colors do |t|
+      t.integer :library_group_id
+      t.string :property
+      t.string :code
+      t.integer :position
+
+      t.timestamps
+    end
+
+    add_index :colors, :library_group_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

data/spec/dummy/db/migrate/20150106001709_create_demands.rb

@@ -0,0 +1,14 @@
+class CreateDemands < ActiveRecord::Migration
+  def change
+    create_table :demands do |t|
+      t.integer :user_id
+      t.integer :item_id
+      t.integer :message_id
+
+      t.timestamps null: false
+    end
+    add_index :demands, :user_id
+    add_index :demands, :item_id
+    add_index :demands, :message_id
+  end
+end

data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb

@@ -0,0 +1,13 @@
+class CreateWithdraws < ActiveRecord::Migration
+  def change
+    create_table :withdraws do |t|
+      t.integer :basket_id
+      t.integer :item_id
+      t.integer :librarian_id
+
+      t.timestamps null: false
+    end
+    add_index :withdraws, :basket_id
+    add_index :withdraws, :item_id
+  end
+end

data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :html_snippet, :text
+  end
+end

data/spec/dummy/db/migrate/20160703184619_add_most_recent_to_reserve_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToReserveTransitions < ActiveRecord::Migration
+  def up
+    add_column :reserve_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :reserve_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160703184650_add_most_recent_to_manifestation_checkout_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToManifestationCheckoutStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :manifestation_checkout_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :manifestation_checkout_stat_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160703184723_add_most_recent_to_manifestation_reserve_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToManifestationReserveStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :manifestation_reserve_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :manifestation_reserve_stat_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160703184747_add_most_recent_to_user_checkout_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserCheckoutStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_checkout_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_checkout_stat_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160703184805_add_most_recent_to_user_reserve_stat_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserReserveStatTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_reserve_stat_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_reserve_stat_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160703190209_add_foreign_key_on_manifestation_id_to_reserve.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyOnManifestationIdToReserve < ActiveRecord::Migration
+  def change
+    add_foreign_key :reserves, :manifestations
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160703185015) do
+ActiveRecord::Schema.define(version: 20160703190209) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -338,6 +338,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "shelf_id"
+    t.integer  "library_id"
   end
 
   add_index "checkouts", ["basket_id"], name: "index_checkouts_on_basket_id"
@@ -345,6 +346,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
   add_index "checkouts", ["item_id", "basket_id"], name: "index_checkouts_on_item_id_and_basket_id", unique: true
   add_index "checkouts", ["item_id"], name: "index_checkouts_on_item_id"
   add_index "checkouts", ["librarian_id"], name: "index_checkouts_on_librarian_id"
+  add_index "checkouts", ["library_id"], name: "index_checkouts_on_library_id"
   add_index "checkouts", ["shelf_id"], name: "index_checkouts_on_shelf_id"
   add_index "checkouts", ["user_id"], name: "index_checkouts_on_user_id"
 
@@ -357,6 +359,17 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.datetime "updated_at"
   end
 
+  create_table "colors", force: :cascade do |t|
+    t.integer  "library_group_id"
+    t.string   "property"
+    t.string   "code"
+    t.integer  "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "colors", ["library_group_id"], name: "index_colors_on_library_group_id"
+
   create_table "content_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
@@ -402,6 +415,18 @@ ActiveRecord::Schema.define(version: 20160703185015) do
   add_index "creates", ["agent_id"], name: "index_creates_on_agent_id"
   add_index "creates", ["work_id"], name: "index_creates_on_work_id"
 
+  create_table "demands", force: :cascade do |t|
+    t.integer  "user_id"
+    t.integer  "item_id"
+    t.integer  "message_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "demands", ["item_id"], name: "index_demands_on_item_id"
+  add_index "demands", ["message_id"], name: "index_demands_on_message_id"
+  add_index "demands", ["user_id"], name: "index_demands_on_user_id"
+
   create_table "donates", force: :cascade do |t|
     t.integer  "agent_id",   null: false
     t.integer  "item_id",    null: false
@@ -644,7 +669,10 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "deleted_at"
+    t.text     "opening_hour"
     t.string   "isil"
+    t.float    "latitude"
+    t.float    "longitude"
   end
 
   add_index "libraries", ["library_group_id"], name: "index_libraries_on_library_group_id"
@@ -677,6 +705,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.boolean  "allow_bookmark_external_url", default: false,                    null: false
     t.string   "url",                         default: "http://localhost:3000/"
     t.text     "settings"
+    t.text     "html_snippet"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
@@ -697,6 +726,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "manifestation_checkout_stat_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "manifestation_checkout_stat_transitions", ["manifestation_checkout_stat_id"], name: "index_manifestation_checkout_stat_transitions_on_stat_id"
@@ -743,6 +773,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "manifestation_reserve_stat_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "manifestation_reserve_stat_transitions", ["manifestation_reserve_stat_id"], name: "index_manifestation_reserve_stat_transitions_on_stat_id"
@@ -876,12 +907,11 @@ ActiveRecord::Schema.define(version: 20160703185015) do
 
   create_table "message_transitions", force: :cascade do |t|
     t.string   "to_state"
-    t.text     "metadata",    default: "{}"
+    t.text     "metadata",   default: "{}"
     t.integer  "sort_key"
     t.integer  "message_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "most_recent"
   end
 
   add_index "message_transitions", ["message_id"], name: "index_message_transitions_on_message_id"
@@ -1046,11 +1076,12 @@ ActiveRecord::Schema.define(version: 20160703185015) do
 
   create_table "reserve_transitions", force: :cascade do |t|
     t.string   "to_state"
-    t.text     "metadata",   default: "{}"
+    t.text     "metadata",    default: "{}"
     t.integer  "sort_key"
     t.integer  "reserve_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "reserve_transitions", ["reserve_id"], name: "index_reserve_transitions_on_reserve_id"
@@ -1069,6 +1100,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.datetime "deleted_at"
     t.boolean  "expiration_notice_to_patron",  default: false
     t.boolean  "expiration_notice_to_library", default: false
+    t.integer  "pickup_location_id"
     t.datetime "retained_at"
     t.datetime "postponed_at"
     t.integer  "lock_version",                 default: 0,     null: false
@@ -1076,6 +1108,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
 
   add_index "reserves", ["item_id"], name: "index_reserves_on_item_id"
   add_index "reserves", ["manifestation_id"], name: "index_reserves_on_manifestation_id"
+  add_index "reserves", ["pickup_location_id"], name: "index_reserves_on_pickup_location_id"
   add_index "reserves", ["request_status_type_id"], name: "index_reserves_on_request_status_type_id"
   add_index "reserves", ["user_id"], name: "index_reserves_on_user_id"
 
@@ -1341,6 +1374,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "user_checkout_stat_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_checkout_stat_transitions", ["sort_key", "user_checkout_stat_id"], name: "index_user_checkout_stat_transitions_on_sort_key_and_stat_id", unique: true
@@ -1475,6 +1509,7 @@ ActiveRecord::Schema.define(version: 20160703185015) do
     t.integer  "user_reserve_stat_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_reserve_stat_transitions", ["sort_key", "user_reserve_stat_id"], name: "index_user_reserve_stat_transitions_on_sort_key_and_stat_id", unique: true
@@ -1525,15 +1560,15 @@ ActiveRecord::Schema.define(version: 20160703185015) do
   add_index "users", ["unlock_token"], name: "index_users_on_unlock_token", unique: true
   add_index "users", ["username"], name: "index_users_on_username", unique: true
 
-  create_table "versions", force: :cascade do |t|
-    t.string   "item_type",  null: false
-    t.integer  "item_id",    null: false
-    t.string   "event",      null: false
-    t.string   "whodunnit"
-    t.text     "object"
-    t.datetime "created_at"
+  create_table "withdraws", force: :cascade do |t|
+    t.integer  "basket_id"
+    t.integer  "item_id"
+    t.integer  "librarian_id"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
   end
 
-  add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
+  add_index "withdraws", ["basket_id"], name: "index_withdraws_on_basket_id"
+  add_index "withdraws", ["item_id"], name: "index_withdraws_on_item_id"
 
 end