redmineup 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8906ecd18c32f3d77f7ecb9ce342051cf620884442332900bd18b3678847264
-  data.tar.gz: ac7a23b98f0a4e612fe255c981d563069c53d4d29448fd1e60fefc8d45244cca
+  metadata.gz: c1f4c8d29e3e301d443f1ff3ba42e1f259d7e9920b0dd08b817c776e362dc001
+  data.tar.gz: fd4c8e149fb512e67a8d02a4efbc46f38341935a6da1b781fb675fdfb19353cc
 SHA512:
-  metadata.gz: 9367020f0bb91903c3c64c2e631f4ccf7559331b59373f11b4b6afa0ed98f6496e1441af347ef287720cee9a6461aab3b3138f4e902dad6e5d6e54ac2d9ad29c
-  data.tar.gz: 6dc7397b41cd7141de6167777edfc2306dd9d7010aa8813e868df272e648f8f6ed49a129104ff54d469fad074d0762d38468f86b2ac8ebdea38e90f0774f25ae
+  metadata.gz: 7b5b31109d40245e2c939a91a88a11f1536b0899aea8a032f773acaf0390f2f23cce5ff40161a8ade27bedb77e13a5604f339f2b61a85609f4d2a70113f93f66
+  data.tar.gz: 106630460ba9b8cb2bb3e80de47834e5f88cda5c6631f4a2fd90ea6921afab7f268c3460ff012251ff201d850e758b3bf690b588c980fcc90b84ea1de7ccbb51

data/doc/CHANGELOG

@@ -1,9 +1,12 @@
 == Redmine UP gem changelog
 
 Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2023 RedmineUP
+Copyright (C) 2011-2023 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2023-10-12 v1.0.3
+
+
 == 2023-10-12 v1.0.1
 
 * RedmineUp module renamed to Redmineup

data/lib/redmineup/currency.rb

@@ -40,7 +40,7 @@ module Redmineup
         Redmine::MenuManager.map(:admin_menu).push(:redmineup_money,
                                                    { controller: 'redmineup', action: 'settings', id: 'money' },
                                                    caption: :label_redmineup_money,
-                                                   html: { class: 'icon icon-redminecrm-money' })
+                                                   html: { class: 'icon icon-redmineup-money' })
 
       end
 

data/lib/redmineup/helpers/calendars_helper.rb

@@ -0,0 +1,22 @@
+module Redmineup
+  module CalendarsHelper
+
+    def calendar_day_css_classes(calendar, day)
+      css = day.month==calendar.month ? +'even' : +'odd'
+      css << " today" if User.current.today == day
+      css << " nwday" if non_working_week_days.include?(day.cwday)
+      css
+    end
+
+    def non_working_week_days
+      @non_working_week_days ||= begin
+        days = Setting.non_working_week_days
+        if days.is_a?(Array) && days.size < 7
+          days.map(&:to_i)
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/redmineup/hooks/views_layouts_hook.rb

@@ -4,6 +4,7 @@ module Redmineup
   module Hooks
     class ViewsLayoutsHook < Redmine::Hook::ViewListener
       def view_layouts_base_html_head(_context = {})
+        stylesheet_link_tag(:calendars, plugin: 'redmineup') +
         stylesheet_link_tag(:money, plugin: 'redmineup')
       end
     end

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

@@ -0,0 +1,32 @@
+module Redmineup
+  module Patches
+    module Compatibility
+      module ApplicationControllerPatch
+        def self.included(base) # :nodoc:
+          base.extend(ClassMethods)
+          base.class_eval do
+            unloadable # Send unloadable so it will not be unloaded in development
+          end
+        end
+
+        module ClassMethods
+          def before_action(*filters, &block)
+            before_filter(*filters, &block)
+          end
+
+          def after_action(*filters, &block)
+            after_filter(*filters, &block)
+          end
+
+          def skip_before_action(*filters, &block)
+            skip_before_filter(*filters, &block)
+          end
+        end
+      end
+    end
+  end
+end
+
+unless ActionController::Base.methods.include?(:before_action)
+  ActionController::Base.send(:include,Redmineup::Patches::Compatibility::ApplicationControllerPatch)
+end

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

@@ -0,0 +1,27 @@
+module Redmineup
+  module Patches
+    module Compatibility
+      module RoutingMapperPatch
+        def self.included(base)
+          base.send(:include, InstanceMethods)
+
+          base.class_eval do
+            alias_method :constraints_without_redmineup, :constraints
+            alias_method :constraints, :constraints_with_redmineup
+          end
+        end
+
+        module InstanceMethods
+          def constraints_with_redmineup(options = {}, &block)
+            options[:object_type] = /.+/ if options[:object_type] && options[:object_type].is_a?(Regexp)
+            constraints_without_redmineup(options, &block)
+          end
+        end
+      end
+    end
+  end
+end
+
+unless ActionDispatch::Routing::Mapper.included_modules.include?(Redmineup::Patches::Compatibility::RoutingMapperPatch)
+  ActionDispatch::Routing::Mapper.send(:include, Redmineup::Patches::Compatibility::RoutingMapperPatch)
+end

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

