gillbus 0.18.13 → 0.18.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b6eb7557d8bbbe297d8f391d4f0ba1a43f99c25
-  data.tar.gz: a72bdec0416f4297fc1772da1dd508def568bdb7
+  metadata.gz: 3a7314c8cf6fe9167342a9fa5afa2a79f3c9d9d4
+  data.tar.gz: 41d2a8dcf95cbc8826e6e67d1718cc612b287b8e
 SHA512:
-  metadata.gz: cb087d9f1d2ed195fa76b9eb065f2dcaf1701690525ddcf15c714d6c43cdee9934a2269ae00498f91c1dadc45763faeda388df6133c4421e5cfdab6cbaa0a167
-  data.tar.gz: 7945e1bcad7972a706f0bb0614e0ba19a961273941020624a2945120ca5b943d28f745591f8ec7174f3cecf531105147339df0b9dd11f82f23fe5f4afa00c55c
+  metadata.gz: 044121e759ccbcd4d07a6ae1af71dc63fbea7b5c811e2bed2742c00e6cbef5f075c2f9c6949340dd10925711c63fd3a0b9b2dc54779f213c6ff5dbc615deb521
+  data.tar.gz: f656e036e42f486ed88cf5a1e690860c6b7eb163325a9f2d7be0360f1f8c6ec2876a5467658ea9b20d1f71d0c616c349ef0a1ba88079eb131d369f814ed6a7bb

data/lib/gillbus.rb

@@ -26,7 +26,7 @@ class Gillbus
       response_class = klass::Response
       request = request_class.new(*args)
       headers = {}
-      headers['Cookie'] = "JSESSIONID=#{session_id}" if session_id
+      headers['Cookie'] = self.class.make_cookies(session_id) if session_id
       headers['Accept-Encoding'] = 'gzip'
       request_time_start = Time.now
       http_response = driver.public_send(request.method, request.path, request.params, headers)
@@ -34,8 +34,7 @@ class Gillbus
       result = response_class.parse_string(http_response.body.force_encoding('utf-8'), timezone: timezone)
       cookie_string = http_response.headers['Set-Cookie']
       if cookie_string
-        returned_session_id = CGI::Cookie.parse(cookie_string)['JSESSIONID'].first
-        self.session_id = returned_session_id
+        self.session_id = self.class.make_session_id(CGI::Cookie.parse(cookie_string))
       end
       result.session_id = session_id
       result.request_time = request_time_end - request_time_start
@@ -43,6 +42,25 @@ class Gillbus
     end
   end
 
+  def self.make_cookies(session_id)
+    if session_id.include?('|')
+      session_id, gclb = session_id.split('|')
+      "JSESSIONID=#{session_id}; GCLB=#{gclb}"
+    else
+      "JSESSIONID=#{session_id}"
+    end
+  end
+
+  def self.make_session_id(parsed_cookies)
+    gclb = parsed_cookies['GCLB'].first
+    session_id = parsed_cookies['JSESSIONID'].first
+    if gclb.present?
+      [session_id, gclb].join('|')
+    else
+      session_id
+    end
+  end
+
   require 'monetize'
   require 'gillbus/helpers/fields'
   require 'gillbus/helpers/update_attrs'

data/lib/gillbus/version.rb

@@ -1,3 +1,3 @@
 class Gillbus
-  VERSION = '0.18.13'.freeze
+  VERSION = '0.18.14'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gillbus
 version: !ruby/object:Gem::Version
-  version: 0.18.13
+  version: 0.18.14
 platform: ruby
 authors:
 - Alexey "codesnik" Trofimenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport