bmc 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 601684041303b80bfb0c70d127bb91a4cda8322ace09a87ae45a28e4eb1e3a11
-  data.tar.gz: e3fa8133b9bfe2557c6fd185831327841d276afa646a5ec9558c2f9bd14b05f0
+  metadata.gz: df08b33875ae05d3bd5725a47921f9156a540ddcca15f8f7727ad64ad09f0f52
+  data.tar.gz: d4650f71805c25b89ab80655ed12164df5081216fa1ca79f4a655c3d830939f5
 SHA512:
-  metadata.gz: 9032ca8dc842a1162b6034c1b2e9edb22c26e593c6ea7a42b327e05c096d76063476c326079a541665ba00c622f6e1b178e3f46454ee0d4d271443e69b60aa32
-  data.tar.gz: 85948674c0734bace8ba0891edd919cb55895c46029aeda1e4f5904c0a9c1c82f42af842159d8dc54ad9e50020b788859e3f5d2286f5c9fab94e6e537e5f5826
+  metadata.gz: '019f2873b3a0e4157a6ca143f54090b676fa056ccc4128a4ab5152e460967c3e82fefbf235c6f0016c6cbee550c4b27bd8a9b385f4232a1f4ac45f59df1000b4'
+  data.tar.gz: 81fccca06be5ebb574b625ac2484500f3e838339ce5cd31e18c1012f7d2688b199a59dcff76031ee837734b82808f53033209aa6aaf2f859882db04957939b60

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Next version
 
+## v1.7.0
+- Rails 8.0
+- Ruby 3.3.0 minimum
+- Fix to `Filter#actives_count` to handle `[""]` value
+- Fix Rubocop
+
+## v1.6.2
+- `ApiControllerConcern` change
+
 ## v1.6.1
 - Add model instance in API errors
 

data/app/controllers/bmc/filters_controller.rb

@@ -15,9 +15,9 @@ class BMC::FiltersController < BMC::ApplicationController
     filters.merge! params.fetch(:filters, {}).permit!.to_h
 
     cookies[:filters] = {
-      :value   => JSON.dump(filters),
-      :expires => 1.year.from_now,
-      :path    => "/",
+      value: JSON.dump(filters),
+      expires: 1.year.from_now,
+      path: "/",
     }
 
     redirect_to back_url

data/app/controllers/concerns/bmc/api_controller_concern.rb

@@ -17,10 +17,10 @@ module BMC::ApiControllerConcern
       json = {
         :error => json_error_string_for_model(any_object),
         :model_errors => json_errors_hash_for_model(any_object),
-        any_object.model_name.singular => any_object,
+        options[:object_key] || any_object.model_name.singular => any_object,
       }
     elsif any_object.is_a?(String)
-      json = {error: any_object}
+      json = { error: any_object }
     else
       json = any_object
     end

data/app/controllers/concerns/bmc/back_url_concern.rb

@@ -3,8 +3,7 @@ module BMC::BackUrlConcern
 
   private
 
