redmineup 1.0.5 → 1.0.7

data/lib/redmineup/assets_manager.rb

@@ -2,7 +2,8 @@ module Redmineup
   class AssetsManager
     def self.install_assets
       return unless Gem.loaded_specs[GEM_NAME]
-      source = File.join(Gem.loaded_specs[GEM_NAME].full_gem_path, 'vendor', 'assets')
+
+      source = File.join(Gem.loaded_specs[GEM_NAME].full_gem_path, 'app', 'assets')
       destination = File.join(Dir.pwd, 'public', 'plugin_assets', GEM_NAME)
       return unless File.directory?(source)
 
@@ -39,5 +40,15 @@ module Redmineup
         end
       end
     end
+
+    def self.base_path
+      Gem.loaded_specs[GEM_NAME].full_gem_path
+    end
+
+    def self.assets_paths
+      return [] unless Gem.loaded_specs[GEM_NAME]
+
+      Dir[File.join(base_path, 'app', 'assets', '*')]
+    end
   end
 end

data/lib/redmineup/helpers/external_assets_helper.rb

@@ -13,7 +13,7 @@ module Redmineup
     def chartjs_assets
       return if @chartjs_tag_included
       @chartjs_tag_included = true
-      javascript_include_tag('Chart.bundle.min', plugin: GEM_NAME)
+      javascript_include_tag('chart.min', plugin: GEM_NAME)
     end
 
   end

data/lib/redmineup/liquid/drops/attachment_drop.rb

@@ -42,6 +42,14 @@ module Redmineup
                      end
         @content
       end
+
+      def to_s
+        filename
+      end
+
+      def to_base64_string
+        Base64.strict_encode64(File.read(@attachment.diskfile))
+      end
     end
   end
 end

data/lib/redmineup/liquid/drops/custom_field_enumeration_drop.rb

@@ -0,0 +1,11 @@
+module Redmineup
+  module Liquid
+    class CustomFieldEnumerationDrop < ::Liquid::Drop
+      delegate :id, :to_s, to: :@enumeration
+
+      def initialize(enumeration)
+        @enumeration = enumeration
+      end
+    end
+  end
+end

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

@@ -35,6 +35,7 @@ module Redmineup
 
       delegate :id,
                :subject,
+               :description,
                :visible?,
                :closed?,
                :start_date,
@@ -71,6 +72,10 @@ module Redmineup
         @assignee ||= UserDrop.new(@issue.assigned_to)
       end
 
+      def attachments
+        @attachments ||= @issue.attachments.map { |attachment| AttachmentDrop.new(attachment) }
+      end
+
       def tracker
         @tracker ||= @issue.tracker && @issue.tracker.name
       end
@@ -103,10 +108,6 @@ module Redmineup
         @project ||= ProjectDrop.new @issue.project if @issue.project
       end
 
-      def description
-        @description ||= replace_images_urls(@issue.description)
-      end
-
       def subtasks
         @subtasks ||= IssuesDrop.new @issue.children
       end
@@ -120,11 +121,11 @@ module Redmineup
       end
 
       def notes
-        @notes ||= @issue.journals.where.not(notes: [nil, '']).order(:created_on).map(&:notes).map { |note| replace_images_urls(note) }
+        @notes ||= @issue.journals.where.not(notes: [nil, '']).order(:created_on).map(&:notes)
       end
 
       def journals
-        @journals ||= JournalsDrop.new(@issue.journals.where.not(notes: nil).find_each { |journal| journal.notes = replace_images_urls(journal.notes) })
+        @journals ||= JournalsDrop.new @issue.journals.where.not(notes: [nil, ''])
       end
 
       def tags
@@ -158,19 +159,6 @@ module Redmineup
       def custom_field_values
         @issue.custom_field_values
       end
-
-      private
-
-      def replace_images_urls(text)
-        text.gsub(/\!.*\!/) do |i_name|
-          i_name = i_name.delete('!')
-          i_name_css = i_name.scan(/^\{.*\}/).first.to_s
-          attachment = @issue.attachments.find_by(filename: i_name.gsub(i_name_css, ''))
-          image = AttachmentDrop.new attachment if attachment
-          attach_url = image.try(:url)
-          attach_url ? "!#{i_name_css}#{attach_url}!" : i_name
-        end
-      end
     end
 
     class JournalsDrop < ::Liquid::Drop
@@ -212,6 +200,10 @@ module Redmineup
       def issue
         @issue ||= IssueDrop.new @journal.issue if @journal.issue
       end
+
+      def attachments
+        @attachments ||= @journal.attachments.map { |attachment| AttachmentDrop.new(attachment) }
+      end
     end
   end
 end

