redmine_crm 0.0.23 → 0.0.43

data/lib/redmine_crm/acts_as_viewed/rcrm_acts_as_viewed.rb

@@ -0,0 +1,274 @@
+# Copyright (c) 2008 Damian Martinelli
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+module RedmineCrm
+  module ActsAsViewed #:nodoc:
+    # == acts_as_viewed
+    # Adds views count capabilities to any ActiveRecord object.
+    # It has the ability to work with objects that have or don't special fields to keep a tally of the
+    # viewings for each object.
+    # In addition it will by default use the User model as the viewer object and keep the viewings per-user.
+    # It can be configured to use another class.
+    # The IP address are used to not repeat views from the same ip. Only one view are count by user or IP.
+    #
+    # Special methods are provided to create the viewings table and if needed, to add the special fields needed
+    # to keep per-objects viewings fast for access to viewed objects. Can be easily used in migrations.
+    #
+    # == Example of usage:
+    #
+    #   class Video < ActiveRecord::Base
+    #     acts_as_viewed
+    #   end
+    #
+    #   In a controller:
+    #
+    #   bill = User.find_by_name 'bill'
+    #   batman = Video.find_by_title 'Batman'
+    #   toystory  = Video.find_by_title 'Toy Story'
+    #
+    #   batman.view request.remote_addr, bill
+    #   toystory.view  request.remote_addr, bill
+    #
+    #   batman.view_count     # => 1
+    #
+    #
+    module Viewed
+      class ViewedError < RuntimeError; end
+
+      def self.included(base) #:nodoc:
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        # Make the model viewable.
+        # The Viewing model, holding the details of the viewings, will be created dynamically if it doesn't exist.
+        #
+        # * Adds a <tt>has_many :viewings</tt> association to the model for easy retrieval of the detailed viewings.
+        # * Adds a <tt>has_many :viewers</tt> association to the object.
+        # * Adds a <tt>has_many :viewings</tt> associations to the viewer class.
+        #
+        # === Options
+        # * <tt>:viewing_class</tt> -
+        #   class of the model used for the viewings. Defaults to Viewing. This class will be dynamically created if not already defined.
+        #   If the class is predefined, it must have in it the following definitions:
+        #   <tt>belongs_to :viewed, :polymorphic => true</tt>
+        #   <tt>belongs_to :viewer, :class_name => 'User', :foreign_key => :viewer_id</tt> replace user with the viewer class if needed.
+        # * <tt>:viewer_class</tt> -
+        #   class of the model that creates the viewing.
+        #   Defaults to User This class will NOT be created, so it must be defined in the app.
+        #   Use the IP address to prevent multiple viewings from the same client.
+        #
+        def rcrm_acts_as_viewed(options = {})
+          # don't allow multiple calls
+          return if self.included_modules.include?(ActsAsViewed::Viewed::ViewMethods)
+          send :include, ActsAsViewed::Viewed::ViewMethods
+
+          # Create the model for ratings if it doesn't yet exist
+          viewing_class = options[:viewing_class] || 'Viewing'
+          viewer_class  = options[:viewer_class]  || 'User'
+
+          unless Object.const_defined?(viewing_class)
+            Object.class_eval <<-EOV
+              class #{viewing_class} < ActiveRecord::Base
+                belongs_to :viewed, polymorphic: true
+                belongs_to :viewer, class_name: '#{viewer_class}', foreign_key: :viewer_id
+              end
+            EOV
+          end
+
+          # Rails < 3
+          # write_inheritable_attribute( :acts_as_viewed_options ,
+          #                                { :viewing_class => viewing_class,
+          #                                  :viewer_class => viewer_class } )
+          # class_inheritable_reader :acts_as_viewed_options
+
+          # Rails >= 3
+          class_attribute :acts_as_viewed_options
+          self.acts_as_viewed_options = { :viewing_class => viewing_class,
+                                          :viewer_class => viewer_class }
+          class_eval do
+            has_many :viewings, as: :viewed, dependent: :delete_all, class_name: viewing_class.to_s
+            has_many :viewers, through: :viewings, class_name: viewer_class.to_s
+
+            before_create :init_viewing_fields
+          end
+
+          # Add to the User (or whatever the viewer is) a has_many viewings
+          viewer_as_class = viewer_class.constantize
+          return if viewer_as_class.instance_methods.include?('find_in_viewings')
+          viewer_as_class.class_eval do
+            has_many :viewings, foreign_key: :viewer_id, class_name: viewing_class.to_s, dependent: :delete_all
+          end
+        end
+      end
+
+      module ViewMethods
+        def self.included(base) #:nodoc:
+          base.extend ClassMethods
+        end
+
+        # Is this object viewed already?
+        def viewed?
+          return (!self.views.nil? && self.views > 0) if attributes.has_key? 'views'
+          !viewings.first.nil?
+        end
+
+        # Get the number of viewings for this object based on the views field,
+        # or with a SQL query if the viewed objects doesn't have the views field
+        def view_count
+          return ("#{self.total_views}(#{self.views})" || 0) if attributes.has_key? 'views'
+          viewings.count
+        end
+
+        # Change views count (total_views and views) if it's existing in object
+        # If options[:only_total] == true count of unique views doesn't change
+        def increase_views_count(options)
+          if attributes.has_key?('views') && attributes.has_key?('total_views')
+            target = self
+            target.views = ((target.views || 0) + 1) unless options[:only_total]
+            target.total_views = ((target.total_views || 0) + 1)
+            target.record_timestamps = false
+            target.save(:validate => false, :touch => false)
+          end
+        end
+
+        # View the object with or without a viewer - create new or update as needed
+        #
+        # * <tt>ip</tt> - the viewer ip
+        # * <tt>viewer</tt> - an object of the viewer class. Must be valid and with an id to be used. Or nil
+        def view(ip, viewer = nil)
+          # Sanity checks for the parameters
+          viewing_class = acts_as_viewed_options[:viewing_class].constantize
+          if viewer && !(acts_as_viewed_options[:viewer_class].constantize === viewer)
+            raise ViewedError, "the viewer object must be the one used when defining acts_as_viewed (or a descendent of it). other objects are not acceptable"
+          end
+
+          viewing_class.transaction do
+            if !viewed_by? ip, viewer
+              view = viewing_class.new
+              view.viewer_id = viewer.id if viewer && !viewer.id.nil?
+              view.ip = ip
+              viewings << view
+              view.save
+              increase_views_count(:only_total => false)
+            else
+              increase_views_count(:only_total => true)
+            end
+            true
+          end
+        end
+
+        # Check if an item was already viewed by the given viewer
+        def viewed_by?(ip, viewer = nil)
+          if viewer && !viewer.nil? && !(acts_as_viewed_options[:viewer_class].constantize === viewer)
+            raise ViewedError, "the viewer object must be the one used when defining acts_as_viewed (or a descendent of it). other objects are not acceptable"
+          end
+          if viewer && !viewer.id.nil? && !viewer.anonymous?
+            return viewings.where("viewer_id = '#{viewer.id}'").any?
+          else
+            return viewings.where("ip = '#{ip}'").any?
+          end
+        end
+
+        private
+
+        def init_viewing_fields #:nodoc:
+          self.views ||= 0 if attributes.has_key?('views')
+        end
+      end
+
+      module ClassMethods
+        # Generate the viewings columns on a table, to be used when creating the table
+        # in a migration. This is the preferred way to do in a migration that creates
+        # new tables as it will make it as part of the table creation, and not generate
+        # ALTER TABLE calls after the fact
+        def generate_viewings_columns(table)
+          table.column :views, :integer # uniq views
+          table.column :total_views, :integer
+        end
+
+        # Create the needed columns for acts_as_viewed.
+        # To be used during migration, but can also be used in other places.
+        def add_viewings_columns
+          if !self.content_columns.find { |c| 'views' == c.name }
+            self.connection.add_column table_name, :views, :integer, :default => '0'
+            self.connection.add_column table_name, :total_views, :integer, :default => '0'
+            self.reset_column_information
+          end
+        end
+
+        # Remove the acts_as_viewed specific columns added with add_viewings_columns
+        # To be used during migration, but can also be used in other places
+        def remove_viewings_columns
+          if self.content_columns.find { |c| 'views' == c.name }
+            self.connection.remove_column table_name, :views
+            self.connection.remove_column table_name, :total_views
+            self.reset_column_information
+          end
+        end
+
+        # Create the viewings table
+        # === Options hash:
+        # * <tt>:table_name</tt> - use a table name other than viewings
+        # To be used during migration, but can also be used in other places
+        def create_viewings_table(options = {})
+          name = options[:table_name] || :viewings
+          if !self.connection.table_exists?(name)
+            self.connection.create_table(name) do |t|
+              t.column :viewer_id,   :integer
+              t.column :viewed_id,   :integer
+              t.column :viewed_type, :string
+              t.column :ip, :string, :limit => '24'
+              t.column :created_at, :datetime
+            end
+
+            self.connection.add_index(name, :viewer_id)
+            self.connection.add_index(name, [:viewed_type, :viewed_id])
+          end
+        end
+
+        # Drop the viewings table.
+        # === Options hash:
+        # * <tt>:table_name</tt> - the name of the viewings table, defaults to viewings
+        # To be used during migration, but can also be used in other places
+        def drop_viewings_table(options = {})
+          name = options[:table_name] || :viewings
+          if self.connection.table_exists?(name)
+            self.connection.drop_table(name)
+          end
+        end
+
+        # Find all viewings for a specific viewer.
+        def find_viewed_by(viewer)
+          viewing_class = acts_as_viewed_options[:viewing_class].constantize
+          if !(acts_as_viewed_options[:viewer_class].constantize === viewer)
+            raise ViewedError, "The viewer object must be the one used when defining acts_as_viewed (or a descendent of it). other objects are not acceptable"
+          end
+          raise ViewedError, 'Viewer must be a valid and existing object' if viewer.nil? || viewer.id.nil?
+          raise ViewedError, 'Viewer must be a valid viewer' if !viewing_class.column_names.include?('viewer_id')
+          conds = ['viewed_type = ? AND viewer_id = ?', self.name, viewer.id]
+          acts_as_viewed_options[:viewing_class].constantize.where(conds).collect { |r| r.viewed_type.constantize.find_by_id r.viewed.id }
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, RedmineCrm::ActsAsViewed::Viewed

