sms_broker 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b28741c2cf164576894b6b876444ae070f7303f
-  data.tar.gz: f0549e93ac7bbe3b87fff76d101a6f06152c192a
+  metadata.gz: ed1f6bc1988ca3ab9a96cac009892365ddcf39ef
+  data.tar.gz: c61521552f75df630c6fd9bea3829cc590bffa6f
 SHA512:
-  metadata.gz: fcd96dffdafb77800af5a3798be97beff7ec3a921fcdbc061c0ad1f069f5ea127a976e0dace58624742c5ad510b400fadd866a3d6eba884d22a179d7577ae3c2
-  data.tar.gz: c6b9c850c13c0c43e2cc324b12fb6bf884bda46a3f0ab709a6ca13a06df0412a82341fd7e4e87d07aa0d47dfd100352906f9a685f6bf9a464c342a1c0cdccf10
+  metadata.gz: f4b7658d1d99dfa94ef72292f50f813d17ab9e41640c6b351c65b4b71b1a5c2780422923ca00ffe297c44cef357f5a2bb745df944c349edd6e9d3a2dc12b2653
+  data.tar.gz: 8aba81f06d37acbfabb28afd7c4ae3a28b452420c3849b69784573244ee1884c31dfda212c6d583fa3d32a620431f447e48ed57906f68ed870f000dce6bcd4a1

data/.rubocop.yml