data/lib/redmineup/liquid/drops/users_drop.rb

@@ -35,7 +35,7 @@ module Redmineup
     end
 
     class UserDrop < ::Liquid::Drop
-      delegate :id, :name, :firstname, :lastname, :mail, :active?, :admin?, :logged?, :language, :to => :@user, allow_nil: true
+      delegate :id, :name, :firstname, :lastname, :mail, :active?, :admin?, :logged?, :language, :to_s, :to => :@user, allow_nil: true
 
       def initialize(user)
         @user = user
@@ -61,8 +61,7 @@ module Redmineup
 
       def custom_field_values
         @user.custom_field_values
-      end         
-      
+      end
     end
   end
 end

data/lib/redmineup/liquid/drops/version_drop.rb

@@ -0,0 +1,40 @@
+module Redmineup
+  module Liquid
+    class VersionDrop < ::Liquid::Drop
+      delegate  :id,
+                :name,
+                :description,
+                :effective_date,
+                :due_date,
+                :wiki_page_title,
+                :status,
+                :sharing,
+                :default_project_version,
+                :start_date,
+                :due_date,
+                :estimated_hours,
+                :spent_hours,
+                :closed?,
+                :open?,
+                :completed?,
+                :completed_percent,
+                :closed_percent,
+                :overdue?,
+                :issues_count,
+                :open_issues_count,
+                :closed_issues_count,
+                :visible_fixed_issues,
+                :wiki_page,
+                :to_s_with_project,
+                :shared?,
+                :deletable?,
+                :default_project_version,
+                :to_s,
+                to: :@version
+
+      def initialize(version)
+        @version = version
+      end
+    end
+  end
+end

data/lib/redmineup/liquid/filters/additional.rb

@@ -0,0 +1,31 @@
+require 'liquid'
+
+module Redmineup
+  module Liquid
+    module Filters
+      module Additional
+        def parse_inline_attachments(text, obj)
+          attachments = obj.attachments if obj.respond_to?(:attachments)
+
+          if attachments.present?
+            text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
+              filename, ext, alt, alttext = $1, $2, $3, $4
+              # search for the picture in attachments
+              if found = Attachment.latest_attach(attachments, CGI.unescape(filename))
+                desc = found.description.to_s.delete('"')
+                alt = " title=\"#{desc}\" alt=\"#{desc}\"" if !desc.blank? && alttext.blank?
+                "src='data:image/#{found.content_type};base64,#{found.to_base64_string}' #{alt}"
+              else
+                m
+              end
+            end
+          end
+
+          text
+        end
+      end
+
+      ::Liquid::Template.register_filter(Redmineup::Liquid::Filters::Additional)
+    end
+  end
+end

data/lib/redmineup/liquid/filters/base.rb

@@ -100,7 +100,12 @@ module Redmineup
         def custom_field(input, field_name)
           if input.respond_to?(:custom_field_values)
             custom_value = input.custom_field_values.detect { |cfv| cfv.custom_field.name == field_name }
-            custom_value.custom_field.format.formatted_custom_value(nil, custom_value) if custom_value
+            if custom_value
+              result = custom_value.custom_field.format.formatted_custom_value(nil, custom_value)
+              return result if result.respond_to?(:to_liquid)
+              drop_class = "Redmineup::Liquid::#{result.class.name}Drop"
+              Object.const_defined?(drop_class) ? drop_class.constantize.new(result) : result
+            end
           end
         end
 

data/lib/redmineup/patches/compatibility/sprite_patch.rb

@@ -0,0 +1,21 @@
+module Redmineup
+  module Patches
+    module Compatibility
+      module SpritePatch
+        def self.included(base)
+          base.send(:include, InstanceMethods)
+        end
+
+        module InstanceMethods
+          def sprite_icon(icon_name, label = nil, icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil)
+            label
+          end
+        end
+      end
+    end
+  end
+end
+
+unless ApplicationHelper.included_modules.include?(Redmineup::Patches::Compatibility::SpritePatch)
+  ApplicationHelper.send(:include, Redmineup::Patches::Compatibility::SpritePatch)
+end

data/lib/redmineup/patches/compatibility_patch.rb

@@ -4,4 +4,7 @@ end
 if Redmine::VERSION.to_s < "5" 
   require 'redmineup/patches/compatibility/user_patch'
 end
-require 'redmineup/patches/compatibility/routing_mapper_patch'
+unless ApplicationHelper.method_defined?(:sprite_icon)
+  require 'redmineup/patches/compatibility/sprite_patch'
+end
+require 'redmineup/patches/compatibility/routing_mapper_patch'

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.0.5'
+  VERSION = '1.0.7'
 end

