asterisk_mini_statement 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b9a567d9c511d2eb0980b65830e34d1976e383d
-  data.tar.gz: db23f88b30b410e41f03ecda7fc8fcec9dc677ad
+  metadata.gz: c13c22c873c5639258a9ebfcee0cc65e6fd81585
+  data.tar.gz: 52a662d74c97cc39a8801691c6732783446f2f39
 SHA512:
-  metadata.gz: 5e5edd4c9f2be60c2012be9d1b90305f975616bfd570291bb683fce02e385115126f9c9ba62cb8d1205d7471d8f280d7b8e812bbf6a1c60c97fc09c9eefcee3b
-  data.tar.gz: 35ed3be2c374225a4e741ee5e64265894cdf80051da099165b29ac9c92e3f6cdc14fcb7bd26026e9edcc624631cfb1c4d572f498d939c4db7f96b6213430fb4e
+  metadata.gz: 4a329cb3670bcb27686f64b15fbae1b74ad021bfc8d256443489a8f88e3a388a568430ef52bb303fa5cdd004b4dda72d4d7c3e2190790a2935135acd0271a4f3
+  data.tar.gz: 62459d67951f77f39d3dc8dad190f5c0ba7609a43a36efeced2de039d2ea705b8c26eff8484f671779591f1dbe722c86814e572b1b0b3cba0d2d05909508271d

data/lib/asterisk_mini_statement.rb

@@ -25,7 +25,7 @@ class AsteriskMiniStatement
   def initialize(cdr_file='/var/log/asterisk/cdr-csv/Master.csv', 
                   startdate: (Date.today - 8).strftime("%d-%b-%Y"),
                     enddate: (Date.today - 1).strftime("%d-%b-%Y"),
-                 telno: 'unknown', outgoing_regex: /SIP\/(\d+)@sipgate,30,tr/)
+                 telno: 'unknown', outgoing_regex: /SIP\/(\d+)@/)
 
     sdate = Date.parse startdate
     edate = Date.parse enddate
@@ -36,25 +36,24 @@ class AsteriskMiniStatement
            lastapp lastdata start answer end duration billsec disposition
                                                                amaflags astid)
 
-    a = s.lines.map {|line| Hash[headings.zip(CSV.parse(line).first)] }
+    lines = s.lines.map {|line| Hash[headings.zip(CSV.parse(line).first)] }
 
 
-    a2 = a.select do |x|
+    lines.select! do |x|
       date = Date.parse(x[:start])
       date >= sdate and date <= edate and \
           x[:disposition] == 'ANSWERED' and x[:lastapp] == 'Dial'
     end
 
-    a3 = a2.group_by {|x| Date.parse(x[:start]) }
+    days = lines.group_by {|x| Date.parse(x[:start]) }
 
     px = Polyrex.new('calls[telno, period]/day[date]/item[time, telno,' + 
                                                                    ' io, dur]')
-
+    px.summary.telno = telno    
     px.summary.period = "%s - %s" % [sdate.strftime("%d/%m/%Y"), 
                                      edate.strftime("%d/%m/%Y")]
-    px.summary.telno = telno
-
-    a3.each do |day, items|
+    
+    days.each do |day, items|
 
       px.create_day({date: day.strftime("%d-%b-%Y")}) do |create|
 
@@ -62,12 +61,9 @@ class AsteriskMiniStatement
 
           outgoing = x[:lastdata][outgoing_regex,1]
 
-          io, telno = if outgoing then
-            io = ['out', outgoing]
-          else
-            telno = ['in', x[:clid][/"([^"]+)/,1]]
-          end
-
+          io, telno = outgoing ? ['out', outgoing] : 
+                                        ['in', x[:clid][/"([^"]+)/,1]]
+          
           raw_a = Subunit.new(units={minutes:60, hours:60}, 
                                     seconds: x[:duration].to_i).to_a
 
@@ -76,8 +72,8 @@ class AsteriskMiniStatement
             val > 0 ? r << (val.to_s + label) : r
           end.take 2
 
-          time =  x[:start][/\d{2}:\d{2}/]
-          create.item(time: time, telno: telno, io: io, dur: a.join(' ') )
+          create.item(time: x[:start][/\d{2}:\d{2}/], telno: telno, 
+                      io: io, dur: a.join(' ') )
         end
 
       end
@@ -102,6 +98,7 @@ Date/time  Telephone    duration
 =========  ===========  ========"
 
     records = px.records.inject('') do |r, day|
+      
       date = Date.parse(day.date)
       r << "\n" + date.strftime("%A #{date.day.ordinalize} %B %Y") + "\n\n"
 
@@ -109,8 +106,7 @@ Date/time  Telephone    duration
 
         r2 << (x.io == 'in' ? '>' : '<')
         r2 << Time.parse(x.time).strftime(" %l:%M%P: ")
-        r2 << x.telno.ljust(13)
-        r2 << x.dur.rjust(8) + "\n"
+        r2 << x.telno.ljust(13) + x.dur.rjust(8) + "\n"
       end
 
       r << "\n" + '-' * 32 + "\n"
@@ -120,4 +116,4 @@ Date/time  Telephone    duration
 
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asterisk_mini_statement
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nvlgfc5b1kUBa0viP6I53DUsYpTa1sWNpVQoXGEIIgB46Gtx/+fY83adQ3SrThtn
   MbY57VwNAM4kow==
   -----END CERTIFICATE-----
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subunit