redmine_extensions 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8cb8428973f6c3353ad74154a7e78037c8e368e
-  data.tar.gz: 83333323c82696c521141ba162396926da14e9d5
+  metadata.gz: da8777314a9bae88694949647545b995d50c9309
+  data.tar.gz: 249040470908720afa5ea03f5b2abb6397ddc6d8
 SHA512:
-  metadata.gz: ab40411071438c646db1a43352981b6c0761fc00d9836d8de6d68f6155143df67b7b48a25b8a464f561c8e6feef997d211c77abb7f2ae5dddb2c664806d2fa09
-  data.tar.gz: 9f6334ced28ff923275659a8ce4ca113cf0d911580441f8e9f198acbdde69f4f095738610b929d57aaeda809a17369926771ab267cab5e637c3020bb072d7284
+  metadata.gz: 7ca1694b0b46c1227f68bd10ec343972463cbc10d28e7270deaf36c049fcae38d048d31956556308abb17c4afad23f1d2bd426c4c29104b31ffa55bf23531ca4
+  data.tar.gz: 68a7929556ee214804c81bbaa6d5ef94f8d9d088fd0ea0720cff306390363fc26f42c9366756424cd15f59a19aff245cc0ee99cdbc73f034ade563698e6a8172

data/app/assets/javascripts/redmine_extensions/application.js

@@ -10,4 +10,6 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require ./easy_togglers
+//= require ./jquery.entityarray
+//= require ./redmine_extensions

data/app/assets/javascripts/redmine_extensions/blocking.js

@@ -0,0 +1,6 @@
+/**
+ * code, that cannot be delayed after window.onload or deferred
+ */
+//= require ./blocking_polyfill
+//= require ./blocking_schedule
+//= require ./blocking_module

data/app/assets/javascripts/redmine_extensions/blocking_module.js

@@ -0,0 +1,58 @@
+(function () {
+  "use strict";
+  /**
+   * @type {Object.<String,Array.<Function>>}
+   */
+  var waitingModules = {};
+  /**
+   * @type {Object<String,boolean>}
+   */
+  var registeredModules = {};
+
+
+  window.EASY = window.EASY || {};
+  /**
+   * Module constructor. Execute [func] only if [moduleName] is registered
+   * Works also, if EASY.registerModule is called after module definition
+   * @param {String} moduleName
+   * @param {Function} func
+   * @param {...*} rest - parameters for [func]
+   */
+  EASY.module = function easyModule(moduleName, func, rest) {
+    if (registeredModules[moduleName]) {
+      if (rest !== undefined) {
+        func.apply(window, Array.prototype.slice.call(arguments, 2));
+      } else {
+        func();
+      }
+      return;
+    }
+    var modules = waitingModules[moduleName];
+    if (!modules) {
+      waitingModules[moduleName] = modules = [];
+    }
+    if (rest) {
+      var args = Array.prototype.slice.call(arguments, 2);
+      modules.push(function () {
+        func.apply(window, args);
+      })
+    } else {
+      modules.push(func);
+    }
+  };
+  /**
+   * Enables modules with [moduleName] name
+   * If any modules are in waitingModules, they are executed immediately.
+   * @param {String} moduleName
+   */
+  EASY.registerModule = function registerModule(moduleName) {
+    registeredModules[moduleName] = true;
+    if (waitingModules[moduleName]) {
+      var modules = waitingModules[moduleName];
+      for (var i = 0; i < modules.length; i++) {
+        modules[i]();
+      }
+      delete waitingModules[moduleName];
+    }
+  };
+})();

data/app/assets/javascripts/redmine_extensions/blocking_polyfill.js

@@ -0,0 +1,59 @@
+
+(function($, window, undefined) {
+  // http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+  // http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
+
+  // requestAnimationFrame polyfill by Erik Moller
+  // fixes from Paul Irish and Tino Zijdel
+
+  var lastTime = 0,
+      running,
+      animate = function (elem) {
+        if (running) {
+          window.requestAnimationFrame(animate, elem);
+          jQuery.fx.tick();
+        }
+      },
+      vendors = ['ms', 'moz', 'webkit', 'o'];
+
+  for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+    window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
+    window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame']
+        || window[vendors[x]+'CancelRequestAnimationFrame'];
+  }
+
+  if (!window.requestAnimationFrame)
+    window.requestAnimationFrame = function(fn, element) {
+      var currTime = new Date().getTime(),
+          delta = currTime - lastTime,
+          timeToCall = Math.max(0, 16 - delta);
+
+      var id = window.setTimeout(function() {
+            fn(currTime + timeToCall);
+          },
+          timeToCall
+      );
+
+      lastTime = currTime + timeToCall;
+
+      return id;
+    };
+
+  if (!window.cancelAnimationFrame) {
+    window.cancelAnimationFrame = function(id) {
+      clearTimeout(id);
+    };
+  }
+
+  jQuery.fx.timer = function (timer) {
+    if (timer() && jQuery.timers.push(timer) && !running) {
+      running = true;
+      animate(timer.elem);
+    }
+  };
+
+  jQuery.fx.stop = function() {
+    running = false;
+  };
+
+}(jQuery, this));