data/lib/redmineup.rb

@@ -27,6 +27,7 @@ require 'redmineup/money_helper'
 require 'redmineup/colors_helper'
 
 require 'liquid'
+require 'redmineup/liquid/filters/additional'
 require 'redmineup/liquid/filters/base'
 require 'redmineup/liquid/filters/arrays'
 require 'redmineup/liquid/filters/colors'
@@ -37,6 +38,8 @@ require 'redmineup/liquid/drops/users_drop'
 require 'redmineup/liquid/drops/time_entries_drop'
 require 'redmineup/liquid/drops/attachment_drop'
 require 'redmineup/liquid/drops/issue_relations_drop'
+require 'redmineup/liquid/drops/version_drop'
+require 'redmineup/liquid/drops/custom_field_enumeration_drop'
 
 require 'redmineup/helpers/external_assets_helper'
 require 'redmineup/helpers/form_tag_helper'
@@ -61,7 +64,20 @@ if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend(Redmineup::ActsAsVotable::Votable)
 end
 
-Redmineup::AssetsManager.install_assets
+if defined?(Propshaft::Assembly)
+  Propshaft::Assembly.prepend(Module.new do
+    def initialize(config)
+      base_dir = Pathname.new(Redmineup::AssetsManager.base_path)
+      paths = Redmineup::AssetsManager.assets_paths.map { |path| Pathname.new(path)}
+      asset_prefix = "plugin_assets/#{Redmineup::GEM_NAME}"
+
+      config[:redmine_extension_paths] << Redmine::AssetPath.new(base_dir, paths, asset_prefix)
+      super
+    end
+  end)
+else
+  Redmineup::AssetsManager.install_assets
+end
 
 if defined?(ActionView::Base)
   ActionView::Base.send :include, Redmineup::CalendarsHelper

data/test/liquid/drops/issues_drop_test.rb

@@ -26,6 +26,11 @@ module Redmineup
       assert_equal @user.name, @liquid_render.render('{{ issue.author.name }}')
     end
 
+    def test_issue_attachments
+      attachment_author = @issue.attachments.first.author.name
+      assert_equal attachment_author, @liquid_render.render('{% assign attach = issue.attachments | first %}{{ attach.author.name }}')
+    end
+
     def test_issue_delegated
       assert_equal [@issue.id, @issue.subject, @issue.description].join('|'),
                    @liquid_render.render('{{ issue.id }}|{{ issue.subject }}|{{ issue.description }}')

data/test/liquid/filters/additional_filter_test.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../liquid_helper'
+include LiquidHelperMethods
+
+module Redmineup
+  class AdditionalFilterTest < ActiveSupport::TestCase
+    def setup
+      @issue = Issue.first
+      @issue_drop = Liquid::IssueDrop.new(@issue)
+      @strainer = ::Liquid::Context.new.strainer
+    end
+
+    def test_parse_inline_attachments
+      text = '<p>description with image <img src="screenshot.png" /></p>'
+      attachment = mock_attachment
+      attachments = [attachment]
+      @issue_drop.define_singleton_method(:attachments) { attachments }
+      Attachment.stub(:latest_attach, attachment) do
+        assert_equal '<p>description with image <img src="mock_url" title="attach_image" alt="attach_image" loading="lazy" /></p>', @strainer.parse_inline_attachments(text, @issue_drop)
+      end
+    end
+
+    private
+
+    def mock_attachment
+      attachment = Minitest::Mock.new
+      attachment.expect(:url, 'mock_url')
+      attachment.expect(:description, "attach_image")
+      attachment
+    end
+  end
+end

data/test/models/attachment.rb

@@ -1,3 +1,8 @@
 class Attachment < ActiveRecord::Base
   belongs_to :author, :class_name => "User"
+
+  def self.latest_attach(attachments, filename)
+    # stub method for test
+    # returned one attachment
+  end
 end

data/test/models/issue.rb

@@ -8,6 +8,7 @@ class Issue < ActiveRecord::Base
 
   has_many :relations_from, class_name: 'IssueRelation', foreign_key: 'issue_from_id', dependent: :delete_all
   has_many :relations_to, class_name: 'IssueRelation', foreign_key: 'issue_to_id', dependent: :delete_all
+  has_many :journals, foreign_key: 'journalized_id'
 
   up_acts_as_draftable
   up_acts_as_taggable
@@ -18,4 +19,8 @@ class Issue < ActiveRecord::Base
   def visible?
     true
   end
+
+  def attachments
+    Attachment.all
+  end
 end

data/test/models/journal.rb

@@ -0,0 +1,6 @@
+class Journal < ActiveRecord::Base
+  belongs_to :journalized, :polymorphic => true
+  belongs_to :issue, :foreign_key => :journalized_id
+
+  belongs_to :user
+end

data/test/schema.rb

@@ -25,97 +25,104 @@ ActiveRecord::Schema.define version: 0 do
     t.datetime :updated_at
   end
 
-  create_table "tags", :force => true do |t|
-    t.column "name", :string
+  create_table :journals, force: true  do |t|
+    t.integer :journalized_id, default: 0, null: false
+    t.string :journalized_type, limit: 30, default: "", null: false
+    t.integer :user_id, default: 0, null: false
+    t.text :notes
+    t.datetime :created_on, null: false
+    t.boolean :private_notes, default: false, null: false
   end
 
-  create_table "taggings", :force => true do |t|
-    t.column "tag_id", :integer
-    t.column "taggable_id", :integer
-    t.column "taggable_type", :string
-    t.column "created_at", :datetime
-  end
-
-  create_table "users", :force => true do |t|
-    t.column "name", :string
-    t.column "language", :string
-  end
-
-  create_table "issue_relations", :force => true do |t|
-    t.column "issue_from_id", :integer
-    t.column "issue_to_id", :integer
-    t.column "relation_type", :string
-    t.column "delay", :integer
+  create_table :tags, force: true do |t|
+    t.string :name
   end
 
-  create_table "issues", :force => true do |t|
-    t.integer  "project_id"
-    t.column "subject", :string
-    t.column "description", :string
-    t.column "closed", :boolean
-    t.column "cached_tag_list", :string
-    t.column "user_id", :integer
-    t.column "author_id", :integer
-    t.column "views", :integer, :default => 0
-    t.column "total_views", :integer, :default => 0
+  create_table :taggings, force: true do |t|
+    t.integer  :tag_id
+    t.integer  :taggable_id
+    t.string   :taggable_type
+    t.datetime :created_at
   end
 
-  create_table "votes", :force => true do |t|
-    t.references "votable", :polymorphic => true
-    t.references "voter", :polymorphic => true
-
-    t.boolean "vote_flag"
-    t.string "vote_scope"
-    t.integer "vote_weight"
-    t.string "vote_ip"
-
+  create_table :users, force: true do |t|
+    t.string :name
+    t.string :language
+  end
+
+  create_table :issue_relations, force: true do |t|
+    t.integer :issue_from_id
+    t.integer :issue_to_id
+    t.string  :relation_type
+    t.integer :delay
+  end
+
+  create_table :issues, force: true do |t|
+    t.integer :project_id
+    t.string  :subject
+    t.string  :description
+    t.boolean :closed
+    t.string  :cached_tag_list
+    t.integer :user_id
+    t.integer :author_id
+    t.integer :views, default: 0
+    t.integer :total_views, default: 0
+  end
+
+  create_table :votes, force: true do |t|
+    t.references :votable, polymorphic: true
+    t.references :voter, polymorphic: true
+    t.boolean  :vote_flag
+    t.string   :vote_scope
+    t.integer  :vote_weight
+    t.string   :vote_ip
     t.timestamps
   end
 
-  create_table "news", :force => true do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "author_id"
+  create_table :news, force: true do |t|
+    t.string  :title
+    t.text    :description
+    t.integer :author_id
   end
 
-  create_table "projects", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.string   "identifier"
-    t.integer  "status"
+  create_table :projects, force: true do |t|
+    t.string  :name
+    t.text    :description
+    t.string  :identifier
+    t.integer :status
   end
 
-  create_table :voters, :force => true do |t|
+  create_table :voters, force: true do |t|
     t.string :name
   end
 
-  create_table :not_voters, :force => true do |t|
+  create_table :not_voters, force: true do |t|
     t.string :name
   end
 
-  create_table :votables, :force => true do |t|
+  create_table :votables, force: true do |t|
     t.string :name
   end
 
-  create_table :votable_voters, :force => true do |t|
+  create_table :votable_voters, force: true do |t|
     t.string :name
   end
 
-  create_table :sti_votables, :force => true do |t|
+  create_table :sti_votables, force: true do |t|
     t.string :name
     t.string :type
   end
 
-  create_table :sti_not_votables, :force => true do |t|
+  create_table :sti_not_votables, force: true do |t|
     t.string :name
     t.string :type
   end
 
-  create_table :not_votables, :force => true do |t|
+  create_table :not_votables, force: true do |t|
     t.string :name
   end
 
-  create_table :votable_caches, :force => true do |t|
+  create_table :votable_caches, force: true do |t|
     t.string :name
     t.integer :cached_votes_total
     t.integer :cached_votes_score
