enju_message 0.1.14.pre14 → 0.1.14.pre15

data/spec/controllers/message_templates_controller_spec.rb

@@ -7,7 +7,7 @@ describe MessageTemplatesController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all message_templates as @message_templates" do
         get :index
@@ -16,7 +16,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all message_templates as @message_templates" do
         get :index
@@ -25,7 +25,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns empty as @message_templates" do
         get :index
@@ -45,7 +45,7 @@ describe MessageTemplatesController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message_template as @message_template" do
         message_template = FactoryGirl.create(:message_template)
@@ -55,7 +55,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested message_template as @message_template" do
         message_template = FactoryGirl.create(:message_template)
@@ -65,7 +65,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested message_template as @message_template" do
         message_template = FactoryGirl.create(:message_template)
@@ -85,7 +85,7 @@ describe MessageTemplatesController do
 
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message_template as @message_template" do
         get :new
@@ -95,7 +95,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested message_template as @message_template" do
         get :new
@@ -105,7 +105,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "should not assign the requested message_template as @message_template" do
         get :new
@@ -125,7 +125,7 @@ describe MessageTemplatesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message_template as @message_template" do
         message_template = FactoryGirl.create(:message_template)
@@ -135,7 +135,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested message_template as @message_template" do
         message_template = FactoryGirl.create(:message_template)
@@ -145,7 +145,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested message_template as @message_template" do
         message_template = FactoryGirl.create(:message_template)
@@ -170,7 +170,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
@@ -198,7 +198,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
@@ -226,7 +226,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "assigns a newly created message_template as @message_template" do
@@ -288,7 +288,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested message_template" do
@@ -315,7 +315,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested message_template" do
@@ -338,7 +338,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested message_template" do
@@ -387,7 +387,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested message_template" do
         delete :destroy, :id => @message_template.id
@@ -400,7 +400,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested message_template" do
         delete :destroy, :id => @message_template.id
@@ -413,7 +413,7 @@ describe MessageTemplatesController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested message_template" do
         delete :destroy, :id => @message_template.id

data/spec/controllers/messages_controller_spec.rb

@@ -9,10 +9,7 @@ describe MessagesController do
     end
 
     describe "When logged in as Administrator" do
-      before(:each) do
-        @user = FactoryGirl.create(:admin)
-        sign_in @user
-      end
+      login_fixture_admin
 
       it "should get its own messages" do
         get :index
@@ -29,10 +26,7 @@ describe MessagesController do
     end
 
     describe "When logged in as Librarian" do
-      before(:each) do
-        @user = FactoryGirl.create(:librarian)
-        sign_in @user
-      end
+      login_fixture_librarian
 
       it "should get its own messages" do
         get :index
@@ -133,7 +127,7 @@ describe MessagesController do
   
   describe "GET new" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message as @message" do
         get :new
@@ -142,7 +136,7 @@ describe MessagesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "should not assign the requested message as @message" do
         get :new
@@ -187,7 +181,7 @@ describe MessagesController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message as @message" do
         message = messages(:user1_to_user2_1)
@@ -200,7 +194,7 @@ describe MessagesController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested message as @message" do
         message = messages(:user1_to_user2_1)
@@ -238,7 +232,7 @@ describe MessagesController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "assigns a newly created message as @message" do

data/spec/dummy/app/mailers/notifier.rb

@@ -11,20 +11,20 @@ class Notifier < ActionMailer::Base
 
   def message_notification(message_id)
     message = Message.find(message_id)
-    I18n.locale = message.receiver.locale.try(:to_sym) || I18n.default_locale
-    from = "#{LibraryGroup.system_name(message.receiver.locale)} <#{LibraryGroup.site_config.email}>"
+    I18n.locale = message.receiver.profile.locale.try(:to_sym) || I18n.default_locale
+    from = "#{LibraryGroup.system_name(message.receiver.profile.locale)} <#{LibraryGroup.site_config.email}>"
     if message.subject
       subject = message.subject
     else
-      subject = I18n.t('message.new_message_from_library', :library => LibraryGroup.system_name(message.receiver.user.locale))
+      subject = I18n.t('message.new_message_from_library', :library => LibraryGroup.system_name(message.receiver.user.profile.locale))
     end
     if message.sender
