thumbs_up 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb255a6f08815057ab4a1896ed3e9d854c1c9c1
-  data.tar.gz: 8dc62bc7e179b16b6e2e307493f2a84b35445738
+  metadata.gz: 11003465d42393c944f234e11e53ad2d772e4089
+  data.tar.gz: 6ad0d8e91290c87792123ea3337c714fc5f5ee16
 SHA512:
-  metadata.gz: 708c9cf6c4b659a8d56d5cd56dafd785d6e05bfd0c9d85e177abe94b832f9e85cf7278482ae6149e52234f3ff085be80a27845975800a395e480e81839dbf7cb
-  data.tar.gz: 31d121f34fa8dd291fec0f33a7411842bb548f773f28d01434c5b07efd869a60b0d325acb848f743f0d0361eafd10df574ea3ea529e263c92152ebca7a7e3a6d
+  metadata.gz: fd79c8576b6e65baf65ac5da1921700ac5a07740a43b325f239c90dc4adc11f83480a48f1d3b49def1ff78983722d14609f3df219afa0f9fdd3ff25ce141cce1
+  data.tar.gz: 7029585f3bbe640e98469557c0bfd5088f7f379d8e403ca73428ddf7d3dc6accb66952a287fa41a88bf4db87002bdfd8814e6bff2499f23f89ac3ac6ffbaba50

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'http://rubygems.org'
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 ThumbsUp
 =======
 