data/app/assets/javascripts/redmine_extensions/blocking_schedule.js

@@ -0,0 +1,125 @@
+(function () {
+  "use strict";
+  /**
+   * @typedef {Function} SchedulePrerequisite
+   * @return {boolean}
+   */
+  /**
+   * @typedef {{func:Function,[priority]:number,[pre]:SchedulePrerequisite}} ScheduleTask
+   */
+  var lateMaxDelay = 3;
+  var lateDelay = lateMaxDelay;
+  /** @type {Array.<ScheduleTask>} */
+  var mainArray = [];
+  /** @type {Array.<ScheduleTask>} */
+  var lateArray = [];
+  /** @type {Array.<ScheduleTask|null>} */
+  var prerequisiteArray = [];
+
+  /** @param {ScheduleTask} a
+   * @param {ScheduleTask} b
+   */
+  var sortFunction = function (a, b) {
+    return b.priority - a.priority;
+  };
+
+  var tick = function () {
+    var count1 = 0;
+    if (mainArray.length > 0) {
+      count1 = mainArray.length;
+      mainArray.sort(sortFunction);
+      for (var i = 0; i < mainArray.length; i++) {
+        mainArray[i].func();
+      }
+      mainArray = [];
+      lateDelay = lateMaxDelay;
+    }
+    var count2 = executePrerequisites();
+    var count3 = 0;
+    if (lateArray.length) {
+      if (lateDelay === 0) {
+        lateArray.sort(sortFunction);
+        // console.log(lateArray.map(function (p1) {
+        //   return p1.priority
+        // }));
+        var limitPriority = lateArray[0].priority - 5;
+        for (i = 0; i < lateArray.length; i++) {
+          if (lateArray[i].priority <= limitPriority) break;
+          lateArray[i].func.call(window);
+        }
+        if (i === lateArray.length) {
+          count3 = lateArray.length;
+          lateArray = [];
+          lateDelay = lateMaxDelay;
+        } else {
+          lateArray = lateArray.slice(i);
+          count3 = i;
+        }
+      } else {
+        lateDelay--;
+      }
+    }
+    if (EASY.schedule.out && (count1 || count2 || count3)) {
+      console.log("EE: " + count1 + " REQ: " + count2 + " LATE: " + count3);
+    }
+  };
+  var isNotNull = function (a) {
+    return a !== null;
+  };
+  /** @return {number} */
+  var executePrerequisites = function () {
+    if (prerequisiteArray.length === 0) return 0;
+    var count = 0;
+    for (var i = 0; i < prerequisiteArray.length; i++) {
+      if (prerequisiteArray[i].pre()) {
+        count++;
+        prerequisiteArray[i].func.call(window);
+        prerequisiteArray[i] = null;
+      }
+    }
+    if (count) {
+      prerequisiteArray = prerequisiteArray.filter(isNotNull);
+      count += executePrerequisites();
+    }
+    return count;
+  };
+
+  var cycle = function scheduleCycle() {
+    tick();
+    window.requestAnimationFrame(cycle);
+  };
+  document.addEventListener("DOMContentLoaded", cycle);
+  window.EASY = window.EASY || {};
+  /**
+   *
+   * @type {{out: boolean, late: EASY.schedule.late, require: EASY.schedule.require, main: EASY.schedule.main}}
+   */
+  EASY.schedule = {
+    out: false,
+    /**
+     * Functions, which should be executed right after "DOMContentLoaded" event
+     * @param {Function} func
+     * @param {number} [priority]
+     */
+    main: function (func, priority) {
+      mainArray.push({func: func, priority: priority || 0})
+    },
+    /**
+     * Functions, which should wait for prerequisite fulfillment
+     * @param {Function} func
+     * @param {SchedulePrerequisite} prerequisite
+     */
+    require: function (func, prerequisite) {
+      prerequisiteArray.push({func: func, pre: prerequisite})
+    },
+    /**
+     * Functions, which should be executed after several render loops after "DOMContentLoaded" event
+     * @param {Function} func
+     * @param {number} [priority]
+     */
+    late: function (func, priority) {
+      lateArray.push({func: func, priority: priority || 0})
+    }
+  };
+})();
+

data/app/assets/javascripts/redmine_extensions/easy_togglers.js

@@ -55,4 +55,4 @@ var EasyToggler = new function() {
   };
 };
 
-$(document).ready(EasyToggler.ensureToggle);
+EASY.schedule.main(EasyToggler.ensureToggle);

data/app/assets/javascripts/redmine_extensions/redmine_extensions.js

@@ -31,242 +31,6 @@ REDMINE_EXTENSIONS = {
 
 };
 
-
-// TODO delete - it will be added to extensions
-(function($, undefined) {
-
-    var plugin = 'easygrouploader';
-    if( $.fn[plugin] )
-        return;
-    var defaults = {
-        next_button_cols: 1,
-        load_opened: false,
-        load_limit: 25,
-        texts: {
-            'next': 'Next',
-        }
-    };
-
-    $.fn[plugin] = function(options, methodParams) {
-        $.each($(this), function(idx) {
-            var instance = $(this).data('plugin_' + plugin);
-            if (!instance) {
-                instance = new EasyGroupLoader(this, options);
-                $(this).data('plugin_' + plugin, instance);
-            } else if (typeof options === 'string') {
-                switch (options) {
-                    case 'load_groups':
-                        if (instance.options.load_opened)
-                            instance.load_all_groups();
-                }
-            }
-        });
-        return $(this);
-    };
-
-
-    function EasyGroupLoader(elem, options) {
-        this.groupsContainer = $(elem);
-        this.options = $.extend({}, defaults, options);
-        this.loadUrl = options.loadUrl || elem.data('url');
-        this.callback = options.callback;
-        this.texts = this.options.texts;
-
-        this.init();
-    }
-
-    EasyGroupLoader.prototype.init = function()
-    {
-        var self = this;
-        this.groupsContainer.on('click', '.group .expander', function(evt) {
-            var $row = $(this).closest('tr.group');
-            var group = $row.data('group') || new Group(self, $row);
-
-            if (!group.loaded) {
-                if (!group.header.hasClass('group-loaded')) {
-                  group.load();
-                  group.toggle();
-                }
-            } else {
-                group.toggle();
-                if(typeof(self.callback) === 'function')
-                    self.callback();
-            }
-
-        });
-        if (this.options.load_opened)
-            this.load_all_groups();
-    };
-
-    EasyGroupLoader.prototype.initInlineEdit = function()
-    {
-        $('.multieditable-container:not(.multieditable-initialized)', this.groupsContainer).each(function() {
-            initInlineEditForContainer(this);
-        });
-        initProjectEdit();
-        initEasyAutocomplete();
-    };
-
-    EasyGroupLoader.prototype.load_all_groups = function()
-    {
-        var group;
-        var self = this;
-        var groups_to_load = [];
-        var entity_count = 0;
-        $('.group', this.groupsContainer).not('.group-loaded').each(function() {
-            group = $(this).data('group') || new Group(self, $(this));
-            if (!group.loaded) {
-                groups_to_load.push(group);
-                entity_count += group.count;
-            }
-            if (entity_count >= self.options.load_limit) {
-                self.load_groups(groups_to_load);
-                entity_count = 0;
-                groups_to_load = [];
-            }
-        });
-        if (groups_to_load.length > 0) {
-            this.load_groups(groups_to_load);
-        }
-    };
-
-    EasyGroupLoader.prototype.load_groups = function(groups_to_load) {
-        var self = this;
-        var group_names = groups_to_load.map(function(group) {
-            return group.group_value;
-        });
-        // var url = EPExtensions.setAttrToUrl(, 'group_to_load', group_names);
-        $.ajax(this.loadUrl, {
-            method: 'GET',
-            data: { group_to_load: group_names },
-            success: function(data, textStatus, request) {
-                var parsed = (typeof data === 'object') ? data : $.parseJSON(data);
-
-                $.each(groups_to_load, function(idx, group) {
-                    group.parseData(parsed[group.group_name]);
-                    group.toggle();
-                });
-                self.initInlineEdit();
-            }
-        });
-    };
-
-    function Group(loader, header)
-    {
-        this.loader = loader;
-        this.header = header;
-        this.header.data('group', this);
-        this.group_name = this.header.data('group-name');
-        this.group_value = this.group_name;
-        if( $.isArray(this.group_name) ) {
-            // potencialne nebezpecne - TODO: vymyslet spravny oddelovac
-            this.group_name = '["' + this.group_name.join('", "') + '"]';
-        }
-        this.count = parseInt(this.header.data('entity-count'));
-        this.pages = this.header.data('pages') || 1;
-        this.loaded = this.header.hasClass('preloaded');
-    }
-
-    Group.prototype.toggle = function() {
-        EPExtensions.issuesToggleRowGroup(this.header);
-    };
-
-    Group.prototype.load = function() {
-        var $hrow = this.header;
-        var self = this;
-
-        if (!$hrow.hasClass('group-loaded')) {
-            $hrow.addClass('group-loaded');
-            $.ajax(this.loader.loadUrl, {
-                method: 'GET',
-                data: {
-                    group_to_load: this.group_value
-                },
-                success: function(data, textStatus, request) {
-                    self.parseData(data);
-                    self.loader.initInlineEdit();
-                    if(typeof(self.loader.callback) === 'function')
-                        self.loader.callback();
-                }
-            });
-        }
-    };
-
-    Group.prototype.parseData = function(data) {
-        var $hrow = this.header;
-
-        this.rows = $(data);
-        $hrow.after(this.rows);
-        $hrow.data('group-page', 1);
-        this.loaded = true;
-        if (this.pages > 1) {
-            this.createNextButton();
-            // .find doesn't work on this set
-            this.rows.filter("tr:last").after(this.next_button);
-        }
-    };
-
-    Group.prototype.loadNext = function() {
-        var $hrow = this.header;
-        var page = $hrow.data('group-page') + 1;
-        var self = this;
-
-        if (page <= this.pages) {
-            $.ajax(this.loader.loadUrl, {
-                method: 'GET',
-                data: {
-                    page: page,
-                    group_to_load: this.group_value
-                },
-                success: function(data, textStatus, request) {
-                    self.next_button.before(data);
-
-                    self.loader.initInlineEdit();
-                    $hrow.data('group-page', page);
-                    if (self.pages === page) {
-                        self.next_button.remove();
-                    }
-                }
-            });
-        }
-    };
-
-    Group.prototype.createNextButton = function() {
-        //var next_link_url = EPExtensions.setAttrToUrl(this.loader.loadUrl, 'group_to_load', this.group_value);
-        var next_link_url = this.loader.loadUrl + ( this.loader.loadUrl.indexOf('?') >= 0 ? '&' : '?' ) + $.param({group_to_load: this.group_value});
-        this.next_link = $('<a>', {href: next_link_url, 'class': 'button'}).text(this.loader.texts['next']).append($("<i>", {"class": "icon-arrow"}));
-        this.next_button = $('<tr/>', {'class': 'easy-next-button'}).html($('<td>', {colspan: this.loader.options.next_button_cols, "class": "text-center"}).html(this.next_link));
-
-        var self = this;
-
-        this.next_link.click(function(evt) {
-            evt.preventDefault();
-            self.loadNext();
-        });
-    };
-
-})(jQuery);
-
-window.cancelAnimFrame = ( function() {
-    return window.cancelAnimationFrame              ||
-        window.webkitCancelRequestAnimationFrame    ||
-        window.mozCancelRequestAnimationFrame       ||
-        window.oCancelRequestAnimationFrame         ||
-        window.msCancelRequestAnimationFrame        ||
-        clearTimeout;
-} )();
-
-window.requestAnimFrame = (function(){
-    return  window.requestAnimationFrame   ||
-        window.webkitRequestAnimationFrame ||
-        window.mozRequestAnimationFrame    ||
-        window.oRequestAnimationFrame      ||
-        window.msRequestAnimationFrame     ||
-        function(callback){
-            return window.setTimeout(callback, 1000 / 60);
-        };
-})();
-
 window.showFlashMessage = (function(type, message, delay){
     var $content = $("#content");
     $content.find(".flash").remove();
@@ -291,7 +55,7 @@ window.showFlashMessage = (function(type, message, delay){
     var $element = $(element);
     if(delay){
         setTimeout(function(){
-            requestAnimFrame(function(){
+            window.requestAnimationFrame(function(){
                 closeFlashMessage($element);
             });
         }, delay);

data/app/controllers/easy_settings_controller.rb

@@ -3,20 +3,9 @@
 #
 class EasySettingsController < ApplicationController
 
-  before_filter :require_admin, only: [:edit, :update]
-  before_filter :find_optional_project
-  before_filter :find_plugin, only: [:edit, :update]
-
-  def new
-  end
-
-  def create
-    if @easy_settings.save
-      redirect_to :back
-    else
-      render :new
-    end
-  end
+  before_action :require_admin, only: [:edit, :update]
+  before_action :find_optional_project
+  before_action :find_plugin, only: [:edit, :update]
 
   def edit
     @settings = Setting.send("plugin_#{@plugin.id}")
@@ -25,11 +14,11 @@ class EasySettingsController < ApplicationController
 
   def update
     if params[:settings]
-      Setting.send("plugin_#{@plugin.id}=", params[:settings])
+      Setting.send("plugin_#{@plugin.id}=", params[:settings].permit!)
     end
 
     if params[:easy_setting]
-      @easy_settings = EasySettings::ParamsWrapper.from_params(params[:easy_setting], project: @project, prefix: @plugin.id)
+      @easy_settings = EasySettings::ParamsWrapper.from_params(params[:easy_setting].permit!, project: @project, prefix: @plugin.id)
 
       if @easy_settings.save
         # All good

data/app/helpers/redmine_extensions/application_helper.rb

@@ -108,6 +108,21 @@ module RedmineExtensions
       end
     end
 
+    def late_javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
+      content =
+        if block_given?
+          html_options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
+          capture(&block)
+        else
+          content_or_options_with_block
+        end
+      html_options.reverse_merge!({type:'application/javascript'})
+      priority = html_options.delete(:priority) || 0
+      content = "  EASY.schedule.late(function(){#{content}  }, #{priority});"
+
+      content_tag(:script, javascript_cdata_section(content), html_options)
+    end
+
 
     # ==== Options
     # * <tt>class: Hash or String</tt> - This option can be used to add custom CSS classes. It can be *String* or *Hash*.
@@ -240,7 +255,7 @@ module RedmineExtensions
 
       content_tag(:span, :class => 'easy-multiselect-tag-container') do
         text_field_tag('', '', (options[:html_options] || {}).merge(id: options[:id])) +
-          javascript_tag("$('##{options[:id]}').easymultiselect({multiple: #{options[:multiple]}, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, combo: #{options[:combo]}, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
+          late_javascript_tag("$('##{options[:id]}').easymultiselect({multiple: #{options[:multiple]}, rootElement: #{options[:rootElement].to_json}, inputName: '#{name}', preload: #{options[:preload]}, combo: #{options[:combo]}, source: #{source}, selected: #{selected_values.to_json}, show_toggle_button: #{options[:show_toggle_button]}, select_first_value: #{options[:select_first_value]}, load_immediately: #{options[:load_immediately]}, autocomplete_options: #{(options[:jquery_auto_complete_options]||{}).to_json} });")
       end
     end
 

data/app/models/easy_setting.rb

@@ -73,7 +73,6 @@ class EasySetting < ActiveRecord::Base
   after_save :mapper_after_save
   after_destroy :invalidate_cache
 
-  attr_protected :id
   serialize :value
 
   @@mapper = EasySettings::Mapper.new

data/db/migrate/20150705172511_create_easy_settings.rb

@@ -1,4 +1,4 @@
-class CreateEasySettings < ActiveRecord::Migration
+class CreateEasySettings < RedmineExtensions::Migration
   def up
     if table_exists?(:easy_settings)
       add_column(:easy_settings, :type, :string, null: true) unless column_exists?(:easy_settings, :type)

data/db/migrate/20160519161300_create_entity_assignments.rb

@@ -1,4 +1,4 @@
-class CreateEntityAssignments < ActiveRecord::Migration
+class CreateEntityAssignments < RedmineExtensions::Migration
   def self.up
     unless table_exists?(:easy_entity_assignments)
       create_table :easy_entity_assignments do |t|

data/lib/generators/redmine_extensions/entity/templates/custom_field.rb.erb

@@ -1,7 +1,7 @@
-class <%= model_name %>CustomField < CustomField
-
-  def type_name
-    :label_<%= @model_name_pluralize_underscored %>
-  end
-
-end
+class <%= model_name %>CustomField < CustomField
+
+  def type_name
+    :label_<%= @model_name_pluralize_underscored %>
+  end
+
+end

data/lib/generators/redmine_extensions/entity/templates/index.api.rsb.erb

@@ -1,5 +1,5 @@
-api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
-  @entities.each do |<%= model_name_underscored %>|
-    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
-  end
-end
+api.array :<%= model_name_pluralize_underscored %>, api_meta(total_count: @entity_count, offset: @offset, limit: @limit) do
+  @entities.each do |<%= model_name_underscored %>|
+    render_api_<%= model_name_underscored %>(api, <%= model_name_underscored %>)
+  end
+end

data/lib/generators/redmine_extensions/entity/templates/mail_added.html.erb.erb

@@ -1 +1 @@
-<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>
+<h1><%%= link_to(@<%= model_name_underscored %>.to_s, @<%= model_name_underscored %>_url) %></h1>

data/lib/generators/redmine_extensions/entity/templates/mail_added.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/mail_updated.text.erb.erb

@@ -1,2 +1,2 @@
-<%%= @<%= model_name_underscored %>.to_s %>
-<%%= @<%= model_name_underscored %>_url %>
+<%%= @<%= model_name_underscored %>.to_s %>
+<%%= @<%= model_name_underscored %>_url %>

data/lib/generators/redmine_extensions/entity/templates/routes.rb.erb

@@ -1,13 +1,13 @@
-<% if project? %>
-resources :projects do
-  resources :<%= model_name_pluralize_underscored %>
-end
-<% end %>
-resources :<%= model_name_pluralize_underscored %> do
-  collection do
-    get 'autocomplete'
-    get 'bulk_edit'
-    post 'bulk_update'
-    get 'context_menu'
-  end
+<% if project? %>
+resources :projects do
+  resources :<%= model_name_pluralize_underscored %>
+end
+<% end %>
+resources :<%= model_name_pluralize_underscored %> do
+  collection do
+    get 'autocomplete'
+    get 'bulk_edit'
+    post 'bulk_update'
+    get 'context_menu'
+  end
 end

data/lib/generators/redmine_extensions/plugin/USAGE

@@ -2,6 +2,7 @@ Description:
     The plugin generator creates stubs for new Redmine plugin.
     Plugin is prepared for use in Redmine and Easy Redmine as well.
     You can use --customer flag to generate a special plugin if you can make just a few changes to code. Backup this plugin before Redmine or Easy Redmine upgrade and move back for keep you changes.
+    You can use --path flag to specify parent directory.
 
 Example:
     rails g redmine_extensions:plugin NameOfNewPlugin

data/lib/generators/redmine_extensions/plugin/plugin_generator.rb

@@ -5,13 +5,15 @@ module RedmineExtensions
     attr_reader :plugin_path, :plugin_name_underscored, :plugin_pretty_name, :plugin_title
 
     class_option :customer, type: :boolean, default: false, banner: '', :desc => 'plugin will act as customer modification. It is useful for changing few things and be uptodate with the core.'
+    class_option :path, type: :string, default: nil, banner: '', :desc => 'relative path to parent directory for plugin.'
 
     def initialize(*args)
       super
 
       @plugin_name_underscored = options[:customer] ? "modification_#{file_name.underscore}" : file_name.underscore
       @plugin_pretty_name = plugin_name_underscored.titleize
-      @plugin_path = "plugins/#{plugin_name_underscored}"
+
+      @plugin_path = (options[:path] || "plugins") + "/#{plugin_name_underscored}"
       @plugin_title = @plugin_name_underscored.camelize
     end
 

data/lib/redmine_extensions.rb

@@ -1,2 +1,2 @@
-require "redmine_extensions/engine"
-require 'redmine_extensions/core_ext'
+require_relative "./redmine_extensions/engine"
+require_relative './redmine_extensions/core_ext'

data/lib/redmine_extensions/core_ext.rb

@@ -1,3 +1,3 @@
-require 'redmine_extensions/core_ext/object'
-require 'redmine_extensions/core_ext/string'
-require 'redmine_extensions/core_ext/date_range'
+require_relative './core_ext/object'
+require_relative './core_ext/string'
+require_relative './core_ext/date_range'

data/lib/redmine_extensions/easy_query_adapter.rb

@@ -3,8 +3,8 @@ require 'query'
 module RedmineExtensions
   module QueryColumnAdapter
     def self.included(base)
-      base.extend(ClassMethods)
-      base.send(:include, InstanceMethods)
+      base.extend ClassMethods
+      base.include InstanceMethods
 
       base.class_eval do
         attr_accessor :includes
@@ -168,8 +168,8 @@ end
 if Redmine::Plugin.installed?(:easy_extensions)
   # EasyQuery exist
 else
-  QueryColumn.__send__(:include, RedmineExtensions::QueryColumnAdapter)
+  QueryColumn.include RedmineExtensions::QueryColumnAdapter
   RedmineExtensions::PatchManager.register_model_patch('Query', 'RedmineExtensions::QueryAdapter')
   EasyQuery = EasyQueryAdapter
-  EasyQuery.__send__(:prepend, RedmineExtensions::QueryAdapterDefaults)
+  EasyQuery.prepend RedmineExtensions::QueryAdapterDefaults
 end

data/lib/redmine_extensions/easy_settings.rb

@@ -1,8 +1,8 @@
 module EasySettings
 end
 
-require 'redmine_extensions/easy_settings/key'
-require 'redmine_extensions/easy_settings/key_dsl'
-require 'redmine_extensions/easy_settings/mapper'
-require 'redmine_extensions/easy_settings/form_model'
-require 'redmine_extensions/easy_settings/params_wrapper'
+require_relative './easy_settings/key'
+require_relative './easy_settings/key_dsl'
+require_relative './easy_settings/mapper'
+require_relative './easy_settings/form_model'
+require_relative './easy_settings/params_wrapper'

data/lib/redmine_extensions/easy_settings/params_wrapper.rb

@@ -7,7 +7,6 @@ module EasySettings
       if !raw_params.is_a?(Hash) && !raw_params.is_a?(ActionController::Parameters)
         raw_params = {}
       end
-
       new(raw_params, project, prefix)
     end
 

data/lib/redmine_extensions/engine.rb

@@ -1,8 +1,8 @@
 require 'active_support/dependencies'
-require 'redmine_extensions/patch_manager'
-require 'redmine_extensions/redmine_patches/patches'
+require_relative './patch_manager'
+require_relative './redmine_patches/patches'
 
-require 'redmine_extensions/query_output'
+require_relative './query_output'
 
 module RedmineExtensions
   class Engine < ::Rails::Engine
@@ -16,18 +16,20 @@ module RedmineExtensions
 
     config.autoload_paths << config.root.join('lib')
     config.eager_load_paths << config.root.join('app', 'models', 'easy_queries')
+    config.assets.precompile << 'redmine_extensions/applications.js'
+    config.assets.precompile << 'redmine_extensions/blocking.js'
 
     #config.to_prepare goes after Reloader.to_prepare
-    ActionDispatch::Reloader.to_prepare do
+    RedmineExtensions::Reloader.to_prepare do
       RedmineExtensions::QueryOutput.register_output RedmineExtensions::QueryOutputs::ListOutput
       RedmineExtensions::QueryOutput.register_output RedmineExtensions::QueryOutputs::TilesOutput
       # RedmineExtensions::BasePresenter.register 'RedmineExtensions::EasyQueryPresenter', 'EasyQuery'
       # ApplicationController.send :include, RedmineExtensions::RailsPatches::ControllerQueryHelpers
-      ApplicationController.send :include, RedmineExtensions::RenderingHelper
+      ApplicationController.include RedmineExtensions::RenderingHelper
     end
 
     initializer 'redmine_extensions.initialize' do |app|
-      ActionDispatch::Routing::RouteSet::Generator.send(:include, RedmineExtensions::RailsPatches::RouteSetGeneratorPatch)
+      ActionDispatch::Routing::RouteSet::Generator.prepend RedmineExtensions::RailsPatches::RouteSetGeneratorPatch
     end
 
     initializer 'redmine_extensions.append_migrations' do |app|
@@ -58,23 +60,23 @@ module RedmineExtensions
         include RedmineExtensions::RailsPatches::ActiveRecord
       end
       ActiveSupport.on_load(:action_view) do
-        default_form_builder.send(:include, RedmineExtensions::RailsPatches::FormBuilderPatch)
+        default_form_builder.include RedmineExtensions::RailsPatches::FormBuilderPatch
       end
     end
 
     initializer 'redmine_extensions.initialize_easy_plugins', after: :load_config_initializers do
-      require 'redmine_extensions/hooks'
+      require_relative './hooks'
 
       unless Redmine::Plugin.installed?(:easy_extensions)
         ActiveSupport.run_load_hooks(:easyproject, self)
       end
 
-      require 'redmine_extensions/easy_query_adapter'
-      require 'redmine_extensions/easy_entity_formatters/easy_entity_formatter'
+      require_relative './easy_query_adapter'
+      require_relative './easy_entity_formatters/easy_entity_formatter'
     end
 
     # initializer :add_html_formatting do |app|
-    #   require "redmine_extensions/html_formatting"
+    #   require_relative "./html_formatting"
     #   Redmine::WikiFormatting.register(:HTML, RedmineExtensions::HTMLFormatting::Formatter, RedmineExtensions::HTMLFormatting::Helper)
     # end
 

data/lib/redmine_extensions/hooks.rb

@@ -1,16 +1,30 @@
 module RedmineExtensions
   class Hooks < Redmine::Hook::ViewListener
+    @visited = false
+    def easy_extensions_blocking_javascripts_hook(context={})
+      if defined?(EasyExtensions)
+        @visited = true
+        context[:template].require_asset('redmine_extensions/blocking')
+      end
+    end
 
-    def view_layouts_base_html_head(context={})
+    def easy_extensions_javascripts_hook(context={})
       if defined?(EasyExtensions)
-        context[:hook_caller].javascript_include_tag('redmine_extensions/application')
-      else
+        context[:template].require_asset('redmine_extensions/blocking') unless @visited
+        context[:template].require_asset('redmine_extensions/application')
+        # context[:hook_caller].javascript_include_tag('redmine_extensions/application')
+      end
+    end
+
+    def view_layouts_base_html_head(context={})
+      unless defined?(EasyExtensions)
+        javascript_include_tag('redmine_extensions/blocking_polyfill') +
+        javascript_include_tag('redmine_extensions/blocking_schedule') +
+        javascript_include_tag('redmine_extensions/blocking_module') +
         javascript_include_tag('redmine_extensions/jquery.entityarray') +
         javascript_include_tag('redmine_extensions/redmine_extensions') +
         javascript_include_tag('redmine_extensions/easy_togglers')
       end
-
     end
-
   end
 end

data/lib/redmine_extensions/html_formatting.rb

@@ -1,3 +1,3 @@
-require 'redmine_extensions/html_formatting/internals'
-require 'redmine_extensions/html_formatting/formatter'
-require 'redmine_extensions/html_formatting/helper'
+require_relative './html_formatting/internals'
+require_relative './html_formatting/formatter'
+require_relative './html_formatting/helper'

data/lib/redmine_extensions/migration.rb

@@ -0,0 +1,9 @@
+module RedmineExtensions
+  if Rails.version.start_with?('5')
+    class Migration < ActiveRecord::Migration[4.2]
+    end
+  else
+    class Migration < ActiveRecord::Migration
+    end
+  end
+end

data/lib/redmine_extensions/patch_manager.rb

@@ -116,8 +116,8 @@ module RedmineExtensions
         controller_klass = controller_klass_name.constantize
 
         @registered_easy_page_helpers.each do |helper_klass_name|
-          if m = helper_klass_name.match(/\A(\S+)Helper\z/)
-            helper_klass_symbol = m[1]
+          if helper_klass_name.end_with?('Helper')
+            helper_klass_symbol = helper_klass_name[0, helper_klass_name.index('Helper')]
           end
 
           controller_klass.class_eval "helper :#{helper_klass_symbol.underscore}" if helper_klass_symbol
@@ -352,18 +352,40 @@ module RedmineExtensions
         pm_klass = patching_module.constantize
         oktp_klass = original_klass_to_patch.constantize
 
-        oktp_klass.send(:include, pm_klass) # unless oktp_klass.include?(pm_klass)
+        if @options[:prepend]
+          oktp_klass.prepend pm_klass # unless oktp_klass.include?(pm_klass)
+        else
+          oktp_klass.include pm_klass # unless oktp_klass.include?(pm_klass)
+        end
       end
 
     end
 
   end
+
+  module Reloader
+    def self.to_prepare(*args, &block)
+      if defined? ActiveSupport::Reloader
+        ActiveSupport::Reloader.to_prepare(*args, &block)
+      else
+        ActionDispatch::Reloader.to_prepare(*args, &block)
+      end
+    end
+
+    def self.to_cleanup(*args, &block)
+      if defined? ActiveSupport::Reloader
+        ActiveSupport::Reloader.to_complete(*args, &block)
+      else
+        ActionDispatch::Reloader.to_cleanup(*args, &block)
+      end
+    end
+  end
 end
 
 ActiveSupport.on_load(:easyproject, yield: true) do
   RedmineExtensions::PatchManager.apply_persisting_patches
 end
 
-ActionDispatch::Reloader.to_prepare do
+RedmineExtensions::Reloader.to_prepare do
   RedmineExtensions::PatchManager.apply_reloadable_patches
 end

data/lib/redmine_extensions/rails_patches/route_set_generator_patch.rb

@@ -1,20 +1,10 @@
 module RedmineExtensions
   module RailsPatches
     module RouteSetGeneratorPatch
-
-      def self.included(base)
-
-        base.class_eval do
-          def use_relative_controller_with_redmine_extensions!
-            return if current_controller && current_controller.start_with?('redmine_extensions')
-            use_relative_controller_without_redmine_extensions!
-          end
-
-          alias_method_chain :use_relative_controller!, :redmine_extensions
-        end
-
+      def use_relative_controller!
+        return if current_controller && current_controller.start_with?('redmine_extensions')
+        super
       end
-
     end
   end
 end

data/lib/redmine_extensions/redmine_patches/controllers/application_controller_patch.rb

@@ -2,8 +2,8 @@ module RedmineExtensions
   module ApplicationControllerPatch
 
     def self.included(base)
-      base.extend(ClassMethods)
-      base.send(:include, InstanceMethods)
+      base.extend ClassMethods
+      base.include InstanceMethods
 
       base.class_eval do
         helper_method :easy_extensions?
@@ -29,13 +29,11 @@ module RedmineExtensions
 
       private
 
-        def save_easy_settings(project = nil)
-          if params[:easy_setting].is_a?(Hash) || params[:easy_setting].is_a?(ActionController::Parameters)
-            wrapper = EasySettings::ParamsWrapper.from_params(params.delete(:easy_setting), project: project)
-            wrapper.save
-            wrapper
-          end
-        end
+      def save_easy_settings(project = nil)
+        wrapper = EasySettings::ParamsWrapper.from_params(params.require(:easy_setting).permit!, project: project)
+        wrapper.save
+        wrapper
+      end
 
     end
 

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +145,10 @@ files:
 - LICENSE
 - Rakefile
 - app/assets/javascripts/redmine_extensions/application.js
+- app/assets/javascripts/redmine_extensions/blocking.js
+- app/assets/javascripts/redmine_extensions/blocking_module.js
+- app/assets/javascripts/redmine_extensions/blocking_polyfill.js
+- app/assets/javascripts/redmine_extensions/blocking_schedule.js
 - app/assets/javascripts/redmine_extensions/easy_togglers.js
 - app/assets/javascripts/redmine_extensions/jquery.entityarray.js
 - app/assets/javascripts/redmine_extensions/redmine_extensions.js
@@ -231,6 +247,7 @@ files:
 - lib/redmine_extensions/html_formatting/formatter.rb
 - lib/redmine_extensions/html_formatting/helper.rb
 - lib/redmine_extensions/html_formatting/internals.rb
+- lib/redmine_extensions/migration.rb
 - lib/redmine_extensions/patch_manager.rb
 - lib/redmine_extensions/query_output.rb
 - lib/redmine_extensions/query_outputs/list_output.rb
@@ -276,22 +293,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Redmine Extensions is set of usefull features for Redmine. Main focus is
   on development helpers, but many users can find it helpfull
 test_files:
-- spec/rails_helper.rb
-- spec/factories/time_entries.rb
+- spec/factories/easy_queries.rb
 - spec/factories/easy_settings.rb
 - spec/factories/issues.rb
 - spec/factories/projects.rb
+- spec/factories/time_entries.rb
 - spec/factories/trackers.rb
-- spec/factories/easy_queries.rb
 - spec/factories/users.rb
+- spec/features/autocomplete_spec.rb
+- spec/models/easy_setting_spec.rb
 - spec/presenters/redmine_extensions/easy_setting_presenter_spec.rb
-- spec/support/plugin_generator.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
-- spec/models/easy_setting_spec.rb
-- spec/features/autocomplete_spec.rb
+- spec/support/plugin_generator.rb