firstmiler_sms_oauth 0.0.4 → 0.0.5

data/lib/firstmiler_sms_oauth/fm_sms.rb

@@ -28,21 +28,12 @@ module FirstmilerSmsOauth
     end
 
     def handle_response(response)
-      flag, msg = FirstmilerSmsOauth::FmSmsException.check_response(response)
+      flag= FirstmilerSmsOauth::FmSmsException.check_response(response)
       if flag
         FirstmilerSmsOauth::FmSmsResponse.new(response)
-      else
-        raise msg
       end
     end
 
-    def exotel_sid
-      FirstmilerSmsOauth.exotel_sid
-    end
-
-    def raise_blank_sms_template_exception
-      raise "Sms Template content should not be blank."
-    end
     class << self
       def send(number, content)
         new.send(number, content)

data/lib/firstmiler_sms_oauth/fm_sms_exception.rb

@@ -4,14 +4,40 @@ module FirstmilerSmsOauth
   module FmSmsException
     module_function
     def check_response(response)
-      exotel_hash=Hash.from_xml(response.gsub("\n", ""))
+      exotel_hash = Hash.from_xml(response.gsub("\n", ""))
       if exotel_hash["TwilioResponse"].has_key?("SMSMessage")
         return true
       elsif exotel_hash["TwilioResponse"].has_key?("RestException")
-        return false, exotel_hash["TwilioResponse"]["RestException"]["Message"]
+        hash = exotel_hash["TwilioResponse"]["RestException"]
+        raise_exception(hash["status"], hash["Message"])
+      end
+      false
+    end
+
+
+    def raise_exception(code, message = nil)
+      case code.to_i
+      when 400
+        raise ParamsError, message
+      when 401
+        raise AuthenticationError, message
+      when 403
+        raise ExotelAccountError, message
+      when 500
+        raise InvalidSmsTemplateError, "Sms Template is invalid, format for sms template should be 'sms content %{key}'"
       else
-        return false , "Some unknown exception occured"
+        raise UnexpectedError, "#{code} #{message}"
       end
     end
   end
+
+  class AuthenticationError < StandardError;  end
+
+  class UnexpectedError < StandardError;  end
+
+  class ParamsError < StandardError;  end
+
+  class ExotelAccountError < StandardError;  end
+
+  class InvalidSmsTemplateError < StandardError;  end
 end

data/lib/firstmiler_sms_oauth/otp.rb

@@ -11,7 +11,18 @@ module FirstmilerSmsOauth
     end
 
     def sms_template
-      FirstmilerSmsOauth.sms_template
+      template = FirstmilerSmsOauth.sms_template
+      unless is_valid_sms_template?(template)
+        FirstmilerSmsOauth::FmSmsException.raise_exception(500)
+      end
+    end
+
+    def is_valid_sms_template?(template)
+      template.present? && check_valid_formate?(template)
+    end
+
+    def check_valid_formate?(template)
+      template.include? '%{key}'
     end
   end
 end

data/lib/firstmiler_sms_oauth/sms_oauth.rb

@@ -13,13 +13,8 @@ module FirstmilerSmsOauth
 
     module InstanceMethods
       def send_otp_token
-        p content = sms_content
-        begin
-          FirstmilerSmsOauth::FmSms.send(self.phone_no, content)
-        rescue Exception => e
-          delete_user_sms_oauth_tokens
-          p e.to_s
-        end
+        content = sms_content
+        FirstmilerSmsOauth::FmSms.send(self.phone_no, content)
       end
 
       def delete_user_sms_oauth_tokens
@@ -42,7 +37,7 @@ module FirstmilerSmsOauth
         key
       end
 
-      def varify_otp?(token)
+      def verify_otp?(token)
         flag = all_tokens.include?(token.to_s)
         delete_user_sms_oauth_tokens
         flag

data/lib/firstmiler_sms_oauth/version.rb

@@ -1,3 +1,3 @@
 module FirstmilerSmsOauth
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firstmiler_sms_oauth
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord