redmine_extensions 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002eb7a53213f9d31059a1c7bcc099463893c3b4
-  data.tar.gz: 3e26d2836b750e51d43361822f6c2f9da2453e5a
+  metadata.gz: 4f421201ad531afbd5de4df6dbaabcdb76a0118d
+  data.tar.gz: f8590c69aeb9812efdfe110682fff9f91d9ba900
 SHA512:
-  metadata.gz: c04c0b3b80337845436b639be277afba66b7322613f57973cccfe58fd640de034c3cad54120de67237967f1455873990667a7604ec894a901f951dda4a94a6eb
-  data.tar.gz: 642bf45996d775e20dad82f5c56fbb4d1e6f5252ec371a8a6104e8e3138a7ebd03948c8ccc0df21f5eec52527326b1993e4b742a81b343d1a25777b3fbce94cf
+  metadata.gz: d2f2030116481690fdae03a6c749a4bd367c7bf69a37685acaeed8a62f2e2cb21d37afac4bc4a32ec68792a5e9a9212aa8775217adfd420fdf3ec93c32292225
+  data.tar.gz: 04ba05638b6a38cd141ad892c71ff7fc3771e308f7638200bce082e4ed060e6a3182f5dda0a226caa499280d31351156811ece6c28303992b8a5414e660989e7

data/app/views/redmine_extensions/_development_mode.html.erb

@@ -0,0 +1,33 @@
+<% if RedmineExtensions::PatchManager.reloadable_patches_applied > 1 %>
+  <div class="patches-applied">
+    <i class="icon icon-reload"></i> Patches applied (<%= RedmineExtensions::PatchManager.reloadable_patches_applied %>x)
+  </div>
+
+  <style>
+    .patches-applied {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      padding: 2px 10px;
+      background: #f44336;
+      border-top: 1px solid #b71c1c;
+      border-right: 1px solid #b71c1c;
+      animation: patches-applied-pulse 2s 5;
+      color: #fff;
+      z-index: 9999999;
+    }
+
+    @keyframes patches-applied-pulse {
+      0% {
+        box-shadow: 0 0 0 0 rgba(229, 115, 115, 0.4);
+      }
+      70% {
+        box-shadow: 0 0 0 20px rgba(229, 115, 115, 0);
+      }
+      100% {
+        box-shadow: 0 0 0 0 rgba(229, 115, 115, 0);
+      }
+    }
+  </style>
+<% end %>
+

data/lib/redmine_extensions/engine.rb

@@ -1,6 +1,6 @@
 require 'active_support/dependencies'
 require_relative './patch_manager'
-require_relative './redmine_patches/patches'
+require_relative './redmine_patches/controllers/application_controller_patch'
 
 require_relative './query_output'
 
@@ -70,9 +70,6 @@ module RedmineExtensions
       unless Redmine::Plugin.installed?(:easy_extensions)
         ActiveSupport.run_load_hooks(:easyproject, self)
       end
-
-      require_relative './easy_query_adapter'
-      require_relative './easy_entity_formatters/easy_entity_formatter'
     end
 
     # initializer :add_html_formatting do |app|

data/lib/redmine_extensions/hooks.rb

@@ -1,6 +1,10 @@
 module RedmineExtensions
   class Hooks < Redmine::Hook::ViewListener
 
+    if Rails.env.development?
+      render_on :view_layouts_base_body_bottom, partial: 'redmine_extensions/development_mode'
+    end
+
     if defined?(EasyExtensions)
       if EasyExtensions.try(:deferred_js)
 
@@ -37,5 +41,6 @@ module RedmineExtensions
           javascript_include_tag('redmine_extensions/redmine_extensions')
       end
     end
+
   end
 end

data/lib/redmine_extensions/patch_manager.rb

@@ -4,6 +4,11 @@ module RedmineExtensions
 
     PERSISTING_PATCHES = [:force_first, :ruby, :rails, :redmine_plugins, :others]
 
+    @@patches_locations = {}
+
+    @@reloading_code = false
+    @@reloadable_patches_applied = 0
+
     # is called after EasyPatchesSection load
     def self.initialize_sections
       @@registered_patches ||= ActiveSupport::OrderedHash.new
@@ -18,6 +23,20 @@ module RedmineExtensions
       @@registered_patches[:models] ||= EasyPatchesSection.new
     end
 
+    def self.patches_locations
+      @@patches_locations
+    end
+
+    def self.with_reloading_code
+      @@reloading_code = true
+      yield
+    ensure
+      @@reloading_code = false
+    end
+
+    def self.reloadable_patches_applied
+      @@reloadable_patches_applied
+    end
 
     # register_patch
     # => original_klass_to_patch: 'Project', 'CustomField'