@@ -0,0 +1,16 @@
+Style/MultilineMethodCallIndentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+AllCops:
+  TargetRubyVersion: 2.3
+  DisplayCopNames: true
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/support/*.rb'
+    - '*.gemspec'
+
+Documentation:
+  Enabled: false

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+- 2.3.0

data/Gemfile

@@ -6,4 +6,5 @@ group :test do
   gem 'codeclimate-test-reporter'
   gem 'simplecov', require: false
   gem 'rack-test'
+  gem 'vcr'
 end

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-task :default => :test
+task default: :test
 RSpec::Core::RakeTask.new(:test)

data/lib/sms_broker/client/base.rb

@@ -1,24 +1,23 @@
 module SmsBroker
   module Client
-
     class Base
-
       attr_reader :name,
                   :client,
-                  :options,
                   :sender_id,
                   :phone_number
 
-      def initialize(name, client)
+      def initialize(name, client, options = {})
         @name = name
         @client = client
+        @sender_id = options[:sender_id]
+        @phone_number = options[:phone_number]
       end
 
-      def serialize_number(number)
-        "#{number}".delete("+")
-      end
+      def serialize_to_number(number)
+        return number if number.start_with?('+')
 
+        "+#{number}"
+      end
     end
-
   end
 end

data/lib/sms_broker/client/nexmo.rb

@@ -1,27 +1,18 @@
 module SmsBroker
   module Client
-
     class Nexmo < Base
-
       def initialize(options)
-        nexmo_options = options.dup
-
-        auth_options = {
-          key:    nexmo_options.delete(:key),
-          secret: nexmo_options.delete(:secret)
-        }
+        client = \
+          ::Nexmo::Client.new(key: options[:key], secret: options[:secret])
 
-        @sender_id = nexmo_options.delete(:sender_id)
-        @phone_number = nexmo_options.delete(:phone_number)
-
-        super(:nexmo, ::Nexmo::Client.new(auth_options))
+        super :nexmo, client, options
       end
 
       def send_message(message)
         response = client.send_message \
           text: message[:text],
-          from: serialize_number(message[:from]),
-          to: serialize_number(message[:to])
+          from: message[:from],
+          to: serialize_to_number(message[:to])
 
         if success_response?(response)
           Response::NexmoSuccess.new(response)
@@ -35,10 +26,8 @@ module SmsBroker
       def success_response?(response)
         # just looking for the first message,
         # right now only one message per call
-        response['messages'].length > 0 && response['messages'][0]['status'] == '0'
+        !response['messages'].empty? && response['messages'][0]['status'] == '0'
       end
-
     end
-
   end
 end

data/lib/sms_broker/client/response/error.rb

@@ -1,9 +1,7 @@
 module SmsBroker
   module Client
     module Response
-
       class Error
-
         attr_reader :service,
                     :response,
                     :serialized
@@ -19,11 +17,9 @@ module SmsBroker
         end
 
         def invalid_sender_id?
-          (@serialized[:errors]['sender_id'] || {}).include?('is invalid')
+          (@serialized[:errors]['sender_id'] || []).include?('is invalid')
         end
-
       end
-
     end
   end
 end

data/lib/sms_broker/client/response/nexmo_error.rb

@@ -1,10 +1,8 @@
 module SmsBroker
   module Client
     module Response
-
       class NexmoError < Error
-
-        SENDER_ID_NOT_SUPPORTED = '15'
+        SENDER_ID_NOT_SUPPORTED = '15'.freeze
 
         def initialize(nexmo_response)
           super :nexmo, nexmo_response, serialize_error_response(nexmo_response)
@@ -27,9 +25,7 @@ module SmsBroker
 
           errors
         end
-
       end
-
     end
   end
 end

data/lib/sms_broker/client/response/nexmo_success.rb

@@ -1,9 +1,7 @@
 module SmsBroker
   module Client
     module Response
-
       class NexmoSuccess < Success
-
         def initialize(nexmo_response)
           super :nexmo, nexmo_response, serialize(nexmo_response)
         end
@@ -17,21 +15,23 @@ module SmsBroker
             to: single_response['to'],
             from: single_response['from'],
             message_id: single_response['message-id'],
-            raw: {
-              to: single_response['to'],
-              from: single_response['from'],
-              status: single_response['status'],
-              network: single_response['network'],
-              message_id: single_response['message-id'],
-              client_ref: single_response['client-ref'],
-              remaining_balance: single_response['remaining-balance'],
-              message_price: single_response['message-price']
-            }
+            raw: response_to_hash(single_response)
           }
         end
 
-      end
+        def response_to_hash(response)
+          attributes = %w(
+            to from status network message-id client-ref
+            remaining-balance message-price
+          )
 
+          {}.tap do |hash|
+            attributes.each do |attr|
+              hash[attr.tr('-', '_').to_sym] = response[attr]
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/sms_broker/client/response/success.rb

@@ -1,9 +1,7 @@
 module SmsBroker
   module Client
     module Response
-
       class Success
-
         attr_reader :raw,
                     :service,
                     :serialized
@@ -29,9 +27,7 @@ module SmsBroker
         def message_id
           serialized[:message_id]
         end
-
       end
-
     end
   end
 end

data/lib/sms_broker/client/response/twilio_error.rb

@@ -1,10 +1,8 @@
 module SmsBroker
   module Client
     module Response
-
       class TwilioError < Error
-
-        SENDER_ID_NOT_SUPPORTED = '21212'
+        SENDER_ID_NOT_SUPPORTED = '21212'.freeze
 
         def initialize(twilio_response)
           super :twilio, twilio_response, serialize(twilio_response)
@@ -22,10 +20,10 @@ module SmsBroker
 
         def serialize_response_error(response)
           errors = {
-            "#{response.error_code}" => [response.error_message]
+            response.error_code.to_s => [response.error_message]
           }
 
-          if "#{response.error_code}" == SENDER_ID_NOT_SUPPORTED
+          if response.error_code.to_s == SENDER_ID_NOT_SUPPORTED
             errors['sender_id'] = ['is invalid']
           end
 
@@ -34,18 +32,16 @@ module SmsBroker
 
         def serialize_exeception_errors(exception)
           errors = {
-            "#{exception.code}" => [exception.message]
+            exception.code.to_s => [exception.message]
           }
 
-          if "#{exception.code}" == SENDER_ID_NOT_SUPPORTED
+          if exception.code.to_s == SENDER_ID_NOT_SUPPORTED
             errors['sender_id'] = ['is invalid']
           end
 
           errors
         end
-
       end
-
     end
   end
 end

data/lib/sms_broker/client/response/twilio_success.rb

@@ -1,9 +1,7 @@
 module SmsBroker
   module Client
     module Response
-
       class TwilioSuccess < Success
-
         def initialize(twilio_response)
           super :twilio, twilio_response, serialize(twilio_response)
         end
@@ -15,27 +13,24 @@ module SmsBroker
             to: response.to,
             from: response.from,
             message_id: response.sid,
-            raw: {
-              to: response.to,
-              sid: response.sid,
-              uri: response.uri,
-              from: response.from,
-              body: response.body,
-              price: response.price,
-              status: response.status,
-              price_unit: response.price_unit,
-              error_code: response.error_code,
-              account_sid: response.account_sid,
-              api_version: response.api_version,
-              date_created: response.date_created,
-              error_message: response.error_message,
-              messaging_service_sid: response.messaging_service_sid
-            }
+            raw: response_to_hash(response)
           }
         end
 
-      end
+        def response_to_hash(response)
+          attributes = %i(
+            to sid uri from body price status price_unit error_code
+            account_sid api_version date_created error_message
+            messaging_service_sid
+          )
 
+          {}.tap do |hash|
+            attributes.each do |attr|
+              hash[attr] = response.send(attr)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/sms_broker/client/twilio.rb

@@ -1,49 +1,34 @@
 module SmsBroker
   module Client
-
     class Twilio < Base
-
       def initialize(options)
-        twilio_options = options.dup
-
-        auth_options = {
-          account_sid: twilio_options.delete(:account_sid),
-          auth_token:  twilio_options.delete(:auth_token)
-        }
+        client = ::Twilio::REST::Client.new(
+          options[:account_sid],
+          options[:auth_token]
+        )
 
-        @sender_id = twilio_options.delete(:sender_id)
-        @phone_number = twilio_options.delete(:phone_number)
-
-        super \
-          :twilio,
-          ::Twilio::REST::Client.new(auth_options[:account_sid], auth_options[:auth_token])
+        super :Twilio, client, options
       end
 
       def send_message(message)
-        begin
-          response = client.messages.create \
-            body: message[:text],
-            from: serialize_number(message[:from]),
-            to: serialize_number(message[:to])
+        response = client.messages.create \
+          body: message[:text],
+          from: message[:from],
+          to: serialize_to_number(message[:to])
 
-          if failed_response?(response)
-            Response::TwilioError.new(response)
-          else
-            Response::TwilioSuccess.new(response)
-          end
+        return Response::TwilioSuccess.new(response) \
+          if success_response?(response)
 
-        rescue ::Twilio::REST::RequestError => exception
-          Response::TwilioError.new(exception)
-        end
+        Response::TwilioError.new(response)
+      rescue ::Twilio::REST::RequestError => exception
+        Response::TwilioError.new(exception)
       end
 
       private
 
-      def failed_response?(response)
-        ['undelivered', 'failed'].include?(response.status)
+      def success_response?(response)
+        !%w(undelivered failed).include?(response.status)
       end
-
     end
-
   end
 end

data/lib/sms_broker/configuration.rb

@@ -2,55 +2,51 @@ require 'sms_broker/setup'
 require 'sms_broker/exceptions/invalid_setup'
 
 module SmsBroker
-
   module Configuration
+    extend self
 
-    @@configuration = nil
+    @configuration = nil
 
     def default_service
       configuration[:default_service]
     end
 
     def clear_setup
-      @@configuration = nil
+      @configuration = nil
     end
 
     def configuration
       exception = \
         Exceptions::InvalidSetup.new('setup does not exists')
 
-      @@configuration || (raise exception)
+      @configuration || (raise exception)
     end
 
-    def setup(&block)
+    def setup
       setup = Setup.new
       yield setup if block_given?
 
-      @@configuration = setup.options
+      @configuration = setup.options
 
       setup
     end
 
-    def setup!(&block)
+    def setup!
       setup = Setup.new
       yield setup if block_given?
 
       unless setup.valid?
         exception = \
-          Exceptions::InvalidSetup.new('setup is invalid, check exception.errors')
+          Exceptions::InvalidSetup.new("setup is invalid, #{setup.errors}")
 
         exception.errors = setup.errors
 
         raise exception
       end
 
-      @@configuration = setup.options
+      @configuration = setup.options
 
       setup
     end
-
-    extend self
-
   end
-
 end

data/lib/sms_broker/exceptions/invalid_service.rb

@@ -1,9 +1,6 @@
 module SmsBroker
   module Exceptions
-
     class InvalidService < StandardError
-
     end
-
   end
 end

data/lib/sms_broker/exceptions/invalid_setup.rb

@@ -1,11 +1,7 @@
 module SmsBroker
   module Exceptions
-
     class InvalidSetup < StandardError
-
       attr_accessor :errors
-
     end
-
   end
 end

data/lib/sms_broker/message_sender.rb

@@ -1,7 +1,5 @@
 module SmsBroker
-
   class MessageSender
-
     attr_reader :client,
                 :errors
 
@@ -28,7 +26,7 @@ module SmsBroker
 
       response = client.send_message(build_message)
 
-      if should_try_again_with_phone_number?(response)
+      if should_try_with_phone_number?(response)
         return client.send_message(build_message(:phone_number))
       end
 
@@ -56,26 +54,27 @@ module SmsBroker
     private
 
     def build_message(from = :sender_id)
-      sender = \
-        if client.sender_id && from == :sender_id
-          client.sender_id
-        else
-          client.phone_number
-        end
-
       {
         text: @message_text,
-        from: sender,
+        from: get_sender(from),
         to:   @message_to
       }
     end
 
-    def should_try_again_with_phone_number?(response)
+    def get_sender(from)
+      if client.sender_id && from == :sender_id
+        client.sender_id
+      else
+        return client.phone_number if client.phone_number.start_with?('+')
+
+        "+#{client.phone_number}"
+      end
+    end
+
+    def should_try_with_phone_number?(response)
       response.is_a?(Client::Response::Error) &&
         response.invalid_sender_id? &&
-          !!client.sender_id
+        client.sender_id
     end
-
   end
-
 end

data/lib/sms_broker/service.rb

@@ -1,27 +1,23 @@
 require 'sms_broker/message_sender'
-
 require 'sms_broker/client/base'
 require 'sms_broker/client/nexmo'
 require 'sms_broker/client/twilio'
-
 require 'sms_broker/exceptions/invalid_service'
 
 module SmsBroker
-
   CLIENTS = {
-    nexmo:  Client::Nexmo,
+    nexmo: Client::Nexmo,
     twilio: Client::Twilio
-  }
+  }.freeze
 
   class Service
-
     def self.get(name)
       options = service_configuration(name)
 
       result = Service.validate(name, options)
 
       unless result.valid?
-        raise Exceptions::InvalidService, { name.to_sym => result.errors }
+        raise Exceptions::InvalidService, name.to_sym => result.errors
       end
 
       new CLIENTS[name.to_sym].new(options)
@@ -44,7 +40,5 @@ module SmsBroker
     def message(message)
       MessageSender.new(client).message(message)
     end
-
   end
-
 end

data/lib/sms_broker/setup.rb

@@ -1,24 +1,22 @@
 module SmsBroker
-
   class Setup
-
     attr_reader :options,
                 :errors
 
     def self.service_validation_schemas
       {
-        nexmo: Compel.hash.keys({
+        nexmo: Compel.hash.keys(
           key: Compel.string.required,
           secret: Compel.string.required,
           sender_id: Compel.string,
           phone_number: Compel.string.required
-        }),
-        twilio: Compel.hash.keys({
+        ),
+        twilio: Compel.hash.keys(
           sender_id: Compel.string,
           auth_token: Compel.string.required,
           account_sid: Compel.string.required,
           phone_number: Compel.string.required
-        })
+        )
       }
     end
 
@@ -48,10 +46,10 @@ module SmsBroker
     end
 
     def compel_validation_schema(services_list = [])
-      not_all_services_setup = Proc.new do |services_setups|
-        services_list.all?{ |service|
+      not_all_services_setup = proc do |services_setups|
+        services_list.all? do |service|
           services_setups.keys.include?(service.to_sym)
-        }
+        end
       end
 
       services_setups_schema = \
@@ -66,7 +64,7 @@ module SmsBroker
     end
 
     def method_missing(method, args, &block)
-      service = "#{method}".split('_setup')[0].dup
+      service = method.to_s.split('_setup')[0].dup
 
       if @options[:services].include?(service)
         @options[:services_setups][service.to_sym] = args
@@ -76,7 +74,5 @@ module SmsBroker
         super
       end
     end
-
   end
-
 end

data/lib/sms_broker/version.rb

@@ -1,5 +1,3 @@
 module SmsBroker
-
-  VERSION = '1.0.0'
-
+  VERSION = '1.0.2'.freeze
 end

data/lib/sms_broker.rb

@@ -1,17 +1,16 @@
 require 'nexmo'
 require 'compel'
 require 'twilio-ruby'
-
 require 'sms_broker/client/response/error'
 require 'sms_broker/client/response/success'
-
 require 'sms_broker/configuration'
 require 'sms_broker/service'
 
 module SmsBroker
-
   extend Configuration
 
+  module_function
+
   def service(name = default_service)
     Service.get(name)
   end
@@ -19,7 +18,4 @@ module SmsBroker
   def message(body)
     service.message(body)
   end
-
-  extend self
-
 end