sms24x7 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81351ddd3a4bd6af1d84b6829a84e7631dabe5be
-  data.tar.gz: a4c4b9d81ade8918db29e9153b485daa7b66a130
+  metadata.gz: 831503ac07530de905a33164bec1d8f2803f83ae
+  data.tar.gz: 3110b520615fbe8bfb17f5ffec6db5fc8cc8104e
 SHA512:
-  metadata.gz: 30bfd2adc897c2c3d2692d77284c2bce23f0346f784346279df3dff551b2a32a6eb420f1cd7854d5de007ac905600e2bc0933b82035b932deae46555a6f37da1
-  data.tar.gz: 2fc7deb81c9bb316b1fd2526c846ff655e232dbb07c4844d8c0608c0a3d061e5aa6b910114f34a44eaaac39a209fe1e6e1b4725368a5e97177190a4f1b90e375
+  metadata.gz: 189c7e92c1969898eb9870f57670a3720d0ec5d95e4232e360d378fe756fdf5a739021e14e8644914b2806a4a56bf217a83e9a6f19a08f910d0bc67e0d4a7af9
+  data.tar.gz: cf11f47b1bdd46afc1f2840dffaa324b1f98b28adba39ed57ff3fa57b11f2a2d8d8e4904bc33e3e9ab344525c21d6d49aa1f1bb1ab99979d5214cc8ada83543e

data/lib/sms24x7/sms_api.rb

@@ -4,16 +4,34 @@ require 'active_support/core_ext/module/attribute_accessors'
 
 module SmsApi
   SMS_HOST = 'api.sms24x7.ru'
-
-  class BaseError < Exception; end
-  class InterfaceError < BaseError; end
+  API_VERSION = '1.1'
+
+  class BaseError < ::StandardError; end
+  class AccountBlockedError < BaseError; end
+  class AccountNotFoundError < BaseError; end
+  class ActionRejectedError < BaseError; end
+  class ApiVersionError < BaseError; end
+  class ArgumentsError < BaseError; end
   class AuthError < BaseError; end
-  class NoLoginError < BaseError; end
   class BalanceError < BaseError; end
-  class SpamError < BaseError; end
+  class DeliveryError < BaseError; end
+  class DomainBusyError < BaseError; end
   class EncodingError < BaseError; end
+  class InterfaceError < BaseError; end
+  class InternalError < BaseError; end
+  class MessagesNotDeliveryError < BaseError; end
   class NoGateError < BaseError; end
+  class NoLoginError < BaseError; end
   class OtherError < BaseError; end
+  class PasswordError < BaseError; end
+  class SaveError < BaseError; end
+  class SenderNameError < BaseError; end
+  class SessionExpiredError < BaseError; end
+  class SpamError < BaseError; end
+  class TarifNotFoundError < BaseError; end
+  class TimeoutError < BaseError; end
+  class UnauthorizedPartnerError < BaseError; end
+  class UndefinedError < BaseError; end
 
   # Login info
   mattr_accessor :email
@@ -56,13 +74,41 @@ module SmsApi
 
     error_code = error_code.to_i
     if error_code > 0
+      raise_error = -> error, text { raise error, msg['text'] || text }
+
       case error_code
