bmc 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a6a356266f81ad7eb8ea4a4854057b183396375fa8eb0440dc5994e0ba619a
-  data.tar.gz: 7abd6a5c91201a3c34fd0e56014a19767a6113f55d8865da4d2c6ed79747a9b2
+  metadata.gz: dc16d49ff09c9a3ebd6f1404ecd8eed011333e58842f67824adf17897d681f58
+  data.tar.gz: 743ab9c8a8fc353bb0758c6071d53e181231f60796c20fe986ff2d5b16a55d9e
 SHA512:
-  metadata.gz: d3b50c4e23f67f61f8b9fcbf09af737459b0c5e2aacd97fccc76935b1cac3acecbe388cd630dbe24df11ef15ead5eef6a2f574af98e118e08b561247a7eff392
-  data.tar.gz: 2739cc1504180bf2ecb05609d90c788e80142cb3986fa6939853ec9c108d12563fb21443b7f715f271d742699a5d14ab827ec4ff80bc47086394064c9884a1d2
+  metadata.gz: 7ccc820fbfaf071b33d7bb7ee3e735651491594d4413ab4b0d09fe9bc0cbc2f12e36a4c00ab5676c022615d5b7032d46d9b75bddb4297c0b454ac9775d7da2f1
+  data.tar.gz: 3fbf31cfe70e3762536559e1ed79ecdb970987234712c0e67b20739d39d2da54325ec2fd99656ab500e5323f032002c287f2388e11fbe9443157124756f0fdfc

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Next version
 
+## v1.3.1
+- Add sorter helpers
+
+## v1.3.0
+- Replace `icon` helper by `fa_s`/`fa_r`/`fa_b` helpers
+
+## v1.2.1
+- Rails 7 + Ruby 3.1 compatibility
+
 ## v1.2.0
 - Remove FCM
 

data/app/helpers/bmc/bootstrap_helper.rb

@@ -57,7 +57,7 @@ module BMC::BootstrapHelper
     end
 
     content_tag(card_tag, class: card_classes) do
-      [header_html, body_html, footer_html].compact.sum
+      [header_html, body_html, footer_html].compact.sum("".html_safe)
     end
   end
 end

data/app/helpers/bmc/button_helper.rb

@@ -26,7 +26,7 @@ module BMC::ButtonHelper
   )
     text = ta(action) if text.nil? && action
 
-    content = icon(icon).concat(" ").concat(tag.span(text, class: "text"))
+    content = fa_s(icon).concat(" ").concat(tag.span(text, class: "text"))
 
     if method != :get
       options[:method] = method

data/app/helpers/bmc/font_awesome_helper.rb

@@ -1,15 +1,23 @@
 module BMC::FontAwesomeHelper
-  def icon(id, fa_style: nil, size: nil, spin: false, **options)
-    id = id.to_s.tr("_", "-").to_sym
+  def fa_s(id, **options)
+    _bmc_fa_icon(id, fa_style: "fas", **options)
+  end
 
-    if fa_style.nil?
-      fa_style = BMC::FontAwesomeHelper.default_fa_style_for_id(id)
-    end
+  def fa_r(id, **options)
+    _bmc_fa_icon(id, fa_style: "far", **options)
+  end
+
+  def fa_b(id, **options)
+    _bmc_fa_icon(id, fa_style: "fab", **options)
+  end
+
+  def _bmc_fa_icon(id, fa_style: nil, size: nil, spin: false, **options)
+    id = id.to_s.tr("_", "-").to_sym
 
     css_classes = options.delete(:class).to_s.split
     css_classes << "icon"
     css_classes << "fa-#{id}"
-    css_classes << "fa#{fa_style.to_s[0]}"
+    css_classes << fa_style
     css_classes << "fa-#{size}" if size
     css_classes << "fa-spin" if spin
 
@@ -17,51 +25,4 @@ module BMC::FontAwesomeHelper
 
     tag.span(**attributes)
   end
