paycall-sms 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWEzOWVhNDhhNDRlMmFiYWRlMzU4MDg3NzY5NjUyYTJlZDNkZDRmMA==
+    NDRlNTQ3YmI4YjU1MzcwNTQ5Mjg2OTllNmQ2Njg1MjcwNGViNWU1OQ==
   data.tar.gz: !binary |-
-    NzMwYmQyN2QxNGExMTI5ZmJhZTdhZDVmMjcyYjEwYzc0ZTdjYWVkMA==
+    NWQ5MGY3YzkxOTA5OTkyMjY3OWU3N2Y2NWJjYzJiZjM4NGY1ZjI4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MTA3NTgxMzI1YzM0MDhhZGZlYzE3NTI2YjM5OGEwOGY3MTViNTUwZDI0MmRh
-    NWVlZDQ0YzU1ZGIzYzRiYjY4NTA1MDA1MWFhNTM4NmMwNjc5ZGJmYmUzYTA2
-    ZmRiM2IyNjQ1ZTdmNmU4OWMwMGU2MTI2Y2YxY2JmNjBlZTgzYmQ=
+    Zjg3NDZmMjU3MWY3YTllYjY0ODA5M2RmOGFmZDNlMWRhYjE3MjczN2VjOGY5
+    YzliOWMzMDAxNWMxMDBiMTEwYzk0ZmIxYWNkNTZmM2EyMTNhYjRlZGZmZGE1
+    ZmU0NDgyODI2ZWY4MzM3NGZiMzg3NjM5OGY0MGZhOGZlZjJlOTI=
   data.tar.gz: !binary |-
-    Y2JlM2MxM2ZlODE3M2E5YTI1NDE5NTQ0MTM4Y2IyYzY5MmUwOGM3YmY1MjRl
-    ZDlkY2RlNTc3YTM5MjIwMTVmMDRhYzhlYWY2MmVjMTNhZDJjMDYzNDczMjc4
-    ODEyNDRlNzU1MGZkNGE1ODI1NTZjM2UxMjEzNzdmZTZkYjhlMzU=
+    ZTc3Y2IwNDU1ZTkwNTY3MDFhOGRmNjY1MDM4MTMwYmNlYzIwZThkNDc2YjAz
+    YWE5MzNhYWUxYTY5NTYxMjg1OWUyMTBmYjQ5YTdkNmJhOGVkMjczZWJhMjU0
+    MDI2ZDIxOGU1MDE5MmFhYjIwNWFlOGJlMTFiMTI4M2QwMDViYjc=

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/pay_call_sms/delivery_notification_parser.rb

@@ -13,6 +13,7 @@ module PayCallSms
     # params will look something like the following:
     # {"PhoneNumber"=>"972545290862", "CustomerMessageId"=>"34", "Status"=>"inprogress", "dateTime"=>"20-11-2017 17:22:55"}
     def from_http_push_params(params)
+      self.class.normalize_http_push_params(params)
       %w(PhoneNumber   Status   CustomerMessageId   dateTime).each do |p|
         raise ArgumentError.new("Missing http delivery notification push parameter #{p}. Parameters were: #{params.inspect}") if params[p].blank?
       end
@@ -23,6 +24,7 @@ module PayCallSms
         :phone => params['PhoneNumber'],
         :message_id => params['CustomerMessageId'],
         :occurred_at => params['dateTime'],
+        :reason_not_delivered => params['ReasonNotDelivered']
       }
 
       parse_notification_values_hash(values)
@@ -59,7 +61,15 @@ module PayCallSms
     end
 
     def self.gateway_delivery_status_to_delivery_status(gateway_status)
-      {inprogress: :in_progress, delivered: :delivered, failed: :failed}.with_indifferent_access[gateway_status] || :unknown
+      {inprogress: :in_progress, pending: :in_progress, delivered: :delivered, failed: :failed, kosher: :failed}.with_indifferent_access[gateway_status] || :unknown
+    end
+
+    def self.normalize_http_push_params(params)
+      if params['Status'] == 'kosher'
+        params['ReasonNotDelivered'] = 'kosher_number'
+        params['dateTime'] = Time.now.strftime('%d-%m-%Y %H:%M:%s') # "12-12-2017 14:22:1"
+      end
+      params
     end
 
   end

data/lib/pay_call_sms/incoming_message_parser.rb

@@ -24,7 +24,8 @@ module PayCallSms
         phone: params['sender'],
         reply_to_phone: params['recipient'],
         text: params['content'],
-        message_id: params['msgId']
+        message_id: params['msgId'],
+        received_at: params['receivedTime'],
       )
     end
 

data/lib/pay_call_sms/sms_sender.rb

@@ -74,7 +74,10 @@ module PayCallSms
         message: message_text,
         customermessageid: message_id
       }
-      result[:deliverynotificationURL] = options[:delivery_notification_url] if options[:delivery_notification_url].present?
+      if options[:delivery_notification_url].present?
+        result[:deliverynotificationURL] = options[:delivery_notification_url]
+        result[:deliverynotificationmethod] = 'POST'
+      end
       result[:from] = options[:sender_number]
       result[:from] = options[:sender_name] if options[:sender_name].present?
       result

data/paycall-sms.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: paycall-sms 0.1.0 ruby lib
+# stub: paycall-sms 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paycall-sms"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alex Tkachev"]
-  s.date = "2017-11-24"
+  s.date = "2017-12-24"
   s.description = "Ruby api for sms service provider: PayCall"
   s.email = "tkachev.alex@gmail.com"
   s.extra_rdoc_files = [

data/spec/pay_call_sms/delivery_notifications_parser_spec.rb

@@ -29,11 +29,21 @@ describe PayCallSms::DeliveryNotificationParser do
     it 'should be delivered when status is delivered' do
       http_params.update('Status' => 'delivered')
       notification.delivery_status.should == :delivered
+      notification.reason_not_delivered.should be_blank
     end
 
     it 'should be not delivered when status is failed' do
       http_params.update('Status' => 'failed')
       notification.delivery_status.should == :failed
+      notification.reason_not_delivered.should be_blank
+    end
+
+    it 'should normalize http params when status is koshe' do
+      http_params.update('Status' => 'koshe')
+      notification.delivery_status.should == :failed
+      notification.gateway_status.should == 'kosher'
+      notification.occurred_at.should be_present
+      notification.reason_not_delivered.should == 'kosher_number'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paycall-sms
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alex Tkachev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty