bmc 1.4.3 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e0c4e5ab78a01fd7654084f301d4f5b1a742d63c5db56868933d9fd2f7089f
-  data.tar.gz: 717ee2dcc037bb32ef59e290ed6ff3505e567e4c2ae8a90e7cb7ef1ef19714fa
+  metadata.gz: 4b45ace9fe342248cb63e77ac701779ed69c5d6bf05ff3f0b0e2b23a7b46665b
+  data.tar.gz: 057b8aacdcd98a348b54276233b0a5ffc353580e79256c4d05c700c402779d55
 SHA512:
-  metadata.gz: 12c39ca13cca306fb378fedf40993aa1dc689bf64f3f9707704a5b13f4afaa9028c145d6ae30baba97443460a57ca74c84cf30550c21186afe6aa9ec55ae177a
-  data.tar.gz: c0ad050d9893e63177e464c1fb70de88d178b89acef88ab1db2dafa5b7a9272772541710cbbc562c4b58d674da076090ba4497c2af35e05dc91e1eb1cb9d7ddd
+  metadata.gz: 222d61f28a75cf0699935d6272599737ac4eb9c984b5f6012c8b174f593c2eae007d91a758d1a33f67f23d2bc8b13ceb9009979e45317d758dbd184600db19ff
+  data.tar.gz: 6f51eeb1722bf8bc536871700f4e633157e29f100f2677de68fc174cd93e30508511e2087b0aad626de55c7f77789d8d648bf3a982a90ec8a517b426ea763b46

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Next version
 
+## v1.5.1
+- Add options to filters and sorters
+- Fix BMC::ButtonHelper configuration
+
+## v1.5.0
+- Use Turbo instead of rails-ujs by default
+
 ## v1.4.3
 - Rails 7.1
 

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

@@ -14,9 +14,9 @@ class BMC::Filter::ByKeyValue
 
     column = column_for(query)
 
-    if value.to_s.in?(%w(nil null))
+    if value.to_s.in?(%w[nil null])
       query.where("#{column} IS NULL")
-    elsif value.to_s.in?(%w(not_nil not_null))
+    elsif value.to_s.in?(%w[not_nil not_null])
       query.where("#{column} IS NOT NULL")
     else
       query.where("#{column} = ?", value)

data/app/filters/bmc/filter.rb

@@ -3,10 +3,11 @@ class BMC::Filter
 
   STRATEGIES = {}
 
-  attr_reader :jar
+  attr_reader :jar, :options
 
-  def initialize(jar)
+  def initialize(jar, options = {})
     @jar = jar
+    @options = options
   end
 
   def strategies

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
@@ -9,6 +9,14 @@ module BMC::ButtonHelper
     def default_style
       @default_style ||= :outline_primary
     end
+
+    def confirm_attribute
+      @confirm_attribute ||= :"data-turbo-confirm"
+    end
+
+    def method_attribute
+      @method_attribute ||= :"data-turbo-method"
+    end
   end
 
   def bs_button( # rubocop:disable Metrics/ParameterLists
@@ -30,7 +38,12 @@ module BMC::ButtonHelper
     content = fa_s(icon).concat(" ").concat(tag.span(text, class: "text"))
 
     if method != :get
-      options[:method] = method
+      if helper == :link_to
+        options[BMC::ButtonHelper.method_attribute] = method
+        options[:rel] = "nofollow"
+      elsif helper == :button_to
+        options[:method] = method
+      end
       confirm = true if confirm.nil?
     end
 
@@ -48,7 +61,7 @@ module BMC::ButtonHelper
 
     unless confirm.nil?
       confirm = ta(:confirm) if confirm == true
-      options.deep_merge!(data: {confirm: confirm})
+      options[BMC::ButtonHelper.confirm_attribute] = confirm
     end
 
     public_send(helper, content, url, options.sort.to_h)

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

@@ -21,7 +21,7 @@ module BMC::SetupJobConcern
         end
 
         attrs.length.times do |i|
-          instance_variable_set("@#{attrs[i]}", args[i])
+          instance_variable_set(:"@#{attrs[i]}", args[i])
         end
       end
     end

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

@@ -5,7 +5,7 @@ module BMC::DefaultValuesConcern
   end
 
   def assign_default(attribute, value)
-    send("#{attribute}=", value) if send(attribute).nil?
+    send(:"#{attribute}=", value) if send(attribute).nil?
   end
 
   included do

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

@@ -1,6 +1,6 @@
 module BMC::ModelToS
   def to_s
-    %w(name title label).map do |m|
+    %w[name title label].map do |m|
       return send(m) if respond_to?(m)
     end
 

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

@@ -20,7 +20,7 @@ module BMC::Search
         }.join(" OR ")
       }.map { |e| "(#{e})" }.join(" AND ")
 
-      sql_params = words.map.with_index { |word, index| ["w#{index}".to_sym, "%#{word}%"] }.to_h
+      sql_params = words.map.with_index { |word, index| [:"w#{index}", "%#{word}%"] }.to_h
 
       where(sql_query, sql_params)
     end # def search

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/active_model_type_cast.rb

@@ -2,9 +2,9 @@ module BMC::ActiveModelTypeCast
   module Decimal
     def cast_value(value)
       if value.is_a?(String)
-        super value.tr(",", ".").gsub(/[^-0-9.]/, "")
+        super(value.tr(",", ".").gsub(/[^-0-9.]/, ""))
       else
-        super value
+        super(value)
       end
     end
   end
@@ -19,9 +19,9 @@ module BMC::ActiveModelTypeCast
 
     def cast_value(value)
       if sanitizable?(value)
-        super sanitize(value)
+        super(sanitize(value))
       else
-        super value
+        super(value)
       end
     end
 
@@ -41,7 +41,7 @@ module BMC::ActiveModelTypeCast
   module Boolean
     def cast_value(value)
       value = value.strip if value.is_a?(String)
-      super value
+      super(value)
     end
   end
 end

data/lib/bmc/form_back_url.rb

@@ -3,7 +3,7 @@ module BMC::FormBackUrl
     tag.input(
       :type  => "hidden",
       :name  => "back_url",
-      :value => (params[:back_url].presence || request.referer),
+      :value => params[:back_url].presence || request.referer,
     )
   end
 

data/lib/bmc/version.rb

@@ -1,3 +1,3 @@
 module BMC
-  VERSION = "1.4.3"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.1
 platform: ruby
 authors:
 - Benoit MARTIN-CHAVE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2024-04-11 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.4.10
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: BMC