RubyGems - avaya - Versions diffs - 0.0.3 → 0.0.4 - Mend

avaya 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89dd622f3f777a6471b03bb18ec315e01a645814
-  data.tar.gz: 632b4719fe77e52d99e599305fcf23df4031eb0d
+  metadata.gz: 082bb6b5a31180c9f3e830d88c030345128d6b7d
+  data.tar.gz: 4f3eec6f3fc9dbf8b70fee594c6b1abd4b8bc798
 SHA512:
-  metadata.gz: a81ef409cd60c01a8cea2a4ca21991a0ff702713748d5e7269ffd8e9dabaf81eba28da4fa441324cabf23b88ec93fbc51d8567b5bb1e8b211fbf0903b37873f3
-  data.tar.gz: 9c24025f1046626d511b95020ab463d142e746a385acc133335dbcd7898c2f7ff2c70b2c99931973ccf7baab94fb5caca14962d308e8a8687f15e783835fec96
+  metadata.gz: a2d7386171698b8034e85562a9df3ab2e6be0d850b483d3a1dd028565b80da6c81ef70f3a63a2baa255adb96c2daaab2bafa7db55ba1b91cfc19dc07ec7513b0
+  data.tar.gz: a9623e7c9b17631df471dd628ee5e5a111f449de8fc1a9246a50db62fc5875fa6f1f7266fcc8ef79c3943e5c77d8f0ec32b0bd652c552ff2c01e72858bc86b11

data/README.md CHANGED Viewed

@@ -1,4 +1,5 @@
 # Avaya Ip Office integration
+[![Gem Version](https://badge.fury.io/rb/avaya.svg)](http://badge.fury.io/rb/avaya)
 This gem gives limted read only integration from your IPOFFICE (only tested on ip office 500v2)
@@ -6,6 +7,10 @@ This gem gives limted read only integration from your IPOFFICE (only tested on i
 Add this line to your application's Gemfile:
+    gem 'avaya'
+    or bleeding edge
     gem 'avaya' , :git => 'git://github.com/freibuis/Avaya-IP-Office.git' ,branch: master
 And then execute:
@@ -23,7 +28,7 @@ For rails support just run the following command. This will create the initializ
 ## Usage
 1st create the connection
-   $ Avaya::Configuration.config  {|config| config.host = "ip_office_server_ipaddress"}
+   $ Avaya::Configuration.host = "ip_office_server_ipaddress"
 Once you have set up the connection. you can use the helpers to get data out
@@ -53,7 +58,7 @@ an array of :name,:ext,:queue,:voice_mails,:hunt_id is returned
 ## Todo:
-Currently CallList not working as I need to reverse engineer the values from the phone platform
+Currently user_info not working as I need to reverse engineer the values from the phone platform
 ## Contributing

data/avaya.gemspec CHANGED Viewed

@@ -20,5 +20,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 0"
-  spec.add_development_dependency "net-tftp", ">= 0.1.0"
+  spec.add_development_dependency "net-tftp", "~> 0.1.0"
 end

data/lib/avaya/call_list.rb CHANGED Viewed

@@ -1,39 +1,45 @@
 module Avaya
   class CallList
-    attr_reader :all_calls, :name, :ras, :pots, :sip, :q93
+    attr_reader :raw,
+                :name,
+                :ras,
+                :pots,
+                :sip,
+                :q93,
+                :calls
     def initialize
-      @ras       = []
-      @pots      = []
-      @sip       = []
-      @q93       = []
-      @all_calls = Avaya::TFTP.read(:call_list)
+      @ras   = []
+      @pots  = []
+      @sip   = []
+      @q93   = []
+      @calls = []
+      @raw   = Avaya::TFTP.read(:call_list)
     end
     def self.get
       call_list = self.new
       call_list.get
+      call_list
     end
     def get
       #items = @all_calls.collect { |row| row.gsub(/Line /, 'Line_').split(' ') }
-      @all_calls.each do |call|
-        case call
-          when call.starts_with? "NAME:"
-            @name = call.gsub!("NAME: ", '').gsub!('"', '')
-          when call.starts_with? "RAS:"
-            ras_line(call)
-          when call.starts_with? "SIPLine:"
-            sip_line(call)
-          when call.starts_with? "Q93Line:"
-            q93_line(call)
-          when call.starts_with? "CALL:"
-            call_line(call)
+      @raw.each do |call|
+        if call.start_with?("NAME: ")
+          @name = call.gsub!('NAME: ', '').gsub!('"', '')
+        elsif call.start_with? "RAS:"
+          ras_line(call)
+        elsif call.start_with? "SIPLine:"
+          sip_line(call)
+        elsif call.start_with? "Q931Line:"
+          q93_line(call)
+        elsif call.start_with? "CALL:"
+          call_line(call)
         end
       end
@@ -41,46 +47,52 @@ module Avaya
     end
     def ras_line(line)
-      line    = line.split(' ')
       ras_det = {
-          id:    line[0].gsub!(/NAME: /, ''),
-          count: line[0].gsub!(/Chans=/, '')
+          id:    line.match(/^RAS: [0-9]*/).to_s.gsub!(/RAS: /, ''),
+          count: line.match(/Chans=[0-9]*/).to_s.gsub!(/Chans=/, '')
       }
-      @ras.merge! ras_det
+      @ras << ras_det
     end
     def sip_line(line)
-      line     = line.split(' ')
       pots_det = {
-          id:    line[0].gsub!(/POTS: /, ''),
-          count: line[1].gsub!(/Chans=/, ''),
-          used:  line[2].gsub!(/Used=/, ''),
+          id:    line.match(/^SIPLine: [0-9]*/).to_s.gsub!(/SIPLine: /, ''),
+          count: line.match(/Chans=[0-9]*/).to_s.gsub!(/Chans=/, ''),
+          used:  line.match(/Used=[0-9]*/).to_s.gsub!(/Used=/, ''),
       }
-      @pots.merge! pots_det
+      @pots << pots_det
     end
     def q93_line(line)
-      line    = line.split.gsub(/Q931 PRI TE Version /, 'Q931_PRI_TE_Version_').split(' ')
       q93_det = {
-          id:      line[0].gsub!(/NAME: /, ''),
-          count:   line[1].gsub!(/Chans=/, ''),
-          used:    line[2].gsub!(/Used=/, ''),
-          version: line[4].gsub!(/Version=/, '').gsub!('_', ' ')
+          id:      line.match(/^Q931Line: [0-9]*/).to_s.gsub!(/Q931Line: /, ''),
+          count:   line.match(/Chans=[0-9]*/).to_s.gsub!(/Chans=/, ''),
+          used:    line.match(/Used=[0-9]*/).to_s.gsub!(/Used=/, ''),
+          version: line.match(/Version=.*/).to_s.gsub!(/Version=/, '')
       }
-      @q93.merge! q93_det
+      @q93 << q93_det
     end
     def call_line(line)
-      line     = line.gsub(/Line /, 'Line_').split(' ')
-      call_det = {
+      puts line
+      call_det= {
+          call_id:     line.match(/^CALL: [0-9.]*/).to_s.gsub!(/CALL: /, ''),
+          state:       line.match(/ State=[0-9]*/).to_s.gsub!(/ State=/, ''),
+          cut:         line.match(/Cut=[0-9]*/).to_s.gsub!(/Cut=/, ''),
+          music:       line.match(/Music=[0-9.]*/).to_s.gsub!(/Music=/, ''),
+          a_end:       line.match(/Aend=[a-zA-Z0-9"()]*\s[()0-9.]*/).to_s.gsub!(/Aend=/, ''),
+          b_end:       line.match(/Bend=[a-zA-Z0-9"()]*\s[\[\]a-zA-Z0-9()]*\s[0-9().]*/).to_s.gsub!(/Bend=/, ''),
+          called_num:  line.match(/CalledNum=[0-9]*\s[()a-zA-Z0-9]*/).to_s.gsub!(/CalledNum=/, ''),
+          calling_num: line.match(/CallingNum=[0-9]*\s[()a-zA-Z0-9]*/).to_s.gsub!(/CallingNum=/, ''),
+          internal:    line.match(/Internal=[0-9]*/).to_s.gsub!(/Internal=/, '').to_i,
+          time:        line.match(/Time=[0-9]*/).to_s.gsub!(/Time=/, '').to_i,
+          astate:      line.match(/AState=[0-9]*/).to_s.gsub!(/AState=/, '').to_i
       }
-    end
+      @calls << call_det
+    end
   end
 end

data/lib/avaya/user_info.rb CHANGED Viewed

@@ -9,7 +9,16 @@ module Avaya
                 :forward_unconditional_number,
                 :forward_unconditional_all_calls,
                 :forward_busy,
-                :dnd
+                :dnd,
+                :logged_in,
+                :connected_party,
+                :phone_state,
+                :absent_option,
+                :absent_extra_info,
+                :absent_enabled,
+                :ext_template,
+                :twinning_number,
+                :twinning_enabled
     def initialize(ext)
       @ext = ext
@@ -27,14 +36,23 @@ module Avaya
       @login_name                      = @user_info[0]
       @full_name                       = @user_info[1]
-      @ext                             = @user_info[2]
-      @forward_busy                    = @user_info[3] == "1" ? true : false
-      @forward_no_answer               = @user_info[4] == "1" ? true : false
-      @forward_unconditional           = @user_info[5] == "1" ? true : false
+      @ext                             = Integer(@user_info[2])
+      @forward_busy                    = @user_info[3] == "1"
+      @forward_no_answer               = @user_info[4] == "1"
+      @forward_unconditional           = @user_info[5] == "1"
       @forward_unconditional_number    = @user_info[6]
-      @dnd                             = @user_info[8] == "1" ? true : false
-      @forward_unconditional_all_calls = @user_info[25] == "1" ? true : false
-      @voicemail_count                 = @user_info[11]
+      @dnd                             = @user_info[8] == "1"
+      #Phone State "no" onhook ,"og" Out Going,"in" Incoming
+      @phone_state                     = @user_info[19]
+      @connected_party                 = @user_info[20]
+      @forward_unconditional_all_calls = @user_info[25] == "1"
+      @logged_in                       = @user_info[44] == "1"
+      @absent_option                   = Integer(@user_info[37])
+      @absent_extra_info               = @user_info[38]
+      @absent_enabled                  = @user_info[39] == "1"
+      @ext_template                    = @user_info[53]
+      @twinning_number                 = @user_info[67]
+      @twinning_enabled                = @user_info[68]== "1"
       self
     end

data/lib/avaya/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Avaya
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/avaya.rb CHANGED Viewed

@@ -11,7 +11,7 @@ require 'avaya/hunt_info'
 require 'avaya/user_list'
 require 'avaya/member_of'
 require 'avaya/user_info'
-#require 'avaya/call_list'
+require 'avaya/call_list'
 module Avaya

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avaya
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Freibuis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,14 @@ dependencies:
   name: net-tftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: If you are looking to talk to you Avaya Ip Office then this is the gem