bmc 1.2.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59bab32c76657e73db1aaef5bb4e81c1ed6aa9543b94e5dc85f5054eec729a8
-  data.tar.gz: 4df9be0caa78db86d8a62cc8398defd99524e5b57db38c5ce9aa8f710db89053
+  metadata.gz: 660ccd7de1adf652c91f76ddc091f158c1b844d1a5a2a1006ca801c91a54ab79
+  data.tar.gz: 7786e6fd7de7161c0fbd9cb61b1f8200f9e48d65c59296cad7cde39234bb0bb0
 SHA512:
-  metadata.gz: 77820c96a79cb697a80fa0d75d64820faa8e2af8d1a194286abfb7894cb32dbc1fcc1b5a194cb43d6910408ca882b1b52a0fdde30b777d1c92e160ca3217a3c2
-  data.tar.gz: '038cb8ed69f9e6790c08d01ea3f706ef1a22b1372b51ca5ab315d821d01cddf90b4663798e5f48d3c96e6db952d19e8d9638ed3084daafc0ecff86aa085d7e1a'
+  metadata.gz: 714fafade0b2d5fcb2ab9689445c9e327075107ccd5397bdf218ad85108af4e05aa0dd484ff7d68d932d833ce29f3b68b6cf21b27913a61de3c9ee3f54f802d4
+  data.tar.gz: 599dde15b80d1e30103de30e33e0070aa9c3023845d33303d464d6a2967a9c43b9abccd2a11d5a20de965879ee6d459905d3c2a6eac6b4b9773fdd3260aba65b

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Next version
 
+## v1.3.2
+- Add `bs_button_to` helper
+
+## 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
 

data/app/helpers/bmc/button_helper.rb

@@ -22,11 +22,12 @@ module BMC::ButtonHelper
     btn_size: BMC::ButtonHelper.default_size,
     btn_style: BMC::ButtonHelper.default_style,
     add_class: [],
+    helper: :link_to,
     **options
   )
     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
@@ -50,7 +51,11 @@ module BMC::ButtonHelper
       options.deep_merge!(data: {confirm: confirm})
     end
 
-    link_to(content, url, options.sort.to_h)
+    public_send(helper, content, url, options.sort.to_h)
+  end
+
+  def bs_button_to(url, **options)
+    bs_button(url, helper: :button_to, **options)
   end
 
   def new_button(url = url_for(action: :new), **options)

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/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

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.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Benoit MARTIN-CHAVE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: BMC