@@ -0,0 +1,21 @@
+module Redmineup
+  module Patches
+    module Compatibility
+      module UserPatch
+        def self.included(base)
+          base.send(:include, InstanceMethods)
+        end
+
+        module InstanceMethods
+          def atom_key
+            rss_key
+          end
+        end
+      end
+    end
+  end
+end
+
+unless ActionDispatch::Routing::Mapper.included_modules.include?(Redmineup::Patches::Compatibility::UserPatch)
+  ActionDispatch::Routing::Mapper.send(:include, Redmineup::Patches::Compatibility::UserPatch)
+end

data/lib/redmineup/patches/compatibility_patch.rb

@@ -0,0 +1,7 @@
+if Redmine::VERSION.to_s < "4" 
+  require 'redmineup/patches/compatibility/application_controller_patch'
+end
+if Redmine::VERSION.to_s < "5" 
+  require 'redmineup/patches/compatibility/user_patch'
+end
+require 'redmineup/patches/compatibility/routing_mapper_patch'

data/lib/redmineup/version.rb

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

data/lib/redmineup.rb

@@ -40,11 +40,9 @@ require 'redmineup/liquid/drops/issue_relations_drop'
 
 require 'redmineup/helpers/external_assets_helper'
 require 'redmineup/helpers/form_tag_helper'
-require 'redmineup/helpers/rup_calendar_helper'
+require 'redmineup/helpers/calendars_helper'
 require 'redmineup/assets_manager'
 
-require 'redmineup/compatibility/application_controller_patch'
-require 'redmineup/compatibility/routing_mapper_patch'
 require 'redmineup/patches/liquid_patch' unless BigDecimal.respond_to?(:new)
 
 module Redmineup
@@ -60,6 +58,7 @@ end
 Redmineup::AssetsManager.install_assets
 
 if defined?(ActionView::Base)
+  ActionView::Base.send :include, Redmineup::CalendarsHelper
   ActionView::Base.send :include, Redmineup::ExternalAssetsHelper
   ActionView::Base.send :include, Redmineup::FormTagHelper
 end

data/test/acts_as_taggable/rup_acts_as_taggable_test.rb

@@ -338,7 +338,7 @@ class RupActsAsTaggableTest < ActiveSupport::TestCase
 
   def test_tags_condition
     assert_equal "(tags_TABLE.name LIKE #{tags(:feature).id} OR tags_TABLE.name LIKE #{tags(:bug).id})",
-                 Issue.send(:tags_condition, [tags(:feature), tags(:bug)], 'tags_TABLE')
+                 Issue.send(:tags_condition, [tags(:feature), tags(:bug)], 'tags_TABLE').gsub("'", "")
   end
 
   def test_all_tags_list

data/vendor/assets/stylesheets/calendars.css