-      @sender_name = message.sender.full_name
+      @sender_name = message.sender.username
     else
-      @sender_name = LibraryGroup.system_name(message.receiver.locale)
+      @sender_name = LibraryGroup.system_name(message.receiver.profile.locale)
     end
     @message = message
-    @locale = message.receiver.locale
+    @locale = message.receiver.profile.locale
     mail(:from => from, :to => message.receiver.email, :subject => subject)
   end
 end

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -1,7 +1,6 @@
 class CreateAgents < ActiveRecord::Migration
   def change
     create_table :agents do |t|
-      t.integer :user_id
       t.string :last_name
       t.string :middle_name
       t.string :first_name
@@ -44,7 +43,6 @@ class CreateAgents < ActiveRecord::Migration
       t.text :email
       t.text :url
     end
-    add_index :agents, :user_id, :unique => true
     add_index :agents, :language_id
     add_index :agents, :country_id
     add_index :agents, :required_role_id

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

@@ -0,0 +1,18 @@
+class CreateUserImportFiles < ActiveRecord::Migration
+  def change
+    create_table :user_import_files do |t|
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :user_import_file_name
+      t.string :user_import_content_type
+      t.string :user_import_file_size
+      t.datetime :user_import_updated_at
+      t.string :user_import_fingerprint
+      t.string :edit_mode
+      t.text :error_message
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb

@@ -0,0 +1,11 @@
+class CreateUserImportResults < ActiveRecord::Migration
+  def change
+    create_table :user_import_results do |t|
+      t.integer :user_import_file_id
+      t.integer :user_id
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20140122054321_create_profiles.rb

@@ -0,0 +1,20 @@
+class CreateProfiles < ActiveRecord::Migration
+  def change
+    create_table :profiles do |t|
+      t.integer :user_id
+      t.integer :user_group_id
+      t.integer :library_id
+      t.string :locale
+      t.string :user_number
+      t.text :full_name
+      t.text :note
+      t.text :keyword_list
+      t.integer :required_role_id
+
+      t.timestamps
+    end
+
+    add_index :profiles, :user_id
+    add_index :profiles, :user_number, :unique => true
+  end
+end

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

@@ -0,0 +1,14 @@
+class CreateUserImportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_import_file_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_import_file_id
+      t.timestamps
+    end
+
+    add_index :user_import_file_transitions, :user_import_file_id
+    add_index :user_import_file_transitions, [:sort_key, :user_import_file_id], unique: true, name: "index_user_import_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/spec/dummy/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb

@@ -0,0 +1,11 @@
+class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration
+  def up
+    remove_index :users, :email
+    add_index :users, :email
+  end
+
+  def down
+    remove_index :users, :email
+    add_index :users, :email, unique: true
+  end
+end

data/spec/dummy/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddUserEncodingToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :user_encoding, :string
+  end
+end

data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb

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

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

@@ -0,0 +1,14 @@
+class CreateUserExportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_export_file_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_export_file_id
+      t.timestamps
+    end
+
+    add_index :user_export_file_transitions, :user_export_file_id, name: "index_user_export_file_transitions_on_file_id"
+    add_index :user_export_file_transitions, [:sort_key, :user_export_file_id], unique: true, name: "index_user_export_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :default_library_id, :integer
+  end
+end

data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :default_user_group_id, :integer
+  end
+end

data/spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb

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

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130412083556) do
+ActiveRecord::Schema.define(:version => 20140811031145) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -34,7 +34,6 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   end
 
   create_table "agents", :force => true do |t|
-    t.integer  "user_id"
     t.string   "last_name"
     t.string   "middle_name"
     t.string   "first_name"
@@ -85,7 +84,6 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   add_index "agents", ["full_name"], :name => "index_agents_on_full_name"
   add_index "agents", ["language_id"], :name => "index_agents_on_language_id"
   add_index "agents", ["required_role_id"], :name => "index_agents_on_required_role_id"
