thumbs_up 0.6.2 → 0.6.3

data/Rakefile

@@ -30,12 +30,14 @@ task :release => :build do
   system "rm thumbs_up-#{ThumbsUp::VERSION}.gem"
 end
 
-task :test_both_databases do
-  # Test both MySQL and Postgres.
+task :test_all_databases do
+  # Test MySQL, Postgres and SQLite3
   ENV['DB'] = 'mysql'
   Rake::Task['test'].execute
   ENV['DB'] = 'postgres'
   Rake::Task['test'].execute
+  ENV['DB'] = 'sqlite3'
+  Rake::Task['test'].execute
 end
 
-task :default => :test_both_databases
+task :default => :test_all_databases

data/lib/acts_as_voteable.rb

@@ -26,21 +26,12 @@ module ThumbsUp
       def plusminus_tally(params = {})
         t = self.joins("LEFT OUTER JOIN #{Vote.table_name} ON #{self.table_name}.id = #{Vote.table_name}.voteable_id AND #{Vote.table_name}.voteable_type = '#{self.name}'")
         t = t.order("plusminus_tally DESC")
-        t = t.group("#{self.table_name}.id")
+        t = t.group(column_names_for_tally)
         t = t.select("#{self.table_name}.*")
-        if mysql?
-          table = "CAST(#{Vote.table_name}.vote AS UNSIGNED)"
-          true_value = '1'
-          false_value = '0'
-        else
-          table = "#{Vote.table_name}.vote"
-          true_value = 'true'
-          false_value = 'false'
-        end
-        t = t.select("SUM(CASE #{table} WHEN #{true_value} THEN 1 WHEN #{false_value} THEN -1 ELSE 0 END) AS plusminus_tally")
+        t = t.select("SUM(CASE #{Vote.table_name}.vote WHEN #{quoted_true} THEN 1 WHEN #{quoted_false} THEN -1 ELSE 0 END) AS plusminus_tally")
         if params[:separate_updown]
-          t = t.select("SUM(CASE #{table} WHEN #{true_value} THEN 1 WHEN #{false_value} THEN 0 ELSE 0 END) AS up")
-          t = t.select("SUM(CASE #{table} WHEN #{true_value} THEN 0 WHEN #{false_value} THEN 1 ELSE 0 END) AS down")
+          t = t.select("SUM(CASE #{Vote.table_name}.vote WHEN #{quoted_true} THEN 1 WHEN #{quoted_false} THEN 0 ELSE 0 END) AS up")
+          t = t.select("SUM(CASE #{Vote.table_name}.vote WHEN #{quoted_true} THEN 0 WHEN #{quoted_false} THEN 1 ELSE 0 END) AS down")
         end
         t = t.select("COUNT(#{Vote.table_name}.id) AS vote_count")
       end
@@ -57,7 +48,7 @@ module ThumbsUp
       def tally(*args)
         t = self.joins("LEFT OUTER JOIN #{Vote.table_name} ON #{self.table_name}.id = #{Vote.table_name}.voteable_id")
         t = t.order("vote_count DESC")
-        t = t.group("#{self.table_name}.id")
+        t = t.group(column_names_for_tally)
         t = t.select("#{self.table_name}.*")
         t = t.select("COUNT(#{Vote.table_name}.id) AS vote_count")
       end
@@ -115,6 +106,14 @@ module ThumbsUp
         votes.map(&:voter).uniq
       end
 