-  def default_back_url
-  end
+  def default_back_url; end
 
   def back_url
     url = [

data/app/emails/bmc/email.rb

@@ -37,13 +37,13 @@ class BMC::Email
 
   def data
     {
-      :from        => from,
-      :reply_to    => reply_to,
-      :to          => to,
-      :cc          => cc,
-      :subject     => subject,
-      :body        => body,
-      :attachments => attachments,
+      from: from,
+      reply_to: reply_to,
+      to: to,
+      cc: cc,
+      subject: subject,
+      body: body,
+      attachments: attachments,
     }
   end
 
@@ -71,24 +71,19 @@ class BMC::Email
     self.attachments ||= default_attachments
   end
 
-  def default_from
-  end
+  def default_from; end
 
   def default_reply_to
     "#{current_user} <#{current_user.email}>" if current_user
   end
 
-  def default_to
-  end
+  def default_to; end
 
-  def default_cc
-  end
+  def default_cc; end
 
-  def default_subject
-  end
+  def default_subject; end
 
-  def default_body
-  end
+  def default_body; end
 
   def default_attachments
     {}
@@ -106,8 +101,10 @@ class BMC::Email
 
     string = public_send(attr).to_s
     return if string.blank?
+
     addrs  = Mail.new(to: string).to_addrs
     return true if addrs.any? && addrs.all? { |addr| URI::MailTo::EMAIL_REGEXP.match?(addr) }
+
     errors.add(attr, :invalid)
   end
 end

data/app/filters/bmc/filter/by_date.rb

@@ -1,6 +1,6 @@
 class BMC::Filter::ByDate < BMC::Filter::ByKeyValue
   def call(query, value)
     value = Date.parse(value)
-    super(query, value)
+    super
   end
 end

data/app/filters/bmc/filter/by_date_or_datetime_period.rb

@@ -7,7 +7,7 @@ class BMC::Filter::ByDateOrDatetimePeriod < BMC::Filter::ByKeyValue
     super
   end
 
-  def call(query, value) # rubocop:disable Metrics/MethodLength
+  def call(query, value)
     value = value.to_s
 
     if value == "today"

data/app/filters/bmc/filter/by_key_values.rb

@@ -1,7 +1,7 @@
 class BMC::Filter::ByKeyValues < BMC::Filter::ByKeyValue
   def call(query, value)
     value = value.split if value.is_a?(String)
-    value = value.select(&:present?)
+    value = value.compact_blank
 
     return query if value == ["all"]
 

data/app/filters/bmc/filter.rb

@@ -1,7 +1,7 @@
 class BMC::Filter
   include ActiveModel::Model
 
-  STRATEGIES = {}
+  STRATEGIES = {}.freeze
 
   attr_reader :values, :options
 
@@ -39,7 +39,13 @@ class BMC::Filter
   end
 
   def actives_count
-    values.count { |k, v| strategies.key?(k) && v.present? }
+    values.count do |k, v|
+      next false unless strategies.key?(k)
+      next false if v.blank?
+      next false if v.respond_to?(:compact_blank) && v.compact_blank.none?
+
+      true
+    end
   end
 
   def any?

data/app/helpers/bmc/all_helpers.rb

@@ -11,5 +11,5 @@ module BMC::AllHelpers
   include BMC::SortingHelper
   include BMC::TextHelper
 
-  extend self
+  extend self # rubocop:disable Style/ModuleFunction
 end

data/app/helpers/bmc/bootstrap_helper.rb

@@ -1,18 +1,16 @@
 module BMC::BootstrapHelper
   class << self
-    attr_writer :card_classes
+    attr_writer :card_classes, :bootstrap_version
 
     def card_classes
       @card_classes ||= {
-        :card   => "card",
-        :header => "card-header",
-        :body   => "card-body",
-        :footer => "card-footer",
+        card: "card",
+        header: "card-header",
+        body: "card-body",
+        footer: "card-footer",
       }
     end
 
-    attr_writer :bootstrap_version
-
     def bootstrap_version
       @bootstrap_version ||= Bootstrap::VERSION[0]
     end
@@ -28,7 +26,7 @@ module BMC::BootstrapHelper
     end
   end
 
-  def bs_card( # rubocop:disable Metrics/ParameterLists
+  def bs_card(
     header: nil,
     body: true,
     footer: nil,
@@ -48,9 +46,7 @@ module BMC::BootstrapHelper
     body_classes   = ([global_classes[:body]]   + body_class.to_s.split).compact.sort
     footer_classes = ([global_classes[:footer]] + footer_class.to_s.split).compact.sort
 
-    if header
-      header_html = content_tag(header_tag, class: header_classes) { header }
-    end
+    header_html = content_tag(header_tag, class: header_classes) { header } if header
 
     if body
       body_html = content_tag(body_tag, class: body_classes) { capture(&block) }
@@ -58,9 +54,7 @@ module BMC::BootstrapHelper
       body_html = capture(&block)
     end
 
-    if footer
-      footer_html = content_tag(footer_tag, class: footer_classes) { footer }
-    end
+    footer_html = content_tag(footer_tag, class: footer_classes) { footer } if footer
 
     content_tag(card_tag, class: card_classes) do
       [header_html, body_html, footer_html].compact.sum("".html_safe)

data/app/helpers/bmc/button_helper.rb

@@ -19,12 +19,11 @@ module BMC::ButtonHelper
     end
   end
 
-  def bs_button( # rubocop:disable Metrics/ParameterLists
+  def bs_button(
     url,
-    method: :get,
+    icon:, method: :get,
     confirm: nil,
     text: nil,
-    icon:,
     action: nil,
     title: text,
     btn_size: BMC::ButtonHelper.default_size,
@@ -73,9 +72,9 @@ module BMC::ButtonHelper
 
   def new_button(url = url_for(action: :new), **options)
     options = {
-      :icon      => :plus,
-      :action    => :new,
-      :btn_style => :success,
+      icon: :plus,
+      action: :new,
+      btn_style: :success,
     }.merge(options)
 
     bs_button(url, **options)
@@ -83,8 +82,8 @@ module BMC::ButtonHelper
 
   def read_button(url, **options)
     options = {
-      :icon   => :info_circle,
-      :action => :read,
+      icon: :info_circle,
+      action: :read,
     }.merge(options)
 
     bs_button(url, **options)
@@ -92,8 +91,8 @@ module BMC::ButtonHelper
 
   def edit_button(url, **options)
     options = {
-      :icon   => :pencil_alt,
-      :action => :edit,
+      icon: :pencil_alt,
+      action: :edit,
     }.merge(options)
 
     bs_button(url, **options)
@@ -101,10 +100,10 @@ module BMC::ButtonHelper
 
   def delete_button(url, **options)
     options = {
-      :icon      => :trash,
-      :action    => :delete,
-      :btn_style => :danger,
-      :method    => :delete,
+      icon: :trash,
+      action: :delete,
+      btn_style: :danger,
+      method: :delete,
     }.merge(options)
 
     bs_button(url, **options)
@@ -112,9 +111,9 @@ module BMC::ButtonHelper
 
   def print_button(**options)
     options = {
-      :icon    => :print,
-      :action  => :print,
-      :onclick => "print(); return false;",
+      icon: :print,
+      action: :print,
+      onclick: "print(); return false;",
     }.merge(options)
 
     bs_button("#", **options)
@@ -122,9 +121,9 @@ module BMC::ButtonHelper
 
   def download_button(url, **options)
     options = {
-      :icon   => :cloud_download_alt,
-      :action => :download,
-      :target => :_blank,
+      icon: :cloud_download_alt,
+      action: :download,
+      target: :_blank,
     }.merge(options)
 
     bs_button(url, **options)
@@ -140,9 +139,9 @@ module BMC::ButtonHelper
     end
 
     options = {
-      :icon   => :download,
-      :action => :export,
-      :text   => text,
+      icon: :download,
+      action: :export,
+      text: text,
     }.merge(options)
 
     download_button(url, **options)
@@ -150,8 +149,8 @@ module BMC::ButtonHelper
 
   def import_button(url, **options)
     options = {
-      :icon   => :upload,
-      :action => :import,
+      icon: :upload,
+      action: :import,
     }.merge(options)
 
     bs_button(url, **options)
@@ -159,8 +158,8 @@ module BMC::ButtonHelper
 
   def copy_button(url, **options)
     options = {
-      :icon   => :copy,
-      :action => :copy,
+      icon: :copy,
+      action: :copy,
     }.merge(options)
 
     bs_button(url, **options)

data/app/helpers/bmc/filters_helper.rb

@@ -1,15 +1,15 @@
 module BMC::FiltersHelper
   def bmc_time_periods_for_select
     {
-      t("time_periods.all_time")    => "",
-      t("time_periods.today")       => "today",
-      t("time_periods.yesterday")   => "yesterday",
-      t("time_periods.this_week")   => "this_week",
-      t("time_periods.last_week")   => "last_week",
-      t("time_periods.this_month")  => "this_month",
-      t("time_periods.last_month")  => "last_month",
-      t("time_periods.this_year")   => "this_year",
-      t("time_periods.last_year")   => "last_year",
+      t("time_periods.all_time") => "",
+      t("time_periods.today") => "today",
+      t("time_periods.yesterday") => "yesterday",
+      t("time_periods.this_week") => "this_week",
+      t("time_periods.last_week") => "last_week",
+      t("time_periods.this_month") => "this_month",
+      t("time_periods.last_month") => "last_month",
+      t("time_periods.this_year") => "this_year",
+      t("time_periods.last_year") => "last_year",
       t("time_periods.custom_date") => "custom_date",
     }
   end

data/app/helpers/bmc/pagination_helper.rb

@@ -8,8 +8,8 @@ module BMC::PaginationHelper
   end
 
   def paginate(objects, options = {})
-    options = {theme: BMC::PaginationHelper.theme}.merge(options)
-    super(objects, **options).gsub(/>(\s+)</, "><").html_safe
+    options = { theme: BMC::PaginationHelper.theme }.merge(options)
+    super(objects, **options).gsub(/>(\s+)</, "><").html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def pagination_infos(collection)

data/app/helpers/bmc/routes_helper.rb

@@ -13,10 +13,10 @@ module BMC::RoutesHelper
     end
 
     opts = {
-      :controller => "/#{obj.class.to_s.tableize}",
-      :action     => :show,
-      :id         => obj.to_param,
-      :only_path  => true,
+      controller: "/#{obj.class.to_s.tableize}",
+      action: :show,
+      id: obj.to_param,
+      only_path: true,
     }.merge(opts)
 
     routes.url_for(opts)

data/app/helpers/bmc/sorting_helper.rb

@@ -1,8 +1,6 @@
 module BMC::SortingHelper
   def sortable_column(name, column, options = {})
-    unless column.is_a?(Symbol)
-      raise ArgumentError, "invalid column, please use symbol"
-    end
+    raise ArgumentError, "invalid column, please use symbol" unless column.is_a?(Symbol)
 
     current_column, current_direction = sortable_column_order
 
@@ -28,7 +26,7 @@ module BMC::SortingHelper
     end
     url_params[:sort] = new_sort_param
 
-    html_options = {class: klass}.merge(options)
+    html_options = { class: klass }.merge(options)
 
     link_to(name, url_params, html_options)
   end

data/app/helpers/bmc/text_helper.rb

@@ -11,31 +11,31 @@ module BMC::TextHelper
     end
   end
 
-  def euros(n)
-    currency(n, "€")
+  def euros(value)
+    currency(value, "€")
   end
 
-  def currency(n, u)
-    return if n.nil?
+  def currency(value, unit)
+    return if value.nil?
 
     I18n.t("number.currency.format.format")
-      .gsub("%n", number(n))
-      .gsub("%u", u)
+      .gsub("%n", number(value))
+      .gsub("%u", unit)
       .tr(" ", nbsp)
   end
 
-  def percentage(n)
-    return if n.nil?
+  def percentage(value)
+    return if value.nil?
 
-    number(n) + nbsp + "%"
+    "#{number(value)}#{nbsp}%"
   end
 
-  def number(n)
-    return if n.nil?
+  def number(value)
+    return if value.nil?
 
     opts = {}
 
-    if n.class.to_s.match?(/Float|Decimal/i)
+    if value.class.to_s.match?(/Float|Decimal/i)
       opts[:precision] = 2
     else
       opts[:precision] = 0
@@ -44,11 +44,11 @@ module BMC::TextHelper
     opts[:delimiter] = I18n.t("number.format.delimiter")
     opts[:separator] = I18n.t("number.format.separator")
 
-    number_with_precision(n, opts).tr(" ", nbsp)
+    number_with_precision(value, opts).tr(" ", nbsp)
   end
 
-  def date(d, **args)
-    I18n.l(d, **args) unless d.nil?
+  def date(value, **args)
+    I18n.l(value, **args) unless value.nil?
   end
 
   def boolean_icon(bool)
@@ -64,16 +64,16 @@ module BMC::TextHelper
     return if str.to_s.blank?
 
     str = str.delete("\r").strip
-    strip_tags(str).gsub("\n", "<br />").html_safe
+    strip_tags(str).gsub("\n", "<br />").html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def lf2br(str)
     return if str.to_s.blank?
 
-    str.delete("\r").gsub("\n", "<br />").html_safe
+    str.delete("\r").gsub("\n", "<br />").html_safe # rubocop:disable Rails/OutputSafety
   end
 
-  def info( # rubocop:disable Metrics/ParameterLists
+  def info(
     object,
     attribute,
     value: nil,

data/app/libs/bmc/collection_update.rb

@@ -8,7 +8,7 @@ class BMC::CollectionUpdate
   end
 
   def call
-    return update
+    update
   end
 
   def update!

data/app/libs/bmc/mini_model_serializer/serializer.rb

@@ -1,23 +1,9 @@
 class BMC::MiniModelSerializer::Serializer < BMC::MiniModelSerializer::Serialize
-  def attributes
-    raise NotImplementedError
-  end
+  delegate_missing_to :object
+
+  def attributes = raise NotImplementedError
 
   def call
     serialize(attributes.index_with { |k| send(k) })
   end
-
-  private
-
-  def method_missing(m, *)
-    if respond_to_missing?(m)
-      object.send(m, *)
-    else
-      super
-    end
-  end
-
-  def respond_to_missing?(m, include_private = false)
-    super || object.respond_to?(m, true)
-  end
 end

data/app/libs/bmc/token_generator.rb

@@ -22,14 +22,12 @@ class BMC::TokenGenerator
       new(*).call
     end
 
-    attr_writer :default_size
+    attr_writer :default_size, :default_alphabet
 
     def default_size
       @default_size ||= 64
     end
 
-    attr_writer :default_alphabet
-
     def default_alphabet
       @default_alphabet ||= (0..9).to_a + ("a".."z").to_a + ("A".."Z").to_a
     end

data/app/models/concerns/bmc/active_record_uuid_concern.rb

@@ -4,9 +4,7 @@ module BMC::ActiveRecordUUIDConcern
   private
 
   def assign_default_uuid
-    unless self.class.columns_hash["id"].type == :uuid
-      raise "invalid id type, please change to uuid"
-    end
+    raise "invalid id type, please change to uuid" unless self.class.columns_hash["id"].type == :uuid
 
     self.id ||= BMC::SortableUUIDGenerator.call
   end

data/app/models/concerns/bmc/default_values_concern.rb

@@ -1,8 +1,7 @@
 module BMC::DefaultValuesConcern
   extend ActiveSupport::Concern
 
-  def assign_default_values
-  end
+  def assign_default_values; end
 
   def assign_default(attribute, value)
     send(:"#{attribute}=", value) if send(attribute).nil?

data/app/models/concerns/bmc/model_i18n.rb

@@ -11,9 +11,7 @@ module BMC::ModelI18n
     self.class.t(...)
   end
 
-  def ts
-    self.class.ts
-  end
+  delegate :ts, to: :class
 
   def tv(attribute)
     value = public_send(attribute)
@@ -25,26 +23,24 @@ module BMC::ModelI18n
       should_raise = BMC::ModelI18n.raise_on_missing_translations
       exception_class = BMC::ModelI18n::MissingTranslationError
 
-      if should_raise
-        options = options.merge(default: "")
-      end
+      options = options.merge(default: "") if should_raise
 
       if should_raise && attribute.nil?
         human = model_name.human(options)
         type = options[:count].to_i > 1 ? "plural" : "singular"
         raise exception_class, "translation missing: #{self} #{type} model name" if human.blank?
+
         return human
       end
 
       if should_raise && attribute
         human = human_attribute_name(attribute, options)
         raise exception_class, "translation missing: #{self}##{attribute}" if human.blank?
+
         return human
       end
 
-      if attribute.nil?
-        return model_name.human(options)
-      end
+      return model_name.human(options) if attribute.nil?
 
       human_attribute_name(attribute, options) if attribute
     end

data/app/models/concerns/bmc/search.rb

@@ -4,21 +4,21 @@ module BMC::Search
   class_methods do
     def default_search_fields
       columns
-        .select { |column| column.type.in?([:string, :text]) }
+        .select { |column| column.type.in?(%i[string text]) }
         .map    { |column| "#{table_name}.#{column.name}" }
     end # def default_search_fields
 
-    def search(q, *fields)
-      words  = q.to_s.parameterize.split("-")
+    def search(query, *fields)
+      words  = query.to_s.parameterize.split("-")
       fields = default_search_fields if fields.empty?
 
       return all if words.empty?
 
-      sql_query = words.map.with_index { |_word, index|
-        fields.map { |field|
+      sql_query = words.map.with_index do |_word, index|
+        fields.map do |field|
           "(UNACCENT(CAST(#{field} AS TEXT)) ILIKE :w#{index})"
-        }.join(" OR ")
-      }.map { |e| "(#{e})" }.join(" AND ")
+        end.join(" OR ")
+      end.map { |e| "(#{e})" }.join(" AND ") # rubocop:disable Style/MultilineBlockChain
 
       sql_params = words.map.with_index { |word, index| [:"w#{index}", "%#{word}%"] }.to_h
 

data/app/serializers/bmc/serializers/base.rb

@@ -52,11 +52,12 @@ class BMC::Serializers::Base
       return :decimal if value.is_a?(Numeric)
       return :boolean if value.is_a?(TrueClass) || value.is_a?(FalseClass)
       return :date_or_time if value.is_a?(Date) || value.is_a?(Time)
-      return :default
+
+      :default
     end
 
     def format(value)
-      formatter = "format_" + formatter_for(value).to_s
+      formatter = "format_#{formatter_for(value)}"
       public_send(formatter, value)
     end
   end # class << self

data/app/serializers/bmc/serializers/xlsx.rb

@@ -24,13 +24,13 @@ class BMC::Serializers::XLSX < BMC::Serializers::Base
 
   def date_range_styles(row)
     row.each_index.select { row[_1].is_a?(Date) }.map do |col|
-      {range: {rows: :all, columns: col}, styles: {format_code: "dd/mm/yyyy"}}
+      { range: { rows: :all, columns: col }, styles: { format_code: "dd/mm/yyyy" } }
     end
   end
 
   def time_range_styles(row)
     row.each_index.select { row[_1].is_a?(Time) }.map do |col|
-      {range: {rows: :all, columns: col}, styles: {format_code: "dd/mm/yyyy hh:mm:ss"}}
+      { range: { rows: :all, columns: col }, styles: { format_code: "dd/mm/yyyy hh:mm:ss" } }
     end
   end
 end

data/app/sms/bmc/sms/application_sms.rb

@@ -27,16 +27,16 @@ class BMC::SMS::ApplicationSMS
   class << self
     private :new
 
-    def method_missing(m, ...)
-      if respond_to_missing?(m)
-        new(action_name: m).public_send(m, ...)
+    def method_missing(method, ...)
+      if respond_to_missing?(method)
+        new(action_name: method).public_send(method, ...)
       else
         super
       end
     end
 
-    def respond_to_missing?(m, include_private = false)
-      super || public_instance_methods.include?(m)
+    def respond_to_missing?(method, include_private = false)
+      super || public_instance_methods.include?(method)
     end
   end # class << self
 end

data/app/sms/bmc/sms/strategies/amazon.rb

@@ -2,16 +2,16 @@ class BMC::SMS::Strategies::Amazon
   attr_reader :region, :access_key_id, :secret_access_key
 
   def initialize(region: nil, access_key_id: nil, secret_access_key: nil)
-    @region            = region            || ENV["SNS_REGION"]            || ENV["AWS_REGION"]
-    @access_key_id     = access_key_id     || ENV["SNS_ACCESS_KEY_ID"]     || ENV["AWS_ACCESS_KEY_ID"]
-    @secret_access_key = secret_access_key || ENV["SNS_SECRET_ACCESS_KEY"] || ENV["AWS_SECRET_ACCESS_KEY"]
+    @region            = region            || ENV["SNS_REGION"]            || ENV.fetch("AWS_REGION", nil)
+    @access_key_id     = access_key_id     || ENV["SNS_ACCESS_KEY_ID"]     || ENV.fetch("AWS_ACCESS_KEY_ID", nil)
+    @secret_access_key = secret_access_key || ENV["SNS_SECRET_ACCESS_KEY"] || ENV.fetch("AWS_SECRET_ACCESS_KEY", nil)
   end
 
   def client
     @client ||= Aws::SNS::Client.new(
-      :region            => region,
-      :access_key_id     => access_key_id,
-      :secret_access_key => secret_access_key,
+      region: region,
+      access_key_id: access_key_id,
+      secret_access_key: secret_access_key,
     )
   end
 
@@ -19,16 +19,16 @@ class BMC::SMS::Strategies::Amazon
     from = data[:from] || BMC::SMS.default_from
 
     client.publish(
-      :phone_number => data[:to],
-      :message => data[:body],
-      :message_attributes => {
+      phone_number: data[:to],
+      message: data[:body],
+      message_attributes: {
         "AWS.SNS.SMS.SenderID" => {
-          :data_type    => "String",
-          :string_value => from,
+          data_type: "String",
+          string_value: from,
         },
         "AWS.SNS.SMS.SMSType" => {
-          :data_type => "String",
-          :string_value => "Transactional",
+          data_type: "String",
+          string_value: "Transactional",
         },
       },
     )

data/app/sms/bmc/sms/strategies/sendinblue.rb

@@ -1,11 +1,11 @@
 class BMC::SMS::Strategies::Sendinblue
-  URL = "https://api.sendinblue.com/v3/transactionalSMS/sms"
+  URL = "https://api.sendinblue.com/v3/transactionalSMS/sms".freeze
 
   DeliveryError = Class.new(BMC::SMS::DeliveryError)
 
   attr_reader :api_key
 
-  def initialize(api_key: ENV["SENDINBLUE_API_KEY"])
+  def initialize(api_key: ENV.fetch("SENDINBLUE_API_KEY", nil))
     @api_key = api_key
   end
 
@@ -23,8 +23,8 @@ class BMC::SMS::Strategies::Sendinblue
 
   def request_headers
     {
-      :content_type => "application/json",
-      :api_key => api_key,
+      content_type: "application/json",
+      api_key: api_key,
     }
   end
 
@@ -32,10 +32,10 @@ class BMC::SMS::Strategies::Sendinblue
     from = data[:from] || BMC::SMS.default_from
 
     {
-      :type => "transactional",
-      :sender => from,
-      :recipient => data[:to],
-      :content => data[:body],
+      type: "transactional",
+      sender: from,
+      recipient: data[:to],
+      content: data[:body],
     }
   end
 end

data/app/sorters/bmc/sorter.rb

@@ -28,7 +28,7 @@ class BMC::Sorter
   private
 
   def inverted_direction
-    {asc: :desc, desc: :asc}[direction]
+    { asc: :desc, desc: :asc }[direction]
   end
 
   def joins(...)
@@ -39,11 +39,11 @@ class BMC::Sorter
     @collection = @collection.left_joins(...)
   end
 
-  def by_column(c = column)
-    {c => direction}
+  def by_column(column = self.column)
+    { column => direction }
   end
 
-  def by_lower(c = column)
-    Arel.sql "LOWER(#{c}) #{direction}"
+  def by_lower(column = self.column)
+    Arel.sql "LOWER(#{column}) #{direction}"
   end
 end

data/lib/bmc/active_model_custom_error_messages.rb

@@ -3,6 +3,7 @@ module BMC::ActiveModelCustomErrorMessages
   module ForErrors
     def full_message(attribute, message)
       return message[1..] if message[0] == "^"
+
       super
     end
   end
@@ -13,6 +14,7 @@ module BMC::ActiveModelCustomErrorMessages
   module ForError
     def full_message
       return message[1..] if message[0] == "^"
+
       super
     end
   end

data/lib/bmc/active_model_type_cast.rb

@@ -4,7 +4,7 @@ module BMC::ActiveModelTypeCast
       if value.is_a?(String)
         super(value.tr(",", ".").gsub(/[^-0-9.]/, ""))
       else
-        super(value)
+        super
       end
     end
   end
@@ -14,14 +14,14 @@ module BMC::ActiveModelTypeCast
     SANITIZABLE_FORMATS = [
       /^[0-9]{2}\/[0-9]{2}\/[0-9]{4}$/,
       /^[0-9]{4}-[0-9]{2}-[0-9]{2}$/,
-    ]
+    ].freeze
     # rubocop:enable Style/RegexpLiteral
 
     def cast_value(value)
       if sanitizable?(value)
         super(sanitize(value))
       else
-        super(value)
+        super
       end
     end
 
@@ -33,6 +33,7 @@ module BMC::ActiveModelTypeCast
 
     def sanitizable?(value)
       return false unless value.is_a?(String)
+
       sanitized = sanitize(value)
       SANITIZABLE_FORMATS.any? { |r| r =~ sanitized }
     end
@@ -41,7 +42,7 @@ module BMC::ActiveModelTypeCast
   module Boolean
     def cast_value(value)
       value = value.strip if value.is_a?(String)
-      super(value)
+      super
     end
   end
 end

data/lib/bmc/config.rb

@@ -1,5 +1,5 @@
 class << BMC
-  attr_writer :parent_controller
+  attr_writer :parent_controller, :parent_job, :parent_mailer
 
   def parent_controller
     @parent_controller ||= [
@@ -8,8 +8,6 @@ class << BMC
     ].filter_map(&:safe_constantize).first
   end
 
-  attr_writer :parent_job
-
   def parent_job
     @parent_job ||= [
       "ApplicationJob",
@@ -17,8 +15,6 @@ class << BMC
     ].filter_map(&:safe_constantize).first
   end
 
-  attr_writer :parent_mailer
-
   def parent_mailer
     @parent_mailer ||= [
       "ApplicationMailer",

data/lib/bmc/errors_middleware.rb

@@ -3,7 +3,7 @@ class BMC::ErrorsMiddleware
     "ActiveRecord::ConnectionTimeoutError",
     "connections on port 5432",
     "PG::UnableToSend",
-  ]
+  ].freeze
 
   NOT_ACCEPTABLE_ERRORS = [
     "ActionController::BadRequest",
@@ -13,7 +13,7 @@ class BMC::ErrorsMiddleware
     "ActionDispatch::Http::MimeNegotiation::InvalidType",
     "ActionView::MissingTemplate",
     "Mime::Type::InvalidMimeType",
-  ]
+  ].freeze
 
   def initialize(app)
     @app = app
@@ -24,13 +24,9 @@ class BMC::ErrorsMiddleware
   rescue StandardError => e
     error = "#{e.class} : #{e.message}"
 
-    if MAINTENANCE_ERRORS.any? { |pattern| error.match?(pattern) }
-      return respond_with 503, "Maintenance en cours."
-    end
+    return respond_with 503, "Maintenance en cours." if MAINTENANCE_ERRORS.any? { |pattern| error.match?(pattern) }
 
-    if NOT_ACCEPTABLE_ERRORS.any? { |pattern| error.match?(pattern) }
-      return respond_with 406, "Not acceptable."
-    end
+    return respond_with 406, "Not acceptable." if NOT_ACCEPTABLE_ERRORS.any? { |pattern| error.match?(pattern) }
 
     raise e
   end
@@ -38,7 +34,7 @@ class BMC::ErrorsMiddleware
   private
 
   def respond_with(status, body)
-    [status, {"Content-Type" => "text/plain; charset=UTF-8"}, [body]]
+    [status, { "Content-Type" => "text/plain; charset=UTF-8" }, [body]]
   end
 end
 

data/lib/bmc/form_back_url.rb

@@ -1,17 +1,17 @@
 module BMC::FormBackUrl
   def back_url_tag
     tag.input(
-      :type  => "hidden",
-      :name  => "back_url",
-      :value => params[:back_url].presence || request.referer,
+      type: "hidden",
+      name: "back_url",
+      value: params[:back_url].presence || request.referer,
     )
   end
 
   def form_tag_with_body(html_options, content)
     output = form_tag_html(html_options)
-    output.safe_concat(back_url_tag)
+    output.safe_concat(back_url_tag) # rubocop:disable Rails/OutputSafety
     output << content
-    output.safe_concat("</form>")
+    output.safe_concat("</form>") # rubocop:disable Rails/OutputSafety
   end
 end
 

data/lib/bmc/version.rb

@@ -1,3 +1,3 @@
 module BMC
-  VERSION = "1.6.1"
+  VERSION = "1.7.0".freeze
 end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Benoit MARTIN-CHAVE
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails-i18n
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: attr_extras
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +66,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tapenade
+  name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: attr_extras
+  name: tapenade
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,7 +151,6 @@ files:
 - app/libs/bmc/collection_update.rb
 - app/libs/bmc/mini_model_serializer/serialize.rb
 - app/libs/bmc/mini_model_serializer/serializer.rb
-- app/libs/bmc/monkey.rb
 - app/libs/bmc/sortable_uuid_generator.rb
 - app/libs/bmc/token_generator.rb
 - app/mailers/bmc/application_mailer.rb
@@ -163,7 +161,6 @@ files:
 - app/models/concerns/bmc/model_to_s.rb
 - app/models/concerns/bmc/pluck_distinct.rb
 - app/models/concerns/bmc/pluck_to_hash.rb
-- app/models/concerns/bmc/polymorphic_id.rb
 - app/models/concerns/bmc/search.rb
 - app/models/concerns/bmc/timestamp_helpers.rb
 - app/serializers/bmc/serializers.rb
@@ -214,8 +211,8 @@ files:
 homepage: https://gitlab.benoitmc.com/pub/bmc
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -223,15 +220,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.2
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: BMC
 test_files: []

data/app/libs/bmc/monkey.rb

@@ -1,39 +0,0 @@
-module BMC::Monkey
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def prepend_instances(&block)
-      m = Module.new(&block)
-      send(:prepend, m)
-    end
-
-    def prepend_class(&block)
-      m = Module.new(&block)
-      singleton_class.send(:prepend, m)
-    end
-
-    def prepend_instance_method(name, &block)
-      check_instance_method_exist!(name)
-
-      m = Module.new
-      m.send(:define_method, name, &block)
-      send(:prepend, m)
-    end
-
-    def prepend_class_method(name, &block)
-      check_class_method_exist!(name)
-
-      m = Module.new
-      m.send(:define_method, name, &block)
-      singleton_class.send(:prepend, m)
-    end
-
-    def check_instance_method_exist!(name)
-      raise "instance method `#{name}` does not exist" unless instance_methods.include?(name)
-    end
-
-    def check_class_method_exist!(name)
-      raise "class method `#{name}` does not exist" unless methods.include?(name)
-    end
-  end
-end

data/app/models/concerns/bmc/polymorphic_id.rb

@@ -1,37 +0,0 @@
-module BMC::PolymorphicId
-  extend ActiveSupport::Concern
-
-  included do
-    def self.polymorphic_id_for(relation_name)
-      module_src = File.read(__FILE__).split("__END__").last
-      module_src = module_src.gsub("relation", relation_name.to_s)
-      send :include, eval(module_src)
-    end
-
-    def guid
-      return nil if new_record?
-
-      "#{self.class.base_class}-#{id}"
-    end
-  end # included
-end # module
-
-__END__
-
-Module.new do
-  def relation_guid
-    return nil if relation_type.blank? || relation_id.blank?
-
-    "#{relation_type}-#{relation_id}"
-  end
-
-  def relation_guid=(guid)
-    if guid.blank?
-      self.relation = nil
-      return
-    end
-
-    type, id      = guid.split("-", 2)
-    self.relation = type.constantize.find(id)
-  end
-end