redmine_crm 0.0.36 → 0.0.37

data/test/acts_as_votable/rcrm_acts_as_votable_test.rb

@@ -1,12 +1,14 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class RcrmActsAsVotableTest < ActiveSupport::TestCase
-  def test_not_be_votable
-    assert !NotVotable.votable?, false
+
+  class NotVotable < ActiveRecord::Base; end
+  def test_that_votable_returns_false_unless_included
+    assert_equal NotVotable.votable?, false
   end
 
-  def test_be_votable
-    assert Votable.votable?, true
+  def test_that_votable_returns_true_if_included
+    assert_equal Votable.votable?, true
   end
 
   def test_behaves_like_votable_model

data/test/acts_as_votable/rcrm_acts_as_voter_test.rb

@@ -1,12 +1,14 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class RcrmActsAsVoterTest < ActiveSupport::TestCase
-  def test_not_be_votable
-    assert !NotVoter.voter?, false
+
+  class NotVoter < ActiveRecord::Base; end
+  def test_that_voter_returns_false_unless_included
+    assert_equal NotVoter.voter?, false
   end
 
-  def test_be_voter
-    assert Voter.voter?, true
-    assert VotableVoter.voter?, true
+  def test_that_voter_returns_true_if_included
+    assert_equal Voter.voter?, true
+    assert_equal VotableVoter.voter?, true
   end
 end

data/test/acts_as_votable/votable_test.rb

@@ -111,7 +111,7 @@ class VotableTest < ActiveSupport::TestCase
     assert votable.vote_registered?
   end
 
-  def test_not_count_the_vote_as_being_registered_if_that_voter_has_alredy_voted_and_voted_has_not_chanded
+  def test_not_count_the_vote_as_being_registered_if_that_voter_has_already_voted_and_voted_has_not_changed
     votable.vote_by(:voter => voters(:voter), :vote => true)
     votable.vote_by(:voter => voters(:voter), :vote => 'yes')
     assert !votable.vote_registered?

data/test/database.yml

@@ -1,21 +1,17 @@
-mysql:
-  :adapter: mysql2
-  :host: localhost
-  :username: root
-  :password: 1
-  :database: rails_plugin_test
+sqlite:
+  adapter: sqlite3
+  database: ':memory:'
 
-sqlite3:
-  :adapter: sqlite3
-  :database: ':memory:'
+mysql:
+  adapter: mysql2
+  database: redmine_crm_test
+  username: root
+  password: password
+  host: 127.0.0.1
 
 postgresql:
-  :adapter: postgresql
-  :database: rails_plugin_test
-  :user: container
-  :password: 1
-  :host: localhost
-
-default_env:
-  adapter: sqlite3
-  database: ':memory:'
+  adapter: postgresql
+  database: redmine_crm_test
+  user: postgres
+  password: password
+  host: 127.0.0.1

data/test/models/issue.rb

@@ -0,0 +1,14 @@
+require_relative 'project'
+require_relative 'user'
+
+class Issue < ActiveRecord::Base
+  belongs_to :project
+  belongs_to :user
+  belongs_to :author, class_name: 'User'
+
+  rcrm_acts_as_draftable
+  rcrm_acts_as_taggable
+  rcrm_acts_as_viewed
+
+  scope :visible, lambda { where('1=1') }
+end

data/test/{fixtures → models}/vote_classes.rb

@@ -2,10 +2,6 @@ class Voter < ActiveRecord::Base
   rcrm_acts_as_voter
 end
 
-class NotVoter < ActiveRecord::Base
-
-end
-
 class Votable < ActiveRecord::Base
   rcrm_acts_as_votable
   validates_presence_of :name
@@ -31,23 +27,7 @@ class VotableChildOfStiNotVotable < StiNotVotable
   rcrm_acts_as_votable
 end
 
-class NotVotable < ActiveRecord::Base
-end
-
 class VotableCache < ActiveRecord::Base
   rcrm_acts_as_votable
   validates_presence_of :name
 end
-
-class ABoringClass
-  def self.hw
-    'hello world'
-  end
-end
-
-# def clean_database
-#   models = [ActsAsVotable::Vote, Voter, NotVoter, Votable, NotVotable, VotableCache]
-#   models.each do |model|
-#     ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
-#   end
-# end

data/test/schema.rb

@@ -1,4 +1,12 @@
-ActiveRecord::Schema.define :version => 0 do
+ActiveRecord::Schema.define version: 0 do
+
+  create_table :drafts, force: true do |t|
+    t.string :target_type
+    t.references :user
+    t.references :parent, polymorphic: true
+    t.binary :data
+    t.datetime :updated_at
+  end
 
   create_table "tags", :force => true do |t|
     t.column "name", :string

