RubyGems - obzvonilka-api - Versions diffs - 0.2.0 → 0.2.1 - Mend

obzvonilka-api 0.2.0 → 0.2.1

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 (5) hide show

checksums.yaml +7 -7
data/README.md +27 -13
data/lib/obzvonilka/api/version.rb +1 -1
data/lib/obzvonilka/asterisk/voice.rb +7 -3
metadata +78 -68

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
----
-SHA1:
-  data.tar.gz: 8284a8ebc49e5fd0c88c1d1350856504df53395d
-  metadata.gz: b149c8ca739fc96a1c9650f92a105f68fad27ae1
-SHA512:
-  data.tar.gz: deaf55baa40f828c8939d51d0f995e031ac682c159872b51910ba4e3b484286b27eaae8a239d60bc47871bf4e6a05c111d5bf952c76347f04037c37fe23d29cf
-  metadata.gz: e8beda307c4a1ccdad2fd743a8894cdb280e7587e7e30ae91b401421cdff5a85dbff1cc3d6666238eefd70363c8558f17e580ed5f646db27e06ba724ccdae0e4
+---
+SHA1:
+  metadata.gz: bbfb2e731974b70aaec46792fb8714e1a4a84379
+  data.tar.gz: 5bc0b3ae01340ddca87beae11f436c7b7800d169
+SHA512:
+  metadata.gz: a351f46761bffe71355a554f27da4dc340a9ded4785725de5b86add73207885d55699b1338b38a0d4300dfc0bf8aeaf4f28648caade20c3749242e92be5c411b
+  data.tar.gz: 84e25b89014de274e09ceac9f0ce4fbda02c65b1b0af508d4ff400ae2c9cfaec4f91477f2c866d5ca8c21cc5dc1606380b93b5777e43ce7e3673e90d26021440

data/README.md CHANGED Viewed

@@ -1,28 +1,42 @@
 # Obzvonilka::Api
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/obzvonilka/api`. To experiment with that code, run `bin/console` for an interactive prompt.
+Предназначен для интеграции сервиса Obzvonilka с другими системами (Asterisk и другие).
-TODO: Delete this and the text above, and describe your gem
+## Установка
-## Installation
+    $ gem install obzvonilka-api
-Add this line to your application's Gemfile:
+## Usage
-```ruby
-gem 'obzvonilka-api'
-```
+Для интеграции с Asterisk нужно выполнить команду:
-And then execute:
+    $ OBZVONILKA_API_KEY=1234567890 ruby -e "require 'rubygems'; require 'obzvonilka/api'; Obzvonilka::Asterisk::Voice.send_voices"
-    $ bundle
+Значение параметра OBZVONILKA_API_KEY получаете в настройках профила на вкладке "Организации".
-Or install it yourself as:
+Другие возможные параметры, задаваемые переменными окружения:
+|           Название           |         Описание                                  | Значение по умолчанию
+|------------------------------|---------------------------------------------------|--------------------------------------
+| ASTERISK_CDR_CSV_PATH        | Путь к файлу CDR.                                 | /var/log/asterisk/cdr-csv/Master.csv
+| ASTERISK_VOICE_FILES_DIR     | Путь к звуковым файлам.                           | /var/spool/asterisk/monitor
+| ASTERISK_VOICE_PATH_TEMPLATE | Шаблон для формирования имени звукового файла     | "#{FILES_PATH}/%Y/%m/%d/*-%ai.\*"
+| ASTERISK_CHECK_FILE_COUNT    | Количество старых CDR, обрабатываемых при запуске | 100
+| ASTERISK_DST_FIELD_NAME      | Имя поля, в котором хранится вызываемый номер (например, если реальный номер хранится в userfield |
+В шаблоне для формирования имени звукового файла (ASTERISK_VOICE_PATH_TEMPLATE) можно использовать следующие подстановки:
+* %ai - ID звонка в Asterisk
+* %as - src звонка
+* %ad - dst звонка
+* %Y, %m, %d, %H, %M, %S и другие стандартные параметры форматирования даты/времени
+Например, можно использовать шаблон для задания нестандартного имени звукового файла:
+    /records/mind/2xx/outgoing/%H-%M_%Y-%m-%d-*-%ad.wav
-    $ gem install obzvonilka-api
-## Usage
-TODO: Write usage instructions here
 ## Development

data/lib/obzvonilka/api/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Obzvonilka
   module Api
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/obzvonilka/asterisk/voice.rb CHANGED Viewed

@@ -15,10 +15,14 @@ module Obzvonilka
       # Amount of old file, then will be checked
       PREV_FILE_CNT = ENV['ASTERISK_CHECK_FILE_COUNT'] || 100
+      # DST field name from Master.csv. Use if real DST wroted in other field (i.e. userfield)
+      LOG_FIELD_DST = (ENV['ASTERISK_DST_FIELD_NAME'] || :dst).to_sym
       TAIL_COMMAND = "tail -n #{PREV_FILE_CNT} -F '#{LOGS_PATH}'"
       HEADINGS = [:accountcode, :src, :dst, :dcontet, :clid, :channel, :dstchannel, :lastapp, :lastdata,
-                  :start, :answer, :end, :duration, :billsec, :disposition, :amaflags, :astid]
+                  :start, :answer, :end, :duration, :billsec, :disposition, :amaflags, :astid, :userfield]
       def self.send_voices
         read_cdr_rows do |row|
@@ -31,7 +35,7 @@ module Obzvonilka
       end
       def self.send_voice(row, file_name)
-        Obzvonilka::Api::Voice.new.put_voice row[:dst], row[:start], row[:end], file_name, row[:astid]
+        Obzvonilka::Api::Voice.new.put_voice row[LOG_FIELD_DST], row[:start], row[:end], file_name, row[:astid]
       end
       def self.read_cdr_rows
@@ -74,7 +78,7 @@ module Obzvonilka
             when '%as'
               row[:src]
             when '%ad'
-              row[:dst]
+              row[LOG_FIELD_DST]
             else
               row_date(row).strftime(m)
           end

metadata CHANGED Viewed

@@ -1,81 +1,92 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: obzvonilka-api
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 0.2.1
 platform: ruby
-authors:
+authors:
 - ukolovda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-12-23 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2016-01-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
-    requirements:
-    - &id002
-      - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
-    requirements:
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
-  name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: "1.10"
+      - !ruby/object:Gem::Version
+        version: '1.10'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: "10.0"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency
-  name: minitest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement
-    requirements:
-    - *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency
-  name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement
-    requirements:
-    - *id002
-  type: :development
-  version_requirements: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Obzvonilka.ru API
-email:
+email:
 - udmitry@mail.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
-files:
+files:
 - .gitignore
 - .travis.yml
 - CODE_OF_CONDUCT.md
@@ -91,29 +102,28 @@ files:
 - lib/obzvonilka/asterisk/voice.rb
 - obzvonilka-api.gemspec
 homepage: https://github.com/ukolovda/abzvonilka-api
-licenses:
+licenses:
 - MIT
-metadata:
+metadata:
   allowed_push_host: https://rubygems.org
 post_install_message:
 rdoc_options: []
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - *id002
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.17
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Obzvonilka.ru API
 test_files: []