bmc 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64f8cd00d69f9f1fec849416f724c7334eb2a9be8fafc4efe145e559e367b673
-  data.tar.gz: 617c5037874bf257ca62470730cbc6b851a2660b94c2192303fe248d13e02b3a
+  metadata.gz: 610c3313a3499ea6c4b1ab3b3d801ee892cfcce32e5adacf8b935a2032506f71
+  data.tar.gz: 0db6265466d7b9f388b2a73b299b51b138fde69c89b08a67f8bc9fb67cef405d
 SHA512:
-  metadata.gz: 449b81c574ae681471b08c97477b78f05c33db7108fc2ac159de61c9b383e594cce65bffd5ae59a1cb2968cb1e6fbc4a6fadb69320ce2bc8462c242d38095c20
-  data.tar.gz: d9526288891a456f704ecbac6e15e9707803fc590afe0d6c09f0cf9d5b66ee7c2a74e764916e7715d0510ddb686554a93e83f09b79d345ed52aefcbc1ac49c70
+  metadata.gz: acc8116f3b1beff954b12fe0558aa3023172f5e8720316b8dd3f851b60258f774a2d002fd72c84a5fbe1f65c3c6761c967bef7e38f32e5a79c61625fe6e9fd36
+  data.tar.gz: 915fe7c88c4c6d7b201a9a8b70482207cf6f2b55a80222602825ebf33ceae0ebf0a0f0bf38dfe8d4781de2d20e40ff09b6b0ea32c5bec05c03afd9a480d9c4ce

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next version
 
+## v1.1.0
+- SMS strategies rewrite
+
 ## v1.0.1
 - I18n changes
 

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

@@ -14,7 +14,6 @@ module BMC
         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.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-06 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -147,6 +147,7 @@ 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
@@ -172,9 +173,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

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