bmc 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66917c46eb778377885fb86604c50632bc8e9d9c51a2974da48ffb4a30417567
-  data.tar.gz: d53cf1ba56317ebe9789806270a408441690cc55d28ef87b9d0f4f3a0d7e9a64
+  metadata.gz: 761e510c5a970c4720e50d7cb25193dbd77f1d0181151fbdb9b60fa1df105826
+  data.tar.gz: 0d1564a511deab185e8cfc85816c4dac045ff5420a13ca64a7550fb0fb580688
 SHA512:
-  metadata.gz: 6a38bde69e6cc4a9ad5187eade8fecd53f76d193d36d417a67c1eb46c1ac9283d3d94d6a3f473ac3d0ba4dc97e4bcaf60e1dcff0103c3e9c9d9673a46d705c1e
-  data.tar.gz: 1dcc4a6a907c341dc93e36ab4f7bb81821f92523f8b86b4caa2fc854a76c334767ce49e437fcdc87c7c1bb73d30e4fd9b5eef774925375862d48b3a8f2ac1ac4
+  metadata.gz: b1217842ff462ceee4909c28bea5a5f42db0ccf6addcc13f54e18fc573e1564795f13eef2c5f8043667cf2ec6fffd7f4836f1e4af32537b5e2b3dc4e2e833c50
+  data.tar.gz: 2d5bca38555fe9c116aa783f05943320e78a86cfecd2502adbce9e8cf4b29b682a5ce04de53359c54ae87f41927cf7eaf6bcf2a9cba08f20a7ca6f368f20aac5

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Next version
 
+## v1.6.0
+- Filters v2
+- Ruby min version is 3.3
+- Rails min version is 7.1
+
+## v1.5.1
+- Add options to filters and sorters
+- Fix BMC::ButtonHelper configuration
+
 ## v1.5.0
 - Use Turbo instead of rails-ujs by default
 

data/app/controllers/bmc/filters_controller.rb

@@ -4,14 +4,18 @@ class BMC::FiltersController < BMC::ApplicationController
   skip_after_action  :verify_authorized,         raise: false
   skip_after_action  :verify_policy_scoped,      raise: false
 
+  def self.parse(json)
+    JSON.parse(json.to_s).with_indifferent_access
+  rescue JSON::ParserError
+    {}.with_indifferent_access
+  end
+
   def create
-    filters = BMC::Filter.new(cookies)
-    new_filters = params.fetch(:filters, {}).permit!.to_h
-    filters.merge new_filters
+    filters = self.class.parse(cookies[:filters])
+    filters.merge! params.fetch(:filters, {}).permit!.to_h
 
-    # Rewrite cookie with 1 year expiry
     cookies[:filters] = {
-      :value   => cookies[:filters],
+      :value   => JSON.dump(filters),
       :expires => 1.year.from_now,
       :path    => "/",
     }

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

@@ -4,12 +4,12 @@ module BMC::ApiControllerConcern
   private
 
   def render_json(json = {}, options = {})
-    json.reverse_merge!(current_user: current_user)
-    options.reverse_merge!(current_user: current_user)
+    json.reverse_merge!(current_user:)
+    options.reverse_merge!(current_user:)
 
     json = BMC::MiniModelSerializer::Serialize.call(json, options)
 
-    render options.merge(json: json)
+    render options.merge(json:)
   end
 
   def render_json_error(any_object, options = {})

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

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

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

@@ -1,5 +1,5 @@
 class BMC::Filter::ByDateBegin < BMC::Filter::ByKeyValue
-  def apply(query, value)
+  def call(query, value)
     value = Date.parse(value)
     column = column_for(query)
     query.where("#{column} >= ?", value)

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

@@ -1,5 +1,5 @@
 class BMC::Filter::ByDateEnd < BMC::Filter::ByKeyValue
-  def apply(query, value)
+  def call(query, value)
     value = Date.parse(value)
     column = column_for(query)
     query.where("#{column} <= ?", value)

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 apply(query, value) # rubocop:disable Metrics/MethodLength
+  def call(query, value) # rubocop:disable Metrics/MethodLength
     value = value.to_s
 
     if value == "today"

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

