kazoo-ruby-sdk 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 03b2d3ddd7d4f7ad73e7b26c8fb3066dc389ebdf
-  data.tar.gz: 92aa660f9f2196429b567ba6a64fac3b1f2ec5ff
+SHA256:
+  metadata.gz: 9ddd42a741be3478676af431df106f209a9cc20fd38c04aacdbf74c8c3ba34d1
+  data.tar.gz: 07d7239b07498bb8c48ea2513ffb77d6dc2ed71cd7d6540b5cc2b98ef7932bf2
 SHA512:
-  metadata.gz: add34d864fdec876a36676dfa9d7086a488cbcc74583dd277031595b5712146ae27b76908f3f2f9f32505656872afe0351cb159b0a23fea8c22b3b892177d859
-  data.tar.gz: 5170deb08ffb28c77bfa5c3e7bfd4467a3e8b8a5ebc0ad682d783b320ec7d4d4f0fa00e54dfdd89d980ae905f2f78c99599e9a17bc4b53947858e62da3061141
+  metadata.gz: 6bd8d8278371a48769bc374d79039b3bfb87a5b6daf9993ca89bec5b49f80766083d5a5a2bd81ce66386a1eb05e94b35d2ccc21030236068d930be51b448212d
+  data.tar.gz: 2297d0d4963346e639d77440434776a6c0fa57dce936f7d7dc6a052c3eb7547da6680639e34a4146bc521ec099f8a6e30532d202ea8bd2be2fad5abfe657d0fb

data/README.md

@@ -32,39 +32,58 @@ end
 
 ## Usage
 ```ruby
-devices = KazooRubySdk::Devices.list.data        
+devices = KazooRubySdk::Devices.new.list.data        
 device_id = devices[0].id    
 device = KazooRubySdk::Devices.get(device_id)
 ```
+
+By default each method of this SDK will be use the configuration from initializer. 
+Also you can explicitly specify a configuration before calling any method.
+
+```ruby
+configuration = {
+  auth_url: 'http://your_other_server.com:8000/v1',
+  realm: 'your-other-realm',
+  username: 'your-other-username',
+  password: 'your-other-password'
+}
+devices = KazooRubySdk::Devices.new(configuration).list.data        
+```
  
 ## List of methods
 
-#### Devices
+#### Callflows
 * list()
-* get(device_id)
-* get_statuses
+* get(id)
 * create(attributes)
 * update(id, attributes)
 * destroy(id)
 
-#### Users
+#### CDRs
+* range(from, to)
+* get(cdr_id)
+* get_all_by_user(user_id)
+
+#### Devices
 * list()
-* get(id)
+* get(device_id)
+* get_statuses
 * create(attributes)
 * update(id, attributes)
 * destroy(id)
 
-#### Callflows
+#### Phone Numbers
+* create(phone_number, data)
+* butch_create(phone_numbers)
+* destroy(phone_number)
+
+#### Users
 * list()
 * get(id)
 * create(attributes)
 * update(id, attributes)
 * destroy(id)
 
-#### CDRs
-* range(from, to)
-* get(cdr_id)
-* get_all_by_user(user_id)
 
 ## Contributing
 

data/lib/kazoo-ruby-sdk.rb

@@ -3,6 +3,7 @@ require 'faraday'
 require 'faraday_middleware'
 require 'kazoo-ruby-sdk/version'
 
+require 'kazoo-ruby-sdk/connection'
 require 'kazoo-ruby-sdk/base'
 require 'kazoo-ruby-sdk/callflows'
 require 'kazoo-ruby-sdk/cdrs'

data/lib/kazoo-ruby-sdk/base.rb

@@ -1,33 +1,26 @@
 module KazooRubySdk
   class Base
-    class << self
-      attr_accessor :auth_token, :api_url, :realm, :account_id, :owner_id, :pipe
-    end
-
-    private
-
-    def self.auth_token
-      KazooRubySdk::Session.auth_token
-    end
+    include KazooRubySdk::Connection
 
-    def self.api_url
-      KazooRubySdk::Session.api_url
+    def initialize(configuration = {})
+      @session = KazooRubySdk::Session.new(configuration)
+      @configuration = configuration
     end
 
-    def self.realm
-      KazooRubySdk::Session.realm
+    def auth_token
+      @session.auth_token
     end
 
-    def self.account_id
-      KazooRubySdk::Session.account_id
+    def account_id
+      @session.account_id
     end
 
-    def self.owner_id
-      KazooRubySdk::Session.owner_id
+    def owner_id
+      @session.owner_id
     end
 
-    def self.pipe
-      KazooRubySdk::Session.pipe
+    def pipe
+      pipeline(@configuration[:api_url])
     end
   end
 end

data/lib/kazoo-ruby-sdk/callflows.rb

@@ -1,42 +1,42 @@
 module KazooRubySdk
   class Callflows < Base
-    class << self
-      def create(attributes)
-        pipe.put do |request|
-          request.url "accounts/#{account_id}/callflows"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: attributes }
-        end.body
-      end
 
-      def update(callflow_id, attributes)
-        pipe.patch do |request|
-          request.url "accounts/#{account_id}/callflows/#{callflow_id}"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: attributes }
-        end.body
-      end
+    def create(attributes)
+      pipe.put do |request|
+        request.url "accounts/#{account_id}/callflows"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: attributes }
+      end.body
+    end
+
+    def update(callflow_id, attributes)
+      pipe.patch do |request|
+        request.url "accounts/#{account_id}/callflows/#{callflow_id}"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: attributes }
+      end.body
+    end
 
-      def list
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/callflows"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def list
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/callflows"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def get(callflow_id)
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/callflows/#{callflow_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def get(callflow_id)
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/callflows/#{callflow_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def destroy(callflow_id)
-        pipe.delete do |request|
-          request.url "accounts/#{account_id}/callflows/#{callflow_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def destroy(callflow_id)
+      pipe.delete do |request|
+        request.url "accounts/#{account_id}/callflows/#{callflow_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
     end
+
   end
 end

data/lib/kazoo-ruby-sdk/cdrs.rb

@@ -1,26 +1,26 @@
 module KazooRubySdk
   class CDRs < Base
-    class << self
-      def range(from, to)
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/cdrs?created_from=#{from}&created_to=#{to}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
 
-      def get(cdr_id)
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/cdrs/#{cdr_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def range(from, to)
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/cdrs?created_from=#{from}&created_to=#{to}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
+
+    def get(cdr_id)
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/cdrs/#{cdr_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def get_all_by_user(user_id)
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/users/#{user_id}/cdrs"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def get_all_by_user(user_id)
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/users/#{user_id}/cdrs"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
     end
+
   end
 end

data/lib/kazoo-ruby-sdk/connection.rb

@@ -0,0 +1,22 @@
+module KazooRubySdk
+  module Connection
+
+    def pipeline(api_url = nil)
+      api_url ||= KazooRubySdk.configuration.api_url
+      create_conn_object(api_url)
+    end
+
+    private
+
+    def create_conn_object(url)
+      Faraday.new(:url => url, ssl: { verify: false }) do |builder|
+        builder.use Faraday::Response::Mashify
+        builder.use Faraday::Response::ParseJson
+        builder.use Faraday::Response::RaiseError
+        builder.use FaradayMiddleware::EncodeJson
+        builder.use Faraday::Request::UrlEncoded
+        builder.adapter Faraday.default_adapter
+      end
+    end
+  end
+end

data/lib/kazoo-ruby-sdk/devices.rb

@@ -1,49 +1,49 @@
 module KazooRubySdk
   class Devices < Base
-    class << self
-      def list
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/devices"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
 
-      def get(device_id)
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/devices/#{device_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def list
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/devices"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def get_statuses
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/devices/status"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def get(device_id)
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/devices/#{device_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def create(attributes)
-        pipe.put do |request|
-          request.url "accounts/#{account_id}/devices"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: attributes }
-        end.body
-      end
+    def get_statuses
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/devices/status"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def update(device_id, attributes)
-        pipe.patch do |request|
-          request.url "accounts/#{account_id}/devices/#{device_id}"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: attributes }
-        end.body
-      end
+    def create(attributes)
+      pipe.put do |request|
+        request.url "accounts/#{account_id}/devices"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: attributes }
+      end.body
+    end
 
