enju_search_log 0.2.0.beta.1 → 0.2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1183581c4daeef762ecb81966d886fc952f36861
-  data.tar.gz: c9de2625233b2d9ecfef6c9fdf0c21becf06e38e
+  metadata.gz: bbd92d1277968c7a17bf4ca1c65d5d5656464b14
+  data.tar.gz: 6f1a6e8b50a69647fb481cfbc398fe801de10bd6
 SHA512:
-  metadata.gz: 5a748e7617bcc8d471b6696c41de6f1a32a26d9c732b12efef16b57df6e339dd6cc707db1d081a53d4111f9dfa913a2f9c170d8d01c2ed4f7e4b5da10cf5427d
-  data.tar.gz: 8b9be9fd97085adb7735fd9b36bd23897ab18a99d01d2a9cf3acd52496ec3707992a9d57e481519742bd6c50b63c651d63b00a74ad0dd95df56f20608992874a
+  metadata.gz: ce5c2ed6202d682af28f049d8fa48419f7c6e38854d4fadb0d44f0c3d5d61d45564bf3ef1e4aa7a8eb7084899f3ea8f629db8b37d0de83430c82770f7fb93cc0
+  data.tar.gz: 82efc68998d4497b66eb457f159f3a9759d0e192db227702e2001e6e4668ca063e51866f822c9d77d66d0fc98100cc9a1140a568f1dfcc9f5560ae027e50148f

data/app/models/search_history.rb

@@ -20,25 +20,24 @@ end
 #
 #  id                             :integer          not null, primary key
 #  user_id                        :integer
-#  operation                      :string(255)      default("searchRetrieve")
+#  operation                      :string           default("searchRetrieve")
 #  sru_version                    :float            default(1.2)
-#  query                          :string(255)
+#  query                          :string
 #  start_record                   :integer
 #  maximum_records                :integer
-#  record_packing                 :string(255)
-#  record_schema                  :string(255)
+#  record_packing                 :string
+#  record_schema                  :string
 #  result_set_ttl                 :integer
-#  stylesheet                     :string(255)
-#  extra_request_data             :string(255)
+#  stylesheet                     :string
+#  extra_request_data             :string
 #  number_of_records              :integer          default(0)
-#  result_set_id                  :string(255)
+#  result_set_id                  :string
 #  result_set_idle_time           :integer
 #  records                        :text
 #  next_record_position           :integer
 #  diagnostics                    :text
 #  extra_response_data            :text
 #  echoed_search_retrieve_request :text
-#  created_at                     :datetime         not null
-#  updated_at                     :datetime         not null
+#  created_at                     :datetime
+#  updated_at                     :datetime
 #
-

data/lib/enju_search_log/version.rb

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

data/spec/controllers/search_histories_controller_spec.rb

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

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

@@ -1,8 +1,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  include EnjuLeaf::Controller
-  include EnjuBiblio::Controller
   include EnjuLibrary::Controller
+  include EnjuBiblio::Controller
+  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized
 
   include Pundit

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

@@ -4,6 +4,6 @@ class User < ActiveRecord::Base
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  include EnjuLeaf::EnjuUser
+  include EnjuSeed::EnjuUser
   enju_search_log_user_model
 end

data/spec/dummy/config/application.rb

@@ -5,6 +5,8 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 require 'enju_search_log'
 require 'enju_leaf'
+require 'globalize'
+require 'globalize-accessors'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/db/migrate/149_create_message_templates.rb

@@ -0,0 +1,18 @@
+class CreateMessageTemplates < ActiveRecord::Migration
+  def self.up
+    create_table :message_templates do |t|
+      t.string :status, :null => false
+      t.text :title, :null => false
+      t.text :body, :null => false
+      t.integer :position
+      t.string :locale, :default => I18n.default_locale.to_s
+
+      t.timestamps
+    end
+    add_index :message_templates, :status, :unique => true
+  end
+
+  def self.down
+    drop_table :message_templates
+  end
+end

data/spec/dummy/db/migrate/154_create_messages.rb

@@ -0,0 +1,23 @@
+class CreateMessages < ActiveRecord::Migration
+  def self.up
+    create_table :messages, :force => true do |t|
+      t.datetime :read_at
+      t.integer  :receiver_id, :sender_id
+      t.string   :subject, :null => false
+      t.text     :body
+      t.integer :message_request_id
+      t.integer :parent_id
+
+      t.timestamps
+    end
+
+    add_index :messages, :sender_id
+    add_index :messages, :receiver_id
+    add_index :messages, :message_request_id
+    add_index :messages, :parent_id
+  end
+
+  def self.down
+    drop_table :messages
+  end
+end

data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb

@@ -0,0 +1,18 @@
+class CreateMessageRequests < ActiveRecord::Migration
+  def self.up
+    create_table :message_requests do |t|
+      t.integer :sender_id
+      t.integer :receiver_id
+      t.integer :message_template_id
+      t.datetime :sent_at
+      t.datetime :deleted_at
+      t.text :body
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :message_requests
+  end
+end