@@ -0,0 +1,15 @@
+table.cal {width: 100%; margin: 0 0 6px 0; border: 1px solid #c0c0c0; border-spacing: 0; border-radius: 3px;}
+table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
+table.cal thead th.week-number {width: auto;}
+table.cal tbody tr {height: 100px;}
+table.cal td .icon {padding-top: 2px; padding-bottom: 3px;}
+table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em; border-bottom: 0; border-right: 0;}
+table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
+table.cal td p.day-num {font-size: 1.1em; text-align:right;}
+table.cal td.odd p.day-num {color: #bbb;}
+table.cal td.today {background:#ffffdd;}
+table.cal td.today p.day-num {font-weight: bold;}
+table.cal td.nwday:not(.odd) {background-color:#f1f1f1;}
+table.cal .starting a.issue, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
+table.cal .ending a.issue, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
+table.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}

data/vendor/assets/stylesheets/money.css

@@ -1,4 +1,4 @@
-.icon-redminecrm-money {
+.icon-redmineup-money {
   background-image: url(../images/money.png);
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2023-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,7 +113,6 @@ files:
 - README.md
 - Rakefile
 - app/controllers/redmineup_controller.rb
-- app/views/redmine_crm/redmineup_calendar/_calendar.html.erb
 - app/views/redmineup/_money.html.erb
 - app/views/redmineup/settings.html.erb
 - bitbucket-pipelines.yml
@@ -143,16 +142,14 @@ files:
 - lib/redmineup/acts_as_votable/voter.rb
 - lib/redmineup/assets_manager.rb
 - lib/redmineup/colors_helper.rb
-- lib/redmineup/compatibility/application_controller_patch.rb
-- lib/redmineup/compatibility/routing_mapper_patch.rb
 - lib/redmineup/currency.rb
 - lib/redmineup/currency/formatting.rb
 - lib/redmineup/currency/heuristics.rb
 - lib/redmineup/currency/loader.rb
 - lib/redmineup/engine.rb
+- lib/redmineup/helpers/calendars_helper.rb
 - lib/redmineup/helpers/external_assets_helper.rb
 - lib/redmineup/helpers/form_tag_helper.rb
-- lib/redmineup/helpers/rup_calendar_helper.rb
 - lib/redmineup/helpers/tags_helper.rb
 - lib/redmineup/helpers/vote_helper.rb
 - lib/redmineup/hooks/views_layouts_hook.rb
@@ -167,6 +164,10 @@ files:
 - 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/user_patch.rb
+- lib/redmineup/patches/compatibility_patch.rb
 - lib/redmineup/patches/liquid_patch.rb
 - lib/redmineup/settings.rb
 - lib/redmineup/settings/money.rb
@@ -222,6 +223,7 @@ files:
 - 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

data/app/views/redmine_crm/redmineup_calendar/_calendar.html.erb

@@ -1,34 +0,0 @@
-<ul class="cal">
-  <li scope="col" title="<%= l(:label_week) %>" class="calhead week-number"></li>
-  <% 7.times do |i| %>
-    <li scope="col" class="calhead"><%= day_name((calendar.first_wday + i) % 7) %></li>
-  <% end %>
-  <% calendar.format_month.each_slice(7) do |week| %>
-    <li class='week-number'>
-      <span class="label-week"><%= l(:label_week) %></span> <%= calendar.week_number week.first %>
-    </li>
-    <% week.each do |day| %>
-    <li class="<%= calendar.day_css_classes day %> calbody">
-      <p class="day-num"><%= day.day %>
-        <span class="abbr-day">(<%= abbr_day_name(day.cwday) %>)</span>
-      </p>
-      <% calendar.events_on(day).each do |i| %>
-        <% if i.is_a? Issue %>
-          <%= tag.div class: [ i.css_classes, 'tooltip hascontextmenu', starting: day == i.start_date, ending: day == i.due_date] do %>
-            <%= "#{i.project} -" unless @project && @project == i.project %>
-            <%= link_to_issue i, :truncate => 30 %>
-            <span class="tip"><%= render_issue_tooltip i %></span>
-            <%= check_box_tag 'ids[]', i.id, false, :style => 'display:none;', :id => nil %>
-          <% end %>
-        <% else %>
-          <span class="icon icon-package">
-            <%= "#{i.project} -" unless @project && @project == i.project %>
-            <%= link_to_version i %>
-          </span>
-        <% end %>
-      <% end %>
-    </li>
-    <% end %>
-  <% end %>
-</ul>
-<%= context_menu %>

data/lib/redmineup/compatibility/application_controller_patch.rb

@@ -1,33 +0,0 @@
-module Redmineup
-  module Patches
-    module ApplicationControllerPatch
-      def self.included(base) # :nodoc:
-        base.extend(ClassMethods)
-        base.class_eval do
-          unloadable # Send unloadable so it will not be unloaded in development
-        end
-      end
-
-      module ClassMethods
-        def before_action(*filters, &block)
-          before_filter(*filters, &block)
-        end
-
-        def after_action(*filters, &block)
-          after_filter(*filters, &block)
-        end
-
-        def skip_before_action(*filters, &block)
-          skip_before_filter(*filters, &block)
-        end
-      end
-    end
-  end
-end
-
-unless ActionController::Base.methods.include?(:before_action)
-  ActionController::Base.send(
-    :include,
-    Redmineup::Patches::ApplicationControllerPatch
-  )
-end

data/lib/redmineup/compatibility/routing_mapper_patch.rb

@@ -1,25 +0,0 @@
-module Redmineup
-  module Patches
-    module RoutingMapperPatch
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-
-        base.class_eval do
-          alias_method :constraints_without_redmineup, :constraints
-          alias_method :constraints, :constraints_with_redmineup
-        end
-      end
-
-      module InstanceMethods
-        def constraints_with_redmineup(options = {}, &block)
-          options[:object_type] = /.+/ if options[:object_type] && options[:object_type].is_a?(Regexp)
-          constraints_without_redmineup(options, &block)
-        end
-      end
-    end
-  end
-end
-
-unless ActionDispatch::Routing::Mapper.included_modules.include?(Redmineup::Patches::RoutingMapperPatch)
-  ActionDispatch::Routing::Mapper.send(:include, Redmineup::Patches::RoutingMapperPatch)
-end

data/lib/redmineup/helpers/rup_calendar_helper.rb

@@ -1,146 +0,0 @@
-module RedmineUp
-  module CalendarHelper
-    # Simple class to compute the start and end dates of a calendar
-    class Calendar
-      attr_reader :startdt, :enddt
-
-      def initialize(date, options={}, lang = current_language, period = :month)
-        @date = date
-        @events = []
-        @ending_events_by_days = {}
-        @starting_events_by_days = {}
-        # ADDED FOR CONTACTS-DEALS
-        @start_date_field = options[:start_date_field] || "start_date"
-        @due_date_field = options[:due_date_field] || "due_date"
-        # /ADDED FOR CONTACTS-DEALS
-        set_language_if_valid lang
-        case period
-        when :month
-          @startdt = Date.civil(date.year, date.month, 1)
-          @enddt = (@startdt >> 1)-1
-          # starts from the first day of the week
-          @startdt = @startdt - (@startdt.cwday - first_wday)%7
-          # ends on the last day of the week
-          @enddt = @enddt + (last_wday - @enddt.cwday)%7
-        when :week
-          @startdt = date - (date.cwday - first_wday)%7
-          @enddt = date + (last_wday - date.cwday)%7
-        else
-          raise 'Invalid period'
-        end
-      end
-
-      def format_month
-        (@startdt..@enddt).to_a
-      end
-
-      def week_number(day)
-        (day + (11 - day.cwday) % 7).cweek
-      end
-
-      def day_css_classes(day)
-        css = day.month==month ? +'even' : +'odd'
-        css << " today" if User.current.today == day
-        css << " nwday" if non_working_week_days.include?(day.cwday)
-        css
-      end
-
-      # Sets calendar events
-      def events=(events)
-        @events = events
-        # CHANGED FOR CONTACTS-DEALS
-        @ending_events_by_days = @events.group_by {|event| event.send(@start_date_field) ? event.send(@start_date_field).to_date : event.due_date}
-        @starting_events_by_days = @events.group_by {|event| event.send(@due_date_field) ? event.send(@due_date_field).to_date : event.start_date}
-        # /CHANGED FOR CONTACTS-DEALS
-      end
-
-      # Returns events for the given day
-      def events_on(day)
-        ((@ending_events_by_days[day] || []) + (@starting_events_by_days[day] || [])).uniq
-      end
-
-      # Calendar current month
-      def month
-        @date.month
-      end
-
-      # Return the first day of week
-      # 1 = Monday ... 7 = Sunday
-      def first_wday
-        case Setting.start_of_week.to_i
-        when 1
-          @first_dow ||= (1 - 1)%7 + 1
-        when 6
-          @first_dow ||= (6 - 1)%7 + 1
-        when 7
-          @first_dow ||= (7 - 1)%7 + 1
-        else
-          @first_dow ||= (l(:general_first_day_of_week).to_i - 1)%7 + 1
-        end
-      end
-
-      def last_wday
-        @last_dow ||= (first_wday + 5)%7 + 1
-      end
-
-      def abbr_day_name(day)
-        ::I18n.t('date.abbr_day_names')[day % 7]
-      end
-
-      def current_language
-        ::I18n.locale
-      end
-
-      def set_language_if_valid(lang)
-        if l = find_language(lang)
-          ::I18n.locale = l
-        end
-      end
-
-      def find_language(lang)
-        @@languages_lookup ||=
-          valid_languages.inject({}) do |k, v|
-            k[v.to_s.downcase] = v
-            k
-          end
-        @@languages_lookup[lang.to_s.downcase]
-      end
-
-      def valid_languages
-        ::I18n.available_locales
-      end
-
-      def l(*args)
-        case args.size
-        when 1
-          ::I18n.t(*args)
-        when 2
-          if args.last.is_a?(Hash)
-            ::I18n.t(*args.first, **args.last)
-          elsif args.last.is_a?(String)
-            ::I18n.t(args.first, :value => args.last)
-          else
-            ::I18n.t(args.first, :count => args.last)
-          end
-        else
-          raise "Translation string with multiple values: #{args.first}"
-        end
-      end
-
-      def non_working_week_days
-        @non_working_week_days ||= begin
-          days = Setting.non_working_week_days
-          if days.is_a?(Array) && days.size < 7
-            days.map(&:to_i)
-          else
-            []
-          end
-        end
-      end
-    end
-  end
-end
-
-unless ActionView::Base.included_modules.include?(RedmineUp::CalendarHelper)
-  ActionView::Base.send(:include, RedmineUp::CalendarHelper)
-end