@@ -134,11 +141,11 @@ ActiveRecord::Schema.define version: 0 do
     t.float :cached_scoped_weighted_average
   end
 
-  create_table :viewings, :force => true do |t|
+  create_table :viewings, force: true do |t|
     t.column :viewer_id,   :integer
     t.column :viewed_id,   :integer
     t.column :viewed_type, :string
-    t.column :ip, :string, :limit => '24'
+    t.column :ip, :string, limit: '24'
     t.column :created_at, :datetime
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2025-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,6 +112,15 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/assets/images/money.png
+- app/assets/images/vcard.png
+- app/assets/javascripts/Chart.bundle.min.js.bak
+- app/assets/javascripts/chart.min.js
+- app/assets/javascripts/select2.js
+- app/assets/javascripts/select2_helpers.js
+- app/assets/stylesheets/calendars.css
+- app/assets/stylesheets/money.css
+- app/assets/stylesheets/select2.css
 - app/controllers/redmineup_controller.rb
 - app/views/redmineup/_money.html.erb
 - app/views/redmineup/settings.html.erb
@@ -155,18 +164,22 @@ files:
 - lib/redmineup/helpers/vote_helper.rb
 - lib/redmineup/hooks/views_layouts_hook.rb
 - lib/redmineup/liquid/drops/attachment_drop.rb
+- lib/redmineup/liquid/drops/custom_field_enumeration_drop.rb
 - lib/redmineup/liquid/drops/issue_relations_drop.rb
 - lib/redmineup/liquid/drops/issues_drop.rb
 - lib/redmineup/liquid/drops/news_drop.rb
 - lib/redmineup/liquid/drops/projects_drop.rb
 - lib/redmineup/liquid/drops/time_entries_drop.rb
 - lib/redmineup/liquid/drops/users_drop.rb
+- lib/redmineup/liquid/drops/version_drop.rb
+- lib/redmineup/liquid/filters/additional.rb
 - lib/redmineup/liquid/filters/arrays.rb
 - lib/redmineup/liquid/filters/base.rb
 - lib/redmineup/liquid/filters/colors.rb
 - lib/redmineup/money_helper.rb
 - lib/redmineup/patches/compatibility/application_controller_patch.rb
 - lib/redmineup/patches/compatibility/routing_mapper_patch.rb
+- lib/redmineup/patches/compatibility/sprite_patch.rb
 - lib/redmineup/patches/compatibility/user_patch.rb
 - lib/redmineup/patches/compatibility_patch.rb
 - lib/redmineup/patches/liquid_patch.rb
@@ -203,6 +216,7 @@ files:
 - test/liquid/drops/news_drop_test.rb
 - test/liquid/drops/projects_drop_test.rb
 - test/liquid/drops/uses_drop_test.rb
+- test/liquid/filters/additional_filter_test.rb
 - test/liquid/filters/arrays_filter_test.rb
 - test/liquid/filters/base_filter_test.rb
 - test/liquid/filters/colors_filter_test.rb
@@ -210,6 +224,7 @@ files:
 - test/models/attachment.rb
 - test/models/issue.rb
 - test/models/issue_relation.rb
+- test/models/journal.rb
 - test/models/news.rb
 - test/models/project.rb
 - test/models/user.rb
@@ -219,14 +234,6 @@ files:
 - test/tags_helper_test.rb
 - test/test_helper.rb
 - test/vote_helper_test.rb
-- vendor/assets/images/money.png
-- vendor/assets/images/vcard.png
-- vendor/assets/javascripts/Chart.bundle.min.js
-- vendor/assets/javascripts/select2.js
-- vendor/assets/javascripts/select2_helpers.js
-- vendor/assets/stylesheets/calendars.css
-- vendor/assets/stylesheets/money.css
-- vendor/assets/stylesheets/select2.css
 homepage: https://www.redmineup.com
 licenses:
 - GPL-2.0
@@ -280,6 +287,7 @@ test_files:
 - test/liquid/drops/news_drop_test.rb
 - test/liquid/drops/projects_drop_test.rb
 - test/liquid/drops/uses_drop_test.rb
+- test/liquid/filters/additional_filter_test.rb
 - test/liquid/filters/arrays_filter_test.rb
 - test/liquid/filters/base_filter_test.rb
 - test/liquid/filters/colors_filter_test.rb
@@ -287,6 +295,7 @@ test_files:
 - test/models/attachment.rb
 - test/models/issue.rb
 - test/models/issue_relation.rb
+- test/models/journal.rb
 - test/models/news.rb
 - test/models/project.rb
 - test/models/user.rb