Merge pull request #105 from annikoff/v1.0.6

Redmine 3.4.x support

Author: annikoff

.rubocop.yml

@@ -10,6 +10,9 @@ Metrics/AbcSize:
 Metrics/MethodLength:
   Max: 25
 
+Metrics/LineLength:
+  Max: 120
+
 Style/ClassAndModuleChildren:
   Enabled: false
 

.travis.yml

@@ -7,6 +7,7 @@ gemfile:
   - $REDMINE_PATH/Gemfile
 
 env:
+  - REDMINE_VER=3.4-stable
   - REDMINE_VER=3.3-stable
   - REDMINE_VER=3.2-stable
   - REDMINE_VER=3.1-stable
@@ -25,8 +26,9 @@ before_install:
   - ln -s $TRAVIS_BUILD_DIR $REDMINE_PATH/plugins/$PLUGIN_NAME
   - cp config/database.yml.travis $REDMINE_PATH/config/database.yml
   - if [[ $(ruby --version | awk '{print $2}') < 2.1 ]]; then
-    echo "gem 'nokogiri', '= 1.5.11'" >> $REDMINE_PATH/Gemfile;
-    sed -ri 's/("selenium-webdriver")/\1, "= 2.53.4"/' $REDMINE_PATH/Gemfile; fi
+    echo "gem 'nokogiri', '= 1.5.11'" >> $REDMINE_PATH/Gemfile; fi
+  - sed -ri 's/("selenium-webdriver")/\1, "= 2.53.4"/' $REDMINE_PATH/Gemfile
+  - sed -ri 's/("minitest")/\1, "= 5.10.1"/' $REDMINE_PATH/Gemfile
   - cd $REDMINE_PATH
   - if [[ $REDMINE_VER < '3.2-stable' ]]; then
     echo "$(curl http://www.redmine.org/projects/redmine/repository/revisions/14891/diff/trunk/lib/tasks/redmine.rake?format=diff)" > redmine.rake.patch;

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [1.0.6](https://github.com/annikoff/redmine_plugin_computed_custom_field/releases/tag/v1.0.6) - 2017-08-07
+### Added
+- Redmine 3.4.x support.
+
 ## [1.0.5](https://github.com/annikoff/redmine_plugin_computed_custom_field/releases/tag/v1.0.5) - 2017-03-21
 ### Changed
 - PluginGemfile
@@ -107,15 +111,15 @@
 - Formula validation.
 
 ### Changed
-- List of classes for a patch. 
+- List of classes for a patch.
 - README.
 - Excluded CF own id from available fields list.
 
 ### Removed
 - Groups of custom fields from creation form.
 
 ### Fixed
-- Conversion error when formula computation 
+- Conversion error when formula computation
 
 ## [0.0.1](https://github.com/annikoff/redmine_plugin_computed_custom_field/releases/tag/v0.0.1) - 2015-08-13
 ### Added

README.md

@@ -5,10 +5,10 @@
 
 ### Description:
 
-This plugin provides a possibility to create a computed custom field. 
-The value of computed field can be set by formula. 
-In formula constructions like `cfs[cf_id]` are replaced by IDs of custom fields. 
-Valid formula is a valid Ruby code executed when customized object is updated. 
+This plugin provides a possibility to create a computed custom field.
+The value of computed field can be set by formula.
+In formula constructions like `cfs[cf_id]` are replaced by IDs of custom fields.
+Valid formula is a valid Ruby code executed when customized object is updated.
 To put a field ID in the formula, double-click on an item in the list of available fields.
 
 
@@ -53,12 +53,12 @@ rake redmine:plugins:migrate
 
 ### Compatibility
 
-The plugins supports the following Redmine versions: 3.3.x, 3.2.x, 3.1.x, 3.0.x, 2.6.x, 2.5.x.
+The plugins supports the following Redmine versions: 3.4.x, 3.3.x, 3.2.x, 3.1.x, 3.0.x, 2.6.x, 2.5.x.
 
 ### Examples:
 ```ruby
 cfs[1]*2+cfs[2]
-# means 
+# means
 # custom_field_value(1) * 2 + custom_field_value(2)
 ```
 
@@ -75,12 +75,12 @@ end
 ```
 
 ```ruby
-# For IssueCustomField 
+# For IssueCustomField
 (self.estimated_hours || 0) * 2
 ```
 
 ```ruby
-# For ProjectCustomField 
+# For ProjectCustomField
 self.parent_id == 2
 ```
 

init.rb

@@ -3,7 +3,7 @@
   author 'Yakov Annikov'
   url 'https://github.com/annikoff/redmine_plugin_computed_custom_field'
   description ''
-  version '1.0.5'
+  version '1.0.6'
   settings default: {}
 end
 

lib/computed_custom_field/custom_field_patch.rb

@@ -5,6 +5,7 @@ module CustomFieldPatch
     included do
       before_validation -> { self.formula ||= '' }, if: :is_computed?
       validates_with FormulaValidator, if: :is_computed?
+      safe_attributes 'is_computed', 'formula' if CustomField.respond_to? 'safe_attributes'
     end
 
     def is_computed=(arg)