data/test/test_helper.rb

@@ -1,40 +1,13 @@
+require 'rails/all'
+require 'redmine_crm'
 require 'minitest/autorun'
-require 'byebug'
-# require 'test/unit'
-
-begin
-  require File.dirname(__FILE__) + '/../../../../config/environment'
-rescue LoadError
-  require 'rubygems'
-  gem 'activerecord'
-  gem 'actionpack'
-  require 'active_record'
-end
-require "redmine_crm"
-require "active_record/fixtures"
-
-require File.dirname(__FILE__) + '/../lib/redmine_crm/acts_as_taggable/tag'
-require File.dirname(__FILE__) + '/../lib/redmine_crm/acts_as_taggable/tag_list'
-require File.dirname(__FILE__) + '/../lib/redmine_crm/acts_as_taggable/tagging'
-require File.dirname(__FILE__) + '/../lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable'
-require File.dirname(__FILE__) + '/../lib/redmine_crm/helpers/tags_helper'
-require File.dirname(__FILE__) + '/../lib/redmine_crm/acts_as_votable/rcrm_acts_as_votable'
-require File.dirname(__FILE__) + '/../lib/redmine_crm/acts_as_votable/rcrm_acts_as_voter'
-
-# require_dependency File.dirname(__FILE__) + '/../lib/redmine_crm/tags_helper'
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/debug.log')
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[ENV['DB'] || 'sqlite3'])
+ActiveRecord::Base.configurations = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
+ActiveRecord::Base.establish_connection(ENV['DB'].try(:to_sym) || :sqlite)
 
 load(File.dirname(__FILE__) + '/schema.rb')
-load(File.dirname(__FILE__) + '/fixtures/user.rb')
-load(File.dirname(__FILE__) + '/fixtures/issue.rb')
-load(File.dirname(__FILE__) + '/fixtures/vote_classes.rb')
-load(File.dirname(__FILE__) + '/fixtures/news.rb')
-load(File.dirname(__FILE__) + '/fixtures/project.rb')
-
-# Dir["/fixtures/*.rb"].each{|file| load file}
+Dir.glob(File.expand_path('../models/*.rb', __FILE__)).each { |f| require f }
 
 class ActiveSupport::TestCase #:nodoc:
   include ActiveRecord::TestFixtures
@@ -76,31 +49,6 @@ class ActiveSupport::TestCase #:nodoc:
     end
   end
 
-  # def assert_queries(num = 1)
-  #   $query_count = 0
-  #   yield
-  # ensure
-  #   assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
-  # end
-
-  # def assert_queries(num = 1, options = {})
-  #   ignore_none = options.fetch(:ignore_none) { num == :any }
-  #   SQLCounter.clear_log
-  #   yield
-  # ensure
-  #   the_log = ignore_none ? SQLCounter.log_all : SQLCounter.log
-  #   if num == :any
-  #     assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
-  #   else
-  #     mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{the_log.join("\n")}"}"
-  #     assert_equal num, the_log.size, mesg
-  #   end
-  # end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-
   # From Rails trunk
   def assert_difference(expressions, difference = 1, message = nil, &block)
     expression_evaluations = [expressions].flatten.collect{ |expression| lambda { eval(expression, block.binding) } }

data/vendor/assets/javascripts/select2_helpers.js

@@ -0,0 +1,39 @@
+var oldToggleFilter = window.toggleFilter;
+
+window.toggleFilter = function (field) {
+    oldToggleFilter(field);
+    return transform_to_select2(field);
+};
+
+function formatStateWithAvatar(opt) {
+    return $('<span>' + opt.avatar + '&nbsp;' + opt.text + '</span>');
+};
+
+var select2Filters = {};
+
+function transform_to_select2(field) {
+    field = field.replace('.', '_');
+    var filter = select2Filters[field];
+    if (filter !== undefined && $('#tr_' + field + ' .values .select2').size() == 0) {
+        $('#tr_' + field + ' .toggle-multiselect').hide();
+        $('#tr_' + field + ' .values .value').attr('multiple', 'multiple');
+        $('#tr_' + field + ' .values .value').select2({
+            ajax: {
+                url: filter['url'],
+                dataType: 'json',
+                delay: 250,
+                data: function (params) {
+                    return {q: params.term};
+                },
+                processResults: function (data, params) {
+                    return {results: data};
+                },
+                cache: true
+            },
+            placeholder: ' ',
+            minimumInputLength: filter['minimumInputLength'],
+            width: filter['width'],
+            templateResult: filter['formatState']
+        });
+    }
+};

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.6.4
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common libraries for RedmineUP plugins (www.redmineup.com) for Redmine.
   Requered Redmine from http://redmine.org
 email:
