acts_as_votable 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b8402806ab189425b71b1d24d2081123e6bffc1
-  data.tar.gz: 48de253feb1e0df3ef42cd798faaaf8f91f36b47
+  metadata.gz: c2beddd83fe6f3062fdfb1599953b34d942f6ac8
+  data.tar.gz: 8bfb3b0bb95722935fb3eb315da58c619f583921
 SHA512:
-  metadata.gz: 7189eeb6505d6394bb090d58618d23ee13e36e6512f0416a15bf984c489e0775952680b748cadc054bd4948260184ac4a457ef6dee3b34f279561245adb2213e
-  data.tar.gz: 0fd78166628e72e3c77b8b5c8b8ba0028aa3069afb217816324c470ce6cc0c5a809431fcf47a800e440bbcb49020778e54f6f082698321357ded582081f488b0
+  metadata.gz: cbe9cba192df3d698531c14a10f8340b78642cd51288b582b064384ea48931345900c74a499598b541ca2662230d262be6acc0f26d2db9a3763539140ec08683
+  data.tar.gz: 03948b37befab6d39cd621b63d6e32cb2404b4850f2d5b2e2bece1674bcbaa13bcc4aff7e023f30aeff3330c809fdf9eb28b7d28d5ae6d6685c287c5167a90c1

data/README.markdown

@@ -25,7 +25,7 @@ The main goals of this gem are:
 Just add the following to your Gemfile.
 
 ```ruby
-gem 'acts_as_votable', '~> 0.9.0'
+gem 'acts_as_votable', '~> 0.10.0'
 ```
 
 And follow that up with a ``bundle install``.
@@ -316,11 +316,13 @@ class AddCachedVotesToPosts < ActiveRecord::Migration
     add_column :posts, :cached_votes_up, :integer, :default => 0
     add_column :posts, :cached_votes_down, :integer, :default => 0
     add_column :posts, :cached_weighted_score, :integer, :default => 0
+    add_column :posts, :cached_weighted_total, :integer, :default => 0
     add_index  :posts, :cached_votes_total
     add_index  :posts, :cached_votes_score
     add_index  :posts, :cached_votes_up
     add_index  :posts, :cached_votes_down
     add_index  :posts, :cached_weighted_score
+    add_index  :posts, :cached_weighted_total
 
     # Uncomment this line to force caching of existing votes
     # Post.find_each(&:update_cached_votes)
@@ -331,7 +333,8 @@ class AddCachedVotesToPosts < ActiveRecord::Migration
     remove_column :posts, :cached_votes_score
     remove_column :posts, :cached_votes_up
     remove_column :posts, :cached_votes_down