-[![Build Status](https://secure.travis-ci.org/bouchard/thumbs_up.png)](http://travis-ci.org/bouchard/thumbs_up)
+[![Build Status](https://secure.travis-ci.org/bouchard/thumbs_up.png)](http://travis-ci.org/bouchard/thumbs_up) [![Code Climate](https://codeclimate.com/github/bouchard/thumbs_up.png)](https://codeclimate.com/github/bouchard/thumbs_up)
 
 **Note: Version 0.5.x is a breaking change for #plusminus_tally and #tally, with > 50% speedups.**
 
@@ -71,7 +71,7 @@ Usage
     voter.vote_exclusively_for(voteable)	# Removes any previous votes by that particular voter, and votes for.
     voter.vote_exclusively_against(voteable)	# Removes any previous votes by that particular voter, and votes against.
 
-    vote.unvote_for(voteable)  # Clears all votes for that user
+    voter.unvote_for(voteable)  # Clears all votes for that user
 
 ### Querying votes
 
@@ -88,6 +88,22 @@ Did the first user vote for or against the Car with id = 2?
     u.voted_for?(Car.find(2)) #=> true
     u.voted_against?(Car.find(2)) #=> false
 
+Or check directly!
+
+    u = User.first
+    u.vote_for(Car.find(2))
+    u.voted_how?(Car.find(2)) #=> true, if voted_for
+
+    u.vote_against(Car.find(3))
+    u.voted_how?(Car.find(3)) #=> false, if voted_against
+
+    u.vote_for(Car.find(4))
+    u.voted_how?(Car.find(4)) #=> nil, if didn't vote for it
+
+in case you use `--unique-voting false` (documented below):
+
+    u.voted_how?(Car.find(2)) #=> [false, true, true, false]
+
 #### Tallying Votes
 
 You can easily retrieve voteable object collections based on the properties of their votes:

data/lib/acts_as_voter.rb

@@ -88,7 +88,10 @@ module ThumbsUp #:nodoc:
           self.unvote_for(voteable)
         end
         direction = (options[:direction].to_sym == :up)
-        Vote.create!(:vote => direction, :voteable => voteable, :voter => self)
+        # create! does not return the created object
+        v = Vote.new(:vote => direction, :voteable => voteable, :voter => self)
+        v.save!
+        v
       end
 
       def unvote_for(voteable)
@@ -113,6 +116,22 @@ module ThumbsUp #:nodoc:
             ).count
       end
 
+      def voted_how?(voteable)
+        votes = Vote.where(
+              :voter_id => self.id,
+              :voter_type => self.class.base_class.name,
+              :voteable_id => voteable.id,
+              :voteable_type => voteable.class.base_class.name
+            ).map(&:vote) #in case votes is premitted to be duplicated
+        if votes.count == 1
+          votes.first
+        elsif votes.count == 0
+          nil
+        else
+          votes
+        end
+      end
+
     end
   end
 end

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

@@ -3,12 +3,12 @@ class Vote < ActiveRecord::Base
   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")
+  scope :descending, lambda { order("created_at DESC") }
 
   belongs_to :voteable, :polymorphic => true
   belongs_to :voter, :polymorphic => true
 
-  attr_accessible :vote, :voter, :voteable
+  attr_accessible :vote, :voter, :voteable if ActiveRecord::VERSION::MAJOR < 4
 
 <% if options[:unique_voting] == true %>
   # Comment out the line below to allow multiple votes per user.

data/lib/thumbs_up.rb

@@ -25,7 +25,7 @@ module ThumbsUp
     end
 
     # The configuration object.
-    # @see I18::Airbrake.configure
+    # @see ThumbsUp::Configuration
     def configuration
       @configuration ||= Configuration.new
     end

data/lib/thumbs_up/version.rb

@@ -1,3 +1,3 @@
 module ThumbsUp
-	VERSION = '0.6.4'
+	VERSION = '0.6.5'
 end

data/test/test_helper.rb

@@ -98,12 +98,12 @@ 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 :recent, lambda { |*args| where(["created_at > ?", (args.first || 2.weeks.ago)]) }
-  scope :descending, order("created_at DESC")
+  scope :descending, lambda { order("created_at DESC") }
 
   belongs_to :voteable, :polymorphic => true
   belongs_to :voter, :polymorphic => true
 
-  attr_accessible :vote, :voter, :voteable
+  attr_accessible :vote, :voter, :voteable if ActiveRecord::VERSION::MAJOR < 4
 
   # Comment out the line below to allow multiple votes per user.
   validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id]

data/test/thumbs_up_test.rb

@@ -11,6 +11,7 @@ class TestThumbsUp < Test::Unit::TestCase
     user_for = User.create(:name => 'david')
     user_against = User.create(:name => 'brady')
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
+    item2= Item.create(:name => 'PS3', :description => 'Playstation 3')
 
     assert_not_nil user_for.vote_for(item)
     assert_raises(ActiveRecord::RecordInvalid) do
@@ -24,6 +25,7 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_equal 0, user_for.vote_count(:down)
     assert_equal true, user_for.voted_which_way?(item, :up)
     assert_equal false, user_for.voted_which_way?(item, :down)
+    assert_equal true, user_for.voted_how?(item)
     assert_equal 1, user_for.votes.where(:voteable_type => 'Item').count
     assert_equal 0, user_for.votes.where(:voteable_type => 'AnotherItem').count
     assert_raises(ArgumentError) do
@@ -36,6 +38,7 @@ class TestThumbsUp < Test::Unit::TestCase
     end
     assert_equal false, user_against.voted_for?(item)
     assert_equal true, user_against.voted_against?(item)
+    assert_equal false, user_against.voted_how?(item)
     assert_equal true, user_against.voted_on?(item)
     assert_equal 1, user_against.vote_count
     assert_equal 0, user_against.vote_count(:up)
@@ -61,6 +64,18 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_raises(ArgumentError) do
       user_for.vote(item, {:direction => :foo})
     end
+
+    vote = user_against.vote(item, :exclusive => true, :direction => :down)
+    assert_equal true, user_against.voted_against?(item)
+    # Make sure the vote record was returned by the :vote method
+    assert_equal true, vote.is_a?(Vote)
+
+    vote = user_for.vote(item, :exclusive => true, :direction => :up)
+    assert_equal true, user_for.voted_for?(item)
+    # Make sure the vote record was returned by the :vote method
+    assert_equal true, vote.is_a?(Vote)
+
+    assert_nil user_for.voted_how?(item2)
   end
 
   def test_acts_as_voteable_instance_methods
@@ -125,7 +140,9 @@ class TestThumbsUp < Test::Unit::TestCase
 
   def test_tally_empty
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
-    assert_equal 0, Item.tally.having('vote_count > 0').length
+    # COUNT(#{Vote.table_name}.id) is equivalent to aliased column `vote_count` - Postgres
+    # requires the non-aliased name in a HAVING clause.
+    assert_equal 0, Item.tally.having("COUNT(#{Vote.table_name}.id) > 0").length
   end
 
   def test_tally_has_id
@@ -135,7 +152,7 @@ class TestThumbsUp < Test::Unit::TestCase
 
     user.vote_for(item2)
 
-    assert_not_nil Item.tally.all.first.id
+    assert_not_nil Item.tally.first.id
   end
 
   def test_tally_starts_at
@@ -187,10 +204,6 @@ class TestThumbsUp < Test::Unit::TestCase
     Item.tally.except(:order).any?
   end
 
-  def test_tally_empty
-    Item.tally.except(:order).empty?
-  end
-
   def test_plusminus_tally_not_empty_without_conditions
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
     assert_equal 1, Item.plusminus_tally.length
@@ -198,7 +211,9 @@ class TestThumbsUp < Test::Unit::TestCase
 
   def test_plusminus_tally_empty
     item = Item.create(:name => 'XBOX', :description => 'XBOX console')
-    assert_equal 0, Item.plusminus_tally.having('vote_count > 0').length
+    # COUNT(#{Vote.table_name}.id) is equivalent to aliased column `vote_count` - Postgres
+    # requires the non-aliased name in a HAVING clause.
+    assert_equal 0, Item.plusminus_tally.having("COUNT(#{Vote.table_name}.id) > 0").length
   end
 
   def test_plusminus_tally_starts_at
@@ -250,11 +265,11 @@ class TestThumbsUp < Test::Unit::TestCase
     assert_not_nil user.vote_for(item)
 
     if ActiveRecord::Base.connection.adapter_name == 'MySQL'
-      assert (Item.plusminus_tally.having('vote_count > 0').include? item)
-      assert (not Item.plusminus_tally.having('vote_count > 0').include? item_not_included)
+      assert(Item.plusminus_tally.having('vote_count > 0').include?(item))
+      assert(!Item.plusminus_tally.having('vote_count > 0').include?(item_not_included))
     else
-      assert (Item.plusminus_tally.having('COUNT(votes.id) > 0').include? item)
-      assert (not Item.plusminus_tally.having('COUNT(votes.id) > 0').include? item_not_included)
+      assert(Item.plusminus_tally.having('COUNT(votes.id) > 0').include?(item))
+      assert(!Item.plusminus_tally.having('COUNT(votes.id) > 0').include?(item_not_included))
     end
   end
 
@@ -375,10 +390,6 @@ class TestThumbsUp < Test::Unit::TestCase
     Item.plusminus_tally.except(:order).any?
   end
 
-  def test_plusminus_tally_empty
-    Item.plusminus_tally.except(:order).empty?
-  end
-
   def test_karma
     users = (0..1).map{ |u| User.create(:name => "User #{u}") }
     items = (0..1).map{ |u| users[0].items.create(:name => "Item #{u}", :description => "Item #{u}") }
@@ -396,8 +407,8 @@ class TestThumbsUp < Test::Unit::TestCase
     user.vote_for(item)
     user.vote_for(another_item)
 
-    assert_equal 1, Item.plusminus_tally.sum(&:plusminus_tally).to_i
-    assert_equal 1, OtherItem.plusminus_tally.sum(&:plusminus_tally).to_i
+    assert_equal 1, Item.plusminus_tally.to_a.sum(&:plusminus_tally).to_i
+    assert_equal 1, OtherItem.plusminus_tally.to_a.sum(&:plusminus_tally).to_i
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbs_up
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Brady Bouchard
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -154,7 +154,8 @@ files:
 - README.md
 - Rakefile
 homepage: http://github.com/bouchard/thumbs_up
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Voting for ActiveRecord with multiple vote sources and karma calculation.