redmine_crm 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5242b016d5072c81150cb2008b3fc7633a96216f
-  data.tar.gz: b3f77eb78ff97c6c06ef28e57b8d17af8d7f8e34
+  metadata.gz: b05a60d81fa656ebd71d75aa3871db0025c63242
+  data.tar.gz: 3ce1eb527b7b90f316bf5d0883b8d129b12d5045
 SHA512:
-  metadata.gz: ef26d5b1ee5e367ef7240ca961cdeb3bbaaf75b0af6c2c68f779b988302998cd2ee2b69c7a21ac48b22ea18f6ffb141cfa42afb033ca1dc7c0389cd97b395aa4
-  data.tar.gz: f0779bd48b8225c24411e243b4dcb7a8b17b359e51dc57dd894c57f9388e3dcdc3316edd9ee67fb48b223828246025dc083b2034e157cb02d550c4d2c338dde1
+  metadata.gz: 8673d2669a5948e9cc52cf1a294f3d4c6aafa8ff60a3c8346e02ceb03347909b15d5bfb70aa5cca9b7a8e0700f8dd9766924e4612b9cc4beb59e41b5f7d4b3c1
+  data.tar.gz: c99defa93349703c1e4bb22c87bb86de377a1c12b073f091e71da2246c64137684aac82d667bb9c6056d62c54ba928a4592f169f298d311605fdbd81c7e0a22d

data/doc/CHANGELOG

@@ -4,6 +4,10 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2017 RedmineUP
 https://www.redmineup.com/
 
+== 2017-12-22 v0.0.34
+
+* Fixed bug with Redmine 2.x support
+
 == 2017-12-18 v0.0.33
 
 * Rails 5 support (Redmine 4)

data/lib/redmine_crm.rb

@@ -27,7 +27,7 @@ require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/assets_manager'
 
 if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.include(RedmineCrm::ActsAsList::List)
+  ActiveRecord::Base.send :include, RedmineCrm::ActsAsList::List
   ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Voter)
   ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Votable)
 end

data/lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb

@@ -231,10 +231,11 @@ module RedmineCrm
           # scope(:find)
 
           conditions = []
-          conditions << send(:sanitize_sql, options.delete(:conditions)) if options[:conditions]
-          conditions << send(:sanitize_sql, scope) if scope
+          conditions << send(:sanitize_sql_for_assignment, options.delete(:conditions)) if options[:conditions]
+          conditions << send(:sanitize_sql_for_assignment, scope) if scope
           conditions << "#{Tagging.table_name}.taggable_type = #{quote_string_value(base_class.name)}"
           conditions << type_condition unless descends_from_active_record?
+          conditions.delete('')
           conditions.compact!
           conditions = conditions.join(" AND ")
 
@@ -253,6 +254,7 @@ module RedmineCrm
         end
 
        private
+
         def quote_string_value(object)
           connection.quote(object)
         end

data/lib/redmine_crm/acts_as_votable/vote.rb

@@ -18,8 +18,8 @@ module RedmineCrm
 
       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 :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

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

data/test/acts_as_taggable/rcrm_acts_as_taggable_test.rb

@@ -175,8 +175,8 @@ class RcrmActsAsTaggableTest < ActiveSupport::TestCase
     options = Issue.find_options_for_tag_counts(:start_at => 2.weeks.ago, :end_at => Date.today)
     sql = options.values.join(' ')
 
-    assert_no_match /taggings/, sql
-    assert_no_match /tags/, sql
+    assert_no_match %r{taggings}, sql
+    assert_no_match %r{tags}, sql
 
     assert_match /categorisations/, sql
     assert_match /categories/, sql
@@ -330,7 +330,7 @@ class RcrmActsAsTaggableTest < ActiveSupport::TestCase
   end
 
   def test_quote_value
-    assert_equal "'RedmineCrm::ActsAsTaggable::Tag'", Issue.send(:quote_value, RedmineCrm::ActsAsTaggable::Tag, nil)
+    assert_equal "'RedmineCrm::ActsAsTaggable::Tag'", Issue.send(:quote_value, RedmineCrm::ActsAsTaggable::Tag)
   end
 
   def test_tags_condition
@@ -342,6 +342,6 @@ class RcrmActsAsTaggableTest < ActiveSupport::TestCase
     issues(:first_issue).tag_list.remove('error')
     issues(:first_issue).tag_list.add('new')
     issues(:first_issue).save!
-    assert_equal %w(question new), issues(:first_issue).all_tags_list
+    assert_equal %w(question new), issues(:first_issue).reload.all_tags_list
   end
 end

data/test/acts_as_taggable/tag_test.rb

@@ -60,15 +60,6 @@ module RedmineCrm
         assert_tag_counts Tag.counts(:conditions => ['taggings.created_at >= ?', '2015-01-01']),
           :question => 3, :error => 2, :feature => 1, :bug => 1
       end
-
-      def test_all_counts_with_hash_conditions
-        tag_counts = Tag.counts(
-          :conditions => {
-            :taggings => { :created_at => (DateTime.parse('2014-12-31 23:59') .. DateTime.parse('4000-01-01')) }
-          }
-        )
-        assert_tag_counts tag_counts, :question => 3, :error => 2, :feature => 1, :bug => 1
-      end
     end
   end
 end

data/test/acts_as_votable/voter_test.rb

@@ -138,7 +138,7 @@ class VoterTest < ActiveSupport::TestCase
 
   def test_get_all_of_the_voters_up_votes_for_a_class
     votable.vote_by(:voter => voter)
-    votables(:votable2).vote_by( :voter => voter, :vote => false)
+    votables(:votable2).vote_by(:voter => voter, :vote => false)
     assert_equal voter.find_up_votes_for_class(votable_klass).size, 1
     assert_equal voter.votes.up.for_type(votable_klass).count, 1
   end

data/test/database.yml

@@ -15,3 +15,7 @@ postgresql:
   :user: container
   :password: 1
   :host: localhost
+
+default_env:
+  adapter: sqlite3
+  database: ':memory:'

data/test/fixtures/issue.rb

@@ -12,6 +12,10 @@ class Issue < ActiveRecord::Base
   def save_without_validation
     save
   end
+
+  def self.quote_value(value)
+    connection.quote(value)
+  end
 end
 
 class SpecialIssue < Issue

data/test/test_helper.rb

@@ -6,10 +6,9 @@ begin
   require File.dirname(__FILE__) + '/../../../../config/environment'
 rescue LoadError
   require 'rubygems'
-  gem 'activerecord', "4.2.7.1"
-  gem 'actionpack', "4.2.7.1"
+  gem 'activerecord'
+  gem 'actionpack'
   require 'active_record'
-  # require 'action_controller'
 end
 require "redmine_crm"
 require "active_record/fixtures"
@@ -40,10 +39,10 @@ load(File.dirname(__FILE__) + '/fixtures/project.rb')
 class ActiveSupport::TestCase #:nodoc:
   include ActiveRecord::TestFixtures
 
-  self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+  self.fixture_path = File.dirname(__FILE__) + '/fixtures/'
 
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
+  self.use_transactional_tests = true
+  self.use_instantiated_fixtures = false
   set_fixture_class :tags => RedmineCrm::ActsAsTaggable::Tag
   set_fixture_class :taggings => RedmineCrm::ActsAsTaggable::Tagging
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid