moysklad 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb24a3feae7f239a193de031cb2734a7fa5a601e529ad9137ff0799c3db61ec8
-  data.tar.gz: 64cee4b18ed08c5f0ed001f5459a388544812b0d7c7448926d3d129dca397fd0
+  metadata.gz: 3435d7c195bd20de53d97c82ac10d8269d94fc0e35a2e1aaf1330e5939ac28cb
+  data.tar.gz: d6067f848aa3a3568d996a9c9f02537035661fbfb67a5f7cf24193c6114490c6
 SHA512:
-  metadata.gz: 8abd4098182f952d5ceb473b115b095d7fcd47715bb6f16645a8f06f96ff8ff61f830315899194e0383d7f0e1fcb2aa60172b5223fa9e507fe29d8fbce99c59f
-  data.tar.gz: 97082340b4c8ab6974c403077e5a97a9c2450a9dad81bd0e928667241aca5765257edcc94c0c0046eb1007f1007c7ce096a4114248d2e95bcffe8e820099de56
+  metadata.gz: 6847920c2dc4f7d99f9c45b77fe3d0e438cf606452e6cde86fe0c69846268d860ea23ffbcf759d9559acda614de7fa880921b54fcd839cc3cc96e36743118f21
+  data.tar.gz: 82d5e908c6888f8abc700f400d3041b23d08b1642e6deec87a5074acd6327855231de5aac8fd5bf59bdcd855af03e8d2c386bd30a68883000b2c174833270d10

data/lib/moysklad/client.rb

@@ -1,6 +1,8 @@
 require 'faraday'
 require 'faraday/detailed_logger'
 require 'faraday_curl'
+require 'faraday/gzip'
+require 'faraday/encoding'
 
 require_relative 'client/errors'
 
@@ -13,6 +15,8 @@ class Moysklad::Client
         conn.response :detailed_logger, logger
         conn.request :curl, logger, :info
       end
+      conn.request :gzip
+      conn.response :encoding
 
       conn.options.timeout = ENV.fetch('MOYSKLAD_HTTP_TIMEOUT', 120)
       if Faraday::VERSION.split('.').first.to_i < 2
@@ -20,6 +24,8 @@ class Moysklad::Client
       else
         conn.request(:authorization, :basic, login, password)
       end
+
+      conn.adapter Faraday.default_adapter
     end
   end
 
@@ -39,7 +45,6 @@ class Moysklad::Client
       req.url path
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
-      req.headers['Accept-Encoding'] = 'gzip'
       req.body = data
     end
     parse_response result
@@ -51,7 +56,6 @@ class Moysklad::Client
       req.url path
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
-      req.headers['Accept-Encoding'] = 'gzip'
       req.body = data
     end
     parse_response result
@@ -63,7 +67,6 @@ class Moysklad::Client
       req.url path
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
-      req.headers['Accept-Encoding'] = 'gzip'
     end
     parse_response result
   end
@@ -77,7 +80,8 @@ class Moysklad::Client
   end
 
   def parse_response res
-    body = (res.body || '').force_encoding('utf-8')
+    body = res.body
+    body.force_encoding 'utf-8' if  res.body.encoding.to_s == "ASCII-8BIT" && res.headers['content-type'].include?('charset=utf-8')
     Moysklad.logger.debug "Response [#{res.status}] with body #{body}"
 
     if res.status == 200

data/lib/moysklad/version.rb

@@ -1,3 +1,3 @@
 module Moysklad
-  VERSION = '0.4.4'
+  VERSION = '0.4.6'
 end

data/moysklad.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'faraday'
+  spec.add_runtime_dependency 'faraday-gzip'
+  spec.add_runtime_dependency 'faraday-encoding'
   spec.add_runtime_dependency 'virtus'
-  # spec.add_runtime_dependency 'nokogiri-happymapper'
   spec.add_runtime_dependency 'activesupport', '>=3.0.0'
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moysklad
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Danil Pismenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-17 00:00:00.000000000 Z
+date: 2023-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-gzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-encoding
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement