smster_ruby 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e770a6687fb2f4649423933c1c992c7a85c47f1c
-  data.tar.gz: 2f4f85bb85ae13db5d1568cfc31747cc79112c15
+  metadata.gz: bd25178b536520032c87d4c13c5233d707724c72
+  data.tar.gz: 7281059a16e246d80845d41201b1255c1e1fe106
 SHA512:
-  metadata.gz: 75a4f23915602850b4224dd43662cdccd1cfe38124527d12bae3fcfb6b448df261918b43e8bacae3a0d4b4ffbe70f0d30550ccb061f73c78f80ae696d517f378
-  data.tar.gz: b1673ef9142e0a62f2ce48358568d90a02f4031abec65a91b64a9259ec03ce7b73e7118dda44e67400739e58e4d8a6bcb90880614a3d0dd70d562f1460073ee7
+  metadata.gz: 0d78401b0b541ee626746b282e723058a2eee48c60fe277107b91c756077f64eb806ed29469d77dfdbc34fbb5b7b7d92da60fb0808cda0c3ec0d9904aba23196
+  data.tar.gz: 3afd50863d94027d2e927bccb56c000bc70e3ac98d0319d0b2d7f1d19867558aaf5c168bc47621e39ee8d2028da5a41b7f295128a5d0e502efa9ae23d8f08339

data/lib/smster/configuration.rb

@@ -2,15 +2,15 @@ module Smster
   class Configuration
     attr_accessor :nexmo_key,           :nexmo_sekret,
                   :smsru_api_id,        :clickatell_authorization_code,
-                  :smsru_uslugi_login,  :smsru_uslugi_pwd
+                  :sms_uslugi_login,    :sms_uslugi_pwd
 
     def initialize
       @nexmo_key = ''
       @nexmo_sekret = ''
       @clickatell_authorization_code = ''
       @smsru_api_id = ''
-      @smsru_uslugi_login = ''
-      @smsru_uslugi_pwd = ''
+      @sms_uslugi_login = ''
+      @sms_uslugi_pwd = ''
     end
   end
 end

data/lib/smster/sms/clickatell.rb

@@ -1,8 +1,8 @@
 class Sms::Clickatell < SmsLayer
-  attr_accessor :unicode, :clickatell_auth_code
+  attr_accessor :unicode, :clickatell_key
 
-  def clickatell_auth_code
-    @clickatell_auth_code = config.clickatell_authorization_code
+  def clickatell_key
+    @clickatell_key ||= config.clickatell_authorization_code
   end
 
   private
@@ -20,17 +20,17 @@ class Sms::Clickatell < SmsLayer
         'from' => name
       }.to_json
 
-      start_request(msg_params, clickatell_auth_code)
+      start_request(msg_params)
     end
 
-    def start_request(params, code)
+    def start_request(params)
       RestClient.post(
         'https://api.clickatell.com/rest/message',
         params,
         content_type: :json,
         accept: :json,
         'X-Version' => 1,
-        'Authorization' => "bearer #{code}"
+        'Authorization' => "bearer #{clickatell_key}"
       )
     rescue => e
       e.response

data/lib/smster/sms/nexmo.rb

@@ -1,4 +1,14 @@
 class Sms::Nexmo < SmsLayer
+  attr_accessor :nexmo_key, :nexmo_sekret
+
+  def nexmo_key
+    @nexmo_key ||= config.nexmo_key
+  end
+
+  def nexmo_sekret
+    @nexmo_sekret ||= config.nexmo_sekret
+  end
+
   private
 
     def modify_params
@@ -13,8 +23,8 @@ class Sms::Nexmo < SmsLayer
         to: to,
         content_type: :json,
         from: name,
-        api_key: config.nexmo_key,
-        api_secret: config.nexmo_sekret
+        api_key: nexmo_key,
+        api_secret: nexmo_sekret
       )
     end
 

data/lib/smster/sms/sms_uslugi.rb

@@ -1,6 +1,15 @@
 class Sms::SmsUslugi < SmsLayer
   attr_accessor :onlydelivery,    :use_alfasource,      :flash,
-                :date_time_send,  :discount_id
+                :date_time_send,  :discount_id,         :sms_uslugi_login,
+                :sms_uslugi_pwd
+
+  def sms_uslugi_login
+    @sms_uslugi_login ||= config.sms_uslugi_login
+  end
+
+  def sms_uslugi_pwd
+    @sms_uslugi_pwd ||= config.sms_uslugi_pwd
+  end
 
   private
 
@@ -32,8 +41,8 @@ class Sms::SmsUslugi < SmsLayer
 
     def auth_options
       {
-        login: config.smsru_uslugi_login,
-        password: config.smsru_uslugi_pwd
+        login: sms_uslugi_login,
+        password: sms_uslugi_pwd
       }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smster_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - doniv