acts_rateable 0.0.5 → 0.0.6

data/lib/acts_rateable/acts_rateable.rb

@@ -8,10 +8,10 @@ module ActsRateable
     
     def acts_rateable(options = {})
       
-      has_many :rates, class_name: ActsRateable::Rate, foreign_key: :resource_id, conditions: { resource_type: self.name }, dependent: :destroy
-      has_many :rated, class_name: ActsRateable::Rate, foreign_key: :author_id, conditions: { author_type: self.name }, dependent: :destroy
-      has_one :rating, class_name: ActsRateable::Rating, foreign_key: :resource_id, conditions: { resource_type: self.name }, dependent: :destroy
-      has_one :count, class_name: ActsRateable::Count, foreign_key: :resource_id, conditions: { resource_type: self.name }, dependent: :destroy
+      has_many :rates, class_name: ActsRateable::Rate, foreign_key: :resource_id, conditions: { resource_type: self.base_class.name }, dependent: :destroy
+      has_many :rated, class_name: ActsRateable::Rate, foreign_key: :author_id, conditions: { author_type: self.base_class.name }, dependent: :destroy
+      has_one :rating, class_name: ActsRateable::Rating, foreign_key: :resource_id, conditions: { resource_type: self.base_class.name }, dependent: :destroy
+      has_one :count, class_name: ActsRateable::Count, foreign_key: :resource_id, conditions: { resource_type: self.base_class.name }, dependent: :destroy
 
       scope :order_by_rating, lambda { | column='estimate', direction="DESC" |
         includes(:rating).group('ar_ratings.id').order("ar_ratings.#{column.downcase} #{direction.upcase}")
@@ -22,8 +22,8 @@ module ActsRateable
       }
 
       after_save do
-         ActsRateable::Rating.where({resource_id: self.id, resource_type: self.class.name}).first_or_initialize.save #if !rates.empty?
-         ActsRateable::Count.where({resource_id: self.id, resource_type: self.class.name}).first_or_initialize.save #if !rates.empty?
+         ActsRateable::Rating.where({resource_id: self.id, resource_type: self.class.base_class.name}).first_or_initialize.save #if !rates.empty?
+         ActsRateable::Count.where({resource_id: self.id, resource_type: self.class.base_class.name}).first_or_initialize.save #if !rates.empty?
       end
       
       include LocalInstanceMethods

data/lib/acts_rateable/count.rb

@@ -15,21 +15,21 @@ module ActsRateable
 
     def self.set_totals(author)
      sql = "SELECT COUNT(*) total_ratings, SUM(value) rating_sum, AVG(value) rating_avg, "+
-            "(SELECT COUNT(DISTINCT author_id) FROM ar_rates WHERE author_type = '#{author.class.name}') rated_count, "+
-            "((SELECT COUNT(*) from ar_rates WHERE author_type = '#{author.class.name}') / (SELECT COUNT(DISTINCT author_id) FROM ar_rates WHERE author_type = '#{author.class.name}')) avg_num_ratings "+
-            "FROM ar_rates WHERE author_type = '#{author.class.name}'"
-            @@global_counts[author.class.name] = ActsRateable::Rate.connection.execute(sql).first
+            "(SELECT COUNT(DISTINCT author_id) FROM ar_rates WHERE author_type = '#{author.class.base_class.name}') rated_count, "+
+            "((SELECT COUNT(*) from ar_rates WHERE author_type = '#{author.class.base_class.name}') / (SELECT COUNT(DISTINCT author_id) FROM ar_rates WHERE author_type = '#{author.class.base_class.name}')) avg_num_ratings "+
+            "FROM ar_rates WHERE author_type = '#{author.class.base_class.name}'"
+            @@global_counts[author.class.base_class.name] = ActsRateable::Rate.connection.execute(sql).first
     end
 
   	#  RETURNS = { "total_ratings"=>"", "rating_sum"=>"", "rating_avg"=>"", "rated_count"=>"", "avg_num_ratings"=>"" }
     def self.get_totals(author)
-      @@global_counts[author.class.name] ||= set_totals(author)
+      @@global_counts[author.class.base_class.name] ||= set_totals(author)
     end
 
     # RETURNS = {"total_ratings"=>"", "rating_sum"=>"", "rating_avg"=>""}
     def self.values_for(author)    
       sql =   "SELECT COUNT(*) total_ratings, COALESCE(SUM(value),0) rating_sum, COALESCE(AVG(value),0) rating_avg "+
-              "FROM ar_rates WHERE author_type = '#{author.class.name}' and author_id = '#{author.id}'"
+              "FROM ar_rates WHERE author_type = '#{author.class.base_class.name}' and author_id = '#{author.id}'"
               ActsRateable::Rate.connection.execute(sql).first
     end
 

data/lib/acts_rateable/rate.rb

@@ -17,8 +17,8 @@ module ActsRateable
   
     def self.rated?(resource, author)
       rate = where({
-        author_type: author.class.name, author_id: author.id, 
-        resource_type: resource.class.name, resource_id: resource.id
+        author_type: author.class.base_class.name, author_id: author.id,
+        resource_type: resource.class.base_class.name, resource_id: resource.id
       })
       return rate if rate
       return false
@@ -27,8 +27,8 @@ module ActsRateable
     def self.create(author, resource, value)
       return unless author && resource && value
 			atts = { 
-			  resource_type: resource.class.name, resource_id: resource.id, 
-			  author_type: author.class.name, author_id: author.id,
+			  resource_type: resource.class.base_class.name, resource_id: resource.id,
+			  author_type: author.class.base_class.name, author_id: author.id,
 			  value: value
 			}
 			rate = where(atts.except(:value)).first_or_initialize(atts)

data/lib/acts_rateable/rating.rb

@@ -15,21 +15,21 @@ module ActsRateable
 
     def self.set_totals(resource)
      sql = "SELECT COUNT(*) total_ratings, SUM(value) rating_sum, AVG(value) rating_avg, "+
-            "(SELECT COUNT(DISTINCT resource_id) FROM ar_rates WHERE resource_type = '#{resource.class.name}') rated_count, "+
-            "((SELECT COUNT(*) from ar_rates WHERE resource_type = '#{resource.class.name}') / (SELECT COUNT(DISTINCT resource_id) FROM ar_rates WHERE resource_type = '#{resource.class.name}')) avg_num_ratings "+
-            "FROM ar_rates WHERE resource_type = '#{resource.class.name}'"
-            @@global_ratings[resource.class.name] = ActsRateable::Rate.connection.execute(sql).first
+            "(SELECT COUNT(DISTINCT resource_id) FROM ar_rates WHERE resource_type = '#{resource.class.base_class.name}') rated_count, "+
+            "((SELECT COUNT(*) from ar_rates WHERE resource_type = '#{resource.class.base_class.name}') / (SELECT COUNT(DISTINCT resource_id) FROM ar_rates WHERE resource_type = '#{resource.class.base_class.name}')) avg_num_ratings "+
+            "FROM ar_rates WHERE resource_type = '#{resource.class.base_class.name}'"
+            @@global_ratings[resource.class.base_class.name] = ActsRateable::Rate.connection.execute(sql).first
     end
 
   	#  RETURNS = { "total_ratings"=>"", "rating_sum"=>"", "rating_avg"=>"", "rated_count"=>"", "avg_num_ratings"=>"" }
     def self.get_totals(resource)
-      @@global_ratings[resource.class.name] ||= set_totals(resource)
+      @@global_ratings[resource.class.base_class.name] ||= set_totals(resource)
     end
 
     # RETURNS = {"total_ratings"=>"", "rating_sum"=>"", "rating_avg"=>""}
     def self.values_for(resource)    
       sql =   "SELECT COUNT(*) total_ratings, COALESCE(SUM(value),0) rating_sum, COALESCE(AVG(value),0) rating_avg "+
-              "FROM ar_rates WHERE resource_type = '#{resource.class.name}' and resource_id = '#{resource.id}'"
+              "FROM ar_rates WHERE resource_type = '#{resource.class.base_class.name}' and resource_id = '#{resource.id}'"
               ActsRateable::Rate.connection.execute(sql).first
     end
 

data/lib/acts_rateable/version.rb

@@ -1,3 +1,3 @@
 module ActsRateable
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_rateable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails