voterable 0.0.9 → 0.0.10

data/TODO.md

@@ -0,0 +1,6 @@
+# Bugs
+
+# Features
+
+# Questionable Behavior
+1. Prevent Voteable#update_tally from making multiple database 

data/lib/voterable/version.rb

@@ -1,3 +1,3 @@
 module Voterable # :nodoc:
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/voterable/voteable.rb

@@ -19,14 +19,13 @@ module Voterable
       embeds_many :tallys, as: :tallyable, class_name: "Voterable::Tally"
 
       #Create Indexes
-      for i in 0..4
-         index "tallys.#{i}.point"
-         index "tallys.#{i}.count"
-         index "tallys.#{i}.up"
-         index "tallys.#{i}.down"
-      end
+      index "tallys.point"
+      index "tallys.count"
+      index "tallys.up"
+      index "tallys.down"
 
-      after_initialize :update_tally
+      after_initialize :update_tally   # TODO Shouldn't need to update tallys after save
+      # after_initialize :setup
 
       VOTEABLE = {} 
       VOTEBACK = {}
@@ -68,15 +67,35 @@ module Voterable
 
       #Need to make sure these only return kind of voteable
       def self.up_voted_by(voter)
-         votes = Vote.where(voter_id:voter.id, vote: :up)
+         votes = Vote.where(voter_id:voter.id, voteable_type:self.name, vote: :up)
          votes.collect{|x| x.voteable}.compact
       end
 
       def self.down_voted_by(voter)
-         votes = Vote.where(voter_id:voter.id, vote: :down)
+         votes = Vote.where(voter_id:voter.id, voteable_type:self.name, vote: :down)
          votes.collect{|x| x.voteable}.compact
       end
 
+      # Returns hash with up and down votes this should be faster than
+      # getting up and down voteables seperatly
+      #
+      # @example getting up and down voted voteables
+      #   Voteable.voted_on_by(voter) # => {:up => [<up_voted>], :down => [<down_voted>]}
+      #
+      def self.voted_on_by(voter)
+         votes = Vote.where(voter_id:voter.id, voteable_type:self.name)
+         up_voted = [] ; down_voted = []
+         votes.each do |vt|         #Sort voteables in to up and down voted
+            if vt.vote == :up
+               up_voted << vt.voteable
+            elsif vt.vote == :down
+               down_voted << vt.voteable
+            end
+         end
+         {:up => up_voted, :down => down_voted}
+      end
+
+
       def self.sort_by(hsh = {})
 
          hsh[:page]       ||= 1         
@@ -112,7 +131,7 @@ module Voterable
 
          # Array into the class and add necessary methods for pagination
          sorted.instance_variable_set("@current_page", page)
-         sorted.instance_variable_set("@num_pages", (self.count.to_f/hsh[:limit]).ceil )
+         sorted.instance_variable_set("@num_pages", (self.count.to_f/hsh[:limit]).ceil ) # TODO eliminate self.count
          sorted.instance_variable_set("@limit_value", hsh[:limit])
          sorted.instance_eval do
             def current_page
@@ -132,10 +151,6 @@ module Voterable
 
       #Instance Methods
 
-      def votes_point
-         point || 0
-      end
-
       # Vote the voteable thing up or down 
       #
       # @parma [ Voterable::Voter ] voter Voter that will be doing the voting
@@ -182,18 +197,18 @@ module Voterable
          return vt
       end
 
-      def unvote(vtr, vote = nil)
+      def unvote(vtr, vt = nil)
          original_points = self.point #Record original points to update user 
 
-         vote ||= Vote.find(voter_id:vtr.id, voteable_id:self.id) 
-         return if not vote # Return if vote doens't exist
+         vt ||= Vote.find(voter_id:vtr.id, voteable_id:self.id) 
+         return nil unless vt # Return if vote doens't exist
 
-         self.point -= self.class.options(vote.vote)
-         vtr.reputation -= self.class.vtback(vote.vote)
+         self.point -= self.class.options(vt.vote)
+         vtr.reputation -= self.class.vtback(vt.vote)
    
          self.count -= 1
 
-         value = vote.vote
+         value = vt.vote
          case value
             when :up   ; self.up -= 1
             when :down ; self.down -= 1
@@ -204,7 +219,7 @@ module Voterable
          self.voter.save
          vtr.save
 
-         votes.destroy_all(vote_id:vote.id)
+         vt.destroy
          self.save
       end
 
@@ -226,7 +241,7 @@ module Voterable
          if bracket_votes
             bracket_votes = bracket_votes.where(:updated_at.lte => time_2).and(:updated_at.gte => time_1)
          else
-            bracket_votes = self.votes.where(:updated_at.lte => time_2).and(:updated_at.gte => time_1)
+            bracket_votes = self.votes.where(:updated_at.lte => time_2).and(:updated_at.gte => time_1) #.to_a
          end
          up_count   = bracket_votes.where(vote: :up).count
          down_count = bracket_votes.where(vote: :down).count

data/lib/voterable/voter.rb

@@ -33,7 +33,7 @@ module Voterable
       #
       # @return [Vote] vote that voter cast
       def vote_for(vtable)
-         Vote.where(voter_id:self.id, voteable_id:vtable.id).first
+         Vote.first(conditions: { voter_id: self.id, voteable_id: vtable.id })
       end
 
       ##
@@ -63,7 +63,7 @@ module Voterable
          #Things that got votes
          self.voteables.each do |t| 
             sum+=t.class.options(:init)  # Voteable initial value
-            sum+=t.votes_point
+            sum+=t.point
          end
 
          #Vote Back

data/spec/voteable_spec.rb

@@ -69,7 +69,26 @@ describe Voterable::Voteable do #:nodoc: all
       it{Voteable.first.tallys.count.should == 5}
       it{Voteable.last.tallys.count.should == 1}
    end
-         
 
+   describe ".voted_on_by(voter)" do
+      before(:each) do 
+         @voter = Factory(:voter)
+         @up    = Factory(:voteable)
+         @down  = Factory(:voteable)
+         @voter.vote(@up,:up)
+         @voter.vote(@down,:down)
+      end
+
+      it{Voteable.up_voted_by(@voter).should == [@up]}
+      it{Voteable.down_voted_by(@voter).should == [@down]}
+
+      it "should return up voted voteable" do
+         Voteable.voted_on_by(@voter)[:up].should == [@up]
+      end
+
+      it "should return down voted voteable" do
+         Voteable.voted_on_by(@voter)[:down].should == [@down]
+      end
+   end
 
 end

data/spec/voting_spec.rb

@@ -9,7 +9,6 @@ describe "Voting" do # :nodoc: all
       @owner.voteables << @voteable
    end
 
-   it{@voteable.should respond_to(:votes_point)}
    it{@voter.should respond_to(:reputation)}
 
    context "when up voted by voter" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voterable
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70122211454760 !ruby/object:Gem::Requirement
+  requirement: &70179104006900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70122211454760
+  version_requirements: *70179104006900
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70122211453520 !ruby/object:Gem::Requirement
+  requirement: &70179104005780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70122211453520
+  version_requirements: *70179104005780
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70122211452700 !ruby/object:Gem::Requirement
+  requirement: &70179103908660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70122211452700
+  version_requirements: *70179103908660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70122211435280 !ruby/object:Gem::Requirement
+  requirement: &70179103908260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211435280
+  version_requirements: *70179103908260
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70122211432600 !ruby/object:Gem::Requirement
+  requirement: &70179103907540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70122211432600
+  version_requirements: *70179103907540
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70122211431600 !ruby/object:Gem::Requirement
+  requirement: &70179103906880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211431600
+  version_requirements: *70179103906880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70122211429900 !ruby/object:Gem::Requirement
+  requirement: &70179103906160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211429900
+  version_requirements: *70179103906160
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70122211428600 !ruby/object:Gem::Requirement
+  requirement: &70179103905520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211428600
+  version_requirements: *70179103905520
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70122211427780 !ruby/object:Gem::Requirement
+  requirement: &70179103904820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211427780
+  version_requirements: *70179103904820
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70122211426480 !ruby/object:Gem::Requirement
+  requirement: &70179103904120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211426480
+  version_requirements: *70179103904120
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70122211425760 !ruby/object:Gem::Requirement
+  requirement: &70179103903660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211425760
+  version_requirements: *70179103903660
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70122211424900 !ruby/object:Gem::Requirement
+  requirement: &70179103903220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70122211424900
+  version_requirements: *70179103903220
 description: Hackish implementaiton of voting on of voteable objects by a voter
 email:
 - benguest@gmail.com
@@ -157,6 +157,7 @@ files:
 - Guardfile
 - README.md
 - Rakefile
+- TODO.md
 - lib/voterable.rb
 - lib/voterable/functions.rb
 - lib/voterable/tally.rb