smster_ruby 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4917706290984b73b76a3cbfb9412bf567f0f7
-  data.tar.gz: 2f967e091ad1c9d830b3e27d8a6a3a7aa33b72cf
+  metadata.gz: e770a6687fb2f4649423933c1c992c7a85c47f1c
+  data.tar.gz: 2f4f85bb85ae13db5d1568cfc31747cc79112c15
 SHA512:
-  metadata.gz: 578c2e9aec36f46c532b954336f3730bdf71d4450ea2f42ba206e870df42e1fc43190d716ec9a828ef7b2d9656ca3ebc3b90f3c801759bf5f54848407507a90c
-  data.tar.gz: f67f0038010cca55a589a470b09c639b57daac964d3918f9bcd8359f28252c8b4b3ffe75f8626eafc7e4794024865fad53c65e2381658184ac9a82fd7a67cb9b
+  metadata.gz: 75a4f23915602850b4224dd43662cdccd1cfe38124527d12bae3fcfb6b448df261918b43e8bacae3a0d4b4ffbe70f0d30550ccb061f73c78f80ae696d517f378
+  data.tar.gz: b1673ef9142e0a62f2ce48358568d90a02f4031abec65a91b64a9259ec03ce7b73e7118dda44e67400739e58e4d8a6bcb90880614a3d0dd70d562f1460073ee7

data/lib/smster/configuration.rb

@@ -1,13 +1,16 @@
 module Smster
   class Configuration
     attr_accessor :nexmo_key,           :nexmo_sekret,
-                  :smsru_api_id,        :clickatell_authorization_code
+                  :smsru_api_id,        :clickatell_authorization_code,
+                  :smsru_uslugi_login,  :smsru_uslugi_pwd
 
     def initialize
       @nexmo_key = ''
       @nexmo_sekret = ''
       @clickatell_authorization_code = ''
       @smsru_api_id = ''
+      @smsru_uslugi_login = ''
+      @smsru_uslugi_pwd = ''
     end
   end
 end

data/lib/smster/sms/clickatell.rb

@@ -2,8 +2,6 @@ class Sms::Clickatell < SmsLayer
   attr_accessor :unicode, :clickatell_auth_code
 
   def clickatell_auth_code
-    config = Smster.configuration
-
     @clickatell_auth_code = config.clickatell_authorization_code
   end
 

data/lib/smster/sms/nexmo.rb

@@ -7,8 +7,6 @@ class Sms::Nexmo < SmsLayer
     end
 
     def send_request
-      config = Smster.configuration
-
       RestClient.post(
         'https://rest.nexmo.com/sms/json',
         text: text,

data/lib/smster/sms/sms_uslugi.rb

@@ -0,0 +1,57 @@
+class Sms::SmsUslugi < SmsLayer
+  attr_accessor :onlydelivery,    :use_alfasource,      :flash,
+                :date_time_send,  :discount_id
+
+  private
+
+    def modify_params
+      self.to = to.gsub(/\D/, '')
+    end
+
+    def send_request
+      RestClient.post("#{base_url}/sendSms.php", options)
+    end
+
+    def assign_attrs_by(response)
+      json_response = JSON.parse(response)
+
+      self.status_message = json_response['descr']
+      self.api_message_id = json_response['smsid']
+      self.cost = json_response['priceOfSending']
+    end
+
+    def base_url
+      'https://lcab.sms-uslugi.ru/lcabApi'
+    end
+
+    def options
+      opts = [auth_options, msg_options, additional_options]
+
+      opts.inject(&:merge)
+    end
+
+    def auth_options
+      {
+        login: config.smsru_uslugi_login,
+        password: config.smsru_uslugi_pwd
+      }
+    end
+
+    def msg_options
+      {
+        txt: text,
+        to: to,
+        source: name
+      }
+    end
+
+    def additional_options
+      {
+        onlydelivery: onlydelivery,
+        use_alfasource: use_alfasource,
+        flash: flash,
+        dateTimeSend: date_time_send,
+        discountID: discount_id
+      }
+    end
+end

data/lib/smster/sms/smsru.rb

@@ -2,8 +2,6 @@ class Sms::Smsru < SmsLayer
   attr_accessor :test, :smsru_api_id
 
   def smsru_api_id
-    config = Smster.configuration
-
     @smsru_api_id = config.smsru_api_id
   end
 

data/lib/smster/sms_layer.rb

@@ -18,4 +18,8 @@ class SmsLayer < Sms
       response = send_request
       assign_attrs_by(response)
     end
+
+    def config
+      Smster.configuration
+    end
 end

data/lib/smster.rb

@@ -5,6 +5,7 @@ require 'smster/sms_layer'
 require 'smster/sms/smsru'
 require 'smster/sms/nexmo'
 require 'smster/sms/clickatell'
+require 'smster/sms/sms_uslugi'
 
 module Smster
   attr_accessor :configuration

data/test/sms_uslugi_test.rb

@@ -0,0 +1,35 @@
+require './test/test_helper'
+
+class SmsUslugiTest < Minitest::Test
+  def test_should_send
+    sms = Sms::SmsUslugi.send_sms(to: @to, text: @text)
+
+    assert_equal @statuses[:sent], sms.status
+  end
+
+  def test_should_assign_cost
+    sms = Sms::SmsUslugi.send_sms(to: @to, text: @text)
+
+    assert_equal true, sms.cost.to_f > 0
+  end
+
+  private
+
+    def stub_send_request
+      body = generate_send_request_body
+
+      stub_request(:post, 'https://lcab.sms-uslugi.ru/lcabApi/sendSms.php')
+        .to_return(status: 200, body: body, headers: {})
+    end
+
+    def generate_send_request_body
+      {
+        code: 1,
+        descr: 'Success',
+        smsid: '966a995b775db12f701b75e4b11c10d5',
+        colsmsOfSending: 1,
+        priceOfSending: '0.67',
+        colAbonentSend: 1
+      }.to_json
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smster_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - doniv
@@ -23,10 +23,12 @@ files:
 - lib/smster/sms.rb
 - lib/smster/sms/clickatell.rb
 - lib/smster/sms/nexmo.rb
+- lib/smster/sms/sms_uslugi.rb
 - lib/smster/sms/smsru.rb
 - lib/smster/sms_layer.rb
 - test/clickatell_test.rb
 - test/nexmo_test.rb
+- test/sms_uslugi_test.rb
 - test/smsru_test.rb
 - test/test_helper.rb
 homepage: https://github.com/IlyaDonskikh/smster_ruby
@@ -56,5 +58,6 @@ summary: SMS service
 test_files:
 - test/clickatell_test.rb
 - test/nexmo_test.rb
+- test/sms_uslugi_test.rb
 - test/smsru_test.rb
 - test/test_helper.rb