enju_message 0.1.14.pre24 → 0.1.14.pre25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931048eaf1302223087dd4114908686cfb07553c
-  data.tar.gz: 611dfc90bf5a93f570f93d2d54892198eda9d9c9
+  metadata.gz: 8142b6f6323115bd8fbb9e97ed5ff0f43db917c7
+  data.tar.gz: 21795810e3d5c2fa3a1ee221d8fc2032910ef159
 SHA512:
-  metadata.gz: 575df8a44234264bc4db999320b9b2b9cf7744379342803933753c1a476180f01edc771bcaa01d24d913976a35f3d8f94a9e8eaca81528b8405e04ce34881487
-  data.tar.gz: 32c4f93dee91f303ad6c027b115ec15eba65142a4a8926a66ec36c7163699bdfb1860e9b09457614d468c790e8e9d66e225910b3a0cb5038bbec7b2998e8d601
+  metadata.gz: 8cf6d6627d4e87e3bac290bc0e428d14dea88811c38860bd4c8755fbf3b88e94af2d76634c831c70026e6316881747965ac4e3eda80da4e31f540d67b38d5433
+  data.tar.gz: d60dc9912499fa081effc6c37ff796701b541eb1d16d9c5b7ff13ceda9192fed658815666d7706f8ff55a8be54e32551981628b40f34b87f261090e2a01298b0

data/app/controllers/messages_controller.rb

@@ -121,17 +121,13 @@ class MessagesController < ApplicationController
   end
 
   def destroy_selected
-    if current_user
-      unless current_user.has_role?('Librarian')
-        access_denied
-      end
-    else
+    unless current_user
       redirect_to new_user_session_url
       return
     end
     respond_to do |format|
       if params[:delete].present?
-        messages = params[:delete].map{|m| Message.find_by_id(m)}
+        messages = params[:delete].map{|m| Message.where(id: m).first}
       end
       if messages.present?
         messages.each do |message|

data/app/models/enju_message/ability.rb

@@ -6,6 +6,7 @@ module EnjuMessage
       case user.try(:role).try(:name)
       when 'Administrator'
         can :manage, Message
+        can :destroy_selected, Message
         can [:read, :update, :destroy, :delete], MessageRequest
         can [:read, :update], MessageTemplate
       when 'Librarian'
@@ -13,13 +14,13 @@ module EnjuMessage
         can [:update], Message do |message|
           message.sender == user
         end
-        can [:show, :destroy, :delete], Message do |message|
+        can [:show, :destroy, :delete, :destroy_selected], Message do |message|
           message.receiver == user
         end
         can [:read, :update, :destroy, :delete], MessageRequest
         can :read, MessageTemplate
       when 'User'
-        can [:read, :destroy, :delete], Message do |message|
+        can [:show, :destroy, :delete, :destroy_selected], Message do |message|
           message.receiver == user
         end
         can :index, Message

data/app/models/message.rb

@@ -6,15 +6,15 @@ class Message < ActiveRecord::Base
   belongs_to :sender, class_name: 'User'
   belongs_to :receiver, class_name: 'User'
   validates_presence_of :subject, :body #, :sender
-  validates_presence_of :recipient, on: :create
-  validates_presence_of :receiver, on: :update
-  before_save :set_receiver
+  validates_presence_of :receiver, message: :invalid
+  before_validation :set_receiver
   after_save :index
   after_destroy :remove_from_index
   after_create :send_notification
 
   acts_as_nested_set
   attr_accessor :recipient
+  validates :recipient, presence: true, on: :create
 
   delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
     to: :state_machine
@@ -43,7 +43,7 @@ class Message < ActiveRecord::Base
 
   def set_receiver
     if recipient
-      self.receiver = User.find(recipient)
+      self.receiver = User.where(username: recipient).first
     end
   end
 

data/app/views/messages/new.html.erb

@@ -4,11 +4,11 @@
   <fieldset>
 
     <%= simple_form_for(@message, url: messages_path, validate: true) do |f| -%>
