thumbs_up 0.5.2 → 0.5.3

data/lib/acts_as_voteable.rb

@@ -87,7 +87,7 @@ module ThumbsUp
       def voted_by?(voter)
         0 < Vote.where(
               :voteable_id => self.id,
-              :voteable_type => self.class.name,
+              :voteable_type => self.class.base_class.name,
               :voter_id => voter.id
             ).count
       end

data/lib/acts_as_voter.rb

@@ -32,7 +32,7 @@ module ThumbsUp #:nodoc:
       #       user.vote_count()      # All votes
 
       def vote_count(for_or_against = :all)
-        v = Vote.where(:voter_id => id).where(:voter_type => self.class.name)
+        v = Vote.where(:voter_id => id).where(:voter_type => self.class.base_class.name)
         v = case for_or_against
           when :all   then v
           when :up    then v.where(:vote => true)
@@ -52,9 +52,9 @@ module ThumbsUp #:nodoc:
       def voted_on?(voteable)
         0 < Vote.where(
               :voter_id => self.id,
-              :voter_type => self.class.name,
+              :voter_type => self.class.base_class.name,
               :voteable_id => voteable.id,
-              :voteable_type => voteable.class.name
+              :voteable_type => voteable.class.base_class.name
             ).count
       end
 
@@ -86,9 +86,9 @@ module ThumbsUp #:nodoc:
       def unvote_for(voteable)
         Vote.where(
           :voter_id => self.id,
-          :voter_type => self.class.name,
+          :voter_type => self.class.base_class.name,
           :voteable_id => voteable.id,
-          :voteable_type => voteable.class.name
+          :voteable_type => voteable.class.base_class.name
         ).map(&:destroy)
       end
 
@@ -98,13 +98,13 @@ module ThumbsUp #:nodoc:
         raise ArgumentError, "expected :up or :down" unless [:up, :down].include?(direction)
         0 < Vote.where(
               :voter_id => self.id,
-              :voter_type => self.class.name,
+              :voter_type => self.class.base_class.name,
               :vote => direction == :up ? true : false,
               :voteable_id => voteable.id,
-              :voteable_type => voteable.class.name
+              :voteable_type => voteable.class.base_class.name
             ).count
       end
 
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 class Vote < ActiveRecord::Base
 
-  scope :for_voter, lambda { |*args| where(["voter_id = ? AND voter_type = ?", args.first.id, args.first.class.name]) }
-  scope :for_voteable, lambda { |*args| where(["voteable_id = ? AND voteable_type = ?", args.first.id, args.first.class.name]) }
+  scope :for_voter, lambda { |*args| where(["voter_id = ? AND voter_type = ?", args.first.id, args.first.class.base_class.name]) }
+  scope :for_voteable, lambda { |*args| where(["voteable_id = ? AND voteable_type = ?", args.first.id, args.first.class.base_class.name]) }
   scope :recent, lambda { |*args| where(["created_at > ?", (args.first || 2.weeks.ago)]) }
   scope :descending, order("created_at DESC")
 
@@ -14,4 +14,4 @@ class Vote < ActiveRecord::Base
   # Comment out the line below to allow multiple votes per user.
   validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id]
 <% end %>
-end
+end

data/lib/has_karma.rb

@@ -29,10 +29,10 @@ module ThumbsUp #:nodoc:
 
     module InstanceMethods
       def karma(options = {})
-        self.class.karmic_objects.collect do |object, attr|
-          v = object.where(["#{Vote.table_name}.vote = ?", true]).where(["#{self.class.table_name}.#{self.class.primary_key} = ?", self.id])
+        self.class.base_class.karmic_objects.collect do |object, attr|
+          v = object.where(["#{Vote.table_name}.vote = ?", true]).where(["#{self.class.base_class.table_name}.#{self.class.base_class.primary_key} = ?", self.id])
           v = v.joins("INNER JOIN #{Vote.table_name} ON #{Vote.table_name}.voteable_type = '#{object.to_s}' AND #{Vote.table_name}.voteable_id = #{object.table_name}.#{object.primary_key}")
-          v = v.joins("INNER JOIN #{self.class.table_name} ON #{self.class.table_name}.#{self.class.primary_key} = #{object.table_name}.#{attr[0]}")
+          v = v.joins("INNER JOIN #{self.class.base_class.table_name} ON #{self.class.base_class.table_name}.#{self.class.base_class.primary_key} = #{object.table_name}.#{attr[0]}")
           (v.count.to_f * attr[1]).round
         end.sum
       end

data/lib/thumbs_up/version.rb

@@ -1,3 +1,3 @@
 module ThumbsUp
-	VERSION = '0.5.2'
+	VERSION = '0.5.3'
 end

data/lib/thumbs_up.rb

@@ -4,4 +4,4 @@ require 'has_karma'
 
 ActiveRecord::Base.send(:include, ThumbsUp::ActsAsVoteable)
 ActiveRecord::Base.send(:include, ThumbsUp::ActsAsVoter)
-ActiveRecord::Base.send(:include, ThumbsUp::Karma)
+ActiveRecord::Base.send(:include, ThumbsUp::Karma)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbs_up
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70213086288380 !ruby/object:Gem::Requirement
+  requirement: &70260724487840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213086288380
+  version_requirements: *70260724487840
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70213086287800 !ruby/object:Gem::Requirement
+  requirement: &70260724487260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,10 +37,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213086287800
+  version_requirements: *70260724487260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70213086287280 !ruby/object:Gem::Requirement
+  requirement: &70260724486740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -48,10 +48,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213086287280
+  version_requirements: *70260724486740
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70213086303020 !ruby/object:Gem::Requirement
+  requirement: &70260724502580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,10 +59,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213086303020
+  version_requirements: *70260724502580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70213086302400 !ruby/object:Gem::Requirement
+  requirement: &70260724501960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,7 +70,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213086302400
+  version_requirements: *70260724501960
 description: ThumbsUp provides dead-simple voting capabilities to ActiveRecord models
   with karma calculation, a la stackoverflow.com.
 email:
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3776225612580691587
+      hash: 4476845312579799296
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: