joy_ussd_engine 0.1.8 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be9eefb4a12df8afda79befef8e0e53798ebf2a013205f82ceff655e29a9a84e
-  data.tar.gz: 39d08095974931300dc44efb3f443936feb69687daa58c012b813594a32468a0
+  metadata.gz: fc56828dccd4668a5061b1c23faaf67963ed9953286d25ee8b229727b5f3f0e6
+  data.tar.gz: 227c2f217a2fe270dcb25e9bb3dc645051f6d878c41fd6f58c7c4002a913cf09
 SHA512:
-  metadata.gz: f287009e3b1933a18d0d8796d39f04e91b85b8bdca52385a40fc7d5596ebdc27953d5fb68561e8d535cbd1294e74bb292741c1df7b6be47f731db3b085f1e279
-  data.tar.gz: 1a5a8bfe5fc507d0235a358ab04b3dcba66178f81d35de3d7d50d6e3ebb056823c81ebbc682b1b65ff1bec7bd3de128b3060e9e03e00b9ad4e2b1b71f9be7d0b
+  metadata.gz: 1047ef6a5a1efe1b786448c3338817dd477603128088349a13a2bbb7642e0687a8d73a8dfb30f027d4e86ee98404bb2c442766cdbd3d2373686272c7f0c9e63a
+  data.tar.gz: 660a1a32faac859e44284e60f1112c3c3d95db2c6bb2de9e1affc5b2d35dc9e702324c687c3951d3a05fcaf05eef0269e45ea1ce95b3d86cae0d3e490b65a0db

data/Gemfile.lock

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

data/lib/joy_ussd_engine/menu.rb

@@ -209,12 +209,12 @@ module JoyUssdEngine
         def run
             save_field_value
             do_validation
-            before_show_menu
-            before_render
             return render_menu_error[:data] if @menu_error
             if allow_validation
                 return render_previous if @previous_menu.field_error
             end
+            before_show_menu
+            before_render
             response = render
             response = response.blank? ? joy_response(@current_client_state) : response
             after_render
@@ -226,12 +226,12 @@ module JoyUssdEngine
         def execute
             save_field_value
             do_validation
-            before_show_menu
-            before_render
             return render_menu_error[:data] if @menu_error
             if allow_validation
                 return render_previous if @previous_menu.field_error
             end
+            before_show_menu
+            before_render
             response = render
             response = response.blank? ? joy_response(@current_client_state) : response
             after_render

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.8"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joy_ussd_engine
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.11
 platform: ruby
 authors:
 - Caleb Mantey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -99,6 +99,7 @@ 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.11.gem
 - spec/joy_ussd_engine_spec.rb
 - spec/joy_ussd_engine_transformer.spec
 - spec/spec_helper.rb