-      <%= f.error_notification -%>
+      <%= f.error_messages -%>
 
       <div class="field">
         <label for="message_recepient"><%= t('message.recipient') -%>:</label>
-        <%- if @message.recipient -%>
+        <%- if @message.receiver -%>
           <%= link_to @message.receiver.username, profile_path(@message.receiver) -%>
           <%= f.hidden_field :recipient, value: @message.recipient -%>
         <%- else -%>

data/config/locales/translation_en.yml

@@ -11,6 +11,7 @@ en:
         body: Body
         sender: Sender
         receiver: Receiver
+        recipient: Recipient
       message_template:
         status: Status
         locale: Locale

data/config/locales/translation_ja.yml

@@ -11,6 +11,7 @@ ja:
         body: 本文
         sender: 差出人
         receiver: 宛て先
+        recipient: 宛て先
       message_template:
         status: 状態
         locale: 言語

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre24"
+  VERSION = "0.1.14.pre25"
 end

data/spec/controllers/messages_controller_spec.rb

@@ -229,6 +229,8 @@ describe MessagesController do
     before(:each) do
       @attrs = {:recipient => users(:user1).username, :subject => 'test',:body => 'test'}
       @invalid_attrs = {:recipient => users(:user1).username, :subject => 'test', :body => ''}
+      @invalid_user_attrs = {:recipient => "invalid_user", :subject => 'test', :body => 'test'}
+      @blank_user_attrs   = {:recipient => "", :subject => 'test', :body => 'test'}
     end
 
     describe "When logged in as Administrator" do
@@ -258,6 +260,24 @@ describe MessagesController do
           response.should be_success
         end
       end
+      describe "with invalid recipient" do
+        it "re-renders the 'new' template" do
+          post :create, :message => @invalid_user_attrs
+          message = assigns(:message)
+          message.should_not be_valid
+          message.errors.should have_key :receiver
+          message.errors.added?(:receiver, :invalid).should be_truthy
+          response.should render_template("new")
+        end
+        it "re-renders the 'new' template" do
+          post :create, :message => @blank_user_attrs
+          message = assigns(:message)
+          message.should_not be_valid
+          message.errors.should have_key :recipient
+          message.errors.added?(:recipient, :blank).should be_truthy
+          response.should render_template("new")
+        end
+      end
     end
 
     describe "When logged in as Librarian" do
@@ -425,12 +445,22 @@ describe MessagesController do
   end
 
   describe "DELETE destroy" do
+    describe "When logged in as Librarian" do
+      login_fixture_librarian
+
+      it "should destroy own message" do
+        @message = FactoryGirl.create(:message, recipient: @user.username)
+        delete :destroy, :id => @message.id
+        response.should redirect_to messages_url
+      end
+    end
     describe "When logged in as User" do
       login_fixture_user
 
       it "should destroy own message" do
         delete :destroy, :id => 2
         response.should redirect_to messages_url
+        response.should_not be_forbidden
       end
 
       it "should not destroy other user's message" do
@@ -442,6 +472,7 @@ describe MessagesController do
     describe "When not logged in" do
       it "destroys the requested message" do
         delete :destroy, :id => 1
+        response.should redirect_to(new_user_session_url)
       end
 
       it "should be redirected to new_user_session_url" do
@@ -450,4 +481,26 @@ describe MessagesController do
       end
     end
   end
+
+  describe "POST destroy_selected" do
+    describe "When logged in as Librarian" do
+      login_fixture_librarian
+      it "should destroy own message" do
+        message = FactoryGirl.create(:message, recipient: @user.username)
+        post :destroy_selected, delete: [ message.id ]
+        response.should_not be_forbidden
+        response.should redirect_to(messages_url)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_fixture_user
+      it "should destroy own message" do
+        message = FactoryGirl.create(:message, recipient: @user.username)
+        post :destroy_selected, delete: [ message.id ]
+        response.should_not be_forbidden
+        response.should redirect_to(messages_url)
+      end
+    end
+  end
 end