@@ -41,6 +97,8 @@ files:
 - doc/CHANGELOG
 - doc/LICENSE.txt
 - lib/redmine_crm.rb
+- lib/redmine_crm/acts_as_draftable/draft.rb
+- lib/redmine_crm/acts_as_draftable/rcrm_acts_as_draftable.rb
 - lib/redmine_crm/acts_as_list/list.rb
 - lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb
 - lib/redmine_crm/acts_as_taggable/tag.rb
@@ -70,6 +128,8 @@ files:
 - lib/redmine_crm/money_helper.rb
 - lib/redmine_crm/version.rb
 - redmine_crm.gemspec
+- test/acts_as_draftable/draft_test.rb
+- test/acts_as_draftable/rcrm_acts_as_draftable_test.rb
 - test/acts_as_taggable/rcrm_acts_as_taggable_test.rb
 - test/acts_as_taggable/tag_list_test.rb
 - test/acts_as_taggable/tag_test.rb
@@ -81,28 +141,27 @@ files:
 - test/acts_as_votable/voter_test.rb
 - test/currency_test.rb
 - test/database.yml
-- test/fixtures/issue.rb
 - test/fixtures/issues.yml
-- test/fixtures/news.rb
 - test/fixtures/news.yml
-- test/fixtures/project.rb
 - test/fixtures/projects.yml
 - test/fixtures/taggings.yml
 - test/fixtures/tags.yml
-- test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/fixtures/votable_caches.yml
 - test/fixtures/votables.yml
-- test/fixtures/vote_classes.rb
 - test/fixtures/voters.yml
 - test/liquid/drops/issues_drop_test.rb
-- test/liquid/drops/liquid_test.rb
 - test/liquid/drops/news_drop_test.rb
 - test/liquid/drops/projects_drop_test.rb
 - test/liquid/drops/uses_drop_test.rb
 - test/liquid/filters/arrays_filter_test.rb
 - test/liquid/filters/base_filter_test.rb
 - test/liquid/liquid_helper.rb
+- test/models/issue.rb
+- test/models/news.rb
+- test/models/project.rb
+- test/models/user.rb
+- test/models/vote_classes.rb
 - test/money_helper_test.rb
 - test/schema.rb
 - test/tags_helper_test.rb
@@ -111,6 +170,7 @@ files:
 - vendor/assets/images/vcard.png
 - vendor/assets/javascripts/Chart.bundle.min.js
 - vendor/assets/javascripts/select2.js
+- vendor/assets/javascripts/select2_helpers.js
 - vendor/assets/stylesheets/select2.css
 homepage: ''
 licenses:
@@ -137,6 +197,8 @@ signing_key:
 specification_version: 4
 summary: Common libraries for RedmineUP plugins for Redmine
 test_files:
+- test/acts_as_draftable/draft_test.rb
+- test/acts_as_draftable/rcrm_acts_as_draftable_test.rb
 - test/acts_as_taggable/rcrm_acts_as_taggable_test.rb
 - test/acts_as_taggable/tag_list_test.rb
 - test/acts_as_taggable/tag_test.rb
@@ -148,28 +210,27 @@ test_files:
 - test/acts_as_votable/voter_test.rb
 - test/currency_test.rb
 - test/database.yml
-- test/fixtures/issue.rb
 - test/fixtures/issues.yml
-- test/fixtures/news.rb
 - test/fixtures/news.yml
-- test/fixtures/project.rb
 - test/fixtures/projects.yml
 - test/fixtures/taggings.yml
 - test/fixtures/tags.yml
-- test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/fixtures/votable_caches.yml
 - test/fixtures/votables.yml
-- test/fixtures/vote_classes.rb
 - test/fixtures/voters.yml
 - test/liquid/drops/issues_drop_test.rb
-- test/liquid/drops/liquid_test.rb
 - test/liquid/drops/news_drop_test.rb
 - test/liquid/drops/projects_drop_test.rb
 - test/liquid/drops/uses_drop_test.rb
 - test/liquid/filters/arrays_filter_test.rb
 - test/liquid/filters/base_filter_test.rb
 - test/liquid/liquid_helper.rb
+- test/models/issue.rb
+- test/models/news.rb
+- test/models/project.rb
+- test/models/user.rb
+- test/models/vote_classes.rb
 - test/money_helper_test.rb
 - test/schema.rb
 - test/tags_helper_test.rb