acts_as_votable 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1843c2e0892abc19c5ecc63dd48e38fe8d48e1cdb7affc3c90d67b0419725e1
-  data.tar.gz: b05a72a3a7310c362233e9d54301a695a03fb72c9fb6068b2fde8e58d1e238bb
+  metadata.gz: 1d9154268f7a15b8f66a0dcf909ce0dffd9e675c97559924c653c3ba90f4cf14
+  data.tar.gz: 3cf9b07d912de5732d8867ad1fb16394244857ce4fb150682154c5e4a6b3e715
 SHA512:
-  metadata.gz: a125832f11dd75fa540f90791b5bdc092b92ade7c2a34218947fa1621aae21487eb38d8664636d1113885bb878927805a10f0db5edb786c48a8339832859bd68
-  data.tar.gz: 23bb31cc323d1173f982b2d12895b834e26b1ede7a6293cc1343538140f2fe3f7f9c0c89daf4de4ea67d72a69b4b4bbca2c4ec53555500ec965f26ca8fb1f475
+  metadata.gz: 3c1c7c024425ec4e0a22432e820f6d47598d0b0adaef43930c37f9ea9fb9d7c832e831e60252b8545679d12125b9f4912e8cc14356ad34e32c26237ddfa0422c
+  data.tar.gz: f36cbcdc97e3f03470227dc669ad9f992f09e8d2e7ff66c5f0bd986ace5677dddcbf1552e6ee69e18148628ad70e5d5cd55357f4048f6f7fb503eca0a5c5a13f

data/Appraisals

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-appraise "rails-4" do
-  gem "rails", "4.2.11"
-end
-
 appraise "rails-5-1" do
   gem "rails", "5.1.7"
 end

data/README.md

@@ -15,8 +15,8 @@ The main goals of this gem are:
 
 ### Supported Ruby and Rails versions
 
-* Ruby >= 2.3.0
-* Rails >= 4
+- Ruby >= 2.5.0
+- Rails >= 5.1
 
 ### Install
 
@@ -33,8 +33,10 @@ And follow that up with a ``bundle install``.
 Acts As Votable uses a votes table to store all voting information.  To
 generate and run the migration just use.
 
-    rails generate acts_as_votable:migration
-    rails db:migrate
+```bash
+rails generate acts_as_votable:migration
+rails db:migrate
+```
 
 You will get a performance increase by adding in cached columns to your model's
 tables.  You will have to do this manually through your own migrations.  See the
@@ -75,7 +77,6 @@ By default all votes are positive, so `@user3` has cast a 'good' vote for `@post
 
 `@user2` and `@user4` on the other had has voted against `@post`.
 
-
 Just about any word works for casting a vote in favor or against post.  Up/Down,
 Like/Dislike, Positive/Negative... the list goes on-and-on.  Boolean flags `true` and
 `false` are also applicable.
@@ -165,6 +166,7 @@ You can add a scope to your vote
 @post.find_votes_for(:vote_scope => 'week').size # => 1
 @post.find_votes_for(:vote_scope => 'month').size # => 1
 ```
+
 ### Adding weights to your votes
 
 You can add weight to your vote. The default value is 1.
@@ -359,63 +361,30 @@ Display average rating:
 <%= post.weighted_average.round(2) %> / 5
 <!-- 3.5 / 5 -->
 ```
-## updated_at at Votable model
+
+## Votable model's `updated_at`
 
 You can control whether `updated_at` column of votable model will be touched or
 not by passing `cacheable_strategy` option to `acts_as_votable` method.
 
 By default, `update` strategy is used. Pass `:update_columns` as
 `cacheable_strategy` if you don't want to touch model's `updated_at` column.
+
 ```ruby
 class Post < ApplicationRecord
   acts_as_votable cacheable_strategy: :update_columns
 end
 ```
 
-NOTE: this option does not work for ActiveRecord < 3.1
-
-
 ## Testing
 
 All tests follow the RSpec format and are located in the spec directory.
 They can be run with:
 
-```
+```bash
 rake spec
 ```
 
-## Changes
-
-### Fixes for votable voter model
-
-In version 0.8.0, there are bugs for a model that is both votable and voter.
-Some name-conflicting methods are renamed:
-+ Renamed Votable.votes to votes_for
-+ Renamed Votable.vote to vote_by,
-+ Removed Votable.vote_by alias (was an alias for :vote_up)
-+ Renamed Votable.unvote_for to unvote_by
-+ Renamed Votable.find_votes to find_votes_for
-+ Renamed Votable.up_votes to get_upvotes
-  + and its aliases :get_true_votes, :get_ups, :get_upvotes, :get_likes, :get_positives, :get_for_votes
-+ Renamed Votable.down_votes to get_downvotes
-  + and its aliases :get_false_votes, :get_downs, :get_downvotes, :get_dislikes, :get_negatives
-
-
 ## License
 
-Acts as votable is released under the [MIT
-License](http://www.opensource.org/licenses/MIT).
-
-## Next steps
-
-- Pass in a block of options when creating acts_as.  Allow for things
-  like disabling the aliasing
-
-- Smarter language syntax.  Example: `@user.likes` will return all of the votables
-that the user likes, while `@user.likes @model` will cast a vote for @model by
-@user.
-
-- The aliased methods are referred to by using the terms 'up/down' and/or
-'true/false'. Need to come up with guidelines for naming these methods.
-
-- Create more aliases. Specifically for counting votes and finding votes.
+Acts as votable is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/acts_as_votable/cacheable.rb

@@ -40,10 +40,6 @@ module ActsAsVotable
     def update_cached_votes(vote_scope = nil)
       updates = {}
 
-      if self.respond_to?(:cached_votes_total=)
-        updates[:cached_votes_total] = count_votes_total(true)
-      end
-
       if self.respond_to?(:cached_votes_up=)
         updates[:cached_votes_up] = count_votes_up(true)
       end
@@ -52,6 +48,13 @@ module ActsAsVotable
         updates[:cached_votes_down] = count_votes_down(true)
       end
 
+      if self.respond_to?(:cached_votes_total=)
+        updates[:cached_votes_total] = (
+          (updates[:cached_votes_up] || count_votes_up(true)) +
+          (updates[:cached_votes_down] || count_votes_down(true))
+        )
+      end
+
       if self.respond_to?(:cached_votes_score=)
         updates[:cached_votes_score] = (
           (updates[:cached_votes_up] || count_votes_up(true)) -
@@ -72,10 +75,6 @@ module ActsAsVotable
       end
 
       if vote_scope
-        if self.respond_to?(scope_cache_field :cached_votes_total=, vote_scope)
-          updates[scope_cache_field :cached_votes_total, vote_scope] = count_votes_total(true, vote_scope)
-        end
-
         if self.respond_to?(scope_cache_field :cached_votes_up=, vote_scope)
           updates[scope_cache_field :cached_votes_up, vote_scope] = count_votes_up(true, vote_scope)
         end
@@ -84,6 +83,13 @@ 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_votes_total=, vote_scope)
+          updates[scope_cache_field :cached_votes_total, vote_scope] = (
+            (updates[scope_cache_field :cached_votes_up, vote_scope] || count_votes_up(true, vote_scope)) +
+            (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
@@ -136,9 +142,7 @@ module ActsAsVotable
 
     def weighted_total(skip_cache = false, vote_scope = nil)
       from_cache(skip_cache, :cached_weighted_total, vote_scope) do
-        ups = get_up_votes(vote_scope: vote_scope).sum(:vote_weight)
-        downs = get_down_votes(vote_scope: vote_scope).sum(:vote_weight)
-        ups + downs
+        find_votes_for(scope_or_empty_hash(vote_scope)).sum(:vote_weight)
       end
     end
 

data/lib/acts_as_votable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActsAsVotable
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/lib/acts_as_votable/votable.rb

@@ -35,7 +35,7 @@ module ActsAsVotable
       }
 
       base.class_eval do
-        has_many :votes_for, class_name: "ActsAsVotable::Vote", as: :votable, dependent: :destroy do
+        has_many :votes_for, class_name: "ActsAsVotable::Vote", as: :votable, dependent: :delete_all do
           def voters
             includes(:voter).map(&:voter)
           end
@@ -74,7 +74,7 @@ module ActsAsVotable
       # find the vote
       votes = find_votes_by(options[:voter], options[:vote_scope])
 
-      if votes.empty? || options[:duplicate]
+      if options[:duplicate] || !votes.exists?
         # this voter has never voted
         vote = ActsAsVotable::Vote.new(
           votable: self,
@@ -109,12 +109,11 @@ module ActsAsVotable
       return false if args[:voter].nil?
       votes = find_votes_by(args[:voter], args[:vote_scope])
 
-      return true if votes.empty?
       ActiveRecord::Base.transaction do
-        votes.each(&:destroy)
-        update_cached_votes args[:vote_scope]
+        deleted_count = votes.delete_all
+        update_cached_votes(args[:vote_scope]) if deleted_count > 0
       end
-      self.vote_registered = false if votes_for.empty?
+      self.vote_registered = false
       return true
     end
 

data/lib/acts_as_votable/voter.rb

@@ -18,7 +18,7 @@ module ActsAsVotable
 
       base.class_eval do
 
-        has_many :votes, class_name: "ActsAsVotable::Vote", as: :voter, dependent: :destroy do
+        has_many :votes, class_name: "ActsAsVotable::Vote", as: :voter, dependent: :delete_all do
           def votables
             includes(:votable).map(&:votable)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_votable
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Ryan