exotel_api 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13d423efa38ef4e16ec11cfc99f08f50074729e6
-  data.tar.gz: 58a898623c86440fb283ed9349347ef7382ada99
+  metadata.gz: 4cd9032584002a065e8875e00362bd88717a81fb
+  data.tar.gz: 1dfbb9cdc4766ea346aa792bf2196b9426c810f4
 SHA512:
-  metadata.gz: cd2b8ca7059d3f6c7301fd96ee0cd70b967721ce27797f9e7edd7ca809eab1dfbf83408d183ca90c508158aeec77577b11440dc87b9bdd96ac44b79b6efc73b3
-  data.tar.gz: 2d2da0337a928c79ce1c00c2113f96b54fc8815290603a68b9071f58cbc4d2939184c05ff0e86b055d898bce7176c198fc24686533b6a1fc495e24e3ec36ff87
+  metadata.gz: ab95301818d01ee0ed2ce99113ccb591d5c39bb1326306234644087ab6bc0368fc61569cddc38eac2db53279f45ce4cd4416221e5ea145232b124dd3239a1db9
+  data.tar.gz: 1b518905b133c183a984f24deaeddcf7ca3571984417b8dbaed3fb3ba8e0360b03b0d8cda78fa70ba7b00759897e976bfc48bd55e176ba1f3bc116ecc8aed85b

data/app/controllers/exotel_api/call/after_dtmf/connect_controller.rb

@@ -1,7 +1,7 @@
 module ExotelApi
   module Call
     module AfterDtmf
-      class ConnectController < ApplicationController
+      class ConnectController < StartController
         #response - nil
         def status
           begin
@@ -15,24 +15,7 @@ module ExotelApi
           end
           render :plain => '', content_type: "text/plain", :status => 200
         end
-  
-        private
-        def find_call
-          if params[:CustomField].present?
-            params[:CustomField].titleize.split.join.constantize::Call::AfterDtmf::Connect.find_by_call_sid(params[:CallSid])
-          else
-            Call.find_by_call_sid(params[:CallSid])
-          end
-        end
-  
-        def direction
-          if params[:Direction] == 'incoming'
-            eval(ExotelApi.inbound_query)
-          else
-            find_call
-          end
-        end
       end
     end
   end
-end
+end

data/app/controllers/exotel_api/call/after_dtmf_controller.rb

@@ -1,6 +1,6 @@
 module ExotelApi
   module Call
-    class AfterDtmfController < ApplicationController
+    class AfterDtmfController < StartController
       #response - list of URLs
       def greeting
         begin
@@ -40,23 +40,6 @@ module ExotelApi
         end
         render :plain => phones, content_type: "text/plain", :status => 200
       end
-  
-      private
-      def find_call
-        if params[:CustomField].present?
-          params[:CustomField].titleize.split.join.constantize::Call::AfterDtmf.find_by_call_sid(params[:CallSid])
-        else
-          Call.find_by_call_sid(params[:CallSid])
-        end
-      end
-  
-      def direction
-        if params[:Direction] == 'incoming'
-          eval(ExotelApi.inbound_query)
-        else
-          find_call
-        end
-      end
     end
   end
-end
+end

data/app/controllers/exotel_api/call/after_greeting/connect_controller.rb

@@ -1,7 +1,7 @@
 module ExotelApi
   module Call
     module AfterGreeting
-      class ConnectController < ApplicationController
+      class ConnectController < StartController
         #response - nil
         def status
           begin
@@ -15,24 +15,7 @@ module ExotelApi
           end
           render :plain => '', content_type: "text/plain", :status => 200
         end
-  
-        private
-        def find_call
-          if params[:CustomField].present?
-            params[:CustomField].titleize.split.join.constantize::Call::AfterGreeting::Connect.find_by_call_sid(params[:CallSid])
-          else
-            Call.find_by_call_sid(params[:CallSid])
-          end
-        end
-  
-        def direction
-          if params[:Direction] == 'incoming'
-            eval(ExotelApi.inbound_query)
-          else
-            find_call
-          end
-        end
       end
     end
   end
-end
+end

data/app/controllers/exotel_api/call/after_greeting_controller.rb

@@ -1,6 +1,6 @@
 module ExotelApi
   module Call
-    class AfterGreetingController < ApplicationController
+    class AfterGreetingController < StartController
       #response - phone
       def connect
         begin
