africas_talking 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4722fe942f4373d4ecc6288ac2c901ae7afe48b7
-  data.tar.gz: 38ad1e6863e51a4ef655b99b6313dc3aeeff5ce8
+  metadata.gz: 976f55a5249626e5675cf40c54094c7d9d77ab2f
+  data.tar.gz: 77bc53c0d10571b039e37cb16d2270325d76d95f
 SHA512:
-  metadata.gz: 85860100e4df575bb327d1b9dfec5d7dd8c7331b08c424957554b455b3b49954fab44a686978f9721ef77c97e4226cd7ee14848209e7727c4b72b316c1e27d11
-  data.tar.gz: d37beab5f552bbe610bd1bd1a9138e00148079db3c59096bf33fa1212e3eeed6d061ca47b6bad4a13fb01e5a4210ebb9935b057e872831b4fee58e35fc4b851f
+  metadata.gz: 9fc3ebbb8d19e2037870d82d13d33f1a1f5b943bbe3522797c03040cfadd11277544a02b1876bb05c057a7760fe0d85c68c16f89c42cb563d443540742f41352
+  data.tar.gz: eabfd6eb1cbca68841e462087042b83468aa7a0035a6addee704b7b03608652d8d9e8656570ef48a4981c7c13d5e296b2ca9303e2c6c1b044498ee934a811104

data/lib/africas_talking/base.rb

@@ -9,12 +9,14 @@ class AfricasTalking::Base
   end
 
 	def post(url, json_body=nil)
-		Typhoeus.post("#{BASE_URI}#{url}", body: json_body, headers: headers)
-	end
+    response = Typhoeus.post("#{BASE_URI}#{url}", body: json_body, headers: headers)
+    process_api_response(response)
+  end
 
-	def get(url)
-		Typhoeus.post("#{BASE_URI}#{url}", headers: headers)
-	end
+  def get(url)
+    response = Typhoeus.post("#{BASE_URI}#{url}", headers: headers)
+    response.options[:response_code] == 200 ? build_messages_array(response) : api_error_messages(response)
+  end
 
 	def parse_api_errors(response)
     reports = parse_api_response(response)["SMSMessageData"]["Recipients"]
@@ -39,4 +41,10 @@ class AfricasTalking::Base
     {'Accept' => "application/json", 'apiKey'=> 'c6ec656ed9bceb689289ccaa6e38d7f6c1b0718a1237b4c13391d1efc1108bfb'}
   end
 
+  def process_api_response(response)
+    return parse_api_response(response) if response.options[:response_code] == 200
+    return parse_api_errors(response) if response.options[:response_code] == 201
+    raise api_error_messages(response)
+  end
+
 end

data/lib/africas_talking/message.rb

@@ -1,5 +1,5 @@
 class AfricasTalking::Message < AfricasTalking::Base
-	
+
 	#POST
 	#/version1/messaging
   #----------------------------------------------------------------------------
@@ -8,8 +8,7 @@ class AfricasTalking::Message < AfricasTalking::Base
   # to      = "+254711XXXYYY,+254733YYYZZZ";
   # And of course we want our recipients to know what we really do
   def deliver(recipients, message, username)
-    response = post('/version1/messaging', {username: username, message: message, to: prepare_recipients(recipients)})
-    process_api_response(response)
+    post('/version1/messaging', {username: username, message: message, to: prepare_recipients(recipients)})
   end
 
   #POST
@@ -19,14 +18,13 @@ class AfricasTalking::Message < AfricasTalking::Base
   # sender = "shortCode or senderId"
 
   def deliver_with_shortcode(recipients, message, from, username)
-    response = post('/version1/messaging', {username: username, message: message, to: recipients, from: from})
-    process_api_response(response)
+    post('/version1/messaging', {username: username, message: message, to: recipients, from: from})
   end
 
   #POST
   #/version1/messaging
   #----------------------------------------------------------------------------
-  # sender = nil # 
+  # sender = nil #
   # bulkSMSMode   # This should always be 1 for bulk messages
   # # enqueue flag is used to queue messages incase you are sending a high volume.
   # # The default value is 0.
