thumbs_up 0.3.1 → 0.3.2

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+pkg/*

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/acts_as_voteable.rb

@@ -30,21 +30,40 @@ module ThumbsUp
       #  :at_most     - Item may not have more than X votes
       def tally(*args)
         options = args.extract_options!
+        
+        # Use the explicit SQL statement throughout for Postgresql compatibility.
+        vote_count = "COUNT(#{Vote.table_name}.voteable_id)"
+        
         t = self.where("#{Vote.table_name}.voteable_type = '#{self.name}'")
+
         # We join so that you can order by columns on the voteable model.
         t = t.joins("LEFT OUTER JOIN #{Vote.table_name} ON #{self.table_name}.#{self.primary_key} = #{Vote.table_name}.voteable_id")
-        t = t.having("vote_count > 0")
-        t = t.group("#{Vote.table_name}.voteable_id")
+        
+        t = t.group("#{Vote.table_name}.voteable_id, #{column_names_for_tally}")
         t = t.limit(options[:limit]) if options[:limit]
         t = t.where("#{Vote.table_name}.created_at >= ?", options[:start_at]) if options[:start_at]
         t = t.where("#{Vote.table_name}.created_at <= ?", options[:end_at]) if options[:end_at]
         t = t.where(options[:conditions]) if options[:conditions]
-        t = options[:order] ? t.order(options[:order]) : t.order("vote_count DESC")
-        t = t.having(["vote_count >= ?", options[:at_least]]) if options[:at_least]
-        t = t.having(["vote_count <= ?", options[:at_most]]) if options[:at_most]
+        t = options[:order] ? t.order(options[:order]) : t.order("#{vote_count} DESC")
+        
+        # I haven't been able to confirm this bug yet, but Arel (2.0.7) currently blows up
+        # with multiple 'having' clauses. So we hack them all into one for now.
+        # If you have a more elegant solution, a pull request on Github would be greatly appreciated.
+        t = t.having([
+            "#{vote_count} > 0",
+            (options[:at_least] ? "#{vote_count} >= #{sanitize(options[:at_least])}" : nil),
+            (options[:at_most] ? "#{vote_count} <= #{sanitize(options[:at_most])}" : nil)
+            ].compact.join(' AND '))
+        # t = t.having("#{vote_count} > 0")
+        # t = t.having(["#{vote_count} >= ?", options[:at_least]]) if options[:at_least]
+        # t = t.having(["#{vote_count} <= ?", options[:at_most]]) if options[:at_most]
         t.select("#{self.table_name}.*, COUNT(#{Vote.table_name}.voteable_id) AS vote_count")
       end
 
+      def column_names_for_tally
+        column_names.map { |column| "#{self.table_name}.#{column}" }.join(', ')
+      end
+
     end
 
     module InstanceMethods
@@ -82,4 +101,4 @@ module ThumbsUp
 
     end
   end
-end
+end

data/lib/acts_as_voter.rb

@@ -79,7 +79,7 @@ module ThumbsUp #:nodoc:
         if options[:exclusive]
           self.clear_votes(voteable)
         end
-        direction = (options[:direction].to_sym == :up ? true : false)
+        direction = (options[:direction].to_sym == :up)
         Vote.create!(:vote => direction, :voteable => voteable, :voter => self)
       end
 

data/lib/generators/thumbs_up/templates/migration.rb

@@ -1,21 +1,23 @@
 class ThumbsUpMigration < ActiveRecord::Migration
   def self.up
     create_table :votes, :force => true do |t|
-      t.boolean    :vote, :default => false
+      
+      t.boolean    :vote,     :default => false
       t.references :voteable, :polymorphic => true, :null => false
       t.references :voter,    :polymorphic => true
       t.timestamps
+      
     end
 
-    add_index :votes, ["voter_id", "voter_type"],       :name => "fk_voters"
-    add_index :votes, ["voteable_id", "voteable_type"], :name => "fk_voteables"
+    add_index :votes, [:voter_id, :voter_type]
+    add_index :votes, [:voteable_id, :voteable_type]
 
-    # If you don't want to enforce "One Person, One Vote" rules in the database, comment out the index below.
-    add_index :votes, ["voter_id", "voter_type", "voteable_id", "voteable_type"], :unique => true, :name => "uniq_one_vote_only"
+    # Comment out the line below to allow multiple votes per voter on a single entity.
+    add_index :votes, [:voter_id, :voter_type, :voteable_id, :voteable_type], :unique => true, :name => 'fk_one_vote_per_user_per_entity'
   end
 
   def self.down
     drop_table :votes
   end
 
-end
+end

data/lib/has_karma.rb

@@ -13,7 +13,7 @@ module ThumbsUp #:nodoc:
         include ThumbsUp::Karma::InstanceMethods
         extend  ThumbsUp::Karma::SingletonMethods
         self.karmic_objects ||= {}
-        self.karmic_objects[voteable_type.to_s.classify.constantize] = [ (options[:as] ? options[:as].to_s.foreign_key : self.name.foreign_key), (options[:weight] ? options[:weight] : 1).to_f ]
+        self.karmic_objects[voteable_type.to_s.classify.constantize] = [ (options[:as] ? options[:as].to_s.foreign_key : self.name.foreign_key), (options[:weight] || 1).to_f ]
       end
     end
 

data/thumbs_up.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{thumbs_up}
-  s.version = "0.3.1"
+  s.version = IO.read('./VERSION')
 
   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 Wnętrzak"]
-  s.date = %q{2010-09-06}
+  s.date = Date.today.to_s
   s.description = %q{ThumbsUp provides dead-simple voting capabilities to ActiveRecord models with karma calculation, a la stackoverflow.com.}
   s.email = %q{brady@ldawn.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Brady Bouchard
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +10:00
+date: 2010-12-16 00:00:00 -07:00
 default_executable: 
 dependencies: []