data/spec/dummy/db/schema.rb

@@ -43,7 +43,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "user_id"
     t.text     "note"
     t.datetime "executed_at"
-    t.string   "agent_import_filename"
+    t.string   "agent_import_file_name"
     t.string   "agent_import_content_type"
     t.integer  "agent_import_file_size"
     t.datetime "agent_import_updated_at"
@@ -199,18 +199,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "updated_at"
   end
 
-  create_table "carrier_type_has_checkout_types", force: :cascade do |t|
-    t.integer  "carrier_type_id",  null: false
-    t.integer  "checkout_type_id", null: false
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "carrier_type_has_checkout_types", ["carrier_type_id"], name: "index_carrier_type_has_checkout_types_on_m_form_id"
-  add_index "carrier_type_has_checkout_types", ["checkout_type_id"], name: "index_carrier_type_has_checkout_types_on_checkout_type_id"
-
   create_table "carrier_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
@@ -220,93 +208,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "updated_at"
   end
 
-  create_table "checked_items", force: :cascade do |t|
-    t.integer  "item_id",      null: false
-    t.integer  "basket_id",    null: false
-    t.datetime "due_date",     null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "librarian_id"
-  end
-
-  add_index "checked_items", ["basket_id"], name: "index_checked_items_on_basket_id"
-  add_index "checked_items", ["item_id"], name: "index_checked_items_on_item_id"
-
-  create_table "checkins", force: :cascade do |t|
-    t.integer  "item_id",                  null: false
-    t.integer  "librarian_id"
-    t.integer  "basket_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "lock_version", default: 0, null: false
-  end
-
-  add_index "checkins", ["basket_id"], name: "index_checkins_on_basket_id"
-  add_index "checkins", ["item_id"], name: "index_checkins_on_item_id"
-  add_index "checkins", ["librarian_id"], name: "index_checkins_on_librarian_id"
-
-  create_table "checkout_stat_has_manifestations", force: :cascade do |t|
-    t.integer  "manifestation_checkout_stat_id", null: false
-    t.integer  "manifestation_id",               null: false
-    t.integer  "checkouts_count"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "checkout_stat_has_manifestations", ["manifestation_checkout_stat_id"], name: "index_checkout_stat_has_manifestations_on_checkout_stat_id"
-  add_index "checkout_stat_has_manifestations", ["manifestation_id"], name: "index_checkout_stat_has_manifestations_on_manifestation_id"
-
-  create_table "checkout_stat_has_users", force: :cascade do |t|
-    t.integer  "user_checkout_stat_id",             null: false
-    t.integer  "user_id",                           null: false
-    t.integer  "checkouts_count",       default: 0, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "checkout_stat_has_users", ["user_checkout_stat_id"], name: "index_checkout_stat_has_users_on_user_checkout_stat_id"
-  add_index "checkout_stat_has_users", ["user_id"], name: "index_checkout_stat_has_users_on_user_id"
-
-  create_table "checkout_types", force: :cascade do |t|
-    t.string   "name",         null: false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "checkout_types", ["name"], name: "index_checkout_types_on_name"
-
-  create_table "checkouts", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "item_id",                            null: false
-    t.integer  "checkin_id"
-    t.integer  "librarian_id"
-    t.integer  "basket_id"
-    t.datetime "due_date"
-    t.integer  "checkout_renewal_count", default: 0, null: false
-    t.integer  "lock_version",           default: 0, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "checkouts", ["basket_id"], name: "index_checkouts_on_basket_id"
-  add_index "checkouts", ["checkin_id"], name: "index_checkouts_on_checkin_id"
-  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", ["user_id"], name: "index_checkouts_on_user_id"
-
-  create_table "circulation_statuses", force: :cascade do |t|
-    t.string   "name",         null: false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "content_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
@@ -446,16 +347,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
   add_index "import_requests", ["manifestation_id"], name: "index_import_requests_on_manifestation_id"
   add_index "import_requests", ["user_id"], name: "index_import_requests_on_user_id"
 