+      def voters_who_voted_for
+          votes.where(:vote => true).map(&:voter).uniq
+      end
+
+      def voters_who_voted_against
+          votes.where(:vote => false).map(&:voter).uniq
+      end
+      
       def voted_by?(voter)
         0 < Vote.where(
               :voteable_id => self.id,

data/lib/has_karma.rb

@@ -19,11 +19,11 @@ module ThumbsUp #:nodoc:
 
     module SingletonMethods
 
-      ## Not yet implemented. Don't use it!
+      # Not yet implemented. Don't use it!
       # Find the most popular users
-      def find_most_karmic
-        self.all
-      end
+      # def find_most_karmic
+      #   self.all
+      # end
 
     end
 

data/lib/thumbs_up/version.rb

@@ -1,3 +1,3 @@
 module ThumbsUp
-	VERSION = '0.6.2'
+	VERSION = '0.6.3'
 end

data/lib/thumbs_up.rb

@@ -4,9 +4,12 @@ require 'has_karma'
 
 module ThumbsUp
   module Base
-    # Check if we're connected to a MySQL database.
-    def mysql?
-      ActiveRecord::Base.connection.adapter_name == 'MySQL'
+    def quoted_true
+      ActiveRecord::Base.connection.quoted_true
+    end
+
+    def quoted_false
+      ActiveRecord::Base.connection.quoted_false
     end
   end
 end

data/test/test_helper.rb

@@ -7,14 +7,13 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'active_record'
 
-if ENV['DB'] == 'mysql'
-  if ENV['TRAVIS']
-    config = {
-      :adapter => 'mysql2',
-      :database => 'thumbs_up_test',
-      :username => 'root'
-    }
-  else
+config = {
+  :database => 'thumbs_up_test',
+  :username => 'test'
+}
+
+case ENV['DB']
+  when 'mysql'
     config = {
       :adapter => 'mysql2',
       :database => 'thumbs_up_test',
@@ -22,33 +21,42 @@ if ENV['DB'] == 'mysql'
       :password => 'test',
       :socket => '/tmp/mysql.sock'
     }
-  end
-
-  ActiveRecord::Base.establish_connection(config)
-  ActiveRecord::Base.connection.drop_database config[:database] rescue nil
-  ActiveRecord::Base.connection.create_database config[:database]
-  ActiveRecord::Base.establish_connection(config)
-else
-  if ENV['TRAVIS']
+    if ENV['TRAVIS']
+      config = {
+        :adapter => 'mysql2',
+        :database => 'thumbs_up_test',
+        :username => 'root'
+      }
+    end
+    ActiveRecord::Base.establish_connection(config)
+    ActiveRecord::Base.connection.drop_database(config[:database]) rescue nil
+    ActiveRecord::Base.connection.create_database(config[:database])
+  when 'postgres'
     config = {
       :adapter => 'postgresql',
       :database => 'thumbs_up_test',
-      :username => 'postgres'
+      :username => 'test',
     }
-  else
+    if ENV['TRAVIS']
+      config = {
+        :adapter => 'postgresql',
+        :database => 'thumbs_up_test',
+        :username => 'postgres',
+      }
+    end
+    ActiveRecord::Base.establish_connection(config.merge({ :database => 'postgres' }))
+    ActiveRecord::Base.connection.drop_database(config[:database])
+    ActiveRecord::Base.connection.create_database(config[:database])
+  when 'sqlite3'
     config = {
-      :adapter => 'postgresql',
-      :database => 'thumbs_up_test',
-      :username => 'test'
+      :adapter => 'sqlite3',
+      :database => 'test.sqlite3',
+      :username => 'test',
     }
-  end
-
-  ActiveRecord::Base.establish_connection(config.merge({ :database => 'postgres' }))
-  ActiveRecord::Base.connection.drop_database config[:database]
-  ActiveRecord::Base.connection.create_database config[:database]
-  ActiveRecord::Base.establish_connection(config)
 end
 
+ActiveRecord::Base.establish_connection(config)
+
 ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Schema.define do

data/test/thumbs_up_test.rb

@@ -64,13 +64,22 @@ class TestThumbsUp < Test::Unit::TestCase
   end
 
   def test_acts_as_voteable_instance_methods
+    item = Item.create(:name => 'XBOX', :description => 'XBOX console')
+
+    assert_equal 0, item.ci_plusminus
+
     user_for = User.create(:name => 'david')
     another_user_for = User.create(:name => 'name')
     user_against = User.create(:name => 'brady')
-    item = Item.create(:name => 'XBOX', :description => 'XBOX console')
+    another_user_against = User.create(:name => 'name')
 
     user_for.vote_for(item)
     another_user_for.vote_for(item)
+    # Use #reload to force reloading of votes from the database,
+    # otherwise these tests fail after "assert_equal 0, item.ci_plusminus" caches
+    # the votes. We hack this as caching is the correct behavious, per-request,
+    # in production.
+    item.reload
 
     assert_equal 2, item.votes_for
     assert_equal 0, item.votes_against
@@ -94,6 +103,18 @@ class TestThumbsUp < Test::Unit::TestCase
     assert voters_who_voted.include?(another_user_for)
     assert voters_who_voted.include?(user_against)
 
+    voters_who_voted_for = item.voters_who_voted_for
+    assert_equal 2, voters_who_voted_for.size
+    assert voters_who_voted_for.include?(user_for)
+    assert voters_who_voted_for.include?(another_user_for)
+
+    another_user_against.vote_against(item)
+
+    voters_who_voted_against = item.voters_who_voted_against
+    assert_equal 2, voters_who_voted_against.size
+    assert voters_who_voted_against.include?(user_against)
+    assert voters_who_voted_against.include?(another_user_against)
+
     non_voting_user = User.create(:name => 'random')
 
     assert_equal true, item.voted_by?(user_for)
@@ -334,6 +355,18 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_equal item_against, Item.plusminus_tally.reorder('plusminus_tally ASC')[0]
   end
 
+  def test_plusminus_tally_limit_with_where_and_having
+    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[0..8].each { |i| u.vote_for(i) } }
+
+    # Postgresql doesn't accept aliases in HAVING clauses, so you'll need to copy and paste the whole statement from the #plusminus_tally method if you want to use HAVING('plusminus_tally > 10'), for example.
+    assert_equal 0, Item.plusminus_tally.limit(5).where('created_at > ?', 2.days.ago).having("SUM(CASE #{Vote.table_name}.vote WHEN #{ActiveRecord::Base.connection.quoted_true} THEN 1 WHEN #{ActiveRecord::Base.connection.quoted_false} THEN -1 ELSE 0 END) > 10").length
+    assert_equal 5, Item.plusminus_tally.limit(5).where('created_at > ?', 2.days.ago).having("SUM(CASE #{Vote.table_name}.vote WHEN #{ActiveRecord::Base.connection.quoted_true} THEN 1 WHEN #{ActiveRecord::Base.connection.quoted_false} THEN -1 ELSE 0 END) > 9").length
+    assert_equal 9, Item.plusminus_tally.limit(10).where('created_at > ?', 2.days.ago).having("SUM(CASE #{Vote.table_name}.vote WHEN #{ActiveRecord::Base.connection.quoted_true} THEN 1 WHEN #{ActiveRecord::Base.connection.quoted_false} THEN -1 ELSE 0 END) > 9").length
+    assert_equal 0, Item.plusminus_tally.limit(10).where('created_at > ?', 1.day.from_now).having("SUM(CASE #{Vote.table_name}.vote WHEN #{ActiveRecord::Base.connection.quoted_true} THEN 1 WHEN #{ActiveRecord::Base.connection.quoted_false} THEN -1 ELSE 0 END) > 9").length
+  end
+
   def test_plusminus_tally_count
     Item.plusminus_tally.except(:order).count
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbs_up
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2013-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -112,6 +112,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 173536367113367291
+      hash: 2682672596544266431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 173536367113367291
+      hash: 2682672596544266431
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23