-      def destroy(device_id)
-        pipe.delete do |request|
-          request.url "accounts/#{account_id}/devices/#{device_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def update(device_id, attributes)
+      pipe.patch do |request|
+        request.url "accounts/#{account_id}/devices/#{device_id}"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: attributes }
+      end.body
     end
+
+    def destroy(device_id)
+      pipe.delete do |request|
+        request.url "accounts/#{account_id}/devices/#{device_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
+
   end
 end

data/lib/kazoo-ruby-sdk/phone_numbers.rb

@@ -1,39 +1,39 @@
 module KazooRubySdk
   class PhoneNumbers < Base
-    class << self
-      # Creates phone number in kazoo for specific account
-      # @param phone_number [String] the phone number
-      # @param data [Hash] number's data. see https://github.com/2600hz/kazoo/blob/master/applications/crossbar/doc/phone_numbers.md#schema
-      # @return [Hashie::Mash] response body
-      def create(phone_number, data = {})
-        pipe.put do |request|
-          request.url "accounts/#{account_id}/phone_numbers/#{phone_number}"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: data }
-        end.body
-      end
 
-      # Creates list of phone numbers in kazoo for specific account
-      # @param phone_number [Array] list of phone numbers
-      # @return [Hashie::Mash] response body
-      def butch_create(phone_numbers)
-        pipe.put do |request|
-          request.url "accounts/#{account_id}/phone_numbers/collection"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: {numbers: phone_numbers} }
-        end.body
-      end
+    # Creates phone number in kazoo for specific account
+    # @param phone_number [String] the phone number
+    # @param data [Hash] number's data. see https://github.com/2600hz/kazoo/blob/master/applications/crossbar/doc/phone_numbers.md#schema
+    # @return [Hashie::Mash] response body
+    def create(phone_number, data = {})
+      pipe.put do |request|
+        request.url "accounts/#{account_id}/phone_numbers/#{phone_number}"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: data }
+      end.body
+    end
+
+    # Creates list of phone numbers in kazoo for specific account
+    # @param phone_number [Array] list of phone numbers
+    # @return [Hashie::Mash] response body
+    def butch_create(phone_numbers)
+      pipe.put do |request|
+        request.url "accounts/#{account_id}/phone_numbers/collection"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: {numbers: phone_numbers} }
+      end.body
+    end
 
 
-      # Delete a specific phone number
-      # @param phone_number [Array] the phone number
-      # @return [Hashie::Mash] response body
-      def destroy(phone_numbers)
-        pipe.delete do |request|
-          request.url "accounts/#{account_id}/phone_numbers/#{phone_number}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    # Delete a specific phone number
+    # @param phone_number [Array] the phone number
+    # @return [Hashie::Mash] response body
+    def destroy(phone_number)
+      pipe.delete do |request|
+        request.url "accounts/#{account_id}/phone_numbers/#{phone_number}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
     end
+
   end
 end

data/lib/kazoo-ruby-sdk/session.rb

@@ -1,56 +1,42 @@
 module KazooRubySdk
   class Session
-    class << self
-      attr_writer :api_url, :realm, :account_id, :owner_id, :auth_token, :pipe
-    end
-
-    class << self
-      def api_url
-        KazooRubySdk.configuration.api_url
-      end
-
-      def realm
-        KazooRubySdk.configuration.realm
-      end
+    include KazooRubySdk::Connection
 
-      def account_id
-        auth_response.data.account_id
-      end
-
-      def owner_id
-        auth_response.data.owner_id
-      end
+    def initialize(configuration = {})
+      @api_url = configuration[:api_url]
+      @realm = configuration[:realm] || KazooRubySdk.configuration.realm
+      @username = configuration[:username] || KazooRubySdk.configuration.username
+      @password = configuration[:password] || KazooRubySdk.configuration.password
+    end
 
