redmineup 1.0.2 → 1.1.13

data/lib/redmineup/helpers/form_tag_helper.rb

@@ -18,6 +18,7 @@ module Redmineup
     # * <tt>:allow_clear</tt> Provides support for clearable selections. Default value false.
     # * <tt>:min_input_length</tt> Minimum number of characters required to start a search. Default value 0.
     # * <tt>:format_state</tt> Defines template of search results in the drop-down.
+    # * <tt>:on_select</tt> Global JS callback name bound to `select2:select` event.
     # * <tt>:tags</tt> Used to enable tagging feature.
     #
     # <b>Note:</b> The HTML specification says when +multiple+ parameter passed to select and all options got deselected
@@ -49,6 +50,31 @@ module Redmineup
 
     alias select2 select2_tag
 
+    # Renders a select2 tag field for a tag list (standalone, no form object).
+    # Analogous to text_field_tag.
+    #
+    # ==== Example
+    #   tag_list_field_tag 'entry[tag_list]', entry.tag_list,
+    #     url: auto_complete_taggable_tags_path(taggable_type: 'DriveEntry')
+    def tag_list_field_tag(name, value = [], options = {})
+      url = options.delete(:url)
+      taggable_type = options.delete(:taggable_type)
+      width = options.delete(:width)
+      project_id = options.delete(:project_id)
+      placeholder = options.delete(:placeholder)
+      select2_tag(
+        name,
+        options_for_select(value, value),
+        {
+          multiple:    true,
+          width:       width || '95%',
+          url:         url || auto_complete_taggable_tags_path(taggable_type: taggable_type, project_id: project_id),
+          placeholder: placeholder || l(:lable_redmineup_add_tag),
+          tags:        true
+        }.merge(options)
+      )
+    end
+
     # Transforms select filters of +type+ fields into select2
     #
     # ==== Examples
@@ -86,3 +112,20 @@ module Redmineup
 
   end
 end
+
+# Extends Rails FormBuilder with tag_list_field, analogous to f.text_field.
+#
+# ==== Example
+#   <%= f.tag_list_field :tag_list %>
+ActionView::Helpers::FormBuilder.class_eval do
+  def tag_list_field(method, **options)
+    url = options.fetch(:url) {
+      @template.auto_complete_taggable_tags_path(taggable_type: @object.class.name)
+    }
+    @template.tag_list_field_tag(
+      "#{@object_name}[#{method}]",
+      @object.public_send(method),
+      {url: url}.merge(options.except(:url))
+    )
+  end
+end

data/lib/redmineup/helpers/tags_helper.rb

@@ -9,5 +9,46 @@ module Redmineup
         yield tag, classes[index]
       end
     end
+
+    def tag_link(url, tag_name, options = {})
+      count      = options.delete(:count)
+      inner      = link_to(tag_name, url, options)
+      inner << content_tag('span', "(#{count})", class: 'tag-count') if count
+      css        = monochrome? ? 'tag-label' : 'tag-label-color'
+      style      = monochrome? ? {} : { style: "background-color: #{Redmineup::ActsAsTaggable::Tag.color_from_name(tag_name)}" }
+      content_tag(:span, inner, { class: css }.merge(style))
+    end
+
+    def tag_separator
+      monochrome? ? ', ' : ' '
+    end
+
+    def monochrome?
+      @monochrome ||= defined?(RedmineupTags) && !RedmineupTags.use_colors?
+    end
+
+    def tag_links(tag_list, options = {}, &url_block)
+      return if tag_list.blank?
+      content_tag(:span, class: 'tag_list') do
+        safe_join(tag_list.map { |tag| tag_link(url_block.call(tag), tag, options.dup) }, tag_separator)
+      end
+    end
+
+    # Renders span.tag_list from an array of tag objects (respond to .name and .count).
+    # Resolves URL via `{key}_tag_url(name)` in the current view context.
+    #
+    #   tag_cloud_links(contact.available_tags, :contact)   # → contact_tag_url(name)
+    #   tag_cloud_links(tags_cloud, :people)                # → people_tag_url(name)
+    def tag_cloud_links(tags, key, options = {})
+      return if tags.blank?
+      url_method = :"#{key}_tag_url"
+      raise NoMethodError, "#{url_method} is not defined in view context" unless respond_to?(url_method, true)
+      content_tag(:span, class: 'tag_list') do
+        safe_join(tags.map { |tag|
+          tag_link(send(url_method, tag.name), tag.name, options.merge(count: tag.count).dup)
+        }, tag_separator)
+      end
+    end
+
   end
 end

data/lib/redmineup/helpers/test_helper.rb

@@ -0,0 +1,12 @@
+module Redmineup
+  module TestHelper
+    module ClassMethods
+      def load_plugin_fixtures(plugin_name, *names)
+        fixtures_dir = File.join(Redmine::Plugin.find(plugin_name).directory, 'test', 'fixtures')
+        ActiveRecord::FixtureSet.create_fixtures(fixtures_dir, names)
+      end
+    end
+  end
+end
+
+ActiveSupport::TestCase.extend Redmineup::TestHelper::ClassMethods

data/lib/redmineup/hooks/views_layouts_hook.rb

@@ -3,9 +3,7 @@
 module Redmineup
   module Hooks
     class ViewsLayoutsHook < Redmine::Hook::ViewListener
-      def view_layouts_base_html_head(_context = {})
-        stylesheet_link_tag(:money, plugin: 'redmineup')
-      end
+      render_on :view_layouts_base_html_head, partial: 'redmineup/additional_assets'
     end
   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,38 @@
+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,
+                :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?,
+                :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

@@ -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 }}
         #
@@ -100,7 +110,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/money_helper.rb

@@ -8,11 +8,19 @@ module Redmineup
       price_to_currency(obj.try(price_field), obj.currency, options).to_s if obj.respond_to?(:currency)
     end
 
-    def prices_collection_by_currency(prices_collection, options = {})
+    def prices_formatted_collection(prices_collection, options = {})
       return [] if prices_collection.blank? || prices_collection == 0
       prices = prices_collection
       prices.reject!{|k, v| v.to_i == 0} if options[:hide_zeros]
-      prices.collect{|k, v| content_tag(:span, price_to_currency(v, k, :symbol => true), :style => "white-space: nowrap;")}.compact
+      prices.map { |k, v| price_to_currency(v, k, symbol: true) }.compact
+    end
+
+    def prices_collection_by_currency(prices_collection, options = {})
+      formatted_prices = prices_formatted_collection(prices_collection, options)
+
+      formatted_prices.map do |formatted_price|
+        content_tag(:span, formatted_price, :style => "white-space: nowrap;")
+      end
     end
 
     def deal_currency_icon(currency)

data/lib/redmineup/patches/action_cable_base_patch.rb

@@ -0,0 +1,25 @@
+module Redmineup
+  module Patches
+    module ActionCableBasePatch
+      def self.prepended(base)
+        base.extend(ClassMethods)
+        base.delegate :rup_broadcast_to, to: :class
+      end
+
+      module ClassMethods
+        def rup_broadcast_to(*args)
+          # TODO: Remove to 2 args after plugins update
+          if args.length == 3
+            klass, model, message = args
+            ActionCable.rup_server(klass).broadcast(broadcasting_for(model), message)
+          else
+            model, message = args
+            ActionCable.rup_server.broadcast(broadcasting_for(model), message)
+          end
+        end
+      end
+    end
+  end
+end
+
+ActionCable::Channel::Base.prepend(Redmineup::Patches::ActionCableBasePatch)

data/lib/redmineup/patches/action_cable_patch.rb