@@ -29,8 +48,19 @@ module RedmineExtensions
     # =>          :last
     # =>          :if => Proc.new{ Object.const_defined?(:EasyBudgetSheetQuery) }
     def self.register_patch(original_klasses_to_patch, patching_module, options={})
+      return if @@reloading_code
+
       options ||= {}
 
+      begin
+        const = patching_module.constantize
+        @@patches_locations[patching_module] = const.methods(false).map{|m| const.method(m) }.first.source_location.first
+      rescue
+        # [0] is register_*_patch
+        from_location = caller_locations[1]
+        @@patches_locations[patching_module] = from_location.absolute_path
+      end
+
       raise ArgumentError, 'EasyPatchManager->register_patch: The \'patching_module\' have to be a string!' unless patching_module.is_a?(String)
 
       if original_klasses_to_patch.is_a?(String)
@@ -136,14 +166,21 @@ module RedmineExtensions
 
     def self.apply_reloadable_patches
       (@@registered_patches.keys - PERSISTING_PATCHES).each do |section|
-        # pp "applying #{@@registered_patches[section].count} patches for section '#{section}'"
+        reloading_log "Applying #{section} patches (#{@@registered_patches[section].count})"
         @@registered_patches[section].apply_all_patches
       end
 
+      reloading_log("Applying page module patches")
       apply_easy_page_patches
+
+      @@reloadable_patches_applied += 1
       true
     end
 
+    def self.reloading_log(message)
+      return if @@reloadable_patches_applied <= 1
+      puts "PatchManager: #{message}"
+    end
 
     class EasyPatchesSection
       include Enumerable
@@ -349,8 +386,10 @@ module RedmineExtensions
           return unless cond.call
         end
 
-        pm_klass = patching_module.constantize
-        oktp_klass = original_klass_to_patch.constantize
+        pm_klass = easy_constantize(patching_module)
+        # pm_klass.class_eval { unloadable }
+
+        oktp_klass = easy_constantize(original_klass_to_patch)
 
         if @options[:prepend]
           oktp_klass.prepend pm_klass # unless oktp_klass.include?(pm_klass)
@@ -359,6 +398,20 @@ module RedmineExtensions
         end
       end
 
+      def easy_constantize(name)
+        const = name.constantize
+      rescue NameError
+        if RedmineExtensions::PatchManager.patches_locations.has_key?(name)
+          RedmineExtensions::PatchManager.with_reloading_code do
+            load RedmineExtensions::PatchManager.patches_locations[patching_module]
+          end
+
+          name.constantize
+        else
+          raise
+        end
+      end
+
     end
 
   end

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,6 +181,7 @@ files:
 - app/views/easy_queries/_index.html.erb
 - app/views/easy_queries/_settings.html.erb
 - app/views/easy_settings/edit.html.erb
+- app/views/redmine_extensions/_development_mode.html.erb
 - config/locales/cs.yml
 - config/locales/en.yml
 - config/routes.rb
@@ -238,9 +239,7 @@ files:
 - lib/redmine_extensions/core_ext/object.rb
 - lib/redmine_extensions/core_ext/string.rb
 - lib/redmine_extensions/deprecator.rb
-- lib/redmine_extensions/easy_entity_formatters/easy_entity_formatter.rb
 - lib/redmine_extensions/easy_form_builder.rb
-- lib/redmine_extensions/easy_query_adapter.rb
 - lib/redmine_extensions/easy_query_helpers/outputs.rb
 - lib/redmine_extensions/easy_settings.rb
 - lib/redmine_extensions/easy_settings/form_model.rb
@@ -264,7 +263,6 @@ files:
 - lib/redmine_extensions/rails_patches/form_builder_patch.rb
 - lib/redmine_extensions/rails_patches/route_set_generator_patch.rb
 - lib/redmine_extensions/redmine_patches/controllers/application_controller_patch.rb
-- lib/redmine_extensions/redmine_patches/patches.rb
 - lib/redmine_extensions/tags/autocomplete_field.rb
 - lib/redmine_extensions/version.rb
 - lib/tasks/redmine_extensions_tasks.rake

data/lib/redmine_extensions/easy_entity_formatters/easy_entity_formatter.rb

@@ -1,27 +0,0 @@
-class EasyEntityFormatter
-
-  def initialize(view_context)
-    @view_context = view_context
-  end
-
-  def view
-    @view_context
-  end
-
-  def l(*args)
-    view.l(*args)
-  end
-
-  def format_column(column, entity)
-    format_object column.value_object(entity)
-  end
-
-  def format_object(value)
-    view.format_object(value)
-  end
-
-  def ending_buttons?
-    false
-  end
-
-end

