thumbs_up 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.5

data/lib/acts_as_voteable.rb

@@ -51,8 +51,9 @@ module ThumbsUp
             AS joined_#{Vote.table_name} ON #{self.table_name}.#{self.primary_key} =
             joined_#{Vote.table_name}.voteable_id")
 
-            t = t.where("joined_#{Vote.table_name}.voteable_type = '#{self.name}'")
             t = t.group("joined_#{Vote.table_name}.voteable_id, joined_#{Vote.table_name}.vote_total, #{column_names_for_tally}")
+            t = t.limit(options[:limit]) if options[:limit]
+            t = t.where("joined_#{Vote.table_name}.voteable_type = '#{self.name}'")
             t = t.where("joined_#{Vote.table_name}.created_at >= ?", options[:start_at]) if options[:start_at]
             t = t.where("joined_#{Vote.table_name}.created_at <= ?", options[:end_at]) if options[:end_at]
             t = options[:ascending] ? t.order("joined_#{Vote.table_name}.vote_total") : t.order("joined_#{Vote.table_name}.vote_total DESC")

data/test/test_helper.rb

@@ -34,8 +34,9 @@ ActiveRecord::Schema.define do
   end
   
   create_table :items, :force => true do |t|
-    t.string :name
-    t.string :description
+    t.integer :user_id
+    t.string  :name
+    t.string  :description
   end
 end
 
@@ -57,12 +58,15 @@ class Vote < ActiveRecord::Base
   validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id]
 end
 
-class User < ActiveRecord::Base
-  acts_as_voter
-end
-
 class Item < ActiveRecord::Base
   acts_as_voteable
+  belongs_to :user
+end
+
+class User < ActiveRecord::Base
+  acts_as_voter
+  has_many :items
+  has_karma(:items)
 end
 
 class Test::Unit::TestCase

data/test/test_thumbs_up.rb

@@ -145,13 +145,13 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_equal 2, Item.tally(:start_at => 3.days.ago, :end_at => 4.days.from_now).length
   end
 
-  def test_rank_tally_empty
+  def test_plusminus_tally_empty
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
 
-    assert_equal 0, Item.rank_tally.length
+    assert_equal 0, Item.plusminus_tally.length
   end
 
-  def test_rank_tally_starts_at
+  def test_plusminus_tally_starts_at
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
     user = User.create(:name => 'david')
 
@@ -159,11 +159,11 @@ class TestThumbsUp < Test::Unit::TestCase
     vote.created_at = 3.days.ago
     vote.save
 
-    assert_equal 0, Item.rank_tally(:start_at => 2.days.ago).length
-    assert_equal 1, Item.rank_tally(:start_at => 4.days.ago).length
+    assert_equal 0, Item.plusminus_tally(:start_at => 2.days.ago).length
+    assert_equal 1, Item.plusminus_tally(:start_at => 4.days.ago).length
   end
 
-  def test_rank_tally_end_at
+  def test_plusminus_tally_end_at
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
     user = User.create(:name => 'david')
 
@@ -171,11 +171,11 @@ class TestThumbsUp < Test::Unit::TestCase
     vote.created_at = 3.days.from_now
     vote.save
 
-    assert_equal 0, Item.rank_tally(:end_at => 2.days.from_now).length
-    assert_equal 1, Item.rank_tally(:end_at => 4.days.from_now).length
+    assert_equal 0, Item.plusminus_tally(:end_at => 2.days.from_now).length
+    assert_equal 1, Item.plusminus_tally(:end_at => 4.days.from_now).length
   end
 
-  def test_rank_tally_between_start_at_end_at
+  def test_plusminus_tally_between_start_at_end_at
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
     another_item = Item.create(:name => 'XBOX', :description => 'XBOX console')
     user = User.create(:name => 'david')
@@ -188,22 +188,22 @@ class TestThumbsUp < Test::Unit::TestCase
     vote.created_at = 3.days.from_now
     vote.save
 