-  add_index "agents", ["user_id"], :name => "index_agents_on_user_id", :unique => true
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -212,6 +210,18 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
 
   add_index "library_groups", ["short_name"], :name => "index_library_groups_on_short_name"
 
+  create_table "message_request_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",           :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "message_request_id"
+    t.datetime "created_at",                           :null => false
+    t.datetime "updated_at",                           :null => false
+  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 => true do |t|
     t.integer  "sender_id"
     t.integer  "receiver_id"
@@ -219,13 +229,10 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.datetime "sent_at"
     t.datetime "deleted_at"
     t.text     "body"
-    t.string   "state"
     t.datetime "created_at",          :null => false
     t.datetime "updated_at",          :null => false
   end
 
-  add_index "message_requests", ["state"], :name => "index_message_requests_on_state"
-
   create_table "message_templates", :force => true do |t|
     t.string   "status",                       :null => false
     t.text     "title",                        :null => false
@@ -238,6 +245,18 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
 
   add_index "message_templates", ["status"], :name => "index_message_templates_on_status", :unique => true
 
+  create_table "message_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",   :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "message_id"
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
+  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 => true do |t|
     t.datetime "read_at"
     t.integer  "receiver_id"
@@ -245,7 +264,6 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.string   "subject",            :null => false
     t.text     "body"
     t.integer  "message_request_id"
-    t.string   "state"
     t.integer  "parent_id"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
@@ -259,6 +277,24 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   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 => true do |t|
+    t.integer  "user_id"
+    t.integer  "user_group_id"
+    t.integer  "library_id"
+    t.string   "locale"
+    t.string   "user_number"
+    t.text     "full_name"
+    t.text     "note"
+    t.text     "keyword_list"
+    t.integer  "required_role_id"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+    t.datetime "expired_at"
+  end
+
+  add_index "profiles", ["user_id"], :name => "index_profiles_on_user_id"
+  add_index "profiles", ["user_number"], :name => "index_profiles_on_user_number", :unique => true
+
   create_table "request_status_types", :force => true do |t|
     t.string   "name",         :null => false
     t.text     "display_name"
@@ -341,6 +377,29 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
   add_index "subscriptions", ["order_list_id"], :name => "index_subscriptions_on_order_list_id"
   add_index "subscriptions", ["user_id"], :name => "index_subscriptions_on_user_id"
 
+  create_table "user_export_file_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",            :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_export_file_id"
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+  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
+  add_index "user_export_file_transitions", ["user_export_file_id"], :name => "index_user_export_file_transitions_on_file_id"
+
+  create_table "user_export_files", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "user_export_file_name"
+    t.string   "user_export_content_type"
+    t.integer  "user_export_file_size"
+    t.datetime "user_export_updated_at"
+    t.datetime "executed_at"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+  end
+
   create_table "user_groups", :force => true do |t|
     t.string   "name"
     t.text     "display_name"
@@ -360,6 +419,44 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.datetime "updated_at", :null => false
   end
 
+  create_table "user_import_file_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",            :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_import_file_id"
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+  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
+  add_index "user_import_file_transitions", ["user_import_file_id"], :name => "index_user_import_file_transitions_on_user_import_file_id"
+
+  create_table "user_import_files", :force => true do |t|
+    t.integer  "user_id"
+    t.text     "note"
+    t.datetime "executed_at"
+    t.string   "user_import_file_name"
+    t.string   "user_import_content_type"
+    t.string   "user_import_file_size"
+    t.datetime "user_import_updated_at"
+    t.string   "user_import_fingerprint"
+    t.string   "edit_mode"
+    t.text     "error_message"
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+    t.string   "user_encoding"
+    t.integer  "default_library_id"
+    t.integer  "default_user_group_id"
+  end
+
+  create_table "user_import_results", :force => true do |t|
+    t.integer  "user_import_file_id"
+    t.integer  "user_id"
+    t.text     "body"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "email",                  :default => "", :null => false
     t.string   "encrypted_password",     :default => "", :null => false
@@ -390,7 +487,7 @@ ActiveRecord::Schema.define(:version => 20130412083556) do
     t.datetime "confirmed_at"
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+  add_index "users", ["email"], :name => "index_users_on_email"
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
   add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
   add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"