redmine_crm 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191f70c5ba08d5ecc851be60c8094e17c5578f8b
-  data.tar.gz: 80038c165458eaa1858f10c360b61b8bc6bbc632
+  metadata.gz: 6525848b0cfe3df65dcbf1ea5903e2ec780ba6e2
+  data.tar.gz: 9ef776d6118e3998256da878882d7635c798306d
 SHA512:
-  metadata.gz: 66e4cc18a95a45af2322642a586a5fe69dd561b7f813fbeb42150f184b39fd604b2d51ce4eb3290216e54f83b4dbf39e89c92e41e81c540d137a9231bc19de67
-  data.tar.gz: e6324a2cbc82d9e8fa7792102d1bc9e3cc5dc4bb20acab99da79c0982b0a380e0557314b9005f0ffa98b2e1d704f1b817c092ca403c242fddcc4f8d12d9000d9
+  metadata.gz: dda3c0995a07c820d329891e3346a713ce561a2810b95cec21faee00457aaba9a068fa4f53df6008ed07ba03d39c929c972bf63f615dd57dacb4cb6eaee74c1f
+  data.tar.gz: 122d384d961f9724a3c696caa9178e977138180e4179d802e44bbd9ca685e9c113277deadf400c882421c5e99fd9d2a7a77e6c12c36a0ff60e4ce217e33feb6f

data/doc/CHANGELOG

@@ -1,8 +1,16 @@
 == Redmine CRM gem changelog
 
 Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2016 RedmineUP
-http://www.redminecrm.com/
+Copyright (C) 2011-2017 RedmineUP
+https://www.redmineup.com/
+
+== 2017-03-13 v0.0.27
+
+* Added IP to Votes
+
+== 2017-03-10 v0.0.26
+
+* Liquid gem with base filters and drops for Redmine objects
 
 == 2016-11-12 v0.0.24
 

data/lib/redmine_crm/acts_as_votable/rcrm_acts_as_votable.rb

@@ -35,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
@@ -46,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)
@@ -57,12 +59,14 @@ 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 = {})

data/lib/redmine_crm/acts_as_votable/votable.rb

@@ -71,16 +71,17 @@ module RedmineCrm
         return false if options[:voter].nil?
 
         # find the vote
-        votes_for = 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_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_scope => options[:vote_scope],
+            :vote_ip => options[:vote_ip]
           )
         else
           # this voter is potentially changing his vote
@@ -97,7 +98,7 @@ module RedmineCrm
         if vote.save
           self.vote_registered = true if last_update != vote.updated_at
           update_cached_votes options[:vote_scope]
-          return true
+          return vote
         else
           self.vote_registered = false
           return false
@@ -105,10 +106,10 @@ module RedmineCrm
       end
 
       def unvote(args = {})
-        return false if args[:voter].nil?
-        votes_for = find_votes_for(:voter_id => args[:voter].id,
-                                   :vote_scope => args[:vote_scope],
-                                   :voter_type => args[:voter].class.base_class.name)
+        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_for.empty?
         votes_for.each(&:destroy)
@@ -117,16 +118,22 @@ module RedmineCrm
         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
+        # 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)

data/lib/redmine_crm/acts_as_votable/vote.rb

@@ -7,9 +7,10 @@ module RedmineCrm
 
       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,
+          :vote_ip
       end
 
       belongs_to :votable, :polymorphic => true

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

data/redmine_crm.gemspec

@@ -6,10 +6,10 @@ require 'redmine_crm/version'
 Gem::Specification.new do |spec|
   spec.name          = "redmine_crm"
   spec.version       = RedmineCrm::VERSION
-  spec.authors       = ["RedmineCRM"]
+  spec.authors       = ["RedmineUP"]
   spec.email         = ["support@redminecrm.com"]
-  spec.summary       = %q{Common libraries for RedmineCRM plugins for Redmine}
-  spec.description   = %q{Common libraries for RedmineCRM plugins for Redmine. Requered Redmine from http://redmine.org}
+  spec.summary       = %q{Common libraries for RedmineUP plugins for Redmine}
+  spec.description   = %q{Common libraries for RedmineUP plugins (www.redmineup.com) for Redmine. Requered Redmine from http://redmine.org}
   spec.homepage      = ""
   spec.license       = "GPL2"
 

data/test/acts_as_votable/votable_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class VotableTest < ActiveSupport::TestCase
-
   def votable
     votables(:votable)
   end
@@ -15,6 +14,36 @@ class VotableTest < ActiveSupport::TestCase
     assert_equal votable.votes_for.size, 1
   end
 
+  def test_have_vote_when_saved_by_id
+    votable.vote_by(:voter => voters(:voter), :vote => "yes", :vote_ip => '127.0.0.1')
+    assert_equal votable.votes_for.size, 1
+    assert_equal votable.votes_for.last.vote_ip, '127.0.0.1'
+  end
+
+  def test_voted_twice_by_one_ip
+    votable.vote_by(:voter => voters(:voter), :vote => "yes", :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    votable.vote_by(:voter => voters(:voter), :vote => "no", :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    assert_equal votable.votes_for.size, 1
+  end
+
+  def test_voted_twice_by_one_ip_with_duplicate_params
+    votable.vote_by(:voter => voters(:voter), :vote => "yes", :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    votable.vote_by(:voter => voters(:voter), :vote => "no", :vote_ip => '127.0.0.1', :vote_by_ip => true, :duplicate => true)
+    assert_equal votable.votes_for.size, 2
+  end
+
+  def test_one_scoped_vote_by_ip_when_using_scope_by_same_person
+    votable.vote_by(:voter => voters(:voter), :vote => 'yes', :vote_scope => 'rank', :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    votable.vote_by(:voter => voters(:voter), :vote => 'yes', :vote_scope => 'rank', :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    assert_equal votable.find_votes_for(:vote_scope => 'rank').size, 1
+  end
+
+  def test_two_votes_for_when_voting_on_two_diff_scopes
+    votable.vote_by(:voter => voters(:voter), :vote => 'yes', :vote_scope => 'weekly_rank', :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    votable.vote_by(:voter => voters(:voter), :vote => 'yes', :vote_scope => 'monthly_rank', :vote_ip => '127.0.0.1', :vote_by_ip => true)
+    assert_equal votable.votes_for.size, 2
+  end
+
   def test_voted_twice_by_same_person
     votable.vote_by(:voter => voters(:voter), :vote => "yes")
     votable.vote_by(:voter => voters(:voter), :vote => "no")

data/test/schema.rb

@@ -36,6 +36,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.boolean "vote_flag"
     t.string "vote_scope"
     t.integer "vote_weight"
+    t.string "vote_ip"
 
     t.timestamps
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
-- RedmineCRM
+- RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -24,8 +24,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.6.4
-description: Common libraries for RedmineCRM plugins for Redmine. Requered Redmine
-  from http://redmine.org
+description: Common libraries for RedmineUP plugins (www.redmineup.com) for Redmine.
+  Requered Redmine from http://redmine.org
 email:
 - support@redminecrm.com
 executables: []
@@ -126,7 +126,7 @@ rubyforge_project:
 rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
-summary: Common libraries for RedmineCRM plugins for Redmine
+summary: Common libraries for RedmineUP plugins for Redmine
 test_files:
 - test/acts_as_taggable/rcrm_acts_as_taggable_test.rb
 - test/acts_as_taggable/tag_list_test.rb