data/lib/redmine_crm/{rcrm_acts_as_votable.rb → acts_as_votable/rcrm_acts_as_votable.rb}

@@ -3,32 +3,30 @@ require 'active_record'
 module RedmineCrm
   module ActsAsVotable #:nodoc:
     module Votable #:nodoc:
-
       def votable?
         false
       end
 
       def rcrm_acts_as_votable
-        require 'redmine_crm/votable'
-        include ActsAsVotable::Votable
+        require 'redmine_crm/acts_as_votable/votable'
+        include RedmineCrm::ActsAsVotable::Votable
 
         class_eval do
           def self.votable?
             true
           end
         end
-
       end
 
       def create_index(table_name, column_name)
         return if self.connection.index_exists?(table_name, column_name)
-        
+
         self.connection.add_index table_name, column_name
       end
 
-      def create_votable_table options = {}
+      def create_votable_table(options = {})
         votes_name_table = options[:votes] || :votes
-          
+
         if !self.connection.table_exists?(votes_name_table)
           self.connection.create_table(votes_name_table) do |t|
             t.references :votable, :polymorphic => true
@@ -37,6 +35,7 @@ module RedmineCrm
             t.column :vote_flag, :boolean
             t.column :vote_scope, :string
             t.column :vote_weight, :integer
+            t.column :vote_ip, :string
 
             t.timestamps
           end
@@ -48,7 +47,8 @@ module RedmineCrm
             :voter_type => :string,
             :vote_flag => :boolean,
             :vote_scope => :string,
-            :vote_weight => :integer
+            :vote_weight => :integer,
+            :vote_ip => :string
           }
           fields.each do |name, type|
             if !self.connection.column_exists?(votes_name_table, name)
@@ -59,21 +59,22 @@ module RedmineCrm
         end
 
         if self.parent::VERSION::MAJOR < 4
-          create_index votes_name_table, [:votable_id, :votable_type]
-          create_index votes_name_table, [:voter_id, :voter_type]
+          create_index votes_name_table, [:votable_id, :votable_type, :vote_ip]
+          create_index votes_name_table, [:voter_id, :voter_type, :vote_ip]
         end
 
         create_index votes_name_table, [:voter_id, :voter_type, :vote_scope]
         create_index votes_name_table, [:votable_id, :votable_type, :vote_scope]
+        create_index votes_name_table, [:voter_type, :vote_scope, :vote_ip]
+        create_index votes_name_table, [:votable_type, :vote_scope, :vote_ip]
       end
 
-      def drop_votable_table options = {}
-        votes_name_table      = options[:votes] || :votes
+      def drop_votable_table(options = {})
+        votes_name_table = options[:votes] || :votes
         if self.connection.table_exists?(votes_name_table)
           self.connection.drop_table votes_name_table
         end
       end