data/spec/dummy/db/migrate/20110913115320_add_lft_and_rgt_to_message.rb

@@ -0,0 +1,11 @@
+class AddLftAndRgtToMessage < ActiveRecord::Migration
+  def self.up
+    add_column :messages, :lft, :integer
+    add_column :messages, :rgt, :integer
+  end
+
+  def self.down
+    remove_column :messages, :rgt
+    remove_column :messages, :lft
+  end
+end

data/spec/dummy/db/migrate/20120125050502_add_depth_to_message.rb

@@ -0,0 +1,6 @@
+class AddDepthToMessage < ActiveRecord::Migration
+  def change
+    add_column :messages, :depth, :integer
+
+  end
+end

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

@@ -6,7 +6,7 @@ class CreateUserImportFiles < ActiveRecord::Migration
       t.datetime :executed_at
       t.string :user_import_file_name
       t.string :user_import_content_type
-      t.string :user_import_file_size
+      t.integer :user_import_file_size
       t.datetime :user_import_updated_at
       t.string :user_import_fingerprint
       t.string :edit_mode

data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb

@@ -0,0 +1,18 @@
+class CreateMessageTransitions < ActiveRecord::Migration
+  def change
+    create_table :message_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 :message_id
+      t.timestamps
+    end
+
+    add_index :message_transitions, :message_id
+    add_index :message_transitions, [:sort_key, :message_id], unique: true
+  end
+end

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

@@ -0,0 +1,18 @@
+class CreateMessageRequestTransitions < ActiveRecord::Migration
+  def change
+    create_table :message_request_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 :message_request_id
+      t.timestamps
+    end
+
+    add_index :message_request_transitions, :message_request_id
+    add_index :message_request_transitions, [:sort_key, :message_request_id], unique: true, name: "index_message_request_transitions_on_sort_key_and_request_id"
+  end
+end

data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToUserImportResult < ActiveRecord::Migration
+  def change
+    add_column :user_import_results, :error_message, :text
+  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/20151213070943_add_translation_table_to_library_group.rb

@@ -0,0 +1,13 @@
+class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
+  def up
+    LibraryGroup.create_translation_table!({
+      login_banner: :text
+    }, {
+      migrate_data: true
+    })
+  end
+
+  def down
+    LibraryGroup.drop_translation_table! migrate_data: true
+  end
+end

data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb

@@ -0,0 +1,9 @@
+class AddFooterBannerToLibraryGroup < ActiveRecord::Migration
+  def up
+    LibraryGroup.add_translation_fields! footer_banner: :text
+  end
+
+  def down
+    remove_column :library_group_translations, :footer_banner
+  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/20160627232219_add_most_recent_to_user_import_file_transitions.rb

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

data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserExportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_export_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_export_file_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/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :max_number_of_results, :integer, default: 500
+  end
+end

data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :family_name_first, :boolean, default: true
+  end
+end

data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :pub_year_facet_range_interval, :integer, default: 10
+  end
+end

data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddUserIdToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_reference :library_groups, :user, index: true, foreign_key: true
+  end
+end

data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_request_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_request_transitions, :most_recent
+  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: 20150221063719) do
+ActiveRecord::Schema.define(version: 20160814165332) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -98,10 +98,22 @@ ActiveRecord::Schema.define(version: 20150221063719) do
   add_index "libraries", ["library_group_id"], name: "index_libraries_on_library_group_id"
   add_index "libraries", ["name"], name: "index_libraries_on_name", unique: true
 
+  create_table "library_group_translations", force: :cascade do |t|
+    t.integer  "library_group_id", null: false
+    t.string   "locale",           null: false
+    t.datetime "created_at",       null: false
+    t.datetime "updated_at",       null: false
+    t.text     "login_banner"
+    t.text     "footer_banner"
+  end
+
+  add_index "library_group_translations", ["library_group_id"], name: "index_library_group_translations_on_library_group_id"
+  add_index "library_group_translations", ["locale"], name: "index_library_group_translations_on_locale"
+
   create_table "library_groups", force: :cascade do |t|
-    t.string   "name",                                              null: false
+    t.string   "name",                                                             null: false
     t.text     "display_name"
-    t.string   "short_name",                                        null: false
+    t.string   "short_name",                                                       null: false
     t.text     "my_networks"
     t.text     "login_banner"
     t.text     "note"
@@ -110,11 +122,86 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "admin_networks"
-    t.string   "url",            default: "http://localhost:3000/"
+    t.string   "url",                           default: "http://localhost:3000/"
     t.text     "settings"
