aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authordima2011-12-10 17:21:59 +0100
committerdima2011-12-10 17:21:59 +0100
commit932790890a583cf877ef06a218316b82a7014b60 (patch)
treeaa037487e22d6a2c5fa35cce705ee9277f6b200b /app/models
parent58ebf1bc9762a4fc05ecae776253560026b5b030 (diff)
downloadinboxes-932790890a583cf877ef06a218316b82a7014b60.tar.bz2
fix readme and remove whitespacetrailing
Diffstat (limited to 'app/models')
-rw-r--r--app/models/discussion.rb4
-rw-r--r--app/models/inboxes/ability.rb6
-rw-r--r--app/models/message.rb12
-rw-r--r--app/models/speaker.rb10
4 files changed, 16 insertions, 16 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb
index ca56596..9e9a92c 100644
--- a/app/models/discussion.rb
+++ b/app/models/discussion.rb
@@ -89,11 +89,11 @@ class Discussion < ActiveRecord::Base
# flag.update_attributes(:updat => Time.zone.now)
speaker.touch
end
-
+
def find_speaker_by_user user
Speaker.find_by_discussion_id_and_user_id(self.id, user.id)
end
-
+
private
def check_that_has_at_least_two_users
diff --git a/app/models/inboxes/ability.rb b/app/models/inboxes/ability.rb
index 4d8408f..deb3d81 100644
--- a/app/models/inboxes/ability.rb
+++ b/app/models/inboxes/ability.rb
@@ -15,20 +15,20 @@ module Inboxes
# and therefore should be easy to test in isolation.
def self.register_ability(ability)
self.abilities.add(ability)
-
+
end
def initialize(user)
# raise "Initializing 3rd patry"
# self.clear_aliased_actions
-
+
# can [:index, :create], Discussion
# can :read, Discussion do |discussion|
# discussion.can_participate?(user)
# end
#include any abilities registered by extensions, etc.
-
+
Ability.abilities.each do |clazz|
ability = clazz.send(:new, user)
@rules = rules + ability.send(:rules)
diff --git a/app/models/message.rb b/app/models/message.rb
index 3579e63..436775b 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -1,20 +1,20 @@
class Message < ActiveRecord::Base
default_scope order(:created_at)
-
+
belongs_to :discussion, :counter_cache => true, :touch => true
belongs_to :user
-
+
validates :user, :discussion, :body, :presence => true
-
+
after_save :mark_discussion_as_read
-
+
def visible_for? user
self.created_at.to_i >= self.discussion.user_invited_at(user).to_i
end
-
+
private
-
+
def mark_discussion_as_read
self.discussion.mark_as_read_for(self.user)
end
diff --git a/app/models/speaker.rb b/app/models/speaker.rb
index 0ed9cdd..4d8795b 100644
--- a/app/models/speaker.rb
+++ b/app/models/speaker.rb
@@ -1,16 +1,16 @@
class Speaker < ActiveRecord::Base
belongs_to :user
belongs_to :discussion
-
+
validates_uniqueness_of :user_id, :scope => :discussion_id
validates :user, :discussion, :presence => true
-
+
after_destroy :destroy_discussion
-
+
private
-
+
def destroy_discussion
self.discussion.destroy unless self.discussion.speakers.any?
end
-
+
end