redmine_crm 0.0.28 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e250724e907f5c6c3b2590d5bd59994d21bba4
-  data.tar.gz: 43d893aed3e87d16da19667b5a3705cc190d07aa
+  metadata.gz: cdec6b77ac05dfc60cd61d029f48518f10991435
+  data.tar.gz: b6df25550e4e7f9bb3c3ebce58d119f3ed08647e
 SHA512:
-  metadata.gz: 210d2487c18e8a6d9a540f889fc30b8631922cc9aef5c98856f4cd2ae5e2e6669ec43bc87359d27fd5d5f9463e185c00219308f2ea3a64f358b2faef477e83aa
-  data.tar.gz: 429c087175aba643771e724e8137b57875552b6026c2bcb5bce3f55f7dbab42c4275c26e1f802cc9a3203124b678732d857e94011b17655a5c70d1a7c0a12be3
+  metadata.gz: 5f03058fb24c1d3777387fc3febd8a6fd502c5f7c3e2e754c58a195b39289b45b3a9f767109551f1ff7c831c10abf1686899072310e0ae6b6d145fc3712dfe47
+  data.tar.gz: 3ae7e0950ff7fb8023340030a33c6cc713f2f89f272a580065b4bbd7357dc3503e8389fd89d767496b07f0ea558c382427add867b8ecd22fd2c6cac0f90cdec6

data/bitbucket-pipelines.yml

@@ -0,0 +1,17 @@
+# This is a sample build configuration for Ruby.
+# Check our guides at https://confluence.atlassian.com/x/8r-5Mw for more examples.
+# Only use spaces to indent your .yml configuration.
+# -----
+# You can specify a custom docker image from Docker Hub as your build environment.
+image: ruby:2.3.0
+
+pipelines:
+  default:
+    - step:
+        script: # Modify the commands below to build your repository.
+          - bundler --version
+          - bundle install
+          - gem install byebug
+          - gem install rails -v 4.2.7.1
+          - gem install sqlite3
+          - rake test

data/doc/CHANGELOG

@@ -4,6 +4,14 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2017 RedmineUP
 https://www.redmineup.com/
 
+== 2017-05-23 v0.0.30
+
+* Fixed votable vote_by
+
+== 2017-03-21 v0.0.29
+
+* Updated available_tags method 
+
 == 2017-03-17 v0.0.28
 
 * Fixed bug with quote_value

data/lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb

@@ -86,21 +86,24 @@ module RedmineCrm
       end
 
       module SingletonMethods
-        # Return all avalible tags for a project or global
-        # Example: Question.available_tags(@project_id )
-        def available_tags(project = nil, limit = 30)
+        #Return all avalible tags for a project or global
+        #Example: Question.available_tags(:project => @project_id )
+        def available_tags(options = {})
+          project = options[:project]
+          limit = options[:limit].to_i.zero? ? 30 : options[:limit].to_i
           scope = Tag.where({})
           class_name = quote_string_value(base_class.name)
           join = []
           join << "JOIN #{Tagging.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id "
           join << "JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id
             AND #{Tagging.table_name}.taggable_type = #{class_name} "
-          if self.attribute_names.include?('project_id')
-            if project
-              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
-            else
-              scope = scope.where("#{table_name}.project_id IS NULL")
-            end
+          if attribute_names.include?('project_id') && project
+            join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+            scope = scope.where("#{table_name}.project_id = ?", project.id)
+          end
+
+          if options[:name_like]
+            scope = scope.where("LOWER(#{Tag.table_name}.name) LIKE LOWER(?)", "%#{options[:name_like]}%")
           end
 
           group_fields = ''
@@ -112,7 +115,7 @@ module RedmineCrm
           scope = scope.group("#{Tag.table_name}.id, #{Tag.table_name}.name #{group_fields}")
           scope = scope.having('COUNT(*) > 0')
           scope = scope.order("#{Tag.table_name}.name")
-          scope = scope.limit(limit) if limit
+          scope = scope.limit(limit)
           scope
         end
         # Returns an array of related tags.

data/lib/redmine_crm/acts_as_votable/votable.rb

@@ -77,12 +77,9 @@ module RedmineCrm
 
         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_ip => options[:vote_ip]
-          )
+          vote_params = { :votable => self, :voter => options[:voter], :vote_scope => options[:vote_scope] }
+          vote_params[:vote_ip] = options[:vote_ip] if options[:vote_ip]
+          vote = RedmineCrm::ActsAsVotable::Vote.new(vote_params)
         else
           # this voter is potentially changing his vote
           vote = votes_for.last

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.28"
+  VERSION = "0.0.30"
 end

data/test/acts_as_taggable/rcrm_acts_as_taggable_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class RcrmActsAsTaggableTest < ActiveSupport::TestCase
   def test_available_tags
     assert_equivalent [tags(:feature), tags(:bug), tags(:error), tags(:question)], Issue.available_tags(Project.first)
-    assert_equivalent [tags(:feature), tags(:bug)], Issue.available_tags(Project.first, 2)
+    assert_equivalent [tags(:error), tags(:question)], Issue.available_tags(:project => Project.first, :limit => 2)
   end
 
   def test_find_related_tags_with
@@ -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)
+    assert_equal "'RedmineCrm::ActsAsTaggable::Tag'", Issue.send(:quote_value, RedmineCrm::ActsAsTaggable::Tag, nil)
   end
 
   def test_tags_condition

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.30
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -36,6 +36,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bitbucket-pipelines.yml
 - config/currency_iso.json
 - doc/CHANGELOG
 - doc/LICENSE.txt