-  create_table "item_has_use_restrictions", force: :cascade do |t|
-    t.integer  "item_id",            null: false
-    t.integer  "use_restriction_id", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "item_has_use_restrictions", ["item_id"], name: "index_item_has_use_restrictions_on_item_id"
-  add_index "item_has_use_restrictions", ["use_restriction_id"], name: "index_item_has_use_restrictions_on_use_restriction_id"
-
   create_table "items", force: :cascade do |t|
     t.string   "call_number"
     t.string   "item_identifier"
@@ -473,8 +364,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "acquired_at"
     t.integer  "bookstore_id"
     t.integer  "budget_type_id"
-    t.integer  "circulation_status_id",   default: 5,     null: false
-    t.integer  "checkout_type_id",        default: 1,     null: false
     t.string   "binding_item_identifier"
     t.string   "binding_call_number"
     t.datetime "binded_at"
@@ -483,8 +372,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
 
   add_index "items", ["binding_item_identifier"], name: "index_items_on_binding_item_identifier"
   add_index "items", ["bookstore_id"], name: "index_items_on_bookstore_id"
-  add_index "items", ["checkout_type_id"], name: "index_items_on_checkout_type_id"
-  add_index "items", ["circulation_status_id"], name: "index_items_on_circulation_status_id"
   add_index "items", ["item_identifier"], name: "index_items_on_item_identifier"
   add_index "items", ["manifestation_id"], name: "index_items_on_manifestation_id"
   add_index "items", ["required_role_id"], name: "index_items_on_required_role_id"
@@ -506,21 +393,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
   add_index "languages", ["iso_639_3"], name: "index_languages_on_iso_639_3"
   add_index "languages", ["name"], name: "index_languages_on_name", unique: true
 
-  create_table "lending_policies", force: :cascade do |t|
-    t.integer  "item_id",                    null: false
-    t.integer  "user_group_id",              null: false
-    t.integer  "loan_period",    default: 0, null: false
-    t.datetime "fixed_due_date"
-    t.integer  "renewal",        default: 0, null: false
-    t.integer  "fine",           default: 0, null: false
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "lending_policies", ["item_id", "user_group_id"], name: "index_lending_policies_on_item_id_and_user_group_id", unique: true
-
   create_table "libraries", force: :cascade do |t|
     t.string   "name",                                null: false
     t.text     "display_name"
@@ -578,19 +450,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "updated_at"
   end
 
-  create_table "manifestation_checkout_stats", force: :cascade do |t|
-    t.datetime "start_date"
-    t.datetime "end_date"
-    t.text     "note"
-    t.string   "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "started_at"
-    t.datetime "completed_at"
-  end
-
-  add_index "manifestation_checkout_stats", ["state"], name: "index_manifestation_checkout_stats_on_state"
-
   create_table "manifestation_relationship_types", force: :cascade do |t|
     t.string   "name",         null: false
     t.text     "display_name"
@@ -612,19 +471,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
   add_index "manifestation_relationships", ["child_id"], name: "index_manifestation_relationships_on_child_id"
   add_index "manifestation_relationships", ["parent_id"], name: "index_manifestation_relationships_on_parent_id"
 
-  create_table "manifestation_reserve_stats", force: :cascade do |t|
-    t.datetime "start_date"
-    t.datetime "end_date"
-    t.text     "note"
-    t.string   "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "started_at"
-    t.datetime "completed_at"
-  end
-
-  add_index "manifestation_reserve_stats", ["state"], name: "index_manifestation_reserve_stats_on_state"
-
   create_table "manifestations", force: :cascade do |t|
     t.text     "original_title",                                  null: false
     t.text     "title_alternative"
@@ -657,7 +503,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "required_score",                  default: 0,     null: false
     t.integer  "frequency_id",                    default: 1,     null: false
     t.boolean  "subscription_master",             default: false, null: false
-    t.string   "attachment_filename"
+    t.string   "attachment_file_name"
     t.string   "attachment_content_type"
     t.integer  "attachment_file_size"
     t.datetime "attachment_updated_at"
