aws_sms 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c413e7374cfbea88e807dfd6857ccd394a1c6520
-  data.tar.gz: 7cd7c2057ae4a9ca60dc0cfabb692a4b05b55568
+  metadata.gz: 9919b56610030d592728da2a1a35be5a5c20c6ea
+  data.tar.gz: 5a4481404dea2e827ebb2265872d23c48f6aa981
 SHA512:
-  metadata.gz: 1070b470cea2009ce101b2fe7c39623771a3533cf76070c1de6347bc6e746b125547b252aa6dbc76d9fc2c801027b8a1695f3e4ac7ca0244d6eddc7c1717637a
-  data.tar.gz: 987dfc4c0c08d1fade06bca0a72a5fb9623feacf110c3732c1fb2f58671e1b12af740793a9d012916cbcfbd2f0641f5b3bac7bf3bc9b6738369e117ca521d809
+  metadata.gz: 7c7f368396fd6d998220db0257d85ae8abbbdc2716e2d9e5ea03562ca35faaf725d256c59e0ceef7ceb21b5afc8fb8144ac0d3f0772117edd9975fb0a66f464c
+  data.tar.gz: 68f38bd47279b5fe34ed951fe8d61a10f394f47ac83df6ef58f82852239ea062f5c3557a0c92fc707e8e2a6bc4a3d541ef62362a068b60448fd6f5c84d85fad5

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in aws_sms.gemspec
 gemspec
 gem 'aws-sdk'
+gem 'configatron'

data/lib/aws_sms/config.rb

@@ -0,0 +1,43 @@
+require 'configatron'
+
+class AwsSms
+  module Config
+
+    def self.set_credentials(aws_default_region:, aws_access_key_id: , aws_secret_access_key:)
+      configatron.aws_default_region = aws_default_region
+      configatron.aws_access_key_id = aws_access_key_id
+      configatron.aws_secret_access_key = aws_secret_access_key
+    end
+
+    def self.set_sms_attributes(attributes)
+      configatron.sms_attributes = attributes
+    end
+
+    def self.access_key
+      ENV['AWS_ACCESS_KEY_ID']     || configatron.aws_access_key_id
+    end
+
+    def self.region
+      ENV['AWS_DEFAULT_REGION']    || configatron.aws_default_region
+    end
+
+    def self.secret_key
+      ENV['AWS_SECRET_ACCESS_KEY'] || configatron.aws_secret_access_key
+    end
+
+    def self.sms_attributes
+      unless configatron.has_key?(:sms_attributes)
+        configatron.sms_attributes = { "DefaultSMSType" => 'Transactional' }
+      end
+      configatron.sms_attributes
+    end
+
+    def self.sms_type
+      configatron.default_sms_type
+    end
+
+    def self.default_sender_id
+      configatron.default_sender_id
+    end
+  end
+end

data/lib/aws_sms/version.rb

@@ -1,3 +1,3 @@
 class AwsSms
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end

data/lib/aws_sms.rb

@@ -1,27 +1,25 @@
 require "aws_sms/version"
 require 'aws-sdk'
+require 'configatron'
+require 'aws_sms/config'
 
 class AwsSms
   class SNSClientError < StandardError; end
   class InvalidNumber < StandardError; end
 
-  def initialize(region: nil, access_key_id: nil, secret_key: nil,
-                 default_sms_type: 'Transactional', default_sender_id: '')
-    @region            = region        || ENV['AWS_DEFAULT_REGION']
-    @access_key_id     = access_key_id || ENV['AWS_ACCESS_KEY_ID']
-    @secret_key        = secret_key    || ENV['AWS_SECRET_ACCESS_KEY']
-    @default_sms_type  = default_sms_type
-    @default_sender_id = default_sender_id
+  def initialize(region: nil, access_key_id: nil, secret_key: nil, sms_attributes: nil)
+    @region            = region            || Config.region
+    @access_key_id     = access_key_id     || Config.access_key
+    @secret_key        = secret_key        || Config.secret_key
+    @default_sms_type  = default_sms_type  || Config.sms_type
+    @default_sender_id = default_sender_id || Config.default_sender_id
+    @sms_attributes    = sms_attributes    || Config.sms_attributes
+    validate_args!
+    set_config!
   end
 
   def send(phone_number, message)
-    validate_args!
-
     client.publish(phone_number: phone_number, message: message)
-  rescue ::Aws::SNS::Errors::InvalidParameter => e
-    raise InvalidNumber, 'Invalid phone number'
-  rescue ::Aws::SNS::Errors::ServiceError => e
-    raise SNSClientError, e.message
   end
 
   private
@@ -29,29 +27,30 @@ class AwsSms
               :default_sms_type
 
   def client
-    ::Aws.config.update({
-      region: region,
-      credentials: Aws::Credentials.new(
-        access_key_id, secret_key
-      )
-    })
-
-    sns = ::Aws::SNS::Client.new()
-    sns.set_sms_attributes({
-      attributes: {
+    @client ||= begin
+      sns = ::Aws::SNS::Client.new()
+      sns.set_sms_attributes({ attributes: {
         "DefaultSMSType" => default_sms_type,
         "DefaultSenderID" => default_sender_id
-      }
+      }})
+      sns
+    end
+  end
+
+  def set_config!
+    ::Aws.config.update({
+      region: region,
+      credentials: Aws::Credentials.new(access_key_id, secret_key)
     })
-    sns
   end
 
   def validate_args!
     if region.nil? || access_key_id.nil? || secret_key.nil?
-      message = 'region, access_key_id, and secret_key arguments must be '\
-              'provided. You can explicitly set them when initializing '\
-              'AWS::SMS.new or set them in your Environment Variables as: '\
-              'AWS_DEFAULT_REGION, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY'
+      message = 'ERROR: region, access_key_id, and secret_key arguments must '\
+              'be provided. You can explicitly set them when initializing '\
+              'AwsSms, set them in your Environment Variables as: '\
+              'AWS_DEFAULT_REGION, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, '\
+              'or use AwsSms::Config.set_credentials'
       raise ArgumentError, message
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_sms
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Brian Vogelgesang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - bin/console
 - bin/setup
 - lib/aws_sms.rb
+- lib/aws_sms/config.rb
 - lib/aws_sms/version.rb
 homepage: https://github.com/KidA001/aws-sms
 licenses: