Scopes: Check param to be persistent User (having an id)

ledermann · Jan 27, 2013 · 45b20d6 · 45b20d6
1 parent ffe2389
commit 45b20d6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/unread/acts_as_readable.rb b/lib/unread/acts_as_readable.rb
@@ -148,9 +148,8 @@ def reset_read_marks!(user = :all)
  def assert_reader(user)
  assert_reader_class
 
- unless user.is_a?(ReadMark.reader_class)
- raise ArgumentError, "Class #{user.class.name} is not registered by acts_as_reader!"
- end
+ raise ArgumentError, "Class #{user.class.name} is not registered by acts_as_reader!" unless user.is_a?(ReadMark.reader_class)
+ raise ArgumentError, "The given user has no id!" unless user.id
  end
 
  def assert_reader_class

diff --git a/test/unread_test.rb b/test/unread_test.rb
@@ -48,11 +48,15 @@ def test_with_read_marks_for
  assert_equal true, emails[1].unread?(@reader)
  end
 
- def scope_param_check
- [ 42, nil, 'foo', :foo, {} ].each do |not_a_user|
- assert_raise(ArgumentError) { Email.unread_by(not_a_user)}
- assert_raise(ArgumentError) { Email.with_read_marks_for(not_a_user)}
+ def test_scope_param_check
+ [ 42, nil, 'foo', :foo, {} ].each do |not_a_reader|
+ assert_raise(ArgumentError) { Email.unread_by(not_a_reader)}
+ assert_raise(ArgumentError) { Email.with_read_marks_for(not_a_reader)}
  end
+
+ unsaved_reader = Reader.new
+ assert_raise(ArgumentError) { Email.unread_by(unsaved_reader)}
+ assert_raise(ArgumentError) { Email.with_read_marks_for(unsaved_reader)}
  end
 
  def test_scope_after_reset