ussd_engine 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57122947aff50821a4a6ec61d38501ce9f525e516be998874590d6104bb1a754
-  data.tar.gz: 581faff4ae10681400a32c21cc72fc5b94525a8e0f7e7a4f1867b7916838238e
+  metadata.gz: d0fb2383f970ce505d57f02fcc5ccb2a186f2f91897f5352eaba61495342c6e7
+  data.tar.gz: 0ff16e29fc1f74924a656f9e1ded9a6b46b48f867bea55b3d9bca48d33b8e620
 SHA512:
-  metadata.gz: a8f7753521a5405026b20c78072c5009bdb952d79599ec735bd0fcd79d9ed6de96f61975a7c89310da9956ef43ea89055416e881e0214094d10b68e7037e75d2
-  data.tar.gz: 1b67596120f200d6a1f9f830f83052d4d444df48fb77a0719cf2b5fdfd6dae3dcae2e12c92f7043916831ec6013c0bbb91da1965d3d554760bb78044ada96012
+  metadata.gz: '0482d00e9a9add76c19817453b70b6d4df14d7f117e21d278ffa3919116d27ee67c5b288663aba2dd3b226e5ddc7cbac349522e8735505cc753b168cd30767e7'
+  data.tar.gz: 40cf67d5f8177a9137d61f7dab22857e61d6b6341df0bd813cbb756eb19b948313c610c65a998c2dcfff2301036a31dfd2c886ed3b246ee5f977c249825962bd

data/lib/ussd_engine/controller/forkable.rb

@@ -0,0 +1,48 @@
+module UssdEngine
+  module Controller
+    module Forkable
+      protected
+
+      def self.included(base)
+        base.stores :forkable_stack
+      end
+
+      def create_fork(source_screen, forked_screen, destination_screen, input = nil)
+        Config.logger&.debug "UssdEngine::Controller::Forkable :: Creating fork: #{source_screen} -> #{forked_screen} -> #{destination_screen}"
+
+        self.forkable_stack ||= []
+        self.forkable_stack.append({
+          source: source_screen,
+          fork: forked_screen,
+          destination: destination_screen,
+        })
+
+        display forked_screen, input
+      end
+
+      def refork(forked_screen, destination_screen, input = nil)
+        raise "You cannot refork outside of a fork" unless forkable_stack.size.positive?
+        Config.logger&.debug "UssdEngine::Controller::Forkable :: Creating refork:  #{forked_screen} -> #{destination_screen}"
+
+        create_fork :forkable_refork, forked_screen, destination_screen, input
+      end
+
+      def abort_fork(input = nil)
+        branch = self.forkable_stack.pop
+        while branch[:source].to_sym == :forkable_refork
+          branch = self.forkable_stack.pop
+        end
+        Config.logger&.debug "UssdEngine::Controller::Forkable :: Aborting fork: #{branch[:fork]} -> #{branch[:source]} #{self.forkable_stack}"
+        Config.logger&.debug "#{forkable_stack}"
+        display branch[:source], input
+      end
+
+      def join_fork(input = nil)
+        branch = self.forkable_stack.pop
+        Config.logger&.debug "UssdEngine::Controller::Forkable :: Joining fork: #{branch[:fork]} -> #{branch[:destination]}"
+        Config.logger&.debug "#{forkable_stack}"
+        display branch[:destination], input
+      end
+    end
+  end
+end

data/lib/ussd_engine/controller/mixin.rb

@@ -2,6 +2,7 @@ require "ussd_engine/controller/io"
 require "ussd_engine/controller/options"
 require "ussd_engine/controller/params"
 require "ussd_engine/controller/storable"
+require "ussd_engine/controller/forkable"
 
 module UssdEngine
   module Controller
@@ -12,6 +13,7 @@ module UssdEngine
 
       def self.included(base)
         base.send :include, UssdEngine::Controller::Storable
+        base.send :include, UssdEngine::Controller::Forkable
         base.send :skip_before_action, :verify_authenticity_token, only: :ussd_controller, raise: false
       end
 

data/lib/ussd_engine/controller/options.rb

@@ -17,10 +17,18 @@ module UssdEngine
       end
 
       def resolve_option(input, options)
-        return unless input.match? /^[1-9](\d)?$/
+        return unless input.to_s.match? /^[1-9](\d)?$/
 
         options.keys[input.to_i - 1]
       end
+
+      def back_option
+        { back: "Back" }
+      end
+
+      def cancel_option
+        { cancel: "Cancel" }
+      end
     end
   end
 end

data/lib/ussd_engine/controller/params.rb

@@ -7,24 +7,40 @@ module UssdEngine
       protected
 
       def ussd_request_id
+        return unless request.env["ussd_engine.request"].present?
+
         request.env["ussd_engine.request"][:id]
       end
 
       def ussd_request_type
+        return unless request.env["ussd_engine.request"].present?
+
         request.env["ussd_engine.request"][:type]
       end
 
       def ussd_request_msisdn
+        return unless request.env["ussd_engine.request"].present?
+
         request.env["ussd_engine.request"][:msisdn]
       end
 
       def ussd_request_provider
+        return unless request.env["ussd_engine.request"].present?
+
         request.env["ussd_engine.request"][:provider]
       end
 
       def ussd_user_input
+        return unless request.env["ussd_engine.request"].present?
+
         request.env["ussd_engine.request"][:input]
       end
+
+      def ussd_request_network
+        return unless request.env["ussd_engine.request"].present?
+
+        request.env["ussd_engine.request"][:network]
+      end
     end
   end
 end

data/lib/ussd_engine/middleware/nalo_processor.rb

@@ -19,6 +19,7 @@ module UssdEngine
               msisdn: Phonelib.parse(params["MSISDN"]).e164,
               type: params["MSGTYPE"] ? :initial : :response,
               input: params["USERDATA"].presence,
+              network: nil,
             }
           end
         end

data/lib/ussd_engine/middleware/nsano_processor.rb

@@ -20,6 +20,7 @@ module UssdEngine
               msisdn: Phonelib.parse(params["msisdn"]).e164,
               type: Config.cache&.read(request_id).present? ? :response : :initial,
               input: params["msg"].presence,
+              network: params["network"],
             }
           end
         end

data/lib/ussd_engine/version.rb

@@ -1,3 +1,3 @@
 module UssdEngine
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/ussd_engine/views/simulator.erb

@@ -162,6 +162,7 @@
 
     function reset(shouldRender) {
       state.isRunning = false
+      state.request_id = btoa(Math.random().toString()).substr(10, 10)
       state.provider = $provider.value
       state.endpoint = $endpoint.value
       state.msisdn = $msisdn.value
@@ -181,7 +182,7 @@
       switch (state.provider) {
         case "nalo":
           data = {
-            USERID: '12345678',
+            USERID: state.request_id,
             MSISDN: state.msisdn,
             USERDATA: $data.value,
             MSGTYPE: !state.isRunning,
@@ -192,7 +193,7 @@
             network: 'MTN',
             msisdn: state.msisdn,
             msg: $data.value,
-            UserSessionID: "12345",
+            UserSessionID: state.request_id,
           }
           break;
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ussd_engine
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,6 +84,7 @@ files:
 - bin/setup
 - lib/ussd_engine.rb
 - lib/ussd_engine/config.rb
+- lib/ussd_engine/controller/forkable.rb
 - lib/ussd_engine/controller/io.rb
 - lib/ussd_engine/controller/mixin.rb
 - lib/ussd_engine/controller/options.rb