-    remove_column  :posts, :cached_weighted_score
+    remove_column :posts, :cached_weighted_score
+    remove_column :posts, :cached_weighted_total
   end
 end
 ```

data/lib/acts_as_votable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsVotable
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/lib/acts_as_votable/votable.rb

@@ -79,7 +79,7 @@ module ActsAsVotable
       _votes_ = find_votes_for({
         :voter_id => options[:voter].id,
         :vote_scope => options[:vote_scope],
-        :voter_type => options[:voter].class.name
+        :voter_type => options[:voter].class.base_class.name
       })
 
       if _votes_.count == 0 or options[:duplicate]
@@ -114,7 +114,7 @@ module ActsAsVotable
 
     def unvote args = {}
       return false if args[:voter].nil?
-      _votes_ = find_votes_for(:voter_id => args[:voter].id, :vote_scope => args[:vote_scope], :voter_type => args[:voter].class.name)
+      _votes_ = find_votes_for(:voter_id => args[:voter].id, :vote_scope => args[:vote_scope], :voter_type => args[:voter].class.base_class.name)
 
       return true if _votes_.size == 0
       _votes_.each(&:destroy)
@@ -155,6 +155,10 @@ module ActsAsVotable
         "cached_scoped_#{vote_scope}_votes_score="
       when :cached_votes_score
         "cached_scoped_#{vote_scope}_votes_score"
+      when :cached_weighted_total
+        "cached_weighted_#{vote_scope}_total"
+      when :cached_weighted_total=
+        "cached_weighted_#{vote_scope}_total="
       when :cached_weighted_score
         "cached_weighted_#{vote_scope}_score"
       when :cached_weighted_score=
@@ -186,6 +190,10 @@ module ActsAsVotable
         )
       end
 
+      if self.respond_to?(:cached_weighted_total=)
+        updates[:cached_weighted_total] = weighted_total(true)
+      end
+
       if self.respond_to?(:cached_weighted_score=)
         updates[:cached_weighted_score] = weighted_score(true)
       end
@@ -203,6 +211,10 @@ module ActsAsVotable
           updates[scope_cache_field :cached_votes_down, vote_scope] = count_votes_down(true, vote_scope)
         end
 
+        if self.respond_to?(scope_cache_field :cached_weighted_total=, vote_scope)
+          updates[scope_cache_field :cached_weighted_total, vote_scope] = weighted_total(true, vote_scope)
+        end
+
         if self.respond_to?(scope_cache_field :cached_weighted_score=, vote_scope)
           updates[scope_cache_field :cached_weighted_score, vote_scope] = weighted_score(true, vote_scope)
         end
@@ -260,6 +272,15 @@ module ActsAsVotable
       get_down_votes(:vote_scope => vote_scope).count
     end
 
+    def weighted_total skip_cache = false, vote_scope = nil
+      if !skip_cache && self.respond_to?(scope_cache_field :cached_weighted_total, vote_scope)
+        return self.send(scope_cache_field :cached_weighted_total, vote_scope)
+      end
+      ups = get_up_votes(:vote_scope => vote_scope).sum(:vote_weight)
+      downs = get_down_votes(:vote_scope => vote_scope).sum(:vote_weight)
+      ups + downs
+    end
+
     def weighted_score skip_cache = false, vote_scope = nil
       if !skip_cache && self.respond_to?(scope_cache_field :cached_weighted_score, vote_scope)
         return self.send(scope_cache_field :cached_weighted_score, vote_scope)
@@ -271,7 +292,7 @@ module ActsAsVotable
 
     # voters
     def voted_on_by? voter
-      votes = find_votes_for :voter_id => voter.id, :voter_type => voter.class.name
+      votes = find_votes_for :voter_id => voter.id, :voter_type => voter.class.base_class.name
       votes.count > 0
     end
 

data/lib/acts_as_votable/voter.rb

@@ -53,25 +53,25 @@ module ActsAsVotable
 
     # results
     def voted_on? votable, args={}
-      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name,
+      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                          :vote_scope => args[:vote_scope])
       votes.size > 0
     end
 
     def voted_up_on? votable, args={}
-      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name,
+      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                          :vote_scope => args[:vote_scope], :vote_flag => true)
       votes.size > 0
     end
 
     def voted_down_on? votable, args={}
-      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name,
+      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                          :vote_scope => args[:vote_scope], :vote_flag => false)
       votes.size > 0
     end
 
     def voted_as_when_voting_on votable, args={}
-      vote = find_votes(:votable_id => votable.id, :votable_type => votable.class.name,
+      vote = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                          :vote_scope => args[:vote_scope]).select(:vote_flag).last
       return nil unless vote
       return vote.vote_flag
@@ -107,7 +107,7 @@ module ActsAsVotable
     end
 
     def find_voted_items extra_conditions = {}
-      options = extra_conditions.merge :voter_id => id, :voter_type => self.class.name
+      options = extra_conditions.merge :voter_id => id, :voter_type => self.class.base_class.name
       include_objects.where(options).collect(&:votable)
     end
 

data/spec/shared_example/votable_model_spec.rb

@@ -206,6 +206,28 @@ shared_examples "a votable_model" do
       votable_cache.cached_votes_score.should == 0
     end
 
+    it "should update cached weighted total if there is a weighted total column" do
+      votable_cache.cached_weighted_total = 50
+      votable_cache.vote_by :voter => voter
+      votable_cache.cached_weighted_total.should == 1
+      votable_cache.vote_by :voter => voter2, :vote => 'false'
+      votable_cache.cached_weighted_total.should == 2
+    end
+
+    it "should update cached weighted total votes_for when a vote up is removed" do
+      votable_cache.vote_by :voter => voter, :vote => 'true', :vote_weight => 3
+      votable_cache.cached_weighted_total.should == 3
+      votable_cache.unvote :voter => voter
+      votable_cache.cached_weighted_total.should == 0
+    end
+
+    it "should update cached weighted total votes_for when a vote down is removed" do
+      votable_cache.vote_by :voter => voter, :vote => 'false', :vote_weight => 4
+      votable_cache.cached_weighted_total.should == 4
+      votable_cache.unvote :voter => voter
+      votable_cache.cached_weighted_total.should == 0
+    end
+
     it "should update cached weighted score if there is a weighted score column" do
       votable_cache.cached_weighted_score = 50
       votable_cache.vote_by :voter => voter
@@ -273,6 +295,12 @@ shared_examples "a votable_model" do
       votable_cache.count_votes_down.should == 50
     end
 
+    it "should select from cached weighted total if there is a weighted total column" do
+      votable_cache.vote_by :voter => voter, :vote => 'false'
+      votable_cache.cached_weighted_total = 50
+      votable_cache.weighted_total.should == 50
+    end
+
     it "should select from cached weighted score if there is a weighted score column" do
       votable_cache.vote_by :voter => voter, :vote => 'false'
       votable_cache.cached_weighted_score = 50

data/spec/spec_helper.rb

@@ -59,12 +59,14 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer :cached_votes_score
     t.integer :cached_votes_up
     t.integer :cached_votes_down
+    t.integer :cached_weighted_total
     t.integer :cached_weighted_score
 
     t.integer :cached_scoped_test_votes_total
     t.integer :cached_scoped_test_votes_score
     t.integer :cached_scoped_test_votes_up
     t.integer :cached_scoped_test_votes_down
+    t.integer :cached_scoped_weighted_total
     t.integer :cached_scoped_weighted_score
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_votable
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec