smster_ruby 1.0.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7cf21eba6341ca5a5c27688bc9736295b513c99
-  data.tar.gz: 6f8f7652396d06f93a8cde59b3a7f2d43cbcc964
+  metadata.gz: 39db1e1ba8b30c1f2e2fa64b90bad2b6262b49bf
+  data.tar.gz: 4dd306b0de5a11c42e71e8c7e656c33878c7d70b
 SHA512:
-  metadata.gz: 79993bad5368ffc2e85c5e121be8d34d539dd24e0525219a4d0a4be04c98c3f22c02c321e6dbc353a74d1062001f446c5547346d7fb32a2ea2e38618a11ec816
-  data.tar.gz: 9a45848e62e5e6cdfdedb182663450fb01b3f843ffbb0af11c1d5da5f6e8528a7497327c1cdf57d07642be11f7f5c23439721bb0a098d27697343021e323ff29
+  metadata.gz: 6fe37efa618c828e8334f56f2a249bfc033cb1b1d5452bf8fa98ec9c736ba4823e46568c4513531404300b203a810444488f083bd9cd9354f6daddb160dc0cbf
+  data.tar.gz: 9aa0a9fb4f795ac66846f3ca3254c3a7f515b0a610ce6cdf549835b0907580affef930f8aa3eb091a9164558c96d050f3ba64f7cdbcdd2cdd0b70043af6103c2

data/lib/smster/sms/clickatell.rb

@@ -1,4 +1,12 @@
-class Sms::Clickatell < Sms
+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
+
   private
 
     def modify_params
@@ -7,10 +15,14 @@ class Sms::Clickatell < Sms
     end
 
     def send_request
-      code = Smster.configuration.clickatell_authorization_code
-      msg_params = { 'text' => text, 'to' => [to] }.to_json
+      msg_params = {
+        'text' => text,
+        'to' => [to],
+        'unicode' => unicode,
+        'from' => name
+      }.to_json
 
-      start_request(msg_params, code)
+      start_request(msg_params, clickatell_auth_code)
     end
 
     def start_request(params, code)

data/lib/smster/sms/nexmo.rb

@@ -1,4 +1,4 @@
-class Sms::Nexmo < Sms
+class Sms::Nexmo < SmsLayer
   private
 
     def modify_params

data/lib/smster/sms/smsru.rb

@@ -1,4 +1,12 @@
-class Sms::Smsru < Sms
+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
+
   private
 
     def modify_params
@@ -6,21 +14,38 @@ class Sms::Smsru < Sms
     end
 
     def send_request
-      config = Smster.configuration
-      api_id = config.smsru_api_id
-
       RestClient.post(
         'http://sms.ru/sms/send',
-        'api_id' => api_id,
+        'api_id' => smsru_api_id,
         'text' => text,
         'to' => to,
-        'from' => name
+        'from' => name,
+        'test' => test
       )
     end
 
     def assign_attrs_by(response)
+      self.status_message = response
+
       return unless response.include?('100')
 
-      self.api_message_id = (/\n(.*)\n/).match(response)[1]
+      self.balance = extract_from(response, /.*\n.*\nbalance=(.*)/)
+      self.api_message_id = extract_from(response, /\n(.*)\n?/)
+      self.cost = extract_from(request_cost, /\n(.*)\n?/)
+    end
+
+    def request_cost
+      RestClient.post(
+        'http://sms.ru/sms/cost',
+        'api_id' => smsru_api_id,
+        'text' => text,
+        'to' => to
+      )
+    end
+
+    def extract_from(response, regexp)
+      value = (regexp).match(response)
+
+      value && value[1]
     end
 end

data/lib/smster/sms.rb

@@ -1,7 +1,7 @@
 class Sms
   attr_accessor :name,        :type,        :api_message_id,
                 :text,        :status,      :status_message,
-                :to
+                :to,          :cost,        :balance
 
   ## Codes
   STATUSES = { created: 0, sent: 1, delivered: 2, failed: 3 }
@@ -18,22 +18,4 @@ class Sms
 
     @status = STATUSES[:created]
   end
-
-  def send_sms
-    send_to_provider
-
-    status_name = api_message_id ? :sent : :failed
-    self.status = STATUSES[status_name]
-
-    self
-  end
-
-  private
-
-    def send_to_provider
-      modify_params
-
-      response = send_request
-      assign_attrs_by(response)
-    end
 end

data/lib/smster/sms_layer.rb

@@ -0,0 +1,19 @@
+class SmsLayer < Sms
+  def send_sms
+    send_to_provider
+
+    status_name = api_message_id ? :sent : :failed
+    self.status = STATUSES[status_name]
+
+    self
+  end
+
+  private
+
+    def send_to_provider
+      modify_params
+
+      response = send_request
+      assign_attrs_by(response)
+    end
+end

data/lib/smster.rb

@@ -1,6 +1,7 @@
 require 'rest_client'
 require 'smster/configuration'
 require 'smster/sms'
+require 'smster/sms_layer'
 require 'smster/sms/smsru'
 require 'smster/sms/nexmo'
 require 'smster/sms/clickatell'

data/test/smsru_test.rb

@@ -1,12 +1,30 @@
 require './test/test_helper'
 
 class SmsruTest < Minitest::Test
+  def setup
+    super
+
+    stub_cost_request
+  end
+
   def test_should_send
     sms = Sms::Smsru.send_sms(to: @to, text: @text)
 
     assert_equal @statuses[:sent], sms.status
   end
 
+  def test_assign_balance
+    sms = Sms::Smsru.send_sms(to: @to, text: @text)
+
+    assert_equal sms.balance, '52.54'
+  end
+
+  def test_assign_cost
+    sms = Sms::Smsru.send_sms(to: @to, text: @text)
+
+    assert_equal sms.cost, '0.69'
+  end
+
   def test_should_modify_to
     to = 'a+bc' + @to
 
@@ -24,4 +42,11 @@ class SmsruTest < Minitest::Test
       stub_request(:post, 'http://sms.ru/sms/send')
         .to_return(status: 200, body: body, headers: {})
     end
+
+    def stub_cost_request
+      body = "100\n0.69\n1"
+
+      stub_request(:post, 'http://sms.ru/sms/cost')
+        .to_return(status: 200, body: body, headers: {})
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smster_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.5
 platform: ruby
 authors:
 - doniv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies: []
 description: SMS sending service through different providers with maximum convenience.
 email:
@@ -24,6 +24,7 @@ files:
 - lib/smster/sms/clickatell.rb
 - lib/smster/sms/nexmo.rb
 - lib/smster/sms/smsru.rb
+- lib/smster/sms_layer.rb
 - test/clickatell_test.rb
 - test/nexmo_test.rb
 - test/smsru_test.rb