@@ -679,7 +525,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.text     "attachment_meta"
     t.integer  "month_of_publication"
     t.boolean  "fulltext_content"
-    t.string   "doi"
     t.boolean  "serial"
     t.text     "statement_of_responsibility"
     t.text     "publication_place"
@@ -690,7 +535,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
 
   add_index "manifestations", ["access_address"], name: "index_manifestations_on_access_address"
   add_index "manifestations", ["date_of_publication"], name: "index_manifestations_on_date_of_publication"
-  add_index "manifestations", ["doi"], name: "index_manifestations_on_doi"
   add_index "manifestations", ["manifestation_identifier"], name: "index_manifestations_on_manifestation_identifier"
   add_index "manifestations", ["updated_at"], name: "index_manifestations_on_updated_at"
 
@@ -790,7 +634,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "picture_filename"
+    t.string   "picture_file_name"
     t.string   "picture_content_type"
     t.integer  "picture_file_size"
     t.datetime "picture_updated_at"
@@ -880,53 +724,6 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "updated_at"
   end
 
-  create_table "reserve_stat_has_manifestations", force: :cascade do |t|
-    t.integer  "manifestation_reserve_stat_id", null: false
-    t.integer  "manifestation_id",              null: false
-    t.integer  "reserves_count"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "reserve_stat_has_manifestations", ["manifestation_id"], name: "index_reserve_stat_has_manifestations_on_manifestation_id"
-  add_index "reserve_stat_has_manifestations", ["manifestation_reserve_stat_id"], name: "index_reserve_stat_has_manifestations_on_m_reserve_stat_id"
-
-  create_table "reserve_stat_has_users", force: :cascade do |t|
-    t.integer  "user_reserve_stat_id", null: false
-    t.integer  "user_id",              null: false
-    t.integer  "reserves_count"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "reserve_stat_has_users", ["user_id"], name: "index_reserve_stat_has_users_on_user_id"
-  add_index "reserve_stat_has_users", ["user_reserve_stat_id"], name: "index_reserve_stat_has_users_on_user_reserve_stat_id"
-
-  create_table "reserves", force: :cascade do |t|
-    t.integer  "user_id",                                      null: false
-    t.integer  "manifestation_id",                             null: false
-    t.integer  "item_id"
-    t.integer  "request_status_type_id",                       null: false
-    t.datetime "checked_out_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    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
-    t.datetime "retained_at"
-    t.datetime "postponed_at"
-    t.integer  "lock_version",                 default: 0,     null: false
-  end
-
-  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", ["request_status_type_id"], name: "index_reserves_on_request_status_type_id"
-  add_index "reserves", ["state"], name: "index_reserves_on_state"
-  add_index "reserves", ["user_id"], name: "index_reserves_on_user_id"
-
   create_table "resource_export_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",                default: "{}"
@@ -941,6 +738,10 @@ ActiveRecord::Schema.define(version: 20150221063719) do
 
   create_table "resource_export_files", force: :cascade do |t|
     t.integer  "user_id"
+    t.string   "resource_export_file_name"
+    t.string   "resource_export_content_type"
+    t.integer  "resource_export_file_size"
+    t.datetime "resource_export_updated_at"
     t.datetime "executed_at"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -965,7 +766,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "user_id"
     t.text     "note"
     t.datetime "executed_at"
-    t.string   "resource_import_filename"
+    t.string   "resource_import_file_name"
     t.string   "resource_import_content_type"
     t.integer  "resource_import_file_size"
     t.datetime "resource_import_updated_at"
@@ -1101,28 +902,6 @@ ActiveRecord::Schema.define(version: 20150221063719) 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 "use_restrictions", force: :cascade do |t|
-    t.string   "name",         null: false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "user_checkout_stats", force: :cascade do |t|
-    t.datetime "start_date"
-    t.datetime "end_date"
-    t.text     "note"
-    t.string   "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "started_at"
-    t.datetime "completed_at"
-  end
-
-  add_index "user_checkout_stats", ["state"], name: "index_user_checkout_stats_on_state"
-
   create_table "user_export_file_transitions", force: :cascade do |t|
     t.string   "to_state"
     t.text     "metadata",            default: "{}"
