joy_ussd_engine 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 355763a76b480555d7caa41b14aa790feaab1b1808a58203f506ad35b79dac91
-  data.tar.gz: bca0bb09e1041f4e3d296cca2d09cc543d129f1a49667ca00c09357af6919455
+  metadata.gz: ade8de5e760c7b722295f11d76e842bbcec0c0fb8bebddf011be1ca90bf7be2f
+  data.tar.gz: a6b4b4ff1caa34b30612fe60dd8fbc4bef81f32e4493bf872f45ba75ee7c104d
 SHA512:
-  metadata.gz: 456e96399fca799748e6172df21f3be5de3b4b4d6c9e58fc81d1b37c750ea0b83f619ca8bd28228922619964f3d2db4ccd4d37a7e1daaf6e87c6578586683752
-  data.tar.gz: 0a7097d5093c16fb6e828161e4c494f6d4c8cb10c5c3015401fadf18a27621db7d61d50f399e736f26ec91f83aa597c21f9d6aaf345e6e48282ba250acf0ea34
+  metadata.gz: b3c507ae3094f6da68393f5fa99bf0e32db83eb1c38926702a89a284378eae506629decdc9cdd50fe06a22bf9b91e7d968d4392cc20b311fe7fa60cfcb827111
+  data.tar.gz: 865bade511b0a484f4da15eb98b2076d9bcfdae40327b18c13ea183a0d4f70b4da7066e2424d154fb1c1a6ac660a2f3cb9840a975ba5cdc26e83ab2868a804c2

data/Gemfile.lock

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

data/README.md

@@ -89,7 +89,7 @@ class MyController < ApplicationController
   skip_before_action :verify_authenticity_token
 
   def create
-    joy_ussd_engine = JoyUssdEngine::Core.new(ussd_params, Ussd::Transformers::HubtelTransformer, start_point: Ussd::Menus::StartMenu, end_point: Ussd::Menus::EndMenu)
+    joy_ussd_engine = JoyUssdEngine::Core.new(ussd_params, JoyUssdEngine::HubtelTransformer, start_point: Ussd::Menus::StartMenu, end_point: Ussd::Menus::EndMenu)
     response = joy_ussd_engine.process
     render json: response, status: :created
   end
@@ -146,7 +146,8 @@ class Ussd::Transformers::HubtelTransformer < JoyUssdEngine::DataTransformer
             session_id: params[:Mobile],
             message: params[:Message],
             ClientState: params[:ClientState],
-            Type: params[:Type]
+            Type: params[:Type],
+            data: params
         }
     end
 

data/lib/generators/joy_menu/templates/joy_menu_template.template

@@ -1,7 +1,4 @@
 class Ussd::Menus::<%= menu_name.camelcase %>Menu < JoyUssdEngine::Menu
-    def on_validate
-        # User input validation
-    end
 
     def before_render
         # Implement before call backs
@@ -9,9 +6,20 @@ class Ussd::Menus::<%= menu_name.camelcase %>Menu < JoyUssdEngine::Menu
         @menu_text = "Welcome to the <%= menu_name.camelcase %> menu"
     end
 
+    def on_validate
+        # User input validation
+        # if @context.get_state[:<%= menu_name.underscore %>] == "Hello"
+        #   @field_error = true
+        #   @error_text = "Sorry! Make sure you entered `Hello`."
+        # end
+    end
+
     def on_error
-        # Render error 
+        # Render error and wait for new user input
         # @menu_text = "#{@error_text}\n#{@menu_text }"
+
+        # OR Render Error and Terminate App Session
+        # return raise_error(@error_text) 
     end
 
     def after_render

data/lib/generators/joy_paginate_menu/templates/joy_paginate_menu_template.template

@@ -1,40 +1,48 @@
 class Ussd::Menus::<%= paginating_menu_name.camelcase %>Menu < JoyUssdEngine::PaginateMenu
-    def on_validate
-        # User input validation
-    end
 
     def before_render
         # Implement before call backs
         @field_name="<%= paginating_menu_name.underscore %>"
 
-    # Store paginating items in @paginating_items array variable 
-    # @paginating_items = [
-    #   {title: "Data Structures", item: {id: 1}},
-    #   {title: "Excel Programming", item: {id: 2}},
-    #   {title: "Economics", item: {id: 3}},
-    #   {title: "Big Bang", item: {id: 4}},
-    #   {title: "Democracy Building", item: {id: 5}},
-    #   {title: "Python for Data Scientist", item: {id: 6}},
-    #   {title: "Money Mind", item: {id: 7}},
-    #   {title: "Design Patterns In C#", item: {id: 8}}
-    # ]
-
-    # Call the paginate method and store the return value in paginated_list 
-    # paginated_list = paginate
-
-    # Use the show menu method to get the paginated list items and return them as text and store in @menu_text
-    # @menu_text = show_menu(paginated_list, title: "Welcome to the <%= paginating_menu_name.camelcase %> menu", key: 'title')
-
-    # Get the selected item from the user with the `get_selected_item` method and save in state with @context.set_state
-    # if has_selected?
-    #   selected_book = get_selected_item
-    #   @context.set_state(selected_book: selected_book)
-    # end
+        # Store paginating items in @paginating_items array variable 
+        # @paginating_items = [
+        #   {title: "Data Structures", item: {id: 1}},
+        #   {title: "Excel Programming", item: {id: 2}},
+        #   {title: "Economics", item: {id: 3}},
+        #   {title: "Big Bang", item: {id: 4}},
+        #   {title: "Democracy Building", item: {id: 5}},
+        #   {title: "Python for Data Scientist", item: {id: 6}},
+        #   {title: "Money Mind", item: {id: 7}},
+        #   {title: "Design Patterns In C#", item: {id: 8}}
+        # ]
+
+        # Call the paginate method and store the return value in paginated_list 
+        # paginated_list = paginate
+
+        # Use the show menu method to get the paginated list items and return them as text and store in @menu_text
+        # @menu_text = show_menu(paginated_list, title: "Welcome to the <%= paginating_menu_name.camelcase %> menu", key: 'title')
+
+        # Get the selected item from the user with the `get_selected_item` method and save in state with @context.set_state
+        # if has_selected?
+        #   selected_book = get_selected_item
+        #   @context.set_state(selected_book: selected_book)
+        # end
+    end
+
+    def on_validate
+        # User input validation
+        # if @context.get_state[:<%= menu_name.underscore %>] == "Hello"
+        #   @field_error = true
+        #   @error_text = "Sorry! Make sure you entered `Hello`."
+        # end
     end
 
     def on_error
-        # Render error 
+        # Render error and wait for new user input
         # @menu_text = "#{@error_text}\n#{@menu_text }"
+
+        # OR Render Error and Terminate App Session
+        # return raise_error(@error_text) 
     end
 
     def after_render

data/lib/generators/joy_route_menu/templates/joy_route_menu_template.template

@@ -1,11 +1,7 @@
 class Ussd::Menus::<%= menu_name.camelcase %>Menu < JoyUssdEngine::Menu
-    def on_validate
-        # User input validation
-    end
-
     def before_render
         # Implement before call backs
-        # @field_name="<%= menu_name.underscore %>"
+        @field_name="<%= menu_name.underscore %>"
 
         # title = "Welcome to the <%= menu_name.camelcase %> menu"
 
@@ -20,9 +16,20 @@ class Ussd::Menus::<%= menu_name.camelcase %>Menu < JoyUssdEngine::Menu
         # @menu_text = show_menu(title)
     end
 
+    def on_validate
+        # User input validation
+        # if @context.get_state[:<%= menu_name.underscore %>] == "Hello"
+        #   @field_error = true
+        #   @error_text = "Sorry! Make sure you entered `Hello`."
+        # end
+    end
+
     def on_error
-        # Render error 
+        # Render error and wait for new user input
         # @menu_text = "#{@error_text}\n#{@menu_text }"
+
+        # OR Render Error and Terminate App Session
+        # return raise_error(@error_text) 
     end
 
     def after_render

data/lib/joy_ussd_engine/menu.rb

@@ -105,6 +105,8 @@ module JoyUssdEngine
             return if @skip_save
             data = @context.get_state
             @previous_client_state = @current_client_state
+            return if data[:"#{@field_name}"].present?
+            return @context.set_state({ClientState: state, PrevClientState: @previous_client_state}) if @field_name.blank?
             # @context.set_state({"#{data[:field]}".to_sym => @context.params[:message]}) unless data[:field].blank?
             @context.set_state({ClientState: state, PrevClientState: @previous_client_state , field: @field_name, field_error: @field_error, error_text: @error_text})
         end
@@ -112,9 +114,26 @@ module JoyUssdEngine
         def save_field_value
             data = get_previous_state
             return if @skip_save
+            return if data[:"#{data[:field]}"].present?
             @context.set_state({"#{data[:field]}".to_sym => @context.params[:message]}) unless data[:field].blank?
         end
 
+        # def save_state_load_menu(state)
+        #     return if @skip_save
+        #     data = @context.get_state
+        #     @previous_client_state = @current_client_state
+        #     # @context.set_state({"#{data[:field]}".to_sym => @context.params[:message]}) unless data[:field].blank?
+        #     return if data[:"#{@field_name}"].present?
+        #     @context.set_state({ClientState: state, PrevClientState: @previous_client_state , field: @field_name, field_error: @field_error, error_text: @error_text})
+        # end
+
+        # def save_field_value_load_menu
+        #     data = get_previous_state
+        #     return if @skip_save
+        #     return if data[:"#{data[:field]}"].present?
+        #     @context.set_state({"#{data[:field]}".to_sym => @context.params[:message]}) unless data[:field].blank?
+        # end
+
         def get_previous_state
             data = @context.get_state
             @previous_client_state = data[:PrevClientState]
@@ -148,10 +167,16 @@ module JoyUssdEngine
             joy_release(@error_text)
         end
 
+        def remove_error_field
+            data = @context.get_state
+            @context.set_state({"#{@field_name}".to_sym => nil})
+        end
+
         def render_field_error
             before_show_menu
             before_render
             on_error
+            remove_error_field
             return render_menu_error[:data] if menu_error
             response = render
             response = response.blank? ? joy_response(current_client_state) : response
@@ -184,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
@@ -201,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/version.rb

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

metadata

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