-
     end
   end
-end
+end

data/lib/redmine_crm/acts_as_votable/rcrm_acts_as_voter.rb

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

data/lib/redmine_crm/{votable.rb → acts_as_votable/votable.rb}

@@ -3,11 +3,9 @@ require 'redmine_crm/helpers/vote_helper'
 module RedmineCrm
   module ActsAsVotable
     module Votable
-
       include ActsAsVotable::Helpers::Words
 
-      def self.included base
-
+      def self.included(base)
         # allow the user to define these himself
         aliases = {
 
@@ -45,14 +43,13 @@ module RedmineCrm
               alias_method(new_method, method)
             end
           end
-
         end
       end
 
       attr_accessor :vote_registered
 
       def vote_registered?
-        return self.vote_registered
+        self.vote_registered
       end
 
       def default_conditions
@@ -63,8 +60,7 @@ module RedmineCrm
       end
 
       # voting
-      def vote_by args = {}
-
+      def vote_by(args = {})
         options = {
           :vote => true,
           :vote_scope => nil
@@ -72,71 +68,68 @@ module RedmineCrm
 
         self.vote_registered = false
 
-        if options[:voter].nil?
-          return false
-        end
+        return false if options[:voter].nil?
 
         # find the vote
-        _votes_ = find_votes_for({
-          :voter_id => options[:voter].id,
-          :vote_scope => options[:vote_scope],
-          :voter_type => options[:voter].class.base_class.name
-        })
+        vote_conditions = { :vote_scope => options[:vote_scope], :voter_type => options[:voter].class.base_class.name }
+        vote_conditions.merge!(options[:vote_by_ip] ? { :vote_ip => options[:vote_ip] } : { :voter_id => options[:voter].id} )
+        votes_for = find_votes_for(vote_conditions)
 
-        if _votes_.count == 0 or options[:duplicate]
+        if votes_for.count == 0 || options[:duplicate]
           # this voter has never voted
-          vote = RedmineCrm::ActsAsVotable::Vote.new(
-            :votable => self,
-            :voter => options[:voter],
-            :vote_scope => options[:vote_scope]
-          )
+          vote_params = { :votable => self, :voter => options[:voter], :vote_scope => options[:vote_scope] }
+          vote_params[:vote_ip] = options[:vote_ip] if options[:vote_ip]
+          vote = RedmineCrm::ActsAsVotable::Vote.new(vote_params)
         else
           # this voter is potentially changing his vote
-          vote = _votes_.last
+          vote = votes_for.last
         end
 
-        last_update = vote.updated_at
-
         vote.vote_flag = votable_words.meaning_of(options[:vote])
 
-        #Allowing for a vote_weight to be associated with every vote. Could change with every voter object
+        # Allowing for a vote_weight to be associated with every vote. Could change with every voter object
         vote.vote_weight = (options[:vote_weight].to_i if options[:vote_weight].present?) || 1
 
-        if vote.save
-          self.vote_registered = true if last_update != vote.updated_at
-          update_cached_votes options[:vote_scope]
-          return true
-        else
-          self.vote_registered = false
-          return false
-        end
+        return false if vote.invalid?
 
+        self.vote_registered = vote.changed?
+        vote.save!(validate: false)
+        update_cached_votes(options[:vote_scope])
+        vote
       end
 
-      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.base_class.name)
+      def unvote(args = {})
+        return false if (!args[:vote_by_ip] && args[:voter].nil?) || (args[:vote_by_ip] && args[:vote_ip].nil?)
+        vote_conditions = { :vote_scope => args[:vote_scope], :voter_type => args[:voter].class.base_class.name }
+        vote_conditions.merge!(args[:vote_by_ip] ? { :vote_ip => args[:vote_ip] } : { :voter_id => args[:voter].id})
+        votes_for = find_votes_for(vote_conditions)
 
-        return true if _votes_.size == 0
-        _votes_.each(&:destroy)
+        return true if votes_for.empty?
+        votes_for.each(&:destroy)
         update_cached_votes args[:vote_scope]
         self.vote_registered = false if votes_for.count == 0
-        return true
+        true
       end
 
-      def vote_up voter, options={}
-        self.vote_by :voter => voter, :vote => true, :vote_scope => options[:vote_scope], :vote_weight => options[:vote_weight]
+      def vote_up(voter, options={})
+        self.vote_by :voter => voter, :vote => true,
+                     :vote_scope => options[:vote_scope], :vote_weight => options[:vote_weight], :vote_ip => options[:vote_ip],
+                     :vote_by_ip => options[:vote_by_ip]
       end
 
-      def vote_down voter, options={}
-        self.vote_by :voter => voter, :vote => false, :vote_scope => options[:vote_scope], :vote_weight => options[:vote_weight]
+      def vote_down(voter, options={})
+        self.vote_by :voter => voter, :vote => false,
+                     :vote_scope => options[:vote_scope], :vote_weight => options[:vote_weight], :vote_ip => options[:vote_ip],
+                     :vote_by_ip => options[:vote_by_ip]
       end
 
-      def unvote_by  voter, options = {}
-        self.unvote :voter => voter, :vote_scope => options[:vote_scope] #Does not need vote_weight since the votes_for are anyway getting destroyed
+      def unvote_by(voter, options = {})
+        # Does not need vote_weight since the votes_for are anyway getting destroyed
+        self.unvote :voter => voter, :vote_scope => options[:vote_scope], :vote_ip => options[:vote_ip],
+                    :vote_by_ip => options[:vote_by_ip]
       end
 
-      def scope_cache_field field, vote_scope
+      def scope_cache_field(field, vote_scope)
         return field if vote_scope.nil?
 
         case field
@@ -172,8 +165,7 @@ module RedmineCrm
       end
 
       # caching
-      def update_cached_votes vote_scope = nil
-
+      def update_cached_votes(vote_scope = nil)
         updates = {}
 
         if self.respond_to?(:cached_votes_total=)
@@ -239,55 +231,52 @@ module RedmineCrm
             updates[scope_cache_field :cached_weighted_average, vote_scope] = weighted_average(true, vote_scope)
           end
         end
-
+        self.record_timestamps = false
         if (::ActiveRecord::VERSION::MAJOR == 3) && (::ActiveRecord::VERSION::MINOR != 0)
-          self.update_attributes(updates, :without_protection => true) if updates.size > 0
+          self.update_attributes(updates, :without_protection => true) if !updates.empty?
         else
-          self.update_attributes(updates) if updates.size > 0
+          self.update_attributes(updates) if !updates.empty?
         end
-
       end
 
-
       # results
-      def find_votes_for extra_conditions = {}
+      def find_votes_for(extra_conditions = {})
         votes_for.where(extra_conditions)
       end
 
-      def get_up_votes options={}
+      def get_up_votes(options = {})
         vote_scope_hash = scope_or_empty_hash(options[:vote_scope])
         find_votes_for({:vote_flag => true}.merge(vote_scope_hash))
       end
 
-      def get_down_votes options={}
+      def get_down_votes(options = {})
         vote_scope_hash = scope_or_empty_hash(options[:vote_scope])
-        find_votes_for({:vote_flag => false}.merge(vote_scope_hash))
+        find_votes_for({ :vote_flag => false }.merge(vote_scope_hash))
       end
 
-
       # counting
-      def count_votes_total skip_cache = false, vote_scope = nil
+      def count_votes_total(skip_cache = false, vote_scope = nil)
         if !skip_cache && self.respond_to?(scope_cache_field :cached_votes_total, vote_scope)
           return self.send(scope_cache_field :cached_votes_total, vote_scope)
         end
         find_votes_for(scope_or_empty_hash(vote_scope)).count
       end
 
-      def count_votes_up skip_cache = false, vote_scope = nil
+      def count_votes_up(skip_cache = false, vote_scope = nil)
         if !skip_cache && self.respond_to?(scope_cache_field :cached_votes_up, vote_scope)
           return self.send(scope_cache_field :cached_votes_up, vote_scope)
         end
         get_up_votes(:vote_scope => vote_scope).count
       end
 
-      def count_votes_down skip_cache = false, vote_scope = nil
+      def count_votes_down(skip_cache = false, vote_scope = nil)
         if !skip_cache && self.respond_to?(scope_cache_field :cached_votes_down, vote_scope)
           return self.send(scope_cache_field :cached_votes_down, vote_scope)
         end
         get_down_votes(:vote_scope => vote_scope).count
       end
 
-      def weighted_total skip_cache = false, vote_scope = nil
+      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
@@ -296,7 +285,7 @@ module RedmineCrm
         ups + downs
       end
 
-      def weighted_score skip_cache = false, vote_scope = nil
+      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)
         end