-
-  class << self
-    def database
-      @database ||= YAML.safe_load(database_yml).deep_symbolize_keys
-    end
-
-    def database_path
-      Rails.root.join("tmp", "fa_database_#{version}.yml")
-    end
-
-    def database_yml
-      download_database! unless File.size?(database_path)
-      File.read(database_path)
-    end
-
-    def database_url
-      short_version = version.split(".")[0, 3].join(".") # 1.20.14.2 => 1.20.14
-      url = "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/#{short_version}/metadata/icons.yml"
-
-      if Gem::Version.new(short_version) < Gem::Version.new("5.6.0")
-        url = url.gsub("/metadata", "/advanced-options/metadata")
-      end
-
-      url
-    end
-
-    def download_database!
-      require "open-uri"
-      data = URI.parse(database_url).open.read
-      File.write(database_path, data)
-    end
-
-    def version
-      require "font_awesome/sass/version"
-      FontAwesome::Sass::VERSION
-    end
-
-    def default_fa_style_for_id(id)
-      return if version.start_with?("4")
-
-      if version.start_with?("5")
-        return BMC::FontAwesomeHelper.database.dig(id, :styles).to_a.first
-      end
-
-      raise "invalid font-awesome-sass version"
-    end
-  end # class << self
 end

data/app/helpers/bmc/form_helper.rb

@@ -19,6 +19,6 @@ module BMC::FormHelper
 
     return if query_values.empty?
 
-    query_values.sum { |k, v| tag.input(type: "hidden", name: k, value: v) }
+    query_values.sum("".html_safe) { |k, v| tag.input(type: "hidden", name: k, value: v) }
   end
 end

data/app/helpers/bmc/link_helper.rb

@@ -10,7 +10,7 @@ module BMC::LinkHelper
   end
 
   def icon_link_to(icon, name, options = nil, html_options = nil, &block)
-    name = icon(icon).concat(" ").concat(name)
+    name = fa_s(icon).concat(" ").concat(name)
     link_to(name, options, html_options, &block)
   end
 

data/app/helpers/bmc/text_helper.rb

@@ -54,8 +54,8 @@ module BMC::TextHelper
   def boolean_icon(bool)
     return if bool.nil?
 
-    return icon(:check, style: "color: green") if bool == true
-    return icon(:times, style: "color: red")   if bool == false
+    return fa_s(:check, style: "color: green") if bool == true
+    return fa_s(:times, style: "color: red")   if bool == false
 
     raise "#{bool} is not a boolean"
   end
@@ -102,7 +102,7 @@ module BMC::TextHelper
     container_css_class = ["info", ("blank" if value.blank?)]
 
     content_tag(tag, class: container_css_class) do
-      [html_label, separator_html, html_value].sum
+      [html_label, separator_html, html_value].sum("".html_safe)
     end
   end # def info
 

data/app/sorters/bmc/sorter.rb

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

data/app/views/bmc/search/_form_bs3.html.slim

@@ -7,7 +7,7 @@ form.search.bs3 method="get" action=action
 
     span.input-group-btn
       button.btn.btn-default.search-reset.reset type="submit"
-        = icon :times
+        = fa_s(:times)
 
       button.btn.btn-default.search-submit type="submit"
-        = icon :search
+        = fa_s(:search)

data/app/views/bmc/search/_form_bs4.html.slim

@@ -5,5 +5,5 @@ form.search.bs4 method="get" action=action
   .input-group.search
     input.form-control.form-control-sm type="text" name="q" placeholder=ta(:search) value=params[:q]
     span.input-group-append
-      button.btn.btn-sm.bg-light.border.search-reset.reset type="submit" = icon(:times)
-      button.btn.btn-sm.bg-light.border.search-submit type="submit" = icon(:search)
+      button.btn.btn-sm.bg-light.border.search-reset.reset type="submit" = fa_s(:times)
+      button.btn.btn-sm.bg-light.border.search-submit type="submit" = fa_s(:search)

data/app/views/bmc/search/_form_bs5.html.slim

@@ -4,5 +4,5 @@ form.search.bs5.mb-3 method="get" action=action
 
   .input-group.search
     input.form-control.form-control-sm type="text" name="q" placeholder=ta(:search) value=params[:q]
-    button.btn.btn-sm.bg-light.border.search-reset.reset type="submit" = icon(:times)
-    button.btn.btn-sm.bg-light.border.search-submit type="submit" = icon(:search)
+    button.btn.btn-sm.bg-light.border.search-reset.reset type="submit" = fa_s(:times)
+    button.btn.btn-sm.bg-light.border.search-submit type="submit" = fa_s(:search)

data/lib/bmc/version.rb

@@ -1,3 +1,3 @@
 module BMC
-  VERSION = "1.2.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Benoit MARTIN-CHAVE
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -213,7 +213,7 @@ homepage: https://gitlab.benoitmc.com/pub/bmc
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -228,8 +228,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: BMC
 test_files: []