redmine_crm 0.0.56 → 0.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 153c60f66d4c53d47d65468f86359268be877a69
-  data.tar.gz: c2c8ad9b9e028b429f142aca1bc84a329071a966
+SHA256:
+  metadata.gz: 81a0216d566bed679a6f87d2ce909333215908e2cdb61fdc4e1e20e220147ee2
+  data.tar.gz: 97490339fb9a5330be1a8928d00afeb5521592a407b4913ecea3b86ca22d7c40
 SHA512:
-  metadata.gz: 1c3520707b176c33109e389a25145024d5e386f98bdc18a25a26af8595abe6ae598c639a4ef53da75bf23e7f582510d7c97bc038f7b350eda90d030dd85a3b7f
-  data.tar.gz: a3c10fc13ca1ee1d4474cc349039ef67b26d5ea47ccefc71afb71c276b15063a5b7a290a498e9e1dc412592f6f190a65504bc66a769a5818686588749d3e652e
+  metadata.gz: 9b17257627ce09e285db95899e99dc9a6db1b7e240f0f81d1adb9e08033ea0347e1fc0b8df313fa39ddaecb7a717bd98e3e6320c723b22032e1222d59b1dd94c
+  data.tar.gz: 16d05fbc85c96c0cdfd07a87da14a9864a02201767beb6cbe47d5e52f641dce7b765b16191587ac7a1fef63778a0550b8af392876991b8dde47c12c8a603de72

data/bitbucket-pipelines.yml

@@ -19,26 +19,6 @@ pipelines:
         services:
           - mysql
           - postgres
-    - step:
-        name: Old ruby
-        image: ruby:1.9.3
-        script:
-          - sed -i "s/'rails'/'rails'\n  spec.add_runtime_dependency 'rake', '~> 11.2.0'/g" redmine_crm.gemspec
-          - sed -i "s/'rails'/'rails'\n  spec.add_runtime_dependency 'i18n', '~> 0.9.5'/g" redmine_crm.gemspec
-          - sed -i "s/'rails'/'rails'\n  spec.add_runtime_dependency 'nokogiri', '~> 1.6.8'/g" redmine_crm.gemspec
-          - sed -i "s/'rails'/'rails', '~> 4.2.11'/g" redmine_crm.gemspec
-          - sed -i "s/'sqlite3'/'sqlite3', '~> 1.3.6'/g" redmine_crm.gemspec
-          - sed -i "s/'mysql2'/'mysql2', '~> 0.4.0'/g" redmine_crm.gemspec
-          - sed -i "s/'pg'/'pg', '~> 0.18.0'/g" redmine_crm.gemspec
-          - sed -i "s/^end/  spec.add_development_dependency 'minitest', '~> 5.11.3'\nend/g" redmine_crm.gemspec
-          - sed -i "s/^end/  spec.add_development_dependency 'sprockets', '~> 3.5.2'\nend/g" redmine_crm.gemspec
-          - sed -i "s/^end/  spec.add_development_dependency 'thor', '~> 0.20.3'\nend/g" redmine_crm.gemspec
-          - sed -i "s/'rubyzip'/'rubyzip', '~> 1.3.0'/g" redmine_crm.gemspec
-          - bundle install
-          - bundle exec rake test DB=sqlite
-          - bundle exec rake test DB=mysql
-        services:
-          - mysql
 
 definitions:
   services:

data/doc/CHANGELOG

@@ -4,6 +4,16 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2022 RedmineUP
 https://www.redmineup.com/
  
+== 2022-09-26 v0.0.58
+
+* Added closed? method to Issue Drop
+* Added blank issue for Time Entry
+* Added helpdesk_ticket method for Issue Drop
+
+== 2022-02-14 v0.0.57
+
+* Fixed BigDecimal liquid bug for ruby > 2.6 
+
 == 2022-02-14 v0.0.56
 
 * Added rcrm_acts_as_priceable 

data/lib/redmine_crm/liquid/drops/issues_drop.rb

@@ -37,7 +37,7 @@ module RedmineCrm
                :subject,
                :description,
                :visible?,
-               :open?,
+               :closed?,
                :start_date,
                :due_date,
                :overdue?,
@@ -146,6 +146,12 @@ module RedmineCrm
         end
       end
 
+      def helpdesk_ticket
+        return nil unless defined?(::HelpdeskTicketDrop)
+
+        @helpdesk_ticket ||= HelpdeskTicketDrop.new(@issue)
+      end
+
       def custom_field_values
         @issue.custom_field_values
       end

data/lib/redmine_crm/liquid/drops/time_entries_drop.rb

@@ -49,7 +49,7 @@ module RedmineCrm
       end
 
       def issue
-        @issue ||= IssueDrop.new(@time_entry.issue)
+        @issue ||= IssueDrop.new(@time_entry.issue) unless @time_entry.issue.blank?
       end
 
       def activity

data/lib/redmine_crm/patches/liquid_patch.rb

@@ -0,0 +1,33 @@
+module RedmineCrm
+  module Patches
+    module LiquidPatch
+      module StandardFilters
+
+        def self.included(base)
+          base.class_eval do
+            
+            private
+    
+            def to_number(obj)
+              case obj
+              when Float
+                BigDecimal(obj.to_s)
+              when Numeric
+                obj
+              when String
+                (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal(obj) : obj.to_i
+              else
+                0
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
+  
+unless Liquid::StandardFilters.included_modules.include?(RedmineCrm::Patches::LiquidPatch::StandardFilters)
+  Liquid::StandardFilters.send(:include, RedmineCrm::Patches::LiquidPatch::StandardFilters)
+end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.56'
+  VERSION = '0.0.58'
 end

data/lib/redmine_crm.rb

@@ -43,6 +43,7 @@ require 'redmine_crm/helpers/form_tag_helper'
 require 'redmine_crm/assets_manager'
 
 require 'redmine_crm/compatibility/application_controller_patch'
+require 'redmine_crm/patches/liquid_patch' unless BigDecimal.respond_to?(:new)
 
 module RedmineCrm
   GEM_NAME = 'redmine_crm'.freeze

data/redmine_crm.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency 'rails'
   spec.add_runtime_dependency 'liquid', '< 2.6.4'

data/test/liquid/drops/issues_drop_test.rb

@@ -29,6 +29,10 @@ module RedmineCrm
     def test_issue_delegated
       assert_equal [@issue.id, @issue.subject, @issue.description].join('|'),
                    @liquid_render.render('{{ issue.id }}|{{ issue.subject }}|{{ issue.description }}')
+
+      assert_not_equal @issue.subject, @liquid_render.render('{% if issue.closed? %}{{issue.subject}}{% endif %}')
+      @issue.closed = true
+      assert_equal @issue.subject, @liquid_render.render('{% if issue.closed? %}{{issue.subject}}{% endif %}')
     end
   end
 end

data/test/liquid/filters/base_filter_test.rb

@@ -52,6 +52,10 @@ module RedmineCrm
       assert_equal '25', @liquid_render.render("{{24.11 | ceil }}")
     end
 
+    def test_big_decimal_filter_patch
+      assert_equal '2.8571', @liquid_render.render("{{ 20 | divided_by: 7.0 | round: 4 }}")
+    end
+
     def test_floor_filter
       assert_equal '24', @liquid_render.render("{{24.99 | floor }}")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.58
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -157,6 +157,7 @@ files:
 - lib/redmine_crm/liquid/filters/base.rb
 - lib/redmine_crm/liquid/filters/colors.rb
 - lib/redmine_crm/money_helper.rb
+- lib/redmine_crm/patches/liquid_patch.rb
 - lib/redmine_crm/settings.rb
 - lib/redmine_crm/settings/money.rb
 - lib/redmine_crm/version.rb
@@ -222,15 +223,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Common libraries for RedmineUP plugins for Redmine