-      def auth_token
-        auth_response.auth_token
-      end
+    def account_id
+      auth_response.data.account_id
+    end
 
-      def pipe
-        create_conn_object(api_url)
-      end
+    def owner_id
+      auth_response.data.owner_id
+    end
 
-      def create_conn_object(url)
-        Faraday.new(:url => url, ssl: { verify: false }) do |builder|
-          builder.use Faraday::Response::Mashify
-          builder.use Faraday::Response::ParseJson
-          builder.use Faraday::Response::RaiseError
-          builder.use FaradayMiddleware::EncodeJson
-          builder.use Faraday::Request::UrlEncoded
-          builder.adapter Faraday.default_adapter
-        end
-      end
+    def auth_token
+      auth_response.auth_token
+    end
 
-      def auth_response
-        KazooRubySdk.cache.fetch('auth_response') do
-          req = {:data => {:credentials => get_credentials_hash, :realm => self.realm}, :verb => 'PUT'}
-          response = pipe.put 'user_auth', req
-          response.body
-        end
-      end
+    private
+
+    def auth_response
+      req = {
+              :data => {
+                :credentials => get_credentials_hash,
+                :realm => @realm
+              },
+              :verb => 'PUT'
+            }
+      response = pipeline(@api_url).put 'user_auth', req
+      response.body
+    end
 
-      def get_credentials_hash
-        Digest::MD5.hexdigest("#{KazooRubySdk.configuration.username}:#{KazooRubySdk.configuration.password}")
-      end
+    def get_credentials_hash
+      Digest::MD5.hexdigest("#{@username}:#{@password}")
     end
   end
 end

data/lib/kazoo-ruby-sdk/users.rb

@@ -1,42 +1,42 @@
 module KazooRubySdk
   class Users < Base
-    class << self
-      def create(attributes)
-        pipe.put do |request|
-          request.url "accounts/#{account_id}/users"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: attributes }
-        end.body
-      end
 
-      def update(user_id, attributes)
-        pipe.patch do |request|
-          request.url "accounts/#{account_id}/users/#{user_id}"
-          request.headers['X-Auth-Token'] = auth_token
-          request.body = { data: attributes }
-        end.body
-      end
+    def create(attributes)
+      pipe.put do |request|
+        request.url "accounts/#{account_id}/users"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: attributes }
+      end.body
+    end
+
+    def update(user_id, attributes)
+      pipe.patch do |request|
+        request.url "accounts/#{account_id}/users/#{user_id}"
+        request.headers['X-Auth-Token'] = auth_token
+        request.body = { data: attributes }
+      end.body
+    end
 
-      def list
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/users"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def list
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/users"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def get(user_id)
-        pipe.get do |request|
-          request.url "accounts/#{account_id}/users/#{user_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def get(user_id)
+      pipe.get do |request|
+        request.url "accounts/#{account_id}/users/#{user_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
+    end
 
-      def destroy(user_id)
-        pipe.delete do |request|
-          request.url "accounts/#{account_id}/users/#{user_id}"
-          request.headers['X-Auth-Token'] = auth_token
-        end.body
-      end
+    def destroy(user_id)
+      pipe.delete do |request|
+        request.url "accounts/#{account_id}/users/#{user_id}"
+        request.headers['X-Auth-Token'] = auth_token
+      end.body
     end
+
   end
 end

data/lib/kazoo-ruby-sdk/version.rb

@@ -1,3 +1,3 @@
 module KazooRubySdk
-  VERSION = "1.0.3"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kazoo-ruby-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - Aleksey Pohodnya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/kazoo-ruby-sdk/callflows.rb
 - lib/kazoo-ruby-sdk/cdrs.rb
 - lib/kazoo-ruby-sdk/configuration.rb
+- lib/kazoo-ruby-sdk/connection.rb
 - lib/kazoo-ruby-sdk/devices.rb
 - lib/kazoo-ruby-sdk/phone_numbers.rb
 - lib/kazoo-ruby-sdk/session.rb
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: SDK for Kazoo API