travelpayouts_api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd8f3d6d42a8bd2230efe4627c0901836f3e87f
-  data.tar.gz: 4e10496471f81af6eb73884d5cb9d0c03c83061d
+  metadata.gz: f09a3ce20567df7a4ae3136976d58d3918e729d6
+  data.tar.gz: 8aa825e9e69e1fc917c4a6a478f7da65aebe72f8
 SHA512:
-  metadata.gz: 6a3cf247c3d8d25d60979396ec677c2efeee01df6d12553d4bf3de97df63c0d3d6697a1be0b62440ce9221661653ac9ee9d01ce3e47fce12bd02c50a7b21a11e
-  data.tar.gz: 217673f1f56b70a916e453b7491ffaf0cee6d92fdb784b43b1de46ac48dec25d132b5d94a36e6760b1b54f3ef0da2ef5b7ab05263a5891813ed0513f39fece36
+  metadata.gz: 146e837156f4150b0e7247ad99e757692576610d11c1c72162ea5fcc110db79ebccdc7c00b266e1b1f0cdb0857a861d8549705fa0e43259b6c9041e988d9cb1f
+  data.tar.gz: 78ebd65113e8528d9dc0ad39d7bf106e8ba9e77fbfcb09ac9a167555564feeb8215e168d67b39605826f7392a7dd2dca9ad26878a5851e86b8350847aa0d75c1

data/README.md

@@ -1,4 +1,4 @@
-# TravelPayouts API
+# Aviasales/TravelPayouts API gem
 
 [![Gem Version](http://img.shields.io/gem/v/travelpayouts_api.svg)][gem]
 

data/lib/travelpayouts_api/request.rb

@@ -5,18 +5,12 @@ module TravelPayouts
       require 'hashie/mash'
 
       def request(url, params, skip_parse: false)
-        token = config.token
         params[:currency] ||= config.currency
-        params[:locale] ||= config.locale
+        params[:locale]   ||= config.locale
 
         params.delete_if{ |_, v| v == nil }
 
-        headers  = {
-          x_access_token: token,
-          accept_encoding: 'gzip, deflate',
-          accept: :json
-        }
-        data = RestClient.get url, headers.merge(params: params)
+        data = RestClient.get url, request_headers.merge(params: params)
         skip_parse ? data : respond(data)
       rescue RestClient::Exception => e
         err = Error.new(e.response, e.http_code)
@@ -25,58 +19,28 @@ module TravelPayouts
       end
 
       def signed_flight_request(method, url, params)
-        token = config.token
-        params[:marker] = config.marker
-        params[:host] = config.host
+        params[:marker]   = config.marker.to_s
+        params[:host]     = config.host
         params[:currency] ||= config.currency
-        params[:locale] ||= config.locale if params.has_key?(:locale)
+        params[:locale]   ||= config.locale if params.has_key?(:locale)
 
         params.delete_if{ |_, v| v == nil }
 
-        values = [token] + param_values(sort_params(params))
-        signature = Digest::MD5.hexdigest values.join(':')
-        params[:signature] = signature
+        params[:signature] = signature(params)
 
-        headers  = {
-          x_access_token: token,
-          accept_encoding: 'gzip, deflate',
-          accept: :json,
-          content_type: 'application/json'
-        }
-
-        return respond RestClient.post url, params.to_json, headers if method == :post
-        respond RestClient.get url, headers.merge(params: params)
-      rescue RestClient::Exception => e
-        err = Error.new(e.response, e.http_code)
-        err.message = e.message
-        raise err
+        run_request(url, params, request_headers(true), method)
       end
 
       def signed_hotel_request(method, url, params)
-        params[:lang] ||= config.locale if params.has_key?(:lang)
+        params[:marker]   = config.marker.to_s
         params[:currency] ||= config.currency
+        params[:lang]     ||= config.locale if params.has_key?(:lang)
 
         params.delete_if{ |_, v| v == nil }
 
-        values = [config.token, config.marker] + param_values(sort_params(params))
-        signature = Digest::MD5.hexdigest values.join(':')
-        params[:signature] = signature
-        params[:marker] = config.marker
+        params[:signature] = signature(params, config.marker)
 
-        headers  = {
-          x_access_token: config.token,
-          accept_encoding: 'gzip, deflate',
-          accept: :json,
-          content_type: 'application/json'
-        }
-
-        return respond RestClient.post url, params.to_json, headers if method == :post
-        respond RestClient.get url, headers.merge(params: params)
-
-      rescue RestClient::Exception => e
-        err = Error.new(e.response, e.http_code)
-        err.message = e.message
-        raise err
+        run_request(url, params, request_headers(true), method)
       end
 
       def sort_params(params)
@@ -91,6 +55,22 @@ module TravelPayouts
         params.map{|p| param_values(p)}.flatten
       end
 
+      def signature(params, marker=nil)
+        sign = marker ? [config.token, marker] : [config.token]
+        values = sign + param_values(sort_params(params))
+        Digest::MD5.hexdigest values.join(':')
+      end
+
+      def request_headers(include_content_type = false)
+        {
+          x_access_token: config.token,
+          accept_encoding: 'gzip, deflate',
+          accept: :json
+        }.tap do |headers|
+          headers[:content_type] = 'application/json' if include_content_type
+        end
+      end
+
       def respond(resp)
         begin
           hash = JSON.parse(resp)
@@ -101,6 +81,15 @@ module TravelPayouts
         convert_to_mash hash
       end
 
+      def run_request(url, params, headers, method)
+        return respond RestClient.post url, params.to_json, headers if method == :post
+        respond RestClient.get url, headers.merge(params: params)
+      rescue RestClient::Exception => e
+        err = Error.new(e.response, e.http_code)
+        err.message = e.message
+        raise err
+      end
+
       def convert_to_mash(hash)
         return Hashie::Mash.new hash if hash.is_a? Hash
         return hash unless hash.is_a? Array

data/lib/travelpayouts_api/version.rb

@@ -1,3 +1,3 @@
 module TravelPayouts
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travelpayouts_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Vitaly Dyatlov