redmineup 1.0.6 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1035b01f7fb3252d090e82266fe2fba481dbbbc18648236196dddee8516d812
-  data.tar.gz: 51c93663b752c3f39223ba51ceba2ca6ff0512414095770944c3141be4933d34
+  metadata.gz: 785a28d029a642ecf01ce919e3c4590b2e393bec640da155fb289eef8aedd1b9
+  data.tar.gz: 4fcb6f8c483751c3a110adbcadc6d2ad78191b0204fc1178623d03b968a50e3b
 SHA512:
-  metadata.gz: bdbb9fe50b93e416a4ca632f44e389e4f095097b376ecaafd2a49454d79b819dbd0bff6704e0758272367b3d0801a096811bb88da17ce40d10e19247f8eab771
-  data.tar.gz: da9985f0cbc49059443f68eac10e37f913ef85f8949b2cd1e84d6407c9e9d9b4aad548533e9bc7dbe36892988eda21457edeeaf7d79e8e072923f0cb85535b29
+  metadata.gz: bf9f8165edb02007ef48a4f8cb56a3f89d60f11fdf771706037b701d1da24017933a057961bc941e19a2afa96affcd269341b14b5443cb76d39c34dff4c5553a
+  data.tar.gz: fdc12c196149feb894ab2b02e46d0c216007e40adb9982e121ec208a80a1e5fa9ce77dbc66430ec54a806b9c87cc855a8d12fa0539db1bc539dcc33cf072b392

data/app/assets/images/icons.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" class="icon--sprite">
+  <defs>
+    <symbol xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round" id="icon--money">
+      <path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M16 6m-5 0a5 3 0 1 0 10 0a5 3 0 1 0 -10 0" /><path d="M11 6v4c0 1.657 2.239 3 5 3s5 -1.343 5 -3v-4" /><path d="M11 10v4c0 1.657 2.239 3 5 3s5 -1.343 5 -3v-4" /><path d="M11 14v4c0 1.657 2.239 3 5 3s5 -1.343 5 -3v-4" /><path d="M7 9h-2.5a1.5 1.5 0 0 0 0 3h1a1.5 1.5 0 0 1 0 3h-2.5" /><path d="M5 15v1m0 -8v1" />
+    </symbol>
+  </defs>
+</svg>

data/app/assets/stylesheets/money.css

@@ -1,8 +1,7 @@
-.icon-redmineup-money {
+#admin-menu a.icon-redmineup-money:not(:has(svg)) {
   background-image: url(../images/money.png);
 }
 
-
 /***** Calendar *****/
 ul.cal {
   list-style: none;

data/doc/CHANGELOG

@@ -1,9 +1,23 @@
-== Redmine UP gem changelog
+== RedmineUP gem changelog
 
 Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2024 Kirill Bezrukov (RedmineUP)
+Copyright (C) 2011-2025 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2025-02-04 v1.0.9
+
+* Added regex_replace Liquid filter
+* Added svg icons for Redmine 6
+
+== 2025-01-31 v1.0.8
+
+* Fixed compatibility patch for Redmine < 5
+
+== 2025-01-29 v1.0.7
+
+* Fixed parse_inline_attachments Liquid filter
+* Added compatibility patch for Redmine 6 sprite_icon 
+
 == 2024-05-07 v1.0.6
 
 * Updated Chart.js to v3.9.1
@@ -23,4 +37,4 @@ https://www.redmineup.com/
 == 2023-09-27 v1.0.0
 
 * Initial release
-* Mirgated from redmineup gem
+* Mirgated from redmineup gem

data/lib/redmineup/currency.rb

@@ -40,7 +40,9 @@ module Redmineup
         Redmine::MenuManager.map(:admin_menu).push(:redmineup_money,
                                                    { controller: 'redmineup', action: 'settings', id: 'money' },
                                                    caption: :label_redmineup_money,
-                                                   html: { class: 'icon icon-redmineup-money' })
+                                                   html: { class: 'icon icon-redmineup-money' },
+                                                   icon: 'money',
+                                                   plugin: :redmineup)
 
       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/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

@@ -12,12 +12,9 @@ module Redmineup
               filename, ext, alt, alttext = $1, $2, $3, $4
               # search for the picture in attachments
               if found = Attachment.latest_attach(attachments, CGI.unescape(filename))
-                image_url = found.url
                 desc = found.description.to_s.delete('"')
-                if !desc.blank? && alttext.blank?
-                  alt = " title=\"#{desc}\" alt=\"#{desc}\""
-                end
-                "src=\"#{image_url}\"#{alt} loading=\"lazy\""
+                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

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

@@ -38,6 +38,16 @@ module Redmineup
           Digest::MD5.hexdigest(input) unless input.blank?
         end
 
+        def regex_replace(str, regex_search, value_replace)
+          regex = /#{regex_search}/
+          return str.gsub(regex, value_replace)
+        end
+
+        def regex_replace_once(str, regex_search, value_replace)
+          regex = /#{regex_search}/
+          return str.sub(regex, value_replace)
+        end        
+
         # example:
         #   {{ "http:://www.example.com?key=hello world" | encode }}
         #
@@ -102,8 +112,9 @@ module Redmineup
             custom_value = input.custom_field_values.detect { |cfv| cfv.custom_field.name == field_name }
             if custom_value
               result = custom_value.custom_field.format.formatted_custom_value(nil, custom_value)
-              result = result.to_s if result.is_a?(CustomFieldEnumeration)
-              result
+              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 ActionView::Base.included_modules.include?(Redmineup::Patches::Compatibility::SpritePatch)
+  ActionView::Base.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'
+if Redmine::VERSION.to_s < "6"
+  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.6'
+  VERSION = '1.0.9'
 end

data/lib/redmineup.rb

@@ -38,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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.9
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,6 +112,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/assets/images/icons.svg
 - app/assets/images/money.png
 - app/assets/images/vcard.png
 - app/assets/javascripts/Chart.bundle.min.js.bak
@@ -164,12 +165,14 @@ 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
@@ -177,6 +180,7 @@ files:
 - 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