@@ -14,23 +14,6 @@ module ExotelApi
         end
         render :plain => phones, content_type: "text/plain", :status => 200
       end
-  
-      private
-      def find_call
-        if params[:CustomField].present?
-          params[:CustomField].titleize.split.join.constantize::Call::AfterGreeting.find_by_call_sid(params[:CallSid])
-        else
-          Call.find_by_call_sid(params[:CallSid])
-        end
-      end
-  
-      def direction
-        if params[:Direction] == 'incoming'
-          eval(ExotelApi.inbound_query)
-        else
-          find_call
-        end
-      end
     end
   end
-end
+end

data/app/controllers/exotel_api/call/connect_controller.rb

@@ -1,6 +1,6 @@
 module ExotelApi
   module Call
-    class ConnectController < CallController
+    class ConnectController < StartController
       #response - nil
       def status
         begin
@@ -14,23 +14,6 @@ module ExotelApi
         end
         render :plain => '', content_type: "text/plain", :status => 200
       end
-  
-      private
-      def find_call
-        if params[:CustomField].present?
-          params[:CustomField].titleize.split.join.constantize::Call::Connect.find_by_call_sid(params[:CallSid])
-        else
-          Call.find_by_call_sid(params[:CallSid])
-        end
-      end
-  
-      def direction
-        if params[:Direction] == 'incoming'
-          eval(ExotelApi.inbound_query)
-        else
-          find_call
-        end
-      end
     end
   end
-end
+end

data/app/controllers/exotel_api/call_controller.rb

@@ -1,5 +1,5 @@
 module ExotelApi
-  class CallController < ApplicationController
+  class CallController < StartController
     skip_before_filter  :verify_authenticity_token
     #response - greeting,menu,connect
     def start
@@ -105,23 +105,23 @@ module ExotelApi
       end
       render :plain => applet, content_type: "text/html", status: 200
     end
-  
-  
-    private
-    def find_call
-      if params[:CustomField].present?
-        params[:CustomField].titleize.split.join.constantize::Call.find_by_call_sid(params[:CallSid])
-      else
-        Call.find_by_call_sid(params[:CallSid])
-      end
-    end
-  
-    def direction
-      if params[:Direction] == 'incoming'
-        eval(ExotelApi.inbound_query)
-      else
-        find_call
+    #response - status code 200,302
+    def repeat
+      begin
+        _call = direction
+        if _call.present?
+          answer = _call.play_again(params) if defined?(_call.play_again)
+          if answer == 'yes'
+            status = '200'
+          else
+            status = '302'
+          end
+        end
+      rescue => e
+        logger.error e.message
+        logger.error e.backtrace.join("\n")
       end
+      render :plain => '', content_type: "text/plain", :status => status
     end
   end
-end
+end

data/app/controllers/exotel_api/ivr/call_controller.rb

@@ -58,8 +58,6 @@ module ExotelApi
       begin
         _call = direction
         if _call.present?
-          _call.repeat += 1
-          _call.save
           status = _call.repeat_callback(params) if defined?(_call.repeat_callback)
         end
       rescue => e

data/app/controllers/exotel_api/start_controller.rb

@@ -0,0 +1,19 @@
+module ExotelApi
+  class StartController < ApplicationController
+    def direction
+      if params[:Direction] == 'incoming'
+        eval(ExotelApi.inbound_query)
+      else
+        find_call
+      end
+    end
+    private
+    def find_call
+      if params[:CustomField].present?
+        params[:CustomField].titleize.split.join.constantize::Call.find_by_call_sid(params[:CallSid])
+      else
+        eval(ExotelApi.status_callback_query)
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -9,7 +9,7 @@ Rails.application.routes.draw do
         post 'status'
       end
     end
-    
+
     namespace :call do
       get 'start'
       get 'greeting'
@@ -35,6 +35,7 @@ Rails.application.routes.draw do
           get 'status'
         end
       end
+      get 'repeat'
     end
   end
 end

data/lib/exotel_api/version.rb

@@ -1,3 +1,3 @@
 module ExotelApi
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exotel_api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Aashutosh Chaudhary
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - app/controllers/exotel_api/call/connect_controller.rb
 - app/controllers/exotel_api/call_controller.rb
 - app/controllers/exotel_api/ivr/call_controller.rb
+- app/controllers/exotel_api/start_controller.rb
 - bin/console
 - bin/setup
 - config/routes.rb