smster_ruby 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4bf257295149476bdbbc89ab56dda3ce9f3698a
-  data.tar.gz: 058d3a0a585adddff39837fd5112e9ef4f33d85f
+  metadata.gz: f7cf21eba6341ca5a5c27688bc9736295b513c99
+  data.tar.gz: 6f8f7652396d06f93a8cde59b3a7f2d43cbcc964
 SHA512:
-  metadata.gz: 1ae39080af8e389db2c832d5f33293d2a99c7e26de4a66e4eb4d9f5b1840f7a299255de869311540af167576671f6e2f9d0dc4aab5b00842303fcbaa205d99c5
-  data.tar.gz: 511ea133420cad3a33575e7d655d92c113d802cfa0a0b1472dc8903daa18d1cef76963e688aeead1a5abc349c77c202841efac145e895373d227cf35da8849f1
+  metadata.gz: 79993bad5368ffc2e85c5e121be8d34d539dd24e0525219a4d0a4be04c98c3f22c02c321e6dbc353a74d1062001f446c5547346d7fb32a2ea2e38618a11ec816
+  data.tar.gz: 9a45848e62e5e6cdfdedb182663450fb01b3f843ffbb0af11c1d5da5f6e8528a7497327c1cdf57d07642be11f7f5c23439721bb0a098d27697343021e323ff29

data/lib/smster/sms/clickatell.rb

@@ -0,0 +1,37 @@
+class Sms::Clickatell < Sms
+  private
+
+    def modify_params
+      self.to = to.gsub(/\D/, '').to_s
+      self.text = text.tr(' ', '+')
+    end
+
+    def send_request
+      code = Smster.configuration.clickatell_authorization_code
+      msg_params = { 'text' => text, 'to' => [to] }.to_json
+
+      start_request(msg_params, code)
+    end
+
+    def start_request(params, code)
+      RestClient.post(
+        'https://api.clickatell.com/rest/message',
+        params,
+        content_type: :json,
+        accept: :json,
+        'X-Version' => 1,
+        'Authorization' => "bearer #{code}"
+      )
+    rescue => e
+      e.response
+    end
+
+    def assign_attrs_by(response)
+      response = JSON.parse(response)
+
+      info = response['data']['message'][0]
+
+      self.status_message = info['error']
+      self.api_message_id = info['apiMessageId']
+    end
+end

data/lib/smster/sms/nexmo.rb

@@ -0,0 +1,29 @@
+class Sms::Nexmo < Sms
+  private
+
+    def modify_params
+      self.to = to.gsub(/\D/, '').to_s
+      self.text = text.tr(' ', '+')
+    end
+
+    def send_request
+      config = Smster.configuration
+
+      RestClient.post(
+        'https://rest.nexmo.com/sms/json',
+        text: text,
+        to: to,
+        content_type: :json,
+        from: name,
+        api_key: config.nexmo_key,
+        api_secret: config.nexmo_sekret
+      )
+    end
+
+    def assign_attrs_by(response)
+      json_response = JSON.parse(response)
+
+      self.status_message = json_response['messages'][0]['error-text']
+      self.api_message_id = json_response['messages'][0]['message-id']
+    end
+end

data/lib/smster/sms/smsru.rb

@@ -1,14 +1,11 @@
 class Sms::Smsru < Sms
   private
 
-    def send_to_provider
-      phone = to.gsub(/\D/, '')
-
-      response = send_request(text, phone)
-      generate_send_resonse(response)
+    def modify_params
+      self.to = to.gsub(/\D/, '')
     end
 
-    def send_request(text, phone)
+    def send_request
       config = Smster.configuration
       api_id = config.smsru_api_id
 
@@ -16,14 +13,14 @@ class Sms::Smsru < Sms
         'http://sms.ru/sms/send',
         'api_id' => api_id,
         'text' => text,
-        'to' => phone,
+        'to' => to,
         'from' => name
       )
     end
 
-    def generate_send_resonse(response)
+    def assign_attrs_by(response)
       return unless response.include?('100')
 
-      (/\n(.*)\n/).match(response)[1]
+      self.api_message_id = (/\n(.*)\n/).match(response)[1]
     end
 end

data/lib/smster/sms.rb

@@ -1,6 +1,7 @@
 class Sms
-  attr_accessor :name,        :type,        :to,
-                :text,        :status,      :status_message
+  attr_accessor :name,        :type,        :api_message_id,
+                :text,        :status,      :status_message,
+                :to
 
   ## Codes
   STATUSES = { created: 0, sent: 1, delivered: 2, failed: 3 }
@@ -19,11 +20,20 @@ class Sms
   end
 
   def send_sms
-    api_message_id = send_to_provider
+    send_to_provider
 
-    self.status = STATUSES[:sent] if api_message_id
-    self.status ||= STATUSES[:failed]
+    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

@@ -2,6 +2,8 @@ require 'rest_client'
 require 'smster/configuration'
 require 'smster/sms'
 require 'smster/sms/smsru'
+require 'smster/sms/nexmo'
+require 'smster/sms/clickatell'
 
 module Smster
   attr_accessor :configuration

data/test/clickatell_test.rb

@@ -0,0 +1,32 @@
+require './test/test_helper'
+
+class ClickatellTest < Minitest::Test
+  def test_should_send
+    sms = Sms::Clickatell.send_sms(to: @to, text: @text)
+
+    assert_equal @statuses[:sent], sms.status
+  end
+
+  def test_should_modify_to
+    to = '+abc' + @to
+
+    sms = Sms::Clickatell.send_sms(to: to, text: @text)
+
+    assert_equal to.gsub(/\D/, ''), sms.to
+  end
+
+  def test_should_modify_text
+    sms = Sms::Clickatell.send_sms(to: @to, text: @text)
+
+    assert_equal @text.tr(' ', '+'), sms.text
+  end
+
+  private
+
+    def stub_send_request
+      body = { data: { message: ['apiMessageId' => 15] } }.to_json
+
+      stub_request(:post, 'https://api.clickatell.com/rest/message')
+        .to_return(status: 200, body: body, headers: {})
+    end
+end

data/test/nexmo_test.rb

@@ -0,0 +1,32 @@
+require './test/test_helper'
+
+class NexmoTest < Minitest::Test
+  def test_should_send
+    sms = Sms::Nexmo.send_sms(to: @to, text: @text)
+
+    assert_equal @statuses[:sent], sms.status
+  end
+
+  def test_should_modify_to
+    to = '+abc' + @to
+
+    sms = Sms::Nexmo.send_sms(to: to, text: @text)
+
+    assert_equal to.gsub(/\D/, ''), sms.to
+  end
+
+  def test_should_modify_text
+    sms = Sms::Nexmo.send_sms(to: @to, text: @text)
+
+    assert_equal @text.tr(' ', '+'), sms.text
+  end
+
+  private
+
+    def stub_send_request
+      body = { messages: ['message-id' => 15] }.to_json
+
+      stub_request(:post, 'https://rest.nexmo.com/sms/json')
+        .to_return(status: 200, body: body, headers: {})
+    end
+end

data/test/smsru_test.rb

@@ -2,28 +2,26 @@ require './test/test_helper'
 
 class SmsruTest < Minitest::Test
   def test_should_send
-    stub_send_request
+    sms = Sms::Smsru.send_sms(to: @to, text: @text)
 
-    @statuses = Sms::STATUSES
-    phone = (99_999_999 * rand).to_s
-    attrs = { to: phone, text: 'i am smster!' }
+    assert_equal @statuses[:sent], sms.status
+  end
 
-    sms = Sms::Smsru.send_sms(attrs)
+  def test_should_modify_to
+    to = 'a+bc' + @to
 
-    assert_equal @statuses[:sent], sms.status
+    sms = Sms::Smsru.send_sms(to: to, text: @text)
+
+    result = to.gsub(/\D/, '')
+    assert_equal result, sms.to
   end
 
   private
 
     def stub_send_request
+      body = "100\n201523-1000007\nbalance=52.54"
+
       stub_request(:post, 'http://sms.ru/sms/send')
-        .to_return(
-          status: 200,
-          body:
-            '100
-            201523-1000007
-            balance=52.54',
-          headers: {}
-        )
+        .to_return(status: 200, body: body, headers: {})
     end
 end

data/test/test_helper.rb

@@ -1,3 +1,13 @@
 require 'minitest/autorun'
 require 'webmock/minitest'
 require 'smster'
+
+class MiniTest::Test
+  def setup
+    @statuses = Sms::STATUSES
+    @to = (99_999_999 * rand).to_i.to_s
+    @text = 'i am smster!'
+
+    stub_send_request
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smster_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - doniv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies: []
 description: SMS sending service through different providers with maximum convenience.
 email:
@@ -21,7 +21,11 @@ files:
 - lib/smster.rb
 - lib/smster/configuration.rb
 - lib/smster/sms.rb
+- lib/smster/sms/clickatell.rb
+- lib/smster/sms/nexmo.rb
 - lib/smster/sms/smsru.rb
+- test/clickatell_test.rb
+- test/nexmo_test.rb
 - test/smsru_test.rb
 - test/test_helper.rb
 homepage: https://github.com/IlyaDonskikh/smster_ruby
@@ -49,5 +53,7 @@ signing_key:
 specification_version: 4
 summary: SMS service
 test_files:
+- test/clickatell_test.rb
+- test/nexmo_test.rb
 - test/smsru_test.rb
 - test/test_helper.rb