joy_ussd_engine 0.1.9 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ade8de5e760c7b722295f11d76e842bbcec0c0fb8bebddf011be1ca90bf7be2f
-  data.tar.gz: a6b4b4ff1caa34b30612fe60dd8fbc4bef81f32e4493bf872f45ba75ee7c104d
+  metadata.gz: 3cf6a8217108c8642a72b12ed5a375785551c3e48820f1f0013a4e4ebf7dd0a7
+  data.tar.gz: b72121272082de46a31fa8c7238a121f73999d6dede1a2f1f26cdbe2e9b8b700
 SHA512:
-  metadata.gz: b3c507ae3094f6da68393f5fa99bf0e32db83eb1c38926702a89a284378eae506629decdc9cdd50fe06a22bf9b91e7d968d4392cc20b311fe7fa60cfcb827111
-  data.tar.gz: 865bade511b0a484f4da15eb98b2076d9bcfdae40327b18c13ea183a0d4f70b4da7066e2424d154fb1c1a6ac660a2f3cb9840a975ba5cdc26e83ab2868a804c2
+  metadata.gz: 53485cbbf16a64e24f7800a75f0475b071da09fcc370ea88a34c4401042578dcd21f776de9772f61d69696d598c8c6889306897b2ce5ca4493573e093795e3d0
+  data.tar.gz: 44b1ea2fa623bbedc93befe4ddd3fcab62caa8500e17c7189ca228f933f7651c8b8ca5331905ebb15c89abb2c868f6f6eaf7ea12a065a9fdceb7170fcdbcb05a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joy_ussd_engine (0.1.9)
+    joy_ussd_engine (0.1.12)
       will_paginate (~> 3.3.0)
 
 GEM

data/lib/joy_ussd_engine/hubtel_transformer.rb

@@ -13,6 +13,10 @@ module JoyUssdEngine
             }
         end
 
+        def app_initiator(params)
+            params[:Type] == 'Initiation'
+        end
+
         def app_terminator(params)
             params[:Type] == 'Release' || (params[:Type] != "Initiation" && @context.get_state.blank?)
         end

data/lib/joy_ussd_engine/session_manager.rb

@@ -1,41 +1,41 @@
 # frozen_string_literal: true
 
 module JoyUssdEngine::SessionManager
-    def expire_mins
-      @selected_provider.expiration.blank? ? 60.seconds : @selected_provider.expiration
-    end
-  
-    def user_mobile_number
-      @user_mobile_number ||= get_state[:"session_id"]
-    end
-  
-    # Retrive Session Data
-    def get_state
-      session_id = params["session_id"]
-      REDIS.with do |conn|
-        data = conn.get(session_id)
-        return {} if data.blank?
-        JSON.parse(data, symbolize_names: true)
-      end
+  def expire_mins
+    @selected_provider.expiration.blank? ? 60.seconds : @selected_provider.expiration
+  end
+
+  def user_mobile_number
+    @user_mobile_number ||= get_state[:"#{@params[:session_id]}"]
+  end
+
+  # Retrive Session Data
+  def get_state
+    session_id = @params[:session_id]
+    REDIS.with do |conn|
+      data = conn.get(session_id)
+      return {} if data.blank?
+      JSON.parse(data, symbolize_names: true)
     end
-  
-    # Store USSD sessions in Redis with Expiry
-    def set_state(payload = {})
-      session_id = params["session_id"]
-      current_data = get_state
-      REDIS.with do |conn|
-        payload = current_data.merge(params.merge(payload))
-        conn.set(session_id, payload.to_json)
-        conn.expire(session_id, expire_mins)
-      end
+  end
+
+  # Store USSD sessions in Redis with Expiry
+  def set_state(payload = {})
+    session_id = @params[:session_id]
+    current_data = get_state
+    REDIS.with do |conn|
+      payload = current_data.merge(params.merge(payload))
+      conn.set(session_id, payload.to_json)
+      conn.expire(session_id, expire_mins)
     end
-  
-    # Delete Session payload
-    def reset_state
-      session_id = params["session_id"]
-      REDIS.with do |conn|
-        conn.del(session_id)
-      end
+  end
+
+  # Delete Session payload
+  def reset_state
+    session_id = @params[:session_id]
+    REDIS.with do |conn|
+      conn.del(session_id)
     end
   end
+end
   

data/lib/joy_ussd_engine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JoyUssdEngine
-  VERSION = "0.1.9"
+  VERSION = "0.1.12"
 end

data/lib/joy_ussd_engine.rb

@@ -29,7 +29,7 @@ module JoyUssdEngine
             # If a particular provider returns some sort of response that can terminate the app we do that check here
             return @current_menu = end_point.to_s if @selected_provider.send("app_terminator", params) || @data[:ClientState] == 'EndJoyUssdEngine'
             
-            @current_menu = @data[:ClientState].blank? ? start_point.to_s : @data[:ClientState]
+            @current_menu = @data[:ClientState].blank? || @selected_provider.send("app_initiator", params) ? start_point.to_s : @data[:ClientState]
         end
 
         def load_menu(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joy_ussd_engine
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.12
 platform: ruby
 authors:
 - Caleb Mantey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -99,8 +99,8 @@ files:
 - lib/joy_ussd_engine/paginate_menu.rb
 - lib/joy_ussd_engine/session_manager.rb
 - lib/joy_ussd_engine/version.rb
-- pkg/joy_ussd_engine-0.1.8.gem
-- pkg/joy_ussd_engine-0.1.9.gem
+- pkg/joy_ussd_engine-0.1.11.gem
+- pkg/joy_ussd_engine-0.1.12.gem
 - spec/joy_ussd_engine_spec.rb
 - spec/joy_ussd_engine_transformer.spec
 - spec/spec_helper.rb