redmine_crm 0.0.23 → 0.0.25

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
@@ -67,13 +65,12 @@ module RedmineCrm
         create_index votes_name_table, [:votable_id, :votable_type, :vote_scope]
       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,18 +68,14 @@ 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
-        })
+        votes_for = find_votes_for(:voter_id => options[:voter].id,
+                                   :vote_scope => options[:vote_scope],
+                                   :voter_type => options[:voter].class.base_class.name)
 
-        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,
@@ -92,14 +84,14 @@ module RedmineCrm
           )
         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
@@ -110,33 +102,34 @@ module RedmineCrm
           self.vote_registered = false
           return false
         end
-
       end
 
-      def unvote args = {}
+      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)
+        votes_for = find_votes_for(:voter_id => args[:voter].id,
+                                   :vote_scope => args[:vote_scope],
+                                   :voter_type => args[:voter].class.base_class.name)
 
-        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={}
+      def vote_up(voter, options = {})
         self.vote_by :voter => voter, :vote => true, :vote_scope => options[:vote_scope], :vote_weight => options[:vote_weight]
       end
 
-      def vote_down voter, options={}
+      def vote_down(voter, options = {})
         self.vote_by :voter => voter, :vote => false, :vote_scope => options[:vote_scope], :vote_weight => options[:vote_weight]
       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 = {})
+        self.unvote :voter => voter, :vote_scope => options[:vote_scope] # Does not need vote_weight since the votes_for are anyway getting destroyed
       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=)
@@ -241,53 +233,50 @@ module RedmineCrm
         end
 
         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,25 @@ 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
+                        :voter_id, :voter_type,
+                        :votable, :voter,
+                        :vote_flag, :vote_scope
       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) }
+      scope :by_type,  lambda { |klass| where(:voter_type => klass) }
 
       validates_presence_of :votable_id
       validates_presence_of :voter_id
-
     end
-
   end
 end

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

@@ -1,9 +1,7 @@
 module RedmineCrm
   module ActsAsVotable
     module Voter
-
       def self.included(base)
-
         # allow user to define these
         aliases = {
           :vote_up_for    => [:likes, :upvotes, :up_votes],
@@ -18,7 +16,6 @@ module RedmineCrm
         }
 
         base.class_eval do
-
           has_many :votes, :class_name => 'RedmineCrm::ActsAsVotable::Vote', :as => :voter, :dependent => :destroy do
             def votables
               includes(:votable).map(&:votable)
@@ -30,107 +27,105 @@ module RedmineCrm
               alias_method(new_method, method)
             end
           end
-
         end
-
       end
 
       # voting
-      def vote args
-        args[:votable].vote_by args.merge({:voter => self})
+      def vote(args)
+        args[:votable].vote_by args.merge(:voter => self)
       end
 
-      def vote_up_for model=nil, args={}
+      def vote_up_for(model = nil, args = {})
         vote :votable => model, :vote_scope => args[:vote_scope], :vote => true
       end
 
-      def vote_down_for model=nil, args={}
+      def vote_down_for(model = nil, args = {})
         vote :votable => model, :vote_scope => args[:vote_scope], :vote => false
       end
 
-      def unvote_for model, args={}
+      def unvote_for(model, args = {})
         model.unvote :voter => self, :vote_scope => args[:vote_scope]
       end
 
       # results
-      def voted_on? votable, args={}
+      def voted_on?(votable, args = {})
         votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                            :vote_scope => args[:vote_scope])
-        votes.size > 0
+        !votes.empty?
       end
 
-      def voted_up_on? votable, args={}
+      def voted_up_on?(votable, args = {})
         votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                            :vote_scope => args[:vote_scope], :vote_flag => true)
-        votes.size > 0
+        !votes.empty?
       end
 
-      def voted_down_on? votable, args={}
+      def voted_down_on?(votable, args = {})
         votes = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
                            :vote_scope => args[:vote_scope], :vote_flag => false)
-        votes.size > 0
+        !votes.empty?
       end
 
-      def voted_as_when_voting_on votable, args={}
+      def voted_as_when_voting_on(votable, args = {})
         vote = find_votes(:votable_id => votable.id, :votable_type => votable.class.base_class.name,
-                           :vote_scope => args[:vote_scope]).select(:vote_flag).last
+                          :vote_scope => args[:vote_scope]).select(:vote_flag).last
         return nil unless vote
-        return vote.vote_flag
+        vote.vote_flag
       end
 
-      def find_votes extra_conditions = {}
+      def find_votes(extra_conditions = {})
         votes.where(extra_conditions)
       end
 
-      def find_up_votes args={}
+      def find_up_votes(args = {})
         find_votes :vote_flag => true, :vote_scope => args[:vote_scope]
       end
 
-      def find_down_votes args={}
+      def find_down_votes(args = {})
         find_votes :vote_flag => false, :vote_scope => args[:vote_scope]
       end
 
-      def find_votes_for_class klass, extra_conditions = {}
-        find_votes extra_conditions.merge({:votable_type => klass.name})
+      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, args={}
+      def find_up_votes_for_class(klass, args = {})
         find_votes_for_class klass, :vote_flag => true, :vote_scope => args[:vote_scope]
       end
 
-      def find_down_votes_for_class klass, args={}
+      def find_down_votes_for_class(klass, args = {})
         find_votes_for_class klass, :vote_flag => false, :vote_scope => args[:vote_scope]
       end
 
       # Including polymporphic relations for eager loading
       def include_objects
-        ActsAsVotable::Vote.includes(:votable)
+        RedmineCrm::ActsAsVotable::Vote.includes(:votable)
       end
 
-      def find_voted_items extra_conditions = {}
+      def find_voted_items(extra_conditions = {})
         options = extra_conditions.merge :voter_id => id, :voter_type => self.class.base_class.name
         include_objects.where(options).collect(&:votable)
       end
 
-      def find_up_voted_items extra_conditions = {}
+      def find_up_voted_items(extra_conditions = {})
         find_voted_items extra_conditions.merge(:vote_flag => true)
       end
 
-      def find_down_voted_items extra_conditions = {}
+      def find_down_voted_items(extra_conditions = {})
         find_voted_items extra_conditions.merge(:vote_flag => false)
       end
 
-      def get_voted klass, extra_conditions = {}
+      def get_voted(klass, extra_conditions = {})
         klass.joins(:votes_for).merge find_votes(extra_conditions)
       end
 
-      def get_up_voted klass
+      def get_up_voted(klass)
         klass.joins(:votes_for).merge find_up_votes
       end
 
-      def get_down_voted klass
+      def get_down_voted(klass)
         klass.joins(:votes_for).merge find_down_votes
       end
     end
   end
-end
+end