-    assert_equal 1, Item.rank_tally(:start_at => 3.days.ago, :end_at => 2.days.from_now).length
-    assert_equal 2, Item.rank_tally(:start_at => 3.days.ago, :end_at => 4.days.from_now).length
+    assert_equal 1, Item.plusminus_tally(:start_at => 3.days.ago, :end_at => 2.days.from_now).length
+    assert_equal 2, Item.plusminus_tally(:start_at => 3.days.ago, :end_at => 4.days.from_now).length
   end
 
-  def test_rank_tally_inclusion
+  def test_plusminus_tally_inclusion
     user = User.create(:name => 'david')
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
     item_not_included = Item.create(:name => 'Playstation', :description => 'Playstation console')
 
     assert_not_nil user.vote_for(item)
 
-    assert (Item.rank_tally.include? item)
-    assert (not Item.rank_tally.include? item_not_included)
+    assert (Item.plusminus_tally.include? item)
+    assert (not Item.plusminus_tally.include? item_not_included)
   end
 
-  def test_rank_tally_default_ordering
+  def test_plusminus_tally_default_ordering
     user = User.create(:name => 'david')
     item_for = Item.create(:name => 'XBOX', :description => 'XBOX console')
     item_against = Item.create(:name => 'Playstation', :description => 'Playstation console')
@@ -211,11 +211,19 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_not_nil user.vote_for(item_for)
     assert_not_nil user.vote_against(item_against)
 
-    assert_equal item_for, Item.rank_tally[0]
-    assert_equal item_against, Item.rank_tally[1]
+    assert_equal item_for, Item.plusminus_tally[0]
+    assert_equal item_against, Item.plusminus_tally[1]
+  end
+  
+  def test_plusminus_tally_limit
+    users = (0..9).map{ |u| User.create(:name => "User #{u}") }
+    items = (0..9).map{ |u| Item.create(:name => "Item #{u}", :description => "Item #{u}") }
+    users.each{ |u| items.each { |i| u.vote_for(i) } }
+    assert_equal 10, Item.plusminus_tally.length
+    assert_equal 2, Item.plusminus_tally(:limit => 2).length
   end
 
-  def test_rank_tally_ascending_ordering
+  def test_plusminus_tally_ascending_ordering
     user = User.create(:name => 'david')
     item_for = Item.create(:name => 'XBOX', :description => 'XBOX console')
     item_against = Item.create(:name => 'Playstation', :description => 'Playstation console')
@@ -223,7 +231,16 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_not_nil user.vote_for(item_for)
     assert_not_nil user.vote_against(item_against)
 
-    assert_equal item_for, Item.rank_tally(:ascending => true)[1]
-    assert_equal item_against, Item.rank_tally(:ascending => true)[0]
+    assert_equal item_for, Item.plusminus_tally(:ascending => true)[1]
+    assert_equal item_against, Item.plusminus_tally(:ascending => true)[0]
+  end
+  
+  def test_karma
+    users = (0..1).map{ |u| User.create(:name => "User #{u}") }
+    items = (0..1).map{ |u| users[0].items.create(:name => "Item #{u}", :description => "Item #{u}") }
+    users.each{ |u| items.each { |i| u.vote_for(i) } }
+    
+    assert_equal 4, users[0].karma
+    assert_equal 0, users[1].karma
   end
 end

data/thumbs_up.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "thumbs_up"
-  s.version = "0.4.4"
+  s.version = File.read('./VERSION').strip
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brady Bouchard", "Peter Jackson", "Cosmin Radoi", "Bence Nagy", "Rob Maddox", "Wojciech Wnetrzak"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbs_up
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2011-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70296099839180 !ruby/object:Gem::Requirement
+  requirement: &70139853634340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296099839180
+  version_requirements: *70139853634340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70296099838660 !ruby/object:Gem::Requirement
+  requirement: &70139854498400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,10 +37,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296099838660
+  version_requirements: *70139854498400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70296099835080 !ruby/object:Gem::Requirement
+  requirement: &70139854495760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -48,10 +48,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296099835080
+  version_requirements: *70139854495760
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70296099834460 !ruby/object:Gem::Requirement
+  requirement: &70139854493840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,7 +59,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296099834460
+  version_requirements: *70139854493840
 description: ThumbsUp provides dead-simple voting capabilities to ActiveRecord models
   with karma calculation, a la stackoverflow.com.
 email: brady@ldawn.com