semaphore-sms 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 109bbcf088a8e6fd255a87164369fb4c45092dac
-  data.tar.gz: ece15bffbbd1ef1ba8b1041b154a0ea973500d36
+  metadata.gz: 53f198e4780b610af7208d4cbbda74017bd5e894
+  data.tar.gz: 02bf0f354a4ce0efb2cc108a44bf6cca1fb5ff2e
 SHA512:
-  metadata.gz: 19878b0a47c50ec4e7dbf6e7d1271b41c46c18500abb298ca0fe4f5beb34b0b23d86f26b87795e2116bac280f60e8e8569624f52dc2abce7af8a16e88cf46761
-  data.tar.gz: ce7b95e4d4c381bfcab66933791b5138d0d71aa5aa6d60132bf74d1714cdf3647d2afc2b3248fd44f4f30dfae31914a66ed0e3ffadd285976025ea82d8e19b62
+  metadata.gz: 78e43db86a717c83f663d4589bbe7d3fbde093d3d3f26d6797cdf58cfab67bc3a065d1458b33b5779d7a4a99bce0ce40ddbb616c96d1886a909f6b2aa8cc52cd
+  data.tar.gz: 30fa575fcacd2ae159770bc7ba3cb4083846a70fee63ad442d97ac9c016585119f373abd66c3857abc61c7abe052228dcef264457ca3a8256133db8b6144bf16

data/README.md

@@ -21,8 +21,8 @@ Or install it yourself as:
 ## Usage
 
 Run:
-```
-    rails g semaphore:sms:install
+```ruby
+rails g semaphore:sms:install
 ```
 
 Note:
@@ -149,7 +149,7 @@ require "semaphore-sms"
     # Note: all params are optional.
       Format is "YYYY-MM-DD" for date,
       Format is lowercase (e.g. "globe", "smart") for network,
-      Format is lowercase (e.g. "pending", "success")
+      Format is lowercase (e.g. "pending", "success") for status
 
 ## Requesting for a specific message
 

data/lib/semaphore/sms.rb

@@ -3,7 +3,7 @@ require "semaphore/sms/client"
 
 module Semaphore
   module Sms
-    class ::Error < StandardError; end
+    class ::ConfigurationError < StandardError; end
 
     class << self
       attr_writer :api_key, :sender_name
@@ -18,7 +18,7 @@ module Semaphore
       end
 
       def api_key
-        raise Error, 'API Key is required for GET/POST' unless @api_key
+        raise ConfigurationError, 'API Key is required for GET/POST' unless @api_key
         @api_key
       end
 

data/lib/semaphore/sms/client.rb

@@ -1,30 +1,40 @@
 require "curb"
 require "json"
-require "pry"
 require "forwardable"
+require "piliponi"
 
 module Semaphore
   module Sms
+    class ::PhoneNumberError < StandardError; end
+
     class Client
       extend Forwardable
+
       Response = Struct.new(:status, :content)
 
       def initialize(config)
-        raise Semaphore::Sms::Error, 'Config must have api key credentials' unless config.respond_to? :api_key
+        raise ConfigurationError, 'Config must have api key credentials' unless config.respond_to? :api_key
         @config = config
       end
 
-      #TODO: add number validation here. Use piliponi gem.
       def send(message, recipients, sendername = nil)
+        recipients = clean_and_validate(recipients)
+
+        raise PhoneNumberError, 'Please verify the phonenumber' unless recipients
+
         options = {
           message: message,
           sendername: sendername || sender_name,
-          number: recipients.kind_of?(Array) ? recipients.join(",") : recipients
+          number: recipients
         }.compact
         api_post("messages", options)
       end
 
       def priority(message, recipients, sendername = nil)
+        recipients = clean_and_validate(recipients)
+
+        raise PhoneNumberError, 'Please verify the phonenumber' unless recipients
+
         options = {
           message: message,
           sendername: sendername || sender_name,
@@ -93,6 +103,19 @@ module Semaphore
         end
       end
 
+      def clean_and_validate(recipients)
+        if recipients.kind_of?(Array)
+          recipients = recipients.reduce([]) do |mem, num|
+            mem << (validate(num) ? clean(num) : false)
+            mem
+          end
+          recipients.include?(false) ? false : recipients.join(",")
+        else
+          recipients = clean(recipients)
+          validate(recipients) ? recipients : false
+        end
+      end
+
       def handle_errors
         begin
           yield
@@ -100,6 +123,14 @@ module Semaphore
           Response.new(:error, { error: e.message })
         end
       end
+
+      def clean(num)
+        Piliponi.clean num
+      end
+
+      def validate(num)
+        Piliponi.plausible? num
+      end
     end
   end
 end

data/lib/semaphore/sms/version.rb

@@ -1,5 +1,5 @@
 module Semaphore
   module Sms
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/semaphore-sms.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "curb", "~> 0.9.4"
+  spec.add_dependency "piliponi", "~> 1.2.1"
   #spec.add_dependency "json", "~> 2.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semaphore-sms
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jim Arnold Go
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: piliponi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement