redmine_crm 0.0.36 → 0.0.37

data/lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb

@@ -253,7 +253,7 @@ module RedmineCrm
           column_names.include?(cached_tag_list_column_name)
         end
 
-       private
+        private
 
         def quote_string_value(object)
           connection.quote(object)

data/lib/redmine_crm/acts_as_viewed/rcrm_acts_as_viewed.rb

@@ -146,7 +146,6 @@ module RedmineCrm
             target.total_views = ((target.total_views || 0) + 1)
             target.record_timestamps = false
             target.save(:validate => false, :touch => false)
-            # target.save_without_validation
           end
         end
 

data/lib/redmine_crm/acts_as_votable/votable.rb

@@ -85,21 +85,17 @@ module RedmineCrm
           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
         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 vote
-        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 = {})

data/lib/redmine_crm/helpers/form_tag_helper.rb

@@ -49,6 +49,37 @@ module RedmineCrm
 
     alias select2 select2_tag
 
+    # Transforms select filter field into select2
+    #
+    # ==== Examples
+    #   transform_to_select2 'issue_tags', url: auto_complete_tags_url
+    #   transform_to_select2 'manager_id', format_state: 'formatStateWithAvatar', min_input_length: 1, url: '/managers'
+    #
+    # ==== Options
+    # * <tt>:url</tt> Defines URL to search remote data using the ajax.
+    # * <tt>:format_state</tt> Defines template of search results in the drop-down.
+    # * <tt>:min_input_length</tt> Minimum number of characters required to start a search. Default value 0.
+    # * <tt>:width</tt> Sets the width of the control. Default value '60%'.
+    #
+    def transform_to_select2(field, options = {})
+      return if field.empty?
+
+      result = ''.html_safe
+      unless @transform_to_select2_included
+      result << javascript_include_tag('select2_helpers', plugin: 'redmine_crm')
+        @transform_to_select2_included = true
+      end
+
+      result << javascript_tag(<<-JS)
+          select2Filters['#{field}'] = {
+              url: '#{options[:url].to_s}',
+              formatState: #{options.fetch(:format_state, 'undefined')},
+              minimumInputLength: #{options.fetch(:min_input_length, 0)},
+              width: '#{options.fetch(:with, '60%')}'
+          };
+      JS
+    end
+
     private
 
     def select2_data_source_options(options = {})

data/lib/redmine_crm/money_helper.rb

@@ -1,5 +1,3 @@
-# byebug
-# require 'action_controller'
 require 'action_view'
 
 module RedmineCrm

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/redmine_crm.gemspec

@@ -18,5 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'liquid', "<2.6.4"
+  spec.add_runtime_dependency 'rails'
+  spec.add_runtime_dependency 'liquid', '< 2.6.4'
+
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'mysql2', '~> 0.4.0'
+  spec.add_development_dependency 'pg'
 end

data/test/acts_as_draftable/draft_test.rb

@@ -0,0 +1,29 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class DraftTest < ActiveSupport::TestCase
+  def test_restore
+    issue = Issue.new(subject: 'some subject', description: 'some description')
+
+    issue.save_draft(current_user)
+    restored_issue = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id).restore
+
+    assert_equal issue.subject, restored_issue.subject
+    assert_equal issue.description, restored_issue.description
+  end
+
+  def test_restore_all
+    first_issue = Issue.new(subject: 'first subject')
+    first_issue.save_draft(current_user)
+    second_issue = Issue.new(subject: 'second subject')
+    second_issue.save_draft(current_user)
+
+    restored_issues = RedmineCrm::ActsAsDraftable::Draft.restore_all
+    assert_equal [first_issue.subject, second_issue.subject], restored_issues.map(&:subject).sort
+  end
+
+  private
+
+  def current_user
+    users(:sam)
+  end
+end

data/test/acts_as_draftable/rcrm_acts_as_draftable_test.rb

