Merge pull request medihack#6 from sunny36/master

Return false on up_voted? and down_voted? when not voted at all.
jeffreyiacono · Jul 2, 2011 · 106adec · 106adec
2 parents 1f62daf + 30434d2
commit 106adec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/make_voteable/voter.rb b/lib/make_voteable/voter.rb
@@ -149,6 +149,7 @@ def voted?(voteable)
     def up_voted?(voteable)
       check_voteable(voteable)
       voting = fetch_voting(voteable)
+      return false if voting.nil?
       return true if voting.has_attribute?(:up_vote) && voting.up_vote
       false
     end
@@ -157,6 +158,7 @@ def up_voted?(voteable)
     def down_voted?(voteable)
       check_voteable(voteable)
       voting = fetch_voting(voteable)
+      return false if voting.nil?
       return true if voting.has_attribute?(:up_vote) && !voting.up_vote
       false
     end

diff --git a/make_voteable.gemspec b/make_voteable.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "activerecord", "~> 3.0"
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rspec", "~> 2.5.0"
-  s.add_development_dependency "database_cleaner", "0.6.7.RC"
+  s.add_development_dependency "database_cleaner", "0.6.7"
   s.add_development_dependency "sqlite3-ruby", "~> 1.3.0"
   s.add_development_dependency "generator_spec", "~> 0.8.2"