bmc 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 610c3313a3499ea6c4b1ab3b3d801ee892cfcce32e5adacf8b935a2032506f71
-  data.tar.gz: 0db6265466d7b9f388b2a73b299b51b138fde69c89b08a67f8bc9fb67cef405d
+  metadata.gz: 8059c6df5d1948303e20ec0771f1d379880a9c9a771d7c92b27432bce595f4c6
+  data.tar.gz: 6497a08bed10f80364780ee870aafe69e6bbc4ff8cff232ac74da63715d7c99c
 SHA512:
-  metadata.gz: acc8116f3b1beff954b12fe0558aa3023172f5e8720316b8dd3f851b60258f774a2d002fd72c84a5fbe1f65c3c6761c967bef7e38f32e5a79c61625fe6e9fd36
-  data.tar.gz: 915fe7c88c4c6d7b201a9a8b70482207cf6f2b55a80222602825ebf33ceae0ebf0a0f0bf38dfe8d4781de2d20e40ff09b6b0ea32c5bec05c03afd9a480d9c4ce
+  metadata.gz: cf4d0096587ce7ebaefbead1b4c1fbd527cd4a97ae9c36f7d9db90d9042e9142932b7e090234d2184387c6d6ed2dd9a8df731a7f638090720f101b813b05c412
+  data.tar.gz: 2955d4e545a15c05216d45cfed14be03a209288abb80ec3798cbf5218e3f76a81ef7a4e34fe1b17a4dd85e14d8049cbb1ecb8620b19dc3fdb60d658ee42432b6

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Next version
 
+## 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
+
 ## v1.1.0
 - SMS strategies rewrite
 

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

@@ -12,7 +12,6 @@ module BMC
     initializer "inflections" do
       ActiveSupport::Inflector.inflections(:en) do |inflect|
         inflect.acronym "BMC"
-        inflect.acronym "FCM"
         inflect.acronym "SMS"
         inflect.acronym "UUID"
         inflect.acronym "XLSX"

data/lib/bmc/version.rb

@@ -1,3 +1,3 @@
 module BMC
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
-- agilidée
+- Benoit MARTIN-CHAVE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -150,8 +150,6 @@ files:
 - app/jobs/bmc/application_job.rb
 - app/jobs/concerns/bmc/setup_job_concern.rb
 - app/libs/bmc/collection_update.rb
-- app/libs/bmc/fcm/notifier.rb
-- app/libs/bmc/fcm/request.rb
 - app/libs/bmc/mini_model_serializer/serialize.rb
 - app/libs/bmc/mini_model_serializer/serializer.rb
 - app/libs/bmc/monkey.rb
@@ -230,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: BMC

data/app/libs/bmc/fcm/notifier.rb

@@ -1,32 +0,0 @@
-class BMC::FCM::Notifier
-  attr_reader :to, :title, :body, :badge, :sound, :data
-
-  # rubocop:disable Metrics/ParameterLists
-  def initialize(to:, title: nil, body:, badge: 0, sound: "default", data: {})
-    super()
-    @to    = to
-    @title = title
-    @body  = body
-    @badge = badge
-    @sound = sound
-    @data  = data
-  end
-  # rubocop:enable Metrics/ParameterLists
-
-  def call
-    BMC::FCM::Request.call(
-      :to => to,
-      :notification => {
-        :title => title,
-        :body  => body,
-        :badge => badge,
-        :sound => sound,
-      },
-      :data => data,
-    )
-  end
-
-  def self.call(...)
-    new(...).call
-  end
-end

data/app/libs/bmc/fcm/request.rb

@@ -1,54 +0,0 @@
-class BMC::FCM::Request
-  extend AttrExtras.mixin
-
-  URL = "https://fcm.googleapis.com/fcm/send"
-
-  class << self
-    attr_writer :api_key
-
-    def api_key
-      @api_key ||= ENV["FCM_API_KEY"]
-    end
-  end
-
-  attr_reader_initialize :request_body
-
-  attr_reader :response_json
-
-  def self.call(...)
-    new(...).call
-  end
-
-  def call
-    response_body = HTTParty.post(URL,
-      :body    => request_body.to_json,
-      :headers => {
-        "Content-Type"  => "application/json",
-        "Authorization" => "key=#{self.class.api_key}",
-      },
-    ).body
-
-    @response_json = JSON.parse(response_body).deep_symbolize_keys
-
-    self
-  rescue JSON::ParserError
-    @response_json = {success: 0, failure: 1, results: [{:error => "InvalidJsonResponse"}]}
-    self
-  end
-
-  def ok?
-    response_json[:success].positive? && response_json[:failure].zero?
-  end
-
-  def error?
-    !ok?
-  end
-
-  def errors
-    response_json[:results].pluck(:error).compact
-  end
-
-  def invalid_token?
-    errors.include?("NotRegistered") || errors.include?("InvalidRegistration")
-  end
-end