acts_as_votable 0.1.0 → 0.1.1

data/.gitignore

@@ -2,3 +2,4 @@ pkg/*
 *.gem
 .bundle
 nbproject/*
+bin

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acts_as_votable (0.0.5)
+    acts_as_votable (0.1.0)
       rails (>= 3.0.0)
 
 GEM
@@ -74,6 +74,7 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    sqlite3 (1.3.3)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -84,5 +85,5 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_votable!
-  rails (>= 3.0.0)
   rspec
+  sqlite3

data/README.markdown

@@ -1,16 +1,3 @@
-### Major Updates
-
-Version 0.1.0 introduces new and refactored function calls that improve the
-natural language syntax of this gem.  Certain calls that were compatible with
-version 0.0.5 will now be broken.  Remember to specify a the version in your
-Gemfile to prevent functionality breakdowns between versions.
-
-In version 0.1.0 functions like ``@post.votes`` return an array of all of the vote
-records for @post.  In order to count the number of votes simply use
-``@post.votes.size`` now.
-
-- - -
-
 # Acts As Votable (aka Acts As Likeable)
 
 Acts As Votable is a Ruby Gem specifically written for Rails/ActiveRecord models.
@@ -19,7 +6,7 @@ The main goals of this gem are:
 - Allow any model to be voted on, like/dislike, upvote/downvote, etc.
 - Allow any model to vote.  In other words, votes do not have to come from a user,
   they can come from any model (such as a Group or Team).
-- Provide an easy to write natural language syntax.
+- Provide an easy to write/read syntax.
 
 ## Installation
 
@@ -110,7 +97,7 @@ You can have your voters ``acts_as_voter`` to provide some reserve functionality
 
     @article.votes.size # => 1
     @article.likes.size # => 1
-    @article.downvotes.size # => 0
+    @article.dislikes.size # => 0
 
 To check if a voter has voted on a model, you can use ``voted_for?``.  You can
 check how the voter voted by using ``voted_as_when_voted_for``.
@@ -133,13 +120,13 @@ Voters can only vote once per model.  In this example the 2nd vote does not coun
 because @user has already voted for @shoe.
 
     @user.likes @shoe
-    @user.upvotes @shoe
+    @user.likes @shoe
 
     @shoe.votes # => 1
     @shoe.likes # => 1
 
 To check if a vote counted, or registered, use vote_registered? on your model
-directly after voting.  For example:
+after voting.  For example:
 
     @hat.liked_by @user
     @hat.vote_registered? # => true
@@ -181,20 +168,18 @@ to speed up @post we would use the following migration:
 
 All tests follow the RSpec format and are located in the spec directory
 
-## Thanks
-
-A huge thank you to Michael Bleigh and his Acts-As-Taggable-On gem.  I learned
-how to write gems by following his source code.
-
 ## TODO
 
+- 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.
 
 - Need to test a model that is votable as well as a voter
 
-- The aliased functions are referred to by using the terms 'up/down' amd/or
-'true/false'.  Need to come up with guidelines for naming these function.
+- 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.

data/acts_as_votable.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
 
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "sqlite3"
 
   s.add_dependency "rails", '>=3.0.0'
 

data/lib/acts_as_votable.rb

@@ -3,19 +3,14 @@ require 'active_support/inflector'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'acts_as_votable/init/init'
-require 'acts_as_votable/init/votable'
-require 'acts_as_votable/init/voter'
-require 'acts_as_votable/votable'
-require 'acts_as_votable/voter'
-require 'acts_as_votable/alias'
-
 module ActsAsVotable
 
   if defined?(ActiveRecord::Base)
+    require 'acts_as_votable/extenders/votable'
+    require 'acts_as_votable/extenders/voter'
     require 'acts_as_votable/vote'
-    ActiveRecord::Base.extend ActsAsVotable::Init::Votable
-    ActiveRecord::Base.extend ActsAsVotable::Init::Voter
+    ActiveRecord::Base.extend ActsAsVotable::Extenders::Votable
+    ActiveRecord::Base.extend ActsAsVotable::Extenders::Voter
   end
 
 end

data/lib/acts_as_votable/extenders/votable.rb

@@ -0,0 +1,25 @@
+module ActsAsVotable
+  module Extenders
+
+    module Votable
+
+      def votable?
+        false
+      end
+
+      def acts_as_votable
+        require 'acts_as_votable/votable'
+        include ActsAsVotable::Votable
+
+        class_eval do
+          def self.votable?
+            true
+          end
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/acts_as_votable/extenders/voter.rb

@@ -0,0 +1,24 @@
+module ActsAsVotable
+  module Extenders
+
+    module Voter
+
+      def voter?
+        false
+      end
+
+      def acts_as_voter(*args)
+        require 'acts_as_votable/voter'
+        include ActsAsVotable::Voter
+
+        class_eval do
+          def self.voter?
+            true
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/acts_as_votable/helpers/words.rb

@@ -0,0 +1,36 @@
+module ActsAsVotable::Helpers
+
+  # this helper provides methods that help find what words are 
+  # up votes and what words are down votes
+  #
+  # It can be called 
+  #
+  # votable_object.votable_words.that_mean_true
+  #
+  module Words
+
+    def votable_words
+      VotableWords
+    end
+
+  end
+
+  class VotableWords
+
+    def self.that_mean_true
+      ['up', 'upvote', 'like', 'liked', 'positive', 'yes', 'good', 'true', 1, true]
+    end
+
+    def self.that_mean_false
+      ['down', 'downvote', 'dislike', 'disliked', 'negative', 'no', 'bad', 'false', 0, false]
+    end
+
+    # check is word is a true or bad vote
+    # if the word is unknown, then it counts it as a true/good
+    # vote.  this exists to allow all voting to be good by default
+    def self.meaning_of word
+      !that_mean_false.include?(word)
+    end
+
+  end
+end

data/lib/acts_as_votable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsVotable
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/acts_as_votable/votable.rb

@@ -1,147 +1,181 @@
+require 'acts_as_votable/helpers/words'
+
 module ActsAsVotable
   module Votable
 
-    def self.included(base)
-      base.send :include, ActsAsVotable::Votable::InstanceMethods
-      # base.extend ActsAsVotable::Votable::ClassMethods
-    end
+    include Helpers::Words
 
+    def self.included base
+ 
+      # allow the user to define these himself 
+      aliases = {
 
-    module ClassMethods
-    end
+        :vote_up => [
+          :up_by, :upvote_by, :like_by, :liked_by, :vote_by, 
+          :up_from, :upvote_from, :like_from, :liked_from, :vote_from 
+        ],
 
-    module InstanceMethods
+        :vote_down => [
+          :down_by, :downvote_by, :dislike_by, :disliked_by,
+          :down_from, :downvote_by, :dislike_by, :disliked_by
+        ],
 
-      attr_accessor :vote_registered
+        :up_votes => [
+          :true_votes, :ups, :upvotes, :likes, :positives, :for_votes,
+        ],
 
-      def vote_registered?
-        return self.vote_registered
-      end
+        :down_votes => [
+          :false_votes, :downs, :downvotes, :dislikes, :negatives
+        ]
 
-      def default_conditions
-        {
-          :votable_id => self.id,
-          :votable_type => self.class.name
-        }
-      end
+      }
 
-      # voting
-      def vote args = {}
+      base.class_eval do
 
-        options = ActsAsVotable::Vote.default_voting_args.merge(args)
-        self.vote_registered = false
+        belongs_to :votable, :polymorphic => true
 
-        if options[:voter].nil?
-          return false
+        aliases.each do |method, links|
+          links.each do |new_method|
+            alias_method(new_method, method)
+          end
         end
 
-        # find the vote
-        votes = find_votes({
-            :voter_id => options[:voter].id,
-            :voter_type => options[:voter].class.name
-          })
-
-        if votes.count == 0
-          # this voter has never voted
-          vote = ActsAsVotable::Vote.new(
-            :votable => self,
-            :voter => options[:voter]
-          )
-        else
-          # this voter is potentially changing his vote
-          vote = votes.first
-        end
+      end
+    end
+
+    attr_accessor :vote_registered
 
-        last_update = vote.updated_at
+    def vote_registered?
+      return self.vote_registered
+    end
 
-        vote.vote_flag = ActsAsVotable::Vote.word_is_a_vote_for(options[:vote])
+    def default_conditions
+      {
+        :votable_id => self.id,
+        :votable_type => self.class.name
+      }
+    end
 
-        if vote.save
-          self.vote_registered = true if last_update != vote.updated_at
-          update_cached_votes
-          return true
-        else
-          self.vote_registered = false
-          return false
-        end
+    # voting
+    def vote args = {}
 
-       
-      end
+      options = {
+        :vote => true,
+      }.merge(args)
+
+      self.vote_registered = false
 
-      def vote_up voter
-        self.vote :voter => voter, :vote => true
+      if options[:voter].nil?
+        return false
       end
 
-      def vote_down voter
-        self.vote :voter => voter, :vote => false
+      # find the vote
+      votes = find_votes({
+        :voter_id => options[:voter].id,
+        :voter_type => options[:voter].class.name
+      })
+
+      if votes.count == 0
+        # this voter has never voted
+        vote = ActsAsVotable::Vote.new(
+          :votable => self,
+          :voter => options[:voter]
+        )
+        # redefine type if this object has a type.  this is to deal
+        # with sti classes
+        vote.votable_type = type if respond_to?(:type) && !type.blank?
+      else
+        # this voter is potentially changing his vote
+        vote = votes.first
       end
 
-      # caching
-      def update_cached_votes
+      last_update = vote.updated_at
 
-        updates = {}
+      vote.vote_flag = votable_words.meaning_of(options[:vote])
 
-        if self.respond_to?(:cached_votes_total=)
-          updates[:cached_votes_total] = count_votes_total(true)
-        end
+      if vote.save
+        self.vote_registered = true if last_update != vote.updated_at
+        update_cached_votes
+        return true
+      else
+        self.vote_registered = false
+        return false
+      end
 
-        if self.respond_to?(:cached_votes_up=)
-          updates[:cached_votes_up] = count_votes_up(true)
-        end
+    end
 
-        if self.respond_to?(:cached_votes_down=)
-          updates[:cached_votes_down] = count_votes_down(true)
-        end
+    def vote_up voter
+      self.vote :voter => voter, :vote => true
+    end
 
-        self.update_attributes(updates) if updates.size > 0
+    def vote_down voter
+      self.vote :voter => voter, :vote => false
+    end
 
-      end
+    # caching
+    def update_cached_votes
 
+      updates = {}
 
-      # results
-      def find_votes extra_conditions = {}
-        ActsAsVotable::Vote.find(:all, :conditions => default_conditions.merge(extra_conditions))
+      if self.respond_to?(:cached_votes_total=)
+        updates[:cached_votes_total] = count_votes_total(true)
       end
-      alias :votes :find_votes
 
-      def up_votes
-        find_votes(:vote_flag => true)
+      if self.respond_to?(:cached_votes_up=)
+        updates[:cached_votes_up] = count_votes_up(true)
       end
 
-      def down_votes
-        find_votes(:vote_flag => false)
+      if self.respond_to?(:cached_votes_down=)
+        updates[:cached_votes_down] = count_votes_down(true)
       end
 
+      self.update_attributes(updates) if updates.size > 0
 
-      # counting
-      def count_votes_total skip_cache = false
-        if !skip_cache && self.respond_to?(:cached_votes_total)
-          return self.send(:cached_votes_total)
-        end
-        find_votes.size
-      end
+    end
 
-      def count_votes_up skip_cache = false
-        if !skip_cache && self.respond_to?(:cached_votes_up)
-          return self.send(:cached_votes_up)
-        end
-        up_votes.size
+
+    # results
+    def find_votes extra_conditions = {}
+      ActsAsVotable::Vote.find(:all, :conditions => default_conditions.merge(extra_conditions))
+    end
+    alias :votes :find_votes
+
+    def up_votes
+      find_votes(:vote_flag => true)
+    end
+
+    def down_votes
+      find_votes(:vote_flag => false)
+    end
+
+
+    # counting
+    def count_votes_total skip_cache = false
+      if !skip_cache && self.respond_to?(:cached_votes_total)
+        return self.send(:cached_votes_total)
       end
+      find_votes.size
+    end
 
-      def count_votes_down skip_cache = false
-        if !skip_cache && self.respond_to?(:cached_votes_down)
-          return self.send(:cached_votes_down)
-        end
-        down_votes.size
+    def count_votes_up skip_cache = false
+      if !skip_cache && self.respond_to?(:cached_votes_up)
+        return self.send(:cached_votes_up)
       end
+      up_votes.size
+    end
 
-      # voters
-      def voted_on_by? voter
-        votes = find_votes :voter_id => voter.id, :voter_type => voter.class.name
-        votes.size > 0
+    def count_votes_down skip_cache = false
+      if !skip_cache && self.respond_to?(:cached_votes_down)
+        return self.send(:cached_votes_down)
       end
+      down_votes.size
+    end
 
+    # voters
+    def voted_on_by? voter
+      votes = find_votes :voter_id => voter.id, :voter_type => voter.class.name
+      votes.size > 0
     end
 
   end
-end
+end

data/lib/acts_as_votable/vote.rb

@@ -1,6 +1,10 @@
+require 'acts_as_votable/helpers/words'
+
 module ActsAsVotable
   class Vote < ::ActiveRecord::Base
 
+    include Helpers::Words
+
     attr_accessible :votable_id, :votable_type,
       :voter_id, :voter_type,
       :votable, :voter,
@@ -12,28 +16,6 @@ module ActsAsVotable
     validates_presence_of :votable_id
     validates_presence_of :voter_id
 
-    def self.true_votes
-      ['up', 'upvote', 'like', 'liked', 'positive', 'yes', 'good', 'true', 1, true]
-    end
-
-    def self.false_votes
-      ['down', 'downvote', 'dislike', 'disliked', 'negative', 'no', 'bad', 'false', 0, false]
-    end
-
-    ##
-    # check is word is a true or bad vote
-    # if the word is unknown, then it counts it as a true/good
-    # vote.  this exists to allow all voting to be good by default
-    def self.word_is_a_vote_for word
-      !false_votes.include? word
-    end
-
-    def self.default_voting_args
-      {
-        :vote => true,
-      }
-    end
-
   end
 
 end

data/lib/acts_as_votable/voter.rb

@@ -2,76 +2,86 @@ module ActsAsVotable
   module Voter
 
     def self.included(base)
-      base.send :include, ActsAsVotable::Voter::InstanceMethods
-    end
 
+      # allow user to define these
+      aliases = {
+        :vote_up_for => [:likes, :upvotes, :up_votes],
+        :vote_down_for => [:dislikes, :downvotes, :down_votes]
+      }
 
-    module ClassMethods
-    end
+      base.class_eval do
 
-    module InstanceMethods
+        belongs_to :voter, :polymorphic => true
 
-      def default_conditions
-        {
-          :voter_id => self.id,
-          :voter_type => self.class.name
-        }
-      end
+        aliases.each do |method, links|
+          links.each do |new_method|
+            alias_method(new_method, method)
+          end
+        end
 
-      # voting
-      def vote args
-        args[:votable].vote args.merge({:voter => self})
       end
 
-      def vote_up_for model
-        vote :votable => model, :vote => true
-      end
+    end
 
-      def vote_down_for model
-        vote :votable => model, :vote => false
-      end
+    def default_conditions
+      {
+        :voter_id => self.id,
+        :voter_type => self.class.name
+      }
+    end
 
-      # results
-      def voted_on? votable
-        votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name)
-        votes.size > 0
-      end
-      alias :voted_for? :voted_on?
+    # voting
+    def vote args
+      args[:votable].vote args.merge({:voter => self})
+    end
 
-      def voted_as_when_voting_on votable
-        votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name)
-        return nil if votes.size == 0
-        return votes.first.vote_flag
-      end
-      alias :voted_as_when_voting_for :voted_as_when_voting_on
+    def vote_up_for model
+      vote :votable => model, :vote => true
+    end
 
-      
-      def find_votes extra_conditions = {}
-        ActsAsVotable::Vote.find(:all, :conditions => default_conditions.merge(extra_conditions))
-      end
-      alias :votes :find_votes
+    def vote_down_for model
+      vote :votable => model, :vote => false
+    end
 
-      def find_up_votes
-        find_votes :vote_flag => true
-      end
+    # results
+    def voted_on? votable
+      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name)
+      votes.size > 0
+    end
+    alias :voted_for? :voted_on?
 
-      def find_down_votes
-        find_votes :vote_flag => false
-      end
+    def voted_as_when_voting_on votable
+      votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.name)
+      return nil if votes.size == 0
+      return votes.first.vote_flag
+    end
+    alias :voted_as_when_voting_for :voted_as_when_voting_on
 
-      def find_votes_for_class klass, extra_conditions = {}
-        find_votes extra_conditions.merge({:votable_type => klass.name})
-      end
+    def find_votes extra_conditions = {}
+      ActsAsVotable::Vote.find(:all, :conditions => default_conditions.merge(extra_conditions))
+    end
+    alias :votes :find_votes
 
-      def find_up_votes_for_class klass
-        find_votes_for_class klass, :vote_flag => true
-      end
+    def find_up_votes
+      find_votes :vote_flag => true
+    end
 
-      def find_down_votes_for_class klass
-        find_votes_for_class klass, :vote_flag => false
-      end
+    def find_down_votes
+      find_votes :vote_flag => false
+    end
+
+    def find_votes_for_class klass, extra_conditions = {}
+      find_votes extra_conditions.merge({:votable_type => klass.name})
+    end
+
+    def find_up_votes_for_class klass
+      find_votes_for_class klass, :vote_flag => true
+    end
 
+    def find_down_votes_for_class klass
+      find_votes_for_class klass, :vote_flag => false
     end
 
+ 
   end
-end
+end

data/spec/spec_helper.rb

@@ -28,6 +28,16 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string :name
   end
 
+  create_table :sti_votables do |t|
+    t.string :name
+    t.string :type
+  end
+
+  create_table :sti_not_votables do |t|
+    t.string :name
+    t.string :type
+  end
+
   create_table :not_votables do |t|
     t.string :name
   end
@@ -55,6 +65,21 @@ class Votable < ActiveRecord::Base
   validates_presence_of :name
 end
 
+class StiVotable < ActiveRecord::Base
+  acts_as_votable
+end
+
+class ChildOfStiVotable < StiVotable
+end
+
+class StiNotVotable < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+class VotableChildOfStiNotVotable < StiNotVotable
+  acts_as_votable
+end
+
 class NotVotable < ActiveRecord::Base
 end
 
@@ -75,4 +100,4 @@ def clean_database
   models.each do |model|
     ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
   end
-end
+end

data/spec/votable_spec.rb

@@ -111,8 +111,6 @@ describe ActsAsVotable::Votable do
       votable2.vote_registered?.should be false
     end
 
-
-
     describe "with cached votes" do
 
       before(:each) do
@@ -170,7 +168,34 @@ describe ActsAsVotable::Votable do
 
     end
 
+    describe "sti models" do
+
+      before(:each) do
+        clean_database
+        @voter = Voter.create(:name => 'i can vote!')
+      end
+
+      it "should be able to vote on a votable child of a non votable sti model" do
+        votable = VotableChildOfStiNotVotable.create(:name => 'sti child')
+
+        votable.vote :voter => @voter, :vote => 'yes'
+        votable.votes.size.should == 1
+      end
+
+      it "should not be able to vote on a parent non votable" do
+        StiNotVotable.should_not be_votable
+      end
+
+      it "should be able to vote on a child when its parent is votable" do
+        votable = ChildOfStiVotable.create(:name => 'sti child')
+
+        votable.vote :voter => @voter, :vote => 'yes'
+        votable.votes.size.should == 1
+      end
+
+    end
+
   end
 
 
-end
+end

data/spec/words_spec.rb

@@ -0,0 +1,30 @@
+require 'acts_as_votable'
+require 'spec_helper'
+
+describe ActsAsVotable::Helpers::Words do
+
+  before :each do
+    @vote = ActsAsVotable::Vote.new
+  end
+
+  it "should know that like is a true vote" do
+    @vote.votable_words.that_mean_true.should include "like"
+  end
+
+  it "should know that bad is a false vote" do
+    @vote.votable_words.that_mean_false.should include "bad"
+  end
+
+  it "should be a vote for true when word is good" do
+    @vote.votable_words.meaning_of('good').should be true
+  end
+
+  it "should be a vote for false when word is down" do
+    @vote.votable_words.meaning_of('down').should be false
+  end
+
+  it "should be a vote for true when the word is unknown" do
+    @vote.votable_words.meaning_of('lsdhklkadhfs').should be true
+  end
+
+end

metadata

@@ -1,60 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: acts_as_votable
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Ryan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-09 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2950990 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *2950990
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2950780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2950780
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2950530 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2950530
 description: Rails gem to allowing records to be votable
-email: 
+email:
 - ryanto
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -62,56 +58,45 @@ files:
 - Rakefile
 - acts_as_votable.gemspec
 - lib/acts_as_votable.rb
-- lib/acts_as_votable/alias.rb
-- lib/acts_as_votable/init/init.rb
-- lib/acts_as_votable/init/votable.rb
-- lib/acts_as_votable/init/voter.rb
+- lib/acts_as_votable/extenders/votable.rb
+- lib/acts_as_votable/extenders/voter.rb
+- lib/acts_as_votable/helpers/words.rb
 - lib/acts_as_votable/version.rb
 - lib/acts_as_votable/votable.rb
 - lib/acts_as_votable/vote.rb
 - lib/acts_as_votable/voter.rb
 - lib/generators/acts_as_votable/migration/migration_generator.rb
 - lib/generators/acts_as_votable/migration/templates/active_record/migration.rb
-- spec/alias_spec.rb
 - spec/spec_helper.rb
 - spec/votable_spec.rb
-- spec/vote_spec.rb
 - spec/voter_spec.rb
-has_rdoc: true
+- spec/words_spec.rb
 homepage: http://rubygems.org/gems/acts_as_votable
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: acts_as_votable
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Rails gem to allowing records to be votable
-test_files: 
-- spec/alias_spec.rb
+test_files:
 - spec/spec_helper.rb
 - spec/votable_spec.rb
-- spec/vote_spec.rb
 - spec/voter_spec.rb
+- spec/words_spec.rb

data/lib/acts_as_votable/alias.rb

@@ -1,14 +0,0 @@
-module ActsAsVotable::Alias
-
-  def self.words_to_alias object, words, call_function
-    words.each do |word|
-      if word.is_a?(String)
-        function = word.to_sym
-        if !object.respond_to?(function)
-          object.send(:alias_method, function, call_function)
-        end
-      end
-    end
-  end
-
-end

data/lib/acts_as_votable/init/init.rb

@@ -1,5 +0,0 @@
-module ActsAsVotable
-  module Init
-    
-  end
-end

data/lib/acts_as_votable/init/votable.rb

@@ -1,39 +0,0 @@
-module ActsAsVotable::Init
-  
-  module Votable
-
-    def votable?
-      false
-    end
-
-    def acts_as_votable(*args)
-
-      class_eval do
-        belongs_to :votable, :polymorphic => true
-
-        def self.votable?
-          true
-        end
-
-        include ActsAsVotable::Votable
-
-      end
-
-      # aliasing
-
-      # voting
-      ActsAsVotable::Alias::words_to_alias self, %w(up_by upvote_by like_by liked_by vote_by), :vote_up
-      ActsAsVotable::Alias::words_to_alias self, %w(up_from upvote_from like_from liked_from vote_from), :vote_up
-      ActsAsVotable::Alias::words_to_alias self, %w(down_by downvote_by dislike_by disliked_by), :vote_down
-      ActsAsVotable::Alias::words_to_alias self, %w(down_from downvote_from dislike_from disliked_from), :vote_down
-
-      # finding
-      ActsAsVotable::Alias::words_to_alias self, %w(true_votes ups upvotes likes positives), :up_votes
-      ActsAsVotable::Alias::words_to_alias self, %w(false_votes downs downvotes dislikes negatives), :down_votes
-
-    end
-
-
-  end
-
-end

data/lib/acts_as_votable/init/voter.rb

@@ -1,30 +0,0 @@
-module ActsAsVotable::Init
-
-  # voter
-  module Voter
-
-    def voter?
-      false
-    end
-
-    def acts_as_voter(*args)
-
-      class_eval do
-        belongs_to :voter, :polymorphic => true
-
-        def self.voter?
-          true
-        end
-
-        include ActsAsVotable::Voter
-
-        ActsAsVotable::Alias::words_to_alias self, %w(likes upvotes up_votes), :vote_up_for
-        ActsAsVotable::Alias::words_to_alias self, %w(dislikes downvotes down_votes), :vote_down_for
-
-      end
-
-    end
-
-  end
-
-end

data/spec/alias_spec.rb

@@ -1,64 +0,0 @@
-require 'acts_as_votable'
-require 'spec_helper'
-
-describe ActsAsVotable::Alias do
-
-  before(:each) do
-    clean_database
-  end
-
-  describe "votable models" do
-
-    before(:each) do
-      clean_database
-      @votable = Votable.new(:name => 'votable with aliases')
-      @votable.save
-
-      @voter = Voter.new(:name => 'a voter')
-      @voter.save
-    end
-
-    it "should alias a bunch of functions" do
-      
-      # voting
-      @votable.respond_to?(:disliked_by).should be true
-      @votable.respond_to?(:up_from).should be true
-
-      # results
-      @votable.respond_to?(:upvotes).should be true
-      @votable.respond_to?(:ups).should be true
-      @votable.respond_to?(:dislikes).should be true
-
-    end
-
-    it "should add callable functions" do
-      @votable.vote :voter => @voter
-      @votable.likes.size.should == 1
-    end
-  end
-
-  describe "voter models" do
-
-    before(:each) do
-      clean_database
-      @votable = Votable.new(:name => 'a votable')
-      @votable.save
-
-      @voter = Voter.new(:name => 'a voter with aliases')
-      @voter.save
-    end
-
-    it "should alias a bunch of functions" do
-      @voter.respond_to?(:upvotes).should be true
-      @voter.respond_to?(:dislikes).should be true
-    end
-
-    it "should add callable functions" do
-      @voter.likes @votable
-      @votable.likes.size.should == 1
-    end
-  end
-
-
-
-end

data/spec/vote_spec.rb

@@ -1,34 +0,0 @@
-require 'acts_as_votable'
-require 'spec_helper'
-
-describe ActsAsVotable::Vote do
-
-  it "should know that like is a true vote" do
-    ActsAsVotable::Vote.true_votes.should include "like"
-  end
-
-  it "should know that bad is a false vote" do
-    ActsAsVotable::Vote.false_votes.should include "bad"
-  end
-
-  it "should be a vote for true when word is good" do
-    ActsAsVotable::Vote.word_is_a_vote_for('good').should be true
-  end
-
-  it "should be a vote for false when word is down" do
-    ActsAsVotable::Vote.word_is_a_vote_for('down').should be false
-  end
-
-  it "should be a vote for true when the word is unknown" do
-    ActsAsVotable::Vote.word_is_a_vote_for('lsdhklkadhfs').should be true
-  end
-
-  it "should have vote=>true in the default voting args" do
-    ActsAsVotable::Vote.default_voting_args[:vote].should be true
-  end
-
-
-
-
-
-end