@@ -1137,31 +916,15 @@ ActiveRecord::Schema.define(version: 20150221063719) do
 
   create_table "user_export_files", force: :cascade 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"
     t.datetime "updated_at"
   end
 
-  create_table "user_group_has_checkout_types", force: :cascade do |t|
-    t.integer  "user_group_id",                                   null: false
-    t.integer  "checkout_type_id",                                null: false
-    t.integer  "checkout_limit",                  default: 0,     null: false
-    t.integer  "checkout_period",                 default: 0,     null: false
-    t.integer  "checkout_renewal_limit",          default: 0,     null: false
-    t.integer  "reservation_limit",               default: 0,     null: false
-    t.integer  "reservation_expired_period",      default: 7,     null: false
-    t.boolean  "set_due_date_before_closing_day", default: false, null: false
-    t.datetime "fixed_due_date"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "current_checkout_count"
-  end
-
-  add_index "user_group_has_checkout_types", ["checkout_type_id"], name: "index_user_group_has_checkout_types_on_checkout_type_id"
-  add_index "user_group_has_checkout_types", ["user_group_id"], name: "index_user_group_has_checkout_types_on_user_group_id"
-
   create_table "user_groups", force: :cascade do |t|
     t.string   "name"
     t.text     "display_name"
@@ -1170,11 +933,8 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "deleted_at"
-    t.integer  "valid_period_for_new_user",        default: 0, null: false
+    t.integer  "valid_period_for_new_user", default: 0, null: false
     t.datetime "expired_at"
-    t.integer  "number_of_day_to_notify_overdue",  default: 1, null: false
-    t.integer  "number_of_day_to_notify_due_date", default: 7, null: false
-    t.integer  "number_of_time_to_notify_overdue", default: 3, null: false
   end
 
   create_table "user_has_roles", force: :cascade do |t|
@@ -1203,7 +963,7 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.integer  "user_id"
     t.text     "note"
     t.datetime "executed_at"
-    t.string   "user_import_filename"
+    t.string   "user_import_file_name"
     t.string   "user_import_content_type"
     t.string   "user_import_file_size"
     t.datetime "user_import_updated_at"
@@ -1225,44 +985,28 @@ ActiveRecord::Schema.define(version: 20150221063719) do
     t.datetime "updated_at"
   end
 
-  create_table "user_reserve_stats", force: :cascade do |t|
-    t.datetime "start_date"
-    t.datetime "end_date"
-    t.text     "note"
-    t.string   "state"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "started_at"
-    t.datetime "completed_at"
-  end
-
-  add_index "user_reserve_stats", ["state"], name: "index_user_reserve_stats_on_state"
-
   create_table "users", force: :cascade do |t|
-    t.string   "email",                    default: "",    null: false
-    t.string   "encrypted_password",       default: "",    null: false
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",            default: 0
+    t.integer  "sign_in_count",          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "save_checkout_history",    default: false, null: false
-    t.string   "checkout_icalendar_token"
     t.string   "username"
     t.datetime "deleted_at"
     t.datetime "expired_at"
-    t.integer  "failed_attempts",          default: 0
+    t.integer  "failed_attempts",        default: 0
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.datetime "confirmed_at"
   end
 
-  add_index "users", ["checkout_icalendar_token"], name: "index_users_on_checkout_icalendar_token", 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

data/spec/models/message_spec.rb

@@ -35,6 +35,11 @@ describe Message do
     message.read?.should be_truthy
     message.current_state.should eq 'read'
   end
+
+  it "should require valid recipient" do
+    @message.recipient = 'invalidusername'
+    @message.save.should be_falsy
+  end
 end
 
 # == Schema Information

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.14.pre24
+  version: 0.1.14.pre25
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -522,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: enju_message plugin