@@ -35,11 +33,9 @@ class AfricasTalking::Message < AfricasTalking::Base
   # reports = gateway.sendMessage(to, message, sender, bulkSMSMode, enqueue)
 
   def enqueue_messages(opts)
-    body={
+    post('/version1/messaging', {
       to: opts.fetch(:recipients), message: opts.fetch(:message, ""), sender: opts.fetch(:sender, nil),
-      enqueue: opts.fetch(:enqueue,1), bulkSMSMode: opts.fetch(:bulkSMSMode, 1), username: opts.fetch(:username)}
-    response = post('/version1/messaging', body)
-    process_api_response(response)
+      enqueue: opts.fetch(:enqueue,1), bulkSMSMode: opts.fetch(:bulkSMSMode, 1), username: opts.fetch(:username)})
   end
 
   #POST
@@ -51,42 +47,29 @@ class AfricasTalking::Message < AfricasTalking::Base
   # To send a premium message, build a HASH (as shown below) with the following attributes keeping in mind the defaults.
   # 1.Specify your premium shortCode and keyword
   # 2.Set keyword as None where not used (Mostly for onDemand services)
-  # 3.Set the bulkSMSMode flag to 0 so that the subscriber gets charged 
+  # 3.Set the bulkSMSMode flag to 0 so that the subscriber gets charged
   # 4.Set the enqueue flag to 0 so that your message will not be queued or to 1 for many messages
   # 5.Incase of an onDemand service, specify the link id. else set it to nil
   # 6.linkId is received from the message sent by subscriber to your onDemand service
   # 7.Specify retryDurationInHours: The numbers of hours our API should retry to send the message incase it doesn't go through.
-    # opts={recipients: "0710335602", message: "Hey there testing something awesome", bulkSMSMode: 0, shortCode:"XXXXX", enqueue: 0, keyword: nil, linkId: "messageLinkId"}
-  
+  # opts={recipients: "0710335602", message: "Hey there testing something awesome", bulkSMSMode: 0, shortCode:"XXXXX", enqueue: 0, keyword: nil, linkId: "messageLinkId"}
+
   def deliver_premium_messages(opts)
-    body={
+    post('/version1/messaging', {
         to: opts.fetch(:recipients), message: opts.fetch(:message),
         keyword: opts.fetch(:keyword, nil), enqueue: opts.fetch(:enqueue, 0), username: opts.fetch(:username),
-        linkId: opts.fetch(:linkId, nil), retryDurationInHours: opts.fetch(:retryDurationInHours, 1)}
-    response = post('/version1/messaging', body)
-    process_api_response(response)
+        linkId: opts.fetch(:linkId, nil), retryDurationInHours: opts.fetch(:retryDurationInHours, 1)})
   end
 
-
   #GET
   #/?username=#{ENV['africas_talking_username']}&lastReceivedId=#{last_received_id}
   # The gateway will return 10 messages at a time back to you, starting with
   # what you currently believe is the lastReceivedId. Specify 0 for the first
   # time you access the gateway, and the ID of the last message we sent you
   # on subsequent results
-
+  #
   def fetch_messages(username, last_received_id=0)
-  	response = get("/version1/messaging?username=#{username}&lastReceivedId=#{last_received_id}")
-  	return build_messages_array(response) if response.options[:response_code] == 200
-  	raise api_error_messages(response)
-  end
-
-private
-
-  def process_api_response(response)
-    return parse_api_response(response) if response.options[:response_code] == 200
-    return parse_api_errors(response) if response.options[:response_code] == 201
-    raise api_error_messages(response)
+  	get("/version1/messaging?username=#{username}&lastReceivedId=#{last_received_id}")
   end
 
 end

data/lib/africas_talking/version.rb

@@ -1,3 +1,3 @@
 module AfricasTalking
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: africas_talking
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Charles Chuck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -208,3 +208,4 @@ test_files:
 - test/mocks/failed_status_report.json
 - test/mocks/success_status_report.json
 - test/test_africas_talking.rb
+has_rdoc: