sipfsm 0.2.0 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f144d93f509d24a49a95d3cff6f70e12196af6f2
+  data.tar.gz: be57d6f58d3508fc5f92a5abec50b46292e9cdcc
+SHA512:
+  metadata.gz: 30fb284b3536325a2ec85417069d8c414d89d052daeac0533c8f30976b87069665bdf240968984cba66d27cb7bfa8b6702815ac5264b6c44cd7ca61e3167166e
+  data.tar.gz: ea144ebd378bfb6e2d239d6c36b0d03146afb98f1bb7c77384ceb6f20601b0d72f0cf8405a1a0c8195458fa51c9de555eae1cca5a151bd05efdceb4c4a5bd58a

data/lib/sipfsm.rb

@@ -22,14 +22,15 @@ module SipFSMModule
 
     # Standard SIP servlet request dispatching
     # is overriden and modified to call the DSL event methods.
+    # However, if fsm not defined or fsm does not respond to the given SIP request, standard dispatching still works.
     def doRequest(request)
       m = request.get_method
       fsmm = "sip#{m}".to_sym
-      run if !fsm_prepare_state([request, nil])
+      st = run(request)
 
-      if fsm_state_responds_to? @state, fsmm 
+      if fsm_state_responds_to? st, fsmm 
         send(fsmm, request, nil)
-      elsif fsm_state_responds_to? @state, :sipREQUEST_ANY
+      elsif fsm_state_responds_to? st, :sipREQUEST_ANY
         send(:sipREQUEST_ANY, request, nil)
       else
         super 
@@ -40,18 +41,18 @@ module SipFSMModule
     # is overriden and modified to call the DSL event methods.
     def doResponse(response)
       m = response.get_status.to_s
-      run if ! fsm_prepare_state([nil, response])
+      st = run(response)
 
       resp_exact = "sipRESPONSE_#{m}".to_sym
       resp_group = "sipRESPONSE_#{m[/./].to_s}xx".to_sym
 
-      if fsm_state_responds_to? @state, resp_exact 
+      if fsm_state_responds_to? st, resp_exact 
         send(resp_exact, nil, response)
 
-      elsif fsm_state_responds_to? @state, resp_group 
+      elsif fsm_state_responds_to? st, resp_group 
         send(resp_group, nil, response)
 
-      elsif fsm_state_responds_to? @state, :sipRESPONSE_ANY
+      elsif fsm_state_responds_to? st, :sipRESPONSE_ANY
         send(:sipRESPONSE_ANY, nil, response)
 
       else
@@ -59,6 +60,7 @@ module SipFSMModule
       end
     end
 
+    # CLASS methods ------------------------------------------------------
     # creates and returns INVITE request
     def self.create_request(app_session, method, from, to)
       sip_factory = $servlet_context.get_attribute('javax.servlet.sip.SipFactory')
@@ -109,28 +111,25 @@ module SipFSMModule
       FSM_STATE_ATTR
     end
 
-    def prepare_state_by_req msg
-      fsm_prepare_state [msg, nil]
-    end
-
     private
     ##### Overriden methods (for FSM) ###########################
 
     # Loading and saving application FSM state from application attribute
-    def fsm_prepare_state msgs
-      m = msgs[0] || msgs[1]
-
-      @sip_session = m.get_session
-      @app_session = m.get_application_session
-      s = @app_session.get_attribute(FSM_STATE_ATTR)
-      @state = s if s
-      s
+
+    def current_state *sip_msg
+      sip_msg.flatten!
+      m = sip_msg[0] || sip_msg[1]
+      application_session(m).get_attribute(FSM_STATE_ATTR)
     end
 
+    def set_current_state st, *sip_msg
+      application_session(sip_msg).set_attribute(FSM_STATE_ATTR, st)
+    end
 
-    def fsm_save_state request
-      @app_session.set_attribute(FSM_STATE_ATTR, @state)
-      @state
+    def application_session *sip_msg
+      sip_msg.flatten!
+      m = sip_msg[0] || sip_msg[1]
+      m.get_application_session
     end
 
     ####### Helper methods ###############
@@ -144,7 +143,7 @@ module SipFSMModule
     def method_missing(name, args)
       if name.to_s =~ /send_response_(.*)/
         args[0].create_response($1.to_i).send
-      elsif name.to_s =~ /is_(.*)_request?/
+      elsif name.to_s =~ /is_(.*)\?/
         args[0].get_method == $1
       else
         super
@@ -167,12 +166,7 @@ module SipFSMModule
 
     # creates URI java object using SipFactory
     def create_uri(str_uri)
-      if @sip_session
-        sipURI = @sip_session.get_servlet_context.get_attribute('javax.servlet.sip.SipFactory').create_uri('sip:' + str_uri)
-        sipURI
-      else
-        nil
-      end
+        sip_factory.create_uri('sip:' + str_uri)
     end
 
     def get_from_user_address_port(msg)
@@ -221,7 +215,7 @@ module SipFSMModule
 
     def is_UNREGISTER?(args)
       request = args[0]
-      return false unless is_REGISTER_request?(args)
+      return false unless is_REGISTER?(args)
 
       exp = request.get_header('Expires')
       if !exp

metadata

@@ -1,34 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: sipfsm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease:
+  version: 0.2.3
 platform: ruby
 authors:
 - Edin Pjanic
 - Amer Hasanovic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplefsm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    none: false
+        version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: jrubycipango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    none: false
-  prerelease: false
+        version: 0.2.11
   type: :runtime
-description: SIP application development in Ruby using SimpleFSM, a simple and lightweight domain specific language (DSL).
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.11
+description: SIP application development in Ruby using SimpleFSM, a simple and lightweight
+  domain specific language (DSL).
 email:
 - edin@ictlab.com.ba
 - amer@ictlab.com.ba
@@ -39,7 +51,8 @@ files:
 - lib/sipfsm.rb
 homepage: http://github.com/edictlab/SipFSM
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -47,20 +60,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
+specification_version: 4
 summary: SipFSM - SIP application development in Ruby
 test_files: []