-        when 2 then raise AuthError
-        when 29 then raise NoGateError
-        when 35 then raise EncodingError
-        when 36 then raise BalanceError, 'No money'
-        when 37, 38 then raise SpamError
-        else raise OtherError, "Communication to API failed. Error code: #{error_code}"
+        when 2 then raise_error[AuthError, 'Wrong login or password']
+        when 3 then raise_error[TimeoutError, 'You have been inactive for more than 24 minutes']
+
+        when 4 then raise_error[AccountBlockedError, 'Your account is blocked']
+        when 5 then raise_error[UndefinedError, 'Undefined method']
+        when 6 then raise_error[ApiVersionError, 'Wrong API version']
+        when 7 then raise_error[ArgumentsError, 'Not all necessary parameters are set']
+        when 10 then raise_error[UnauthorizedPartnerError, 'Partner is not authorized']
+        when 11 then raise_error[SaveError, 'Error saving']
+        when 15 then raise_error[ActionRejectedError, 'Action rejected']
+        when 16 then raise_error[PasswordError, 'Wrong password']
+        when 18 then raise_error[SessionExpiredError, 'Session expired']
+        when 19 then raise_error[InternalError, 'Internal operator error']
+
+        when 22 then raise_error[AccountNotFoundError, 'Account is not found']
+
+        when 29 then raise_error[NoGateError, 'Mobile operator gateway is not connected']
+        when 35 then raise_error[EncodingError, 'Wrong encoding']
+        when 36 then raise_error[BalanceError, 'Not enough money']
+        when 37, 38, 59 then raise_error[SpamError, 'Spam detected']
+
+        when 39 then raise_error[SenderNameError, 'Invalid sender name']
+        when 40 then raise_error[DeliveryError, 'Undeliverable']
+        when 42 then raise_error[NoLoginError, 'Login to continue']
+
+        when 43 then raise_error[DomainBusyError, 'Domain busy']
+        when 45 then raise_error[BaseError, 'Basic settings is not found']
+        when 44, 47 then raise_error[TarifNotFoundError, 'Tarif is not found']
+
+        when 58 then raise_error[MessagesNotDeliveryError, 'Messages are not delivered']
+
+        else raise_error[OtherError, "Communication to API failed. Error code: #{error_code}"]
       end
     end
 
@@ -83,6 +129,7 @@ module SmsApi
   #
   def push_msg_nologin(phone, text, params = {})
     request = {
+        :api => API_VERSION,
         :method => 'push_msg',
         :email => @@email,
         :password => @@password,
@@ -100,6 +147,7 @@ module SmsApi
   #
   def login
     request = {
+        :api => API_VERSION,
         :method => 'login',
         :email => @@email,
         :password => @@password
@@ -132,6 +180,7 @@ module SmsApi
   def push_msg(phone, text, params = {})
     raise NoLoginError, 'Must first call the login method' unless @@cookie
     request = {
+        :api => API_VERSION,
         :method => 'push_msg',
         :phone => phone,
         :text => text

data/lib/sms24x7/version.rb

@@ -1,3 +1,3 @@
 module SmsApi
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/functional_spec.rb

@@ -2,6 +2,9 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe SmsApi do
   describe 'Testing sms24x7 api calls' do
+
+    SENDER_NAME = '+79023897339'
+
     def error_message(variable, filename, line_number = nil)
       msg = "Please setup your #{variable} in spec/#{filename}"
       msg << " at line ##{line_number}" if line_number
@@ -16,16 +19,13 @@ describe SmsApi do
       SmsApi.password.should_not eq(''), error_message('password', 'spec_helper.rb')
     end
 
-    it 'sending SMS' do
+    it 'sending single SMS' do
       check_email_and_password
 
       phone = '' # <- enter here your phone number
       phone.should_not eq(''), error_message('phone number', 'functional_spec.rb', __LINE__ - 1)
 
-      sending_result = SmsApi.push_msg_nologin(phone, 'test passed',
-                                               :sender_name => 'RSpec',
-                                               :api => '1.1',
-                                               :satellite_adv => 'IF_EXISTS')
+      sending_result = SmsApi.push_msg_nologin(phone, 'Single SMS RSpec test passed', :sender_name => SENDER_NAME)
 
       sending_result.should have_key('n_raw_sms')
       sending_result.should have_key('credits')
@@ -39,7 +39,7 @@ describe SmsApi do
 
       SmsApi.login do
         phones.each do |phone|
-          sending_result = SmsApi.push_msg_nologin(phone, 'multiple SMS test passed')
+          sending_result = SmsApi.push_msg(phone, 'Multiple SMS RSpec test passed', :sender_name => SENDER_NAME)
           sending_result.should have_key('n_raw_sms')
           sending_result.should have_key('credits')
         end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sms24x7
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Gleb Averchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb-fu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.1
 description: Sending SMS via sms24x7 API
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -80,17 +80,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Uses sms24x7 gateway for sending SMS