@@ -0,0 +1,185 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class RcrmActsAsDraftableTest < ActiveSupport::TestCase
+  def test_rcrm_acts_as_draftable_without_arguments
+    assert_nothing_raised do
+      Project.rcrm_acts_as_draftable
+    end
+  end
+
+  class SomeClass < ActiveRecord::Base; end
+  def test_rcrm_acts_as_draftable_with_parent
+    assert_nothing_raised do
+      News.rcrm_acts_as_draftable(parent: :author)
+    end
+    assert User.new.respond_to?(:drafts)
+  end
+
+  def test_rcrm_acts_as_draftable_with_non_existing_parent
+    assert_raises do
+      Issue.rcrm_acts_as_draftable(parent: :foo)
+    end
+  end
+
+  def test_rcrm_acts_as_draftable_with_non_hash_argument
+    assert_raises do
+      Issue.rcrm_acts_as_draftable('bar')
+    end
+  end
+
+  def test_rcrm_acts_as_draftable_with_invalid_hash_key
+    assert_raises do
+      Issue.rcrm_acts_as_draftable(baz: 'qux')
+    end
+  end
+
+  def test_drafts
+    issue = Issue.new
+    issue.save_draft(current_user)
+
+    assert_equal 1, Issue.drafts(current_user).count
+    assert_equal RedmineCrm::ActsAsDraftable::Draft, Issue.drafts(current_user).first.class
+  end
+
+  def test_from_draft
+    issue = Issue.new(subject: 'subject')
+    issue.save_draft(current_user)
+
+    issue_from_draft = Issue.from_draft(issue.draft_id)
+
+    assert_equal Issue, issue_from_draft.class
+    assert_equal true, issue_from_draft.new_record?
+    assert_equal issue.draft_id, issue_from_draft.draft_id
+
+    assert_equal issue.subject, issue_from_draft.subject
+  end
+
+  def test_draft_deleted_after_save
+    issue = Issue.new(subject: 'subject')
+    issue.save_draft(current_user)
+
+    issue_from_draft = Issue.from_draft(issue.draft_id)
+
+    assert_difference 'Issue.count', 1 do
+      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', -1 do
+        issue_from_draft.save!
+      end
+    end
+    assert_nil issue_from_draft.draft_id
+  end
+
+  def test_from_draft_with_non_existing_draft_id
+    assert_raises do
+      Issue.from_draft(999)
+    end
+  end
+
+  def test_from_draft_with_wrong_type
+    Project.rcrm_acts_as_draftable
+
+    project = Project.new
+    project.save_draft(current_user)
+
+    assert_raises do
+      Issue.from_draft(project.draft_id)
+    end
+  end
+
+  def test_dump_to_draft
+    assert_equal String, Issue.new.dump_to_draft.class
+  end
+
+  def test_load_to_draft
+    attributes = {subject: 'subject', description: 'description'}
+    draft = Issue.new(attributes).dump_to_draft
+
+    issue = Issue.new
+    issue.load_from_draft(draft)
+
+    assert_equal attributes[:subject], issue.subject
+    assert_equal attributes[:description], issue.description
+  end
+
+  def test_save_draft
+    attributes = {subject: 'subject'}
+    issue = Issue.new(attributes)
+
+    assert_difference 'Issue.count', 0 do
+      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 1 do
+        result = issue.save_draft(current_user)
+        assert_equal true, result
+      end
+    end
+    assert_equal Fixnum, issue.draft_id.class
+
+
+    draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
+    assert_equal 'Issue', draft.target_type
+    assert_equal current_user.id, draft.user_id
+    assert_equal attributes[:subject], draft.restore.subject
+  end
+
+  def test_save_draft_without_user
+    issue = Issue.new
+
+    assert_difference 'Issue.count', 0 do
+      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 1 do
+        result = issue.save_draft
+        assert_equal true, result
+      end
+    end
+
+    draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
+    assert_nil draft.user_id
+  end
+
+  def test_save_draft_with_associations
+    issue = Issue.new(project: projects(:second_project))
+    issue.save_draft(current_user)
+
+    draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
+    assert_equal issue.project.name, draft.restore.project.name
+  end
+
+  def test_save_draft_updates_existing_draft
+    issue = Issue.new
+    issue.save_draft(current_user)
+
+    issue.subject = 'changed subject'
+    assert_difference 'Issue.count', 0 do
+      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 0 do
+        issue.save_draft(current_user)
+      end
+    end
+
+    draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
+    assert_equal issue.subject, draft.restore.subject
+  end
+
+  def test_save_draft_does_not_save_persisted_model
+    issue = Issue.new
+    issue.save_draft(current_user)
+    issue.save!
+    assert_equal false, issue.save_draft(current_user)
+  end
+
+  def test_update_draft
+    issue = Issue.new(subject: 'subject')
+    issue.save_draft(current_user)
+
+    assert_difference 'Issue.count', 0 do
+      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 0 do
+        issue.update_draft(current_user, subject: 'updated_subject')
+      end
+    end
+
+    draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
+    assert_equal issue.subject, draft.restore.subject
+  end
+
+  private
+
+  def current_user
+    users(:sam)
+  end
+end

data/test/acts_as_taggable/rcrm_acts_as_taggable_test.rb

@@ -221,9 +221,13 @@ class RcrmActsAsTaggableTest < ActiveSupport::TestCase
   end
 
   def test_tags_not_saved_if_validation_fails
-    assert_equivalent ["error", "question"], issues(:first_issue).tag_list
-    assert !issues(:first_issue).update_attributes(:tag_list => "One, Two", :description => "")
-    assert_equivalent ["error", "question"], Issue.find(issues(:first_issue).id).tag_list
+    issue = issues(:first_issue)
+    assert_equivalent ["error", "question"], issue.tag_list
+
+    issue.stub(:valid?, false) do
+      assert !issue.update_attributes(tag_list: "One, Two")
+    end
+    assert_equivalent ["error", "question"], Issue.find(issue.id).tag_list
   end
 
   def test_tag_list_accessors_on_new_record
@@ -291,10 +295,8 @@ class RcrmActsAsTaggableTest < ActiveSupport::TestCase
   end
 
   def test_find_tagged_with_using_sti
-    special_issue = SpecialIssue.create!(:description => 'Test', :tag_list => 'Random')
-
-    assert_equal [special_issue], SpecialIssue.find_tagged_with('Random')
-    assert SpecialIssue.find_tagged_with('Random').include?(special_issue)
+    issue = Issue.create!(description: 'Test', tag_list: 'Random')
+    assert_equal [issue], Issue.find_tagged_with('Random')
   end
 
   def test_case_insensitivity
@@ -329,10 +331,6 @@ class RcrmActsAsTaggableTest < ActiveSupport::TestCase
     RedmineCrm::ActsAsTaggable::Tag.destroy_unused = false
   end
 
-  def test_quote_value
-    assert_equal "'RedmineCrm::ActsAsTaggable::Tag'", Issue.send(:quote_value, RedmineCrm::ActsAsTaggable::Tag)
-  end
-
   def test_tags_condition
     assert_equal "(tags_TABLE.name LIKE #{tags(:feature).id} OR tags_TABLE.name LIKE #{tags(:bug).id})",
                  Issue.send(:tags_condition, [tags(:feature), tags(:bug)], 'tags_TABLE')

data/test/acts_as_taggable/tag_list_test.rb

@@ -1,38 +1,34 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-module RedmineCrm
-  module ActsAsTaggable
-    class TagListTest < ActiveSupport::TestCase
-      def setup
-        @tag_list = TagList.new(%w(error bug))
-      end
+class TagListTest < ActiveSupport::TestCase
+  def setup
+    @tag_list = RedmineCrm::ActsAsTaggable::TagList.new(%w(error bug))
+  end
 
-      def test_from
-        assert_equal %w(one two three), TagList.from('one, two, two, three, three, three')
-      end
+  def test_from
+    assert_equal %w(one two three), RedmineCrm::ActsAsTaggable::TagList.from('one, two, two, three, three, three')
+  end
 
-      def test_add
-        @tag_list.add(['new_tag'])
-        assert_equal %w(error bug new_tag), @tag_list
-      end
+  def test_add
+    @tag_list.add(['new_tag'])
+    assert_equal %w(error bug new_tag), @tag_list
+  end
 
-      def test_remove
-        @tag_list.remove(['old_tag'])
-        assert_equal %w(error bug), @tag_list
-        @tag_list.remove(['error'])
-        assert_equal %w(bug), @tag_list
-      end
+  def test_remove
+    @tag_list.remove(['old_tag'])
+    assert_equal %w(error bug), @tag_list
+    @tag_list.remove(['error'])
+    assert_equal %w(bug), @tag_list
+  end
 
-      def test_toggle
-        @tag_list.toggle(['new_tag'])
-        assert_equal %w(error bug new_tag), @tag_list
-        @tag_list.toggle(['error'])
-        assert_equal %w(bug new_tag), @tag_list
-      end
+  def test_toggle
+    @tag_list.toggle(['new_tag'])
+    assert_equal %w(error bug new_tag), @tag_list
+    @tag_list.toggle(['error'])
+    assert_equal %w(bug new_tag), @tag_list
+  end
 
-      def test_to_s
-        assert_equal 'error, bug', @tag_list.to_s
-      end
-    end
+  def test_to_s
+    assert_equal 'error, bug', @tag_list.to_s
   end
 end

data/test/acts_as_taggable/tag_test.rb

@@ -1,65 +1,72 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-module RedmineCrm
-  module ActsAsTaggable
-    class TagTest < ActiveSupport::TestCase
-      def test_find_or_create_with_like_by_name
-        assert_no_difference 'RedmineCrm::ActsAsTaggable::Tag.count' do
-          Tag.find_or_create_with_like_by_name('error')
-        end
-
-        assert_difference 'RedmineCrm::ActsAsTaggable::Tag.count', 1 do
-          Tag.find_or_create_with_like_by_name('new_tag')
-        end
-      end
+class TagTest < ActiveSupport::TestCase
+  def test_find_or_create_with_like_by_name
+    assert_no_difference 'RedmineCrm::ActsAsTaggable::Tag.count' do
+      RedmineCrm::ActsAsTaggable::Tag.find_or_create_with_like_by_name('error')
+    end
 
-      def test_name_required
-        t = Tag.create
-        assert_match /blank/, t.errors[:name].to_s
-      end
+    assert_difference 'RedmineCrm::ActsAsTaggable::Tag.count', 1 do
+      RedmineCrm::ActsAsTaggable::Tag.find_or_create_with_like_by_name('new_tag')
+    end
+  end
 
-      def test_name_unique
-        t = Tag.create!(:name => 'My tag')
-        duplicate = t.dup
-        assert !duplicate.save
-        assert_match /not uniq/, duplicate.errors[:name].to_s
-      end
+  def test_name_required
+    tag = RedmineCrm::ActsAsTaggable::Tag.new
+    tag.valid?
+    assert_match /blank/, tag.errors[:name].to_s
+  end
 
-      def test_taggings
-        assert_equivalent [taggings(:tag_for_error), taggings(:tag_for_error1), taggings(:tag_for_error2)], tags(:error).taggings
-        assert_equivalent [taggings(:tag_for_question1), taggings(:tag_for_question2), taggings(:tag_for_question3)], tags(:question).taggings
-      end
+  def test_name_unique
+    tag = RedmineCrm::ActsAsTaggable::Tag.create!(name: 'My tag')
+    tag_with_same_name = tag.dup
+    assert !tag_with_same_name.valid?
+    assert_match /not uniq/, tag_with_same_name.errors[:name].to_s
+  end
 
-      def test_to_s
-        assert_equal tags(:error).name, tags(:error).to_s
-      end
+  def test_taggings
+    assert_equivalent [taggings(:tag_for_error), taggings(:tag_for_error1), taggings(:tag_for_error2)], tags(:error).taggings
+    assert_equivalent [taggings(:tag_for_question1), taggings(:tag_for_question2), taggings(:tag_for_question3)], tags(:question).taggings
+  end
 
-      def test_equality
-        assert_equal tags(:error), tags(:error)
-        assert_equal Tag.find(tags(:error).id), Tag.find(tags(:error).id)
-        assert_equal Tag.new(:name => 'A'), Tag.new(:name => 'A')
-        assert_not_equal Tag.new(:name => 'A'), Tag.new(:name => 'B')
-      end
+  def test_to_s
+    assert_equal tags(:error).name, tags(:error).to_s
+  end
 
-      def test_taggings_removed_when_tag_destroyed
-        assert_difference("Tagging.count", -Tagging.where(:tag_id => tags(:error).id).count) do
-          assert tags(:error).destroy
-        end
-      end
+  def test_tag_is_equal_to_itself
+    tag = tags(:error)
+    assert_equal tag, tag
+  end
 
-      def test_all_counts
-        assert_tag_counts Tag.counts, :error => 3, :feature => 1, :bug => 1, :question => 3
-      end
+  def test_tag_is_equal_to_tag_with_same_name
+    tag = tags(:error)
+    assert_equal tag, tag.dup
+  end
 
-      def test_all_counts_with_string_conditions
-        assert_tag_counts Tag.counts(:conditions => 'taggings.created_at >= \'2015-01-01\''),
-          :question => 3, :error => 2, :feature => 1, :bug => 1
-      end
+  def test_tag_is_not_equal_to_tag_with_other_name
+    tag = tags(:error)
+    other_tag = tag.dup
+    other_tag.name = 'not error'
+    assert_not_equal tag, other_tag
+  end
 
-      def test_all_counts_with_array_conditions
-        assert_tag_counts Tag.counts(:conditions => ['taggings.created_at >= ?', '2015-01-01']),
-          :question => 3, :error => 2, :feature => 1, :bug => 1
-      end
+  def test_taggings_removed_when_tag_destroyed
+    assert_difference("RedmineCrm::ActsAsTaggable::Tagging.count", -RedmineCrm::ActsAsTaggable::Tagging.where(tag_id: tags(:error).id).count) do
+      assert tags(:error).destroy
     end
   end
+
+  def test_all_counts
+    assert_tag_counts RedmineCrm::ActsAsTaggable::Tag.counts, error: 3, feature: 1, bug: 1, question: 3
+  end
+
+  def test_all_counts_with_string_conditions
+    assert_tag_counts RedmineCrm::ActsAsTaggable::Tag.counts(conditions: 'taggings.created_at >= \'2015-01-01\''),
+      question: 3, error: 2, feature: 1, bug: 1
+  end
+
+  def test_all_counts_with_array_conditions
+    assert_tag_counts RedmineCrm::ActsAsTaggable::Tag.counts(conditions: ['taggings.created_at >= ?', '2015-01-01']),
+      question: 3, error: 2, feature: 1, bug: 1
+  end
 end