data/lib/redmine_extensions/easy_query_adapter.rb

@@ -1,175 +0,0 @@
-require 'query'
-
-module RedmineExtensions
-  module QueryColumnAdapter
-    def self.included(base)
-      base.extend ClassMethods
-      base.include InstanceMethods
-
-      base.class_eval do
-        attr_accessor :includes
-        attr_accessor :joins
-        attr_accessor :preload
-      end
-    end
-
-    module InstanceMethods
-    end
-
-    module ClassMethods
-    end
-  end
-
-  module QueryAdapter
-
-    attr_writer :outputs
-
-    def outputs
-      @outputs ||= ['list']
-    end
-
-    def output=(output_t)
-      self.outputs = Array.wrap(output_t)
-    end
-
-    def default_find_include
-      [].freeze
-    end
-
-    def default_find_preload
-      [].freeze
-    end
-
-    def default_find_joins
-      [].freeze
-    end
-
-    def default_list_columns
-      [].freeze
-    end
-
-    def formatter
-      @formatter
-    end
-
-    def init_formatter(object)
-      return @formatter if @formatter
-
-      if entity
-        begin
-          formatter_klass = "#{entity}Formatter".constantize
-        rescue NameError
-        end
-      end
-
-      formatter_klass ||= EasyEntityFormatter
-      @formatter = formatter_klass.new(object)
-    end
-
-    def entity
-      self.class.queried_class
-    end
-
-    def entity_scope
-      if !@entity_scope.nil?
-        @entity_scope
-      elsif entity.respond_to?(:visible)
-        entity.visible
-      else
-        entity
-      end
-    end
-
-    def set_entity_scope(entity, reference_collection = nil)
-      return nil if entity.nil? || reference_collection.nil?
-
-      @entity_scope = entity.send(reference_collection.to_sym)
-
-      self.filters = {}
-
-      @entity_scope
-    end
-
-    def create_entity_scope(options={})
-      scope = entity_scope.where(statement)
-
-      includes = default_find_include.dup
-      includes.concat(Array.wrap(options[:includes]))
-
-      preload = default_find_preload.dup
-      preload.concat(Array.wrap(options[:preload]))
-
-      joins = default_find_joins.dup
-      joins.concat(Array.wrap(options[:joins]))
-
-      filters.keys.each do |filter|
-        f = available_filters[filter]
-        next if f.blank?
-
-        includes.concat(Array.wrap(f[:includes])) if f[:includes]
-        joins.concat(Array.wrap(f[:joins])) if f[:joins]
-      end if filters
-
-      columns.each do |c|
-        includes.concat(Array.wrap(c.includes)) if c.includes
-        joins.concat(Array.wrap(c.joins)) if c.joins
-        preload.concat(Array.wrap(c.preload)) if c.preload
-      end
-
-      if project
-        includes << :project
-      end
-
-      includes.uniq!
-      joins.uniq!
-      preload.uniq!
-
-      scope.includes(includes).references(includes).joins(joins).preload(preload)
-    end
-
-    def entities(options={})
-      create_entity_scope(options).order(options[:order]).to_a
-    end
-
-    def add_available_column(name, options={})
-      @available_columns ||= []
-
-      @available_columns << QueryColumn.new(name.to_sym, options)
-    end
-
-    def to_partial_path
-      'easy_queries/index'
-    end
-
-    def default_columns_names
-      default_list_columns
-    end
-
-    def queried_table_name
-      entity.table_name
-    end
-
-  end
-
-  module QueryAdapterDefaults
-
-    def initialize(attributes=nil, *args)
-      super
-      self.filters ||= {}
-    end
-
-  end
-
-end
-
-class EasyQueryAdapter < Query
-end
-
-if Redmine::Plugin.installed?(:easy_extensions)
-  # EasyQuery exist
-else
-  QueryColumn.include RedmineExtensions::QueryColumnAdapter
-  RedmineExtensions::PatchManager.register_model_patch('Query', 'RedmineExtensions::QueryAdapter')
-  EasyQuery = EasyQueryAdapter
-  EasyQuery.prepend RedmineExtensions::QueryAdapterDefaults
-end

data/lib/redmine_extensions/redmine_patches/patches.rb

@@ -1,5 +0,0 @@
-require 'active_support/dependencies'
-patch_path = File.join(File.dirname(__FILE__), '**', '*_patch.rb')
-Dir.glob(patch_path).each do |file|
-  require file
-end