@@ -6,7 +6,7 @@ class BMC::Filter::ByKeyValue
     @key = key
   end
 
-  def apply(query, value)
+  def call(query, value)
     return query if value == "all"
 
     value = true  if value == "true"

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

@@ -1,5 +1,5 @@
 class BMC::Filter::ByKeyValues < BMC::Filter::ByKeyValue
-  def apply(query, value)
+  def call(query, value)
     value = value.split if value.is_a?(String)
     value = value.select(&:present?)
 

data/app/filters/bmc/filter.rb

@@ -3,67 +3,43 @@ class BMC::Filter
 
   STRATEGIES = {}
 
-  attr_reader :jar
+  attr_reader :values, :options
 
-  def initialize(jar)
-    @jar = jar
+  def initialize(values, options = {})
+    @values = values.with_indifferent_access
+    @options = options
   end
 
   def strategies
     self.class::STRATEGIES.with_indifferent_access
   end
 
-  def apply(query)
+  def call(query)
     strategies.each do |key, strategy|
-      value = get(key)
+      value = values[key]
 
       next if value.blank?
 
-      query = strategy.apply(query, value)
+      query = strategy.call(query, value)
     end
 
-    return query
+    query
   end
 
-  def method_missing(method, *args)
-    if method.to_s.end_with?("=")
-      key    = method.to_s[0..-2]
-      value  = args.first
-      action = :write
-    else
-      key    = method.to_s
-      action = :read
-    end
-
-    if strategies.key?(key) && action == :read
-      get(key)
-    elsif strategies.key?(key) && action == :write
-      set(key, value)
+  def method_missing(method, ...)
+    if strategies.key?(method)
+      values[method]
     else
       super
     end
   end
 
   def respond_to_missing?(method, include_private = false)
-    super || strategies.key?(method.to_s) || strategies.key?(method.to_s.chomp("="))
-  end
-
-  def read
-    JSON.parse jar["filters"].to_s
-  rescue JSON::ParserError
-    {}
-  end
-
-  def write(filters)
-    jar["filters"] = filters.to_json
-  end
-
-  def merge(new_filters)
-    write read.merge(new_filters)
+    strategies.key?(method) || super
   end
 
   def actives_count
-    read.count { |k, v| strategies.key?(k.to_s) && v.present? }
+    values.count { |k, v| strategies.key?(k) && v.present? }
   end
 
   def any?
@@ -73,14 +49,4 @@ class BMC::Filter
   def empty?
     !any?
   end
-
-  private
-
-  def get(key)
-    read[key.to_s]
-  end
-
-  def set(key, value)
-    merge(key.to_s => value)
-  end
 end

data/app/helpers/bmc/button_helper.rb

@@ -1,6 +1,6 @@
 module BMC::ButtonHelper
   class << self
-    attr_writer :default_size, :default_style
+    attr_writer :default_size, :default_style, :confirm_attribute, :method_attribute
 
     def default_size
       @default_size ||= :sm
@@ -67,8 +67,8 @@ module BMC::ButtonHelper
     public_send(helper, content, url, options.sort.to_h)
   end
 
-  def bs_button_to(url, **options)
-    bs_button(url, helper: :button_to, **options)
+  def bs_button_to(url, **)
+    bs_button(url, helper: :button_to, **)
   end
 
   def new_button(url = url_for(action: :new), **options)

data/app/helpers/bmc/font_awesome_helper.rb

@@ -1,14 +1,14 @@
 module BMC::FontAwesomeHelper
-  def fa_s(id, **options)
-    _bmc_fa_icon(id, fa_style: "fas", **options)
+  def fa_s(id, **)
+    _bmc_fa_icon(id, fa_style: "fas", **)
   end
 
-  def fa_r(id, **options)
-    _bmc_fa_icon(id, fa_style: "far", **options)
+  def fa_r(id, **)
+    _bmc_fa_icon(id, fa_style: "far", **)
   end
 
-  def fa_b(id, **options)
-    _bmc_fa_icon(id, fa_style: "fab", **options)
+  def fa_b(id, **)
+    _bmc_fa_icon(id, fa_style: "fab", **)
   end
 
   def _bmc_fa_icon(id, fa_style: nil, size: nil, spin: false, **options)