@@ -0,0 +1,19 @@
+module Redmineup
+  module Patches
+    module ActionCablePatch
+      def self.prepended(base)
+        base.class_eval do
+          module_function def rup_server(klass = 'ActionCable::Connection::RupConnection')
+            @rup_servers ||= {}
+            return @rup_servers[klass] if @rup_servers[klass]
+
+            config = ActionCable::Server::RupConfiguration.new(connection_klass: klass)
+            @rup_servers[klass] = ActionCable::Server::RupServer.new(config: config)
+          end
+        end
+      end
+    end
+  end
+end
+
+ActionCable.prepend(Redmineup::Patches::ActionCablePatch)

data/lib/redmineup/patches/auto_completes_controller_patch.rb

@@ -0,0 +1,17 @@
+module Redmineup
+  module Patches
+    module AutoCompletesControllerPatch
+      DEFAULT_TAGS_LIMIT = 10
+
+      def taggable_tags
+        limit = params.delete(:limit) || DEFAULT_TAGS_LIMIT
+        klass = Object.const_get(params[:taggable_type].camelcase) if params[:taggable_type].present?
+
+        tags = klass && klass.available_tags(params.merge(limit: limit, name_like: params[:q])) || Redmineup::ActsAsTaggable::Tag.limit(limit)
+        render json: tags.map { |tag| { id: tag.name, text: tag.name } }
+      end
+    end
+  end
+end
+
+AutoCompletesController.prepend(Redmineup::Patches::AutoCompletesControllerPatch)

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

@@ -0,0 +1,16 @@
+module Redmineup
+  module Patches
+    module Compatibility
+      module RoutingMapperPatch
+        def constraints(options = {}, &block)
+          return super(options, &block) unless options.is_a?(Hash)
+
+          options[:object_type] = /.+/ if options[:object_type] && options[:object_type].is_a?(Regexp)
+          super(options, &block)
+        end
+      end
+    end
+  end
+end
+
+ActionDispatch::Routing::Mapper.prepend(Redmineup::Patches::Compatibility::RoutingMapperPatch)

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

@@ -0,0 +1,13 @@
+module Redmineup
+  module Patches
+    module Compatibility
+      module SpritePatch
+        def sprite_icon(icon_name, label = '', icon_only: false, size: '18', css_class: nil, sprite: "icons", plugin: nil, rtl: false)
+          label
+        end
+      end
+    end
+  end
+end
+
+ApplicationHelper.prepend(Redmineup::Patches::Compatibility::SpritePatch)

data/lib/redmineup/patches/compatibility_patch.rb

@@ -0,0 +1,4 @@
+if Redmine::VERSION.to_s < "6"
+  require 'redmineup/patches/compatibility/sprite_patch'
+end
+require 'redmineup/patches/compatibility/routing_mapper_patch'

data/lib/redmineup/patches/liquid_patch.rb

@@ -2,32 +2,23 @@ module Redmineup
   module Patches
     module LiquidPatch
       module StandardFilters
+        private
 
-        def self.included(base)
-          base.class_eval do
-            
-            private
-    
-            def to_number(obj)
-              case obj
-              when Float
-                BigDecimal(obj.to_s)
-              when Numeric
-                obj
-              when String
-                (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal(obj) : obj.to_i
-              else
-                0
-              end
-            end
+        def to_number(obj)
+          case obj
+          when Float
+            BigDecimal(obj.to_s)
+          when Numeric
+            obj
+          when String
+            (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal(obj) : obj.to_i
+          else
+            0
           end
         end
-
       end
     end
   end
 end
-  
-unless Liquid::StandardFilters.included_modules.include?(Redmineup::Patches::LiquidPatch::StandardFilters)
-  Liquid::StandardFilters.send(:include, Redmineup::Patches::LiquidPatch::StandardFilters)
-end
+
+Liquid::StandardFilters.prepend(Redmineup::Patches::LiquidPatch::StandardFilters)

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.0.2'
+  VERSION = '1.1.13'
 end