bmc 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f44e62a2b31e04cc714d58d89b5bf5752a26cb99b2e9013da86a5a7c7b52a15
-  data.tar.gz: 71693371c8912830ecbdbde9a6582c357dd0fdf63c8233ab1fc8c1e52723e828
+  metadata.gz: a59bab32c76657e73db1aaef5bb4e81c1ed6aa9543b94e5dc85f5054eec729a8
+  data.tar.gz: 4df9be0caa78db86d8a62cc8398defd99524e5b57db38c5ce9aa8f710db89053
 SHA512:
-  metadata.gz: 4a865f824ca4aa26d2cb0d0e92360d4aa88f7a0e8cfa7a10d32d35875bfe4a33c53c7cd6f0809da4810c613426b9a56b8d7b3e29fad162f5e816f5137cbe7496
-  data.tar.gz: a3febb518d32c8bccbb22b414fad2bbbe3473c4689b66d76cf7836b5bde532be34e0b22485c344dd24c59d70b0522e214357e50379ee3b60b1aaf78b44946748
+  metadata.gz: 77820c96a79cb697a80fa0d75d64820faa8e2af8d1a194286abfb7894cb32dbc1fcc1b5a194cb43d6910408ca882b1b52a0fdde30b777d1c92e160ca3217a3c2
+  data.tar.gz: '038cb8ed69f9e6790c08d01ea3f706ef1a22b1372b51ca5ab315d821d01cddf90b4663798e5f48d3c96e6db952d19e8d9638ed3084daafc0ecff86aa085d7e1a'

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## Next version
+
+## v1.2.1
+- Rails 7 + Ruby 3.1 compatibility
+
+## v1.2.0
+- Remove FCM
+
+## v1.1.0
+- SMS strategies rewrite
+
+## v1.0.1
+- I18n changes
+
 ## v1.0.0
 
 - Fork from agilibox

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

@@ -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/jobs/bmc/application_job.rb

@@ -0,0 +1,2 @@
+class BMC::ApplicationJob < BMC.parent_job
+end

data/app/sms/bmc/sms/deliver_job.rb

@@ -0,0 +1,5 @@
+class BMC::SMS::DeliverJob < BMC::ApplicationJob
+  def perform(data)
+    BMC::SMS.strategy.call(data)
+  end
+end

data/app/sms/bmc/sms/message.rb

@@ -5,21 +5,11 @@ class BMC::SMS::Message
     @data = data
   end
 
-  def strategy=(value)
-    @strategy = BMC::SMS.parse_strategy(value)
-  end
-
-  def strategy(value = :no_argument)
-    self.strategy = value unless value == :no_argument
-    @strategy || BMC::SMS.strategy
-  end
-
   def deliver_now
-    strategy.call(data)
+    BMC::SMS::DeliverJob.perform_now(data)
   end
 
-  # TODO : Delay
   def deliver_later
-    deliver_now
+    BMC::SMS::DeliverJob.perform_later(data)
   end
 end

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

@@ -0,0 +1,38 @@
+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(
+      :region            => region,
+      :access_key_id     => access_key_id,
+      :secret_access_key => secret_access_key,
+    )
+  end
+
+  def call(data)
+    from = data[:from] || BMC::SMS.default_from
+
+    client.publish(
+      :phone_number => data[:to],
+      :message => data[:body],
+      :message_attributes => {
+        "AWS.SNS.SMS.SenderID" => {
+          :data_type    => "String",
+          :string_value => from,
+        },
+        "AWS.SNS.SMS.SMSType" => {
+          :data_type => "String",
+          :string_value => "Transactional",
+        },
+      },
+    )
+  end
+end

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

@@ -1,9 +1,9 @@
-class BMC::SMS::Strategies::Test < BMC::SMS::Strategies::Base
+class BMC::SMS::Strategies::Test
   def self.deliveries
     @deliveries ||= []
   end
 
-  def call
+  def call(data)
     self.class.deliveries << data
     Rails.logger.info "New SMS sent : #{data.inspect}"
   end

data/app/sms/bmc/sms.rb

@@ -1,35 +1,11 @@
 module BMC::SMS
   class << self
-    def strategy=(value)
-      @strategy = parse_strategy(value)
-    end
-
-    def strategy
-      @strategy ||= default_strategy
-    end
+    attr_accessor :strategy
 
     attr_writer :default_from
 
     def default_from
       @default_from ||= Rails.application.class.to_s.chomp("::Application")
     end
-
-    def parse_strategy(value)
-      if value.is_a?(Symbol)
-        "BMC::SMS::Strategies::#{value.to_s.camelcase}".constantize
-      else
-        value
-      end
-    end
-
-    private
-
-    def default_strategy
-      if Rails.env.development? || Rails.env.test?
-        BMC::SMS::Strategies::Test
-      else
-        BMC::SMS::Strategies::AmazonSNS
-      end
-    end
   end # class << self
 end

data/config/locales/actions.en.yml

@@ -24,7 +24,6 @@ en:
     close      : "Close"
     lock       : "Lock"
     unlock     : "Unlock"
-    snooze     : "Snooze"
     alert      : "Alert"
     complete   : "Complete"
     done       : "Done"
@@ -63,8 +62,6 @@ en:
     comment    : "Comment"
     add_line   : "Add line"
     remove_line: "Remove line"
-    pay        : "Pay"
-    paid       : "Payd"
     continue   : "Continue"
     rename     : "Rename"
     email      : "Send by email"

data/config/locales/actions.fr.yml

@@ -3,7 +3,7 @@ fr:
     actions    : "Actions"
     index      : "Liste"
     list       : "Liste"
-    new        : "Nouveau"
+    new        : "Créer"
     create     : "Créer"
     read       : "Afficher"
     show       : "Afficher"
@@ -24,7 +24,6 @@ fr:
     close      : "Fermer"
     lock       : "Fermer"
     unlock     : "Ouvrir"
-    snooze     : "Reporter"
     alert      : "Alerter"
     complete   : "Marquer terminé"
     done       : "Terminer"
@@ -63,8 +62,6 @@ fr:
     comment    : "Commenter"
     add_line   : "Ajouter une ligne"
     remove_line: "Supprimer la ligne"
-    pay        : "Payer"
-    paid       : "Payée"
     continue   : "Continuer"
     rename     : "Renommer"
     email      : "Envoyer par email"

data/config/locales/attributes.en.yml

@@ -6,7 +6,6 @@ en:
     address               : "Address"
     address1              : "Address"
     address2              : "Address (rest)"
-    addressable           : "Origin"
     amount                : "Amount"
     attachable            : "Origin"
     attachment            : "Attachment"
@@ -21,13 +20,11 @@ en:
     comment               : "Comment"
     commentable           : "Origin"
     comments              : "Comments"
-    corporation_name      : "Name"
     count                 : "Number"
     country               : "Country"
     created_at            : "Created at"
     current_avatar        : "Current avatar"
     customer              : "Customer"
-    customer_guid         : "Customer"
     data                  : "Data"
     date                  : "Date"
     date_begin            : "Date begin"
@@ -44,7 +41,6 @@ en:
     email_subject         : "Subject"
     email_to              : "Recipient"
     facebook              : "Facebook"
-    fax                   : "Fax"
     file                  : "File"
     first_name            : "First name"
     id                    : "Id"
@@ -59,7 +55,6 @@ en:
     month                 : "Month"
     name                  : "Name"
     number                : "Number"
-    paid                  : "Paid ?"
     password              : "Password"
     password_confirmation : "Password (confirm)"
     phone                 : "Phone"

data/config/locales/attributes.fr.yml

@@ -6,7 +6,6 @@ fr:
     address               : "Adresse"
     address1              : "Adresse"
     address2              : "Adresse (suite)"
-    addressable           : "Origine"
     amount                : "Montant"
     attachable            : "Origine"
     attachment            : "Pièce jointe"
@@ -21,13 +20,11 @@ fr:
     comment               : "Commentaire"
     commentable           : "Origine"
     comments              : "Commentaires"
-    corporation_name      : "Nom"
     count                 : "Nombre"
     country               : "Pays"
     created_at            : "Créé le"
     current_avatar        : "Avatar actuel"
     customer              : "Client"
-    customer_guid         : "Client"
     data                  : "Informations"
     date                  : "Date"
     date_begin            : "Date de début"
@@ -44,7 +41,6 @@ fr:
     email_subject         : "Object"
     email_to              : "Destinataire"
     facebook              : "Facebook"
-    fax                   : "Fax"
     file                  : "Fichier"
     first_name            : "Prénom"
     id                    : "Id"
