bulutfon_sdk 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc774a5f4304eae19a555935f79b6034263a0b2
-  data.tar.gz: a99fa05066f254a9a08ebef93e5023a3725386c8
+  metadata.gz: 98c31d0193c61fa20c3a76dbf332211dc048c27f
+  data.tar.gz: 8e8bd10c57f436e6a6480f5f0ec909ebae814857
 SHA512:
-  metadata.gz: fad81ae0eea63e18b3191756aa98661b2a8eefe18afe15d936522e7ade9ef99e3008d4f1e4ef877ce6a213021c9f36a1810e3bcabd834a53f43bd6ae80d2fcc3
-  data.tar.gz: 5f0b201b20335cad2e44e36879fe22ecc1e22ce1726afeca39de80c9b9f312742f756ae331e612a69090036f72a32ca88b9cd41770ba63724669208a39258ddd
+  metadata.gz: 74c9581899a61cde11566b9aeb54a4235565ced86336b4e62ecf95662c5cb0609a174f2556dbdd4827041abf1684ee6ccfb6845278491da325d7842ccdc5fcb9
+  data.tar.gz: 55d1b436c81ebe6784ec9518c6eebe89a0d929728ab7f343cd07e77fa5254167afd2133a24fc1df15a497b70f428f1393c6f880d2181535e96a7334ded25b466

data/lib/bulutfon_sdk/rest/base_request.rb

@@ -10,9 +10,17 @@ module BulutfonSDK
 
       def initialize(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
+        args.select! {|arg| !arg.nil?}
         @config = BulutfonSDK::Util::ClientConfig.new options
-        @token = args[0] || nil
-        raise ArgumentError, 'Auth token is required' if @token.nil?
+        if args.count > 1
+          @email = args[0] || nil
+          @password = args[1] || nil
+          @auth_type = 'credentials'
+        else
+          @token = args[0] || nil
+          @auth_type = 'token'
+        end
+        raise ArgumentError, 'Auth token or user credentials are required' if (@token.nil? && (@email.nil? || @password.nil?))
         set_up_connection
       end
 
@@ -41,14 +49,25 @@ module BulutfonSDK
         def uri_parse(params, path)
           request_path = "#{@config.host}/#{path}"
           uri = URI.parse(request_path)
-          params[:access_token] = @token
+          encrypt_token = params.delete(:encrypt_token)
+          id = params.delete(:id)
+          if @auth_type == 'credentials'
+            params[:email] = @email
+            params[:password] = @password
+          else
+            if encrypt_token && id.present?
+              params[:access_token] = Digest::SHA1.hexdigest(@token.to_s + id.to_s)
+            else
+              params[:access_token] = @token
+            end
+          end
           uri
         end
 
         ##
         # Prepare http request for file saving
-        def save_file(method, path, save_path)
-          uri          = prepare_uri(path)
+        def save_file(method, path, save_path, params = {})
+          uri          = prepare_uri(path, params)
           method_class = Net::HTTP.const_get method.to_s.capitalize
           request      = method_class.new(uri.to_s, HTTP_HEADERS)
           response     = connect_and_send(request, is_file: true )

data/lib/bulutfon_sdk/rest/bulutfon.rb

@@ -13,47 +13,47 @@ module BulutfonSDK
       end
 
       def messages
-        BulutfonSDK::REST::Message.new(@token)
+        BulutfonSDK::REST::Message.new(@token || @email, @password)
       end
 
       def message_titles
-        BulutfonSDK::REST::MessageTitle.new(@token)
+        BulutfonSDK::REST::MessageTitle.new(@token || @email, @password)
       end
 
       def extensions
-        BulutfonSDK::REST::Extension.new(@token)
+        BulutfonSDK::REST::Extension.new(@token || @email, @password)
       end
 
       def dids
-        BulutfonSDK::REST::Did.new(@token)
+        BulutfonSDK::REST::Did.new(@token || @email, @password)
       end
 
       def groups
-        BulutfonSDK::REST::Group.new(@token)
+        BulutfonSDK::REST::Group.new(@token || @email, @password)
       end
 
       def cdrs
-        BulutfonSDK::REST::Cdr.new(@token)
+        BulutfonSDK::REST::Cdr.new(@token || @email, @password)
       end
 
       def call_records
-        BulutfonSDK::REST::CallRecord.new(@token)
+        BulutfonSDK::REST::CallRecord.new(@token || @email, @password)
       end
 
       def incoming_faxes
-        BulutfonSDK::REST::IncomingFax.new(@token)
+        BulutfonSDK::REST::IncomingFax.new(@token || @email, @password)
       end
 
       def outgoing_faxes
-        BulutfonSDK::REST::OutgoingFax.new(@token)
+        BulutfonSDK::REST::OutgoingFax.new(@token || @email, @password)
       end
 
       def announcements
-        BulutfonSDK::REST::Announcement.new(@token)
+        BulutfonSDK::REST::Announcement.new(@token || @email, @password)
       end
 
       def automatic_calls
-        BulutfonSDK::REST::AutomaticCall.new(@token)
+        BulutfonSDK::REST::AutomaticCall.new(@token || @email, @password)
       end
 
     end

data/lib/bulutfon_sdk/rest/call_record.rb

@@ -9,18 +9,18 @@ module BulutfonSDK
         @resource = 'call-records'
       end
 
-      def get( uuid )
-        uri = prepare_uri("#{@resource}/#{uuid}")
+      def get( uuid, encrypt_token = false )
+        uri = prepare_uri("#{@resource}/#{uuid}", {encrypt_token: encrypt_token, id: uuid})
         { download_path: uri.to_s }
       end
 
-      def get_stream( uuid)
-        uri = prepare_uri("#{@resource}/#{uuid}/stream")
+      def get_stream( uuid, encrypt_token = false )
+        uri = prepare_uri("#{@resource}/#{uuid}/stream", {encrypt_token: encrypt_token, id: uuid})
         { download_path: uri.to_s }
       end
 
-      def save( uuid, save_path)
-        save_file( 'get', "#{@resource}/#{uuid}", save_path)
+      def save( uuid, save_path, encrypt_token = false)
+        save_file( 'get', "#{@resource}/#{uuid}", save_path, {encrypt_token: encrypt_token, id: uuid})
       end
 
     end

data/lib/bulutfon_sdk/version.rb

@@ -1,3 +1,3 @@
 module BulutfonSDK
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulutfon_sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ismail Akbudak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json