@@ -305,7 +294,7 @@ module RedmineCrm
         ups - downs
       end
 
-      def weighted_average skip_cache = false, vote_scope = nil
+      def weighted_average(skip_cache = false, vote_scope = nil)
         if !skip_cache && self.respond_to?(scope_cache_field :cached_weighted_average, vote_scope)
           return self.send(scope_cache_field :cached_weighted_average, vote_scope)
         end
@@ -319,7 +308,7 @@ module RedmineCrm
       end
 
       # voters
-      def voted_on_by? voter
+      def voted_on_by?(voter)
         votes = find_votes_for :voter_id => voter.id, :voter_type => voter.class.base_class.name
         votes.count > 0
       end

data/lib/redmine_crm/{vote.rb → acts_as_votable/vote.rb}

@@ -3,28 +3,26 @@ require 'redmine_crm/helpers/vote_helper'
 module RedmineCrm
   module ActsAsVotable
     class Vote < ActiveRecord::Base
-
       include Helpers::Words
 
       if defined?(ProtectedAttributes) || ::ActiveRecord::VERSION::MAJOR < 4
         attr_accessible :votable_id, :votable_type,
           :voter_id, :voter_type,
           :votable, :voter,
-          :vote_flag, :vote_scope
+          :vote_flag, :vote_scope,
+          :vote_ip
       end
 
       belongs_to :votable, :polymorphic => true
       belongs_to :voter, :polymorphic => true
 
-      scope :up, lambda{ where(:vote_flag => true) }
-      scope :down, lambda{ where(:vote_flag => false) }
-      scope :for_type, lambda{ |klass| where(:votable_type => klass) }
-      scope :by_type,  lambda{ |klass| where(:voter_type => klass) }
+      scope :up, lambda { where(:vote_flag => true) }
+      scope :down, lambda { where(:vote_flag => false) }
+      scope :for_type, lambda { |klass| where(:votable_type => klass.to_s) }
+      scope :by_type,  lambda { |klass| where(:voter_type => klass.to_s) }
 
       validates_presence_of :votable_id
       validates_presence_of :voter_id
-
     end
-
   end
 end