@@ -59,7 +55,6 @@ fr:
     month                 : "Mois"
     name                  : "Nom"
     number                : "Nombre"
-    paid                  : "Payée ?"
     password              : "Mot de passe"
     password_confirmation : "Mot de passe (confirmer)"
     phone                 : "Téléphone"

data/config/locales/common.en.yml

@@ -9,8 +9,6 @@ en:
       extension_white_list_error : "This file type is not supported"
 
   filters:
-    all_customers: "All customers"
-    all_owners: "All all owners"
     date_begin: "Date begin"
     date_end: "Date end"
 

data/config/locales/common.fr.yml

@@ -9,8 +9,6 @@ fr:
       extension_white_list_error : "Ce type de fichier n'est pas prit en charge"
 
   filters:
-    all_customers: "Tous les clients"
-    all_owners: "Tout le monde"
     date_begin: "Date début"
     date_end: "Date fin"
 

data/lib/bmc/config.rb

@@ -8,6 +8,15 @@ class << BMC
     ].map(&:safe_constantize).compact.first
   end
 
+  attr_writer :parent_job
+
+  def parent_job
+    @parent_job ||= [
+      "ApplicationJob",
+      "ActiveJob::Base",
+    ].map(&:safe_constantize).compact.first
+  end
+
   attr_writer :parent_mailer
 
   def parent_mailer

data/lib/bmc/engine.rb

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

data/lib/bmc/version.rb

@@ -1,3 +1,3 @@
 module BMC
-  VERSION = "1.0.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
-- agilidée
+- Benoit MARTIN-CHAVE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -147,10 +147,9 @@ files:
 - app/helpers/bmc/sorting_helper.rb
 - app/helpers/bmc/text_helper.rb
 - app/helpers/h.rb
+- 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
@@ -172,9 +171,9 @@ files:
 - app/serializers/bmc/serializers/xlsx.rb
 - app/sms/bmc/sms.rb
 - app/sms/bmc/sms/application_sms.rb
+- app/sms/bmc/sms/deliver_job.rb
 - app/sms/bmc/sms/message.rb
-- app/sms/bmc/sms/strategies/amazon_sns.rb
-- app/sms/bmc/sms/strategies/base.rb
+- app/sms/bmc/sms/strategies/amazon.rb
 - app/sms/bmc/sms/strategies/test.rb
 - app/sorters/bmc/sorter.rb
 - app/views/bmc/search/_form.html.slim
@@ -229,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.3
 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

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

@@ -1,48 +0,0 @@
-class BMC::SMS::Strategies::AmazonSNS < BMC::SMS::Strategies::Base
-  class << self
-    attr_writer :sns_region
-
-    def sns_region
-      @sns_region ||= (ENV["SNS_REGION"] || ENV["AWS_REGION"])
-    end
-
-    attr_writer :sns_access_key_id
-
-    def sns_access_key_id
-      @sns_access_key_id ||= (ENV["SNS_ACCESS_KEY_ID"] || ENV["AWS_ACCESS_KEY_ID"])
-    end
-
-    attr_writer :sns_secret_access_key
-
-    def sns_secret_access_key
-      @sns_secret_access_key ||= (ENV["SNS_SECRET_ACCESS_KEY"] || ENV["AWS_SECRET_ACCESS_KEY"])
-    end
-  end # class << self
-
-  def client
-    @client ||= Aws::SNS::Client.new(
-      :region            => self.class.sns_region,
-      :access_key_id     => self.class.sns_access_key_id,
-      :secret_access_key => self.class.sns_secret_access_key,
-    )
-  end
-
-  def call
-    from = data[:from] || BMC::SMS.default_from
-
-    client.publish(
-      :phone_number       => data[:to],
-      :message            => data[:body],
-      :message_attributes => {
-        "AWS.SNS.SMS.SenderID" => {
-          :data_type    => "String",
-          :string_value => from,
-        },
-        "AWS.SNS.SMS.SMSType"  => {
-          :data_type    => "String",
-          :string_value => "Transactional",
-        },
-      },
-    )
-  end
-end

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

@@ -1,15 +0,0 @@
-class BMC::SMS::Strategies::Base
-  attr_reader :data
-
-  def initialize(data)
-    @data = data
-  end
-
-  def call
-    raise NotImplementedError
-  end
-
-  def self.call(...)
-    new(...).call
-  end
-end