data/app/helpers/bmc/form_helper.rb

@@ -9,7 +9,7 @@ module BMC::FormHelper
   end
 
   def search_form(action: request.fullpath, placeholder: ta(:search))
-    render "bmc/search/form", action: action, placeholder: placeholder
+    render "bmc/search/form", action:, placeholder:
   end
 
   def hidden_inputs_for_get_form(url, except: nil, only: nil)

data/app/helpers/bmc/link_helper.rb

@@ -9,9 +9,9 @@ module BMC::LinkHelper
     end
   end
 
-  def icon_link_to(icon, name, options = nil, html_options = nil, &block)
+  def icon_link_to(icon, name, options = nil, html_options = nil, &)
     name = fa_s(icon).concat(" ").concat(name)
-    link_to(name, options, html_options, &block)
+    link_to(name, options, html_options, &)
   end
 
   def web_link(text, opts = {})

data/app/helpers/bmc/text_helper.rb

@@ -84,11 +84,11 @@ module BMC::TextHelper
     label: object.t(attribute)
   )
     if default == :hide
-      value = fma(object, attribute, value: value, helper: helper)
+      value = fma(object, attribute, value:, helper:)
       return if value.nil?
     end
 
-    value = fma(object, attribute, value: value, default: default, helper: helper)
+    value = fma(object, attribute, value:, default:, helper:)
 
     separator   = " :<br/>".html_safe if separator == :br
     klass       = object.is_a?(Module) ? object : object.class

data/app/jobs/concerns/bmc/setup_job_concern.rb

@@ -1,8 +1,8 @@
 module BMC::SetupJobConcern
   extend ActiveSupport::Concern
 
-  def perform(*args)
-    setup(*args)
+  def perform(*)
+    setup(*)
     call
   end
 

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

@@ -9,9 +9,9 @@ class BMC::MiniModelSerializer::Serializer < BMC::MiniModelSerializer::Serialize
 
   private
 
-  def method_missing(m, *args)
+  def method_missing(m, *)
     if respond_to_missing?(m)
-      object.send(m, *args)
+      object.send(m, *)
     else
       super
     end

data/app/libs/bmc/token_generator.rb

@@ -18,8 +18,8 @@ class BMC::TokenGenerator
   end
 
   class << self
-    def call(*args)
-      new(*args).call
+    def call(*)
+      new(*).call
     end
 
     attr_writer :default_size

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

@@ -7,8 +7,8 @@ module BMC::ModelI18n
   end
   self.raise_on_missing_translations = false
 
-  def t(*args)
-    self.class.t(*args)
+  def t(...)
+    self.class.t(...)
   end
 
   def ts

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

@@ -3,8 +3,8 @@ class BMC::Serializers::XLSX < BMC::Serializers::Base
     headers, *data = formatted_data
 
     SpreadsheetArchitect.to_xlsx(
-      headers: headers,
-      data: data,
+      headers:,
+      data:,
       freeze_headers: true,
       range_styles: range_styles(data[0]),
     )

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

@@ -1,13 +1,11 @@
 class BMC::SMS::Strategies::Amazon
   attr_reader :region, :access_key_id, :secret_access_key
 
-  # rubocop:disable Layout/LineLength
   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"]
   end
-  # rubocop:enable Layout/LineLength
 
   def client
     @client ||= Aws::SNS::Client.new(

data/app/sorters/bmc/sorter.rb

@@ -1,15 +1,16 @@
 class BMC::Sorter
   include BMC::SortingHelper
 
-  attr_reader :collection, :sort_param, :column, :direction
+  attr_reader :collection, :sort_param, :options, :column, :direction
 
   def self.call(...)
     new(...).call
   end
 
-  def initialize(collection, sort_param = nil)
-    @collection         = collection
-    @sort_param         = sort_param
+  def initialize(collection, sort_param, options = {})
+    @collection = collection
+    @sort_param = sort_param
+    @options = options
     @column, @direction = sortable_column_order(sort_param.to_s)
   end
 

data/lib/bmc/version.rb

@@ -1,3 +1,3 @@
 module BMC
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Benoit MARTIN-CHAVE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-06 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: BMC