+    t.text     "html_snippet"
+    t.integer  "max_number_of_results",         default: 500
+    t.boolean  "family_name_first",             default: true
+    t.integer  "pub_year_facet_range_interval", default: 10
+    t.integer  "user_id"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
+  add_index "library_groups", ["user_id"], name: "index_library_groups_on_user_id"
+
+  create_table "message_request_transitions", force: :cascade do |t|
+    t.string   "to_state"
+    t.text     "metadata",           default: "{}"
+    t.integer  "sort_key"
+    t.integer  "message_request_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "most_recent"
+  end
+
+  add_index "message_request_transitions", ["message_request_id"], name: "index_message_request_transitions_on_message_request_id"
+  add_index "message_request_transitions", ["sort_key", "message_request_id"], name: "index_message_request_transitions_on_sort_key_and_request_id", unique: true
+
+  create_table "message_requests", force: :cascade do |t|
+    t.integer  "sender_id"
+    t.integer  "receiver_id"
+    t.integer  "message_template_id"
+    t.datetime "sent_at"
+    t.datetime "deleted_at"
+    t.text     "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "message_templates", force: :cascade do |t|
+    t.string   "status",                    null: false
+    t.text     "title",                     null: false
+    t.text     "body",                      null: false
+    t.integer  "position"
+    t.string   "locale",     default: "en"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "message_templates", ["status"], name: "index_message_templates_on_status", unique: true
+
+  create_table "message_transitions", force: :cascade do |t|
+    t.string   "to_state"
+    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"
+  add_index "message_transitions", ["sort_key", "message_id"], name: "index_message_transitions_on_sort_key_and_message_id", unique: true
+
+  create_table "messages", force: :cascade do |t|
+    t.datetime "read_at"
+    t.integer  "receiver_id"
+    t.integer  "sender_id"
+    t.string   "subject",            null: false
+    t.text     "body"
+    t.integer  "message_request_id"
+    t.integer  "parent_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "lft"
+    t.integer  "rgt"
+    t.integer  "depth"
+  end
+
+  add_index "messages", ["message_request_id"], name: "index_messages_on_message_request_id"
+  add_index "messages", ["parent_id"], name: "index_messages_on_parent_id"
+  add_index "messages", ["receiver_id"], name: "index_messages_on_receiver_id"
+  add_index "messages", ["sender_id"], name: "index_messages_on_sender_id"
 
   create_table "profiles", force: :cascade do |t|
     t.integer  "user_id"
@@ -253,6 +340,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "user_export_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_export_file_transitions", ["sort_key", "user_export_file_id"], name: "index_user_export_file_transitions_on_sort_key_and_file_id", unique: true
@@ -298,6 +386,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "user_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], name: "index_user_import_file_transitions_on_sort_key_and_file_id", unique: true
@@ -309,7 +398,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "executed_at"
     t.string   "user_import_file_name"
     t.string   "user_import_content_type"
-    t.string   "user_import_file_size"
+    t.integer  "user_import_file_size"
     t.datetime "user_import_updated_at"
     t.string   "user_import_fingerprint"
     t.string   "edit_mode"
@@ -327,6 +416,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "error_message"
   end
 
   create_table "users", force: :cascade do |t|
@@ -368,4 +458,15 @@ ActiveRecord::Schema.define(version: 20150221063719) do
 
   add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
 
+  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 "withdraws", ["basket_id"], name: "index_withdraws_on_basket_id"
+  add_index "withdraws", ["item_id"], name: "index_withdraws_on_item_id"
+
 end

data/spec/factories/profile.rb

@@ -0,0 +1,17 @@
+FactoryGirl.define do
+  factory :profile, :class => Profile do |f|
+    f.user_group_id {UserGroup.first.id}
+    f.required_role_id {Role.where(name: 'User').first.id}
+    f.sequence(:user_number){|n| "user_number_#{n}"}
+    f.library_id 2
+    f.locale "ja"
+    factory :librarian_profile, :class => Profile do |profile|
+      profile.required_role_id {Role.where(name: 'Librarian').first.id}
+      profile.association :user, factory: :librarian
+    end
+    factory :admin_profile, :class => Profile do |profile|
+      profile.required_role_id {Role.where(name: 'Administrator').first.id}
+      profile.association :user, factory: :admin
+    end
+  end
+end

data/spec/factories/user.rb

@@ -0,0 +1,43 @@
+FactoryGirl.define do
+  factory :admin, class: User do |f|
+    f.sequence(:username){|n| "admin_#{n}"}
+    f.sequence(:email){|n| "admin_#{n}@example.jp"}
+    f.password 'adminpassword'
+    f.password_confirmation 'adminpassword'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Administrator').id})
+      user_has_role.save
+      user.reload
+    end
+  end
+
+  factory :librarian, class: User do |f|
+    f.sequence(:username){|n| "librarian_#{n}"}
+    f.sequence(:email){|n| "librarian_#{n}@example.jp"}
+    f.password 'librarianpassword'
+    f.password_confirmation 'librarianpassword'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('Librarian').id})
+      user_has_role.save
+      user.reload
+    end
+  end
+
+  factory :user, class: User do |f|
+    f.sequence(:username){|n| "user_#{n}"}
+    f.sequence(:email){|n| "user_#{n}@example.jp"}
+    f.password 'userpassword'
+    f.password_confirmation 'userpassword'
+    f.after(:create) do |user|
+      user_has_role = UserHasRole.new
+      user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by_name('User').id})
+      user_has_role.save
+      user.reload
+    end
+  end
+
+  factory :invalid_user, class: User do |f|
+  end
+end