moysklad 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba3855e983122b5158c941697b4dc46309d9a7fa81bac691a90d4dbbed6238b
-  data.tar.gz: 4edcfda4ffd7ff9156251a5f0f5e7d2de51c2c40c3b1fec1f5d84f77e407d9e5
+  metadata.gz: 3435d7c195bd20de53d97c82ac10d8269d94fc0e35a2e1aaf1330e5939ac28cb
+  data.tar.gz: d6067f848aa3a3568d996a9c9f02537035661fbfb67a5f7cf24193c6114490c6
 SHA512:
-  metadata.gz: 4f19a54c763da441522e474ecd87bfbdfac9656af8e9c598132b7e8101d7dfc71a7d570386fbd78e4c188a1c4038f24c1f3c8c69878f9ab3181a9fd887ba7863
-  data.tar.gz: 1531d71f523c7b0d51f07b1c7beed2be02dad3b1094e714e6917aa69b9c187fa4687b71b1a54e6639350725e84178f32305729a12c7d4a7994627c2499634e38
+  metadata.gz: 6847920c2dc4f7d99f9c45b77fe3d0e438cf606452e6cde86fe0c69846268d860ea23ffbcf759d9559acda614de7fa880921b54fcd839cc3cc96e36743118f21
+  data.tar.gz: 82d5e908c6888f8abc700f400d3041b23d08b1642e6deec87a5074acd6327855231de5aac8fd5bf59bdcd855af03e8d2c386bd30a68883000b2c174833270d10

data/lib/moysklad/client.rb

@@ -2,6 +2,7 @@ require 'faraday'
 require 'faraday/detailed_logger'
 require 'faraday_curl'
 require 'faraday/gzip'
+require 'faraday/encoding'
 
 require_relative 'client/errors'
 
@@ -14,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
@@ -21,29 +24,25 @@ class Moysklad::Client
       else
         conn.request(:authorization, :basic, login, password)
       end
+
+      conn.adapter Faraday.default_adapter
     end
   end
 
   def download(path, filename)
-    response = client.get path do |req|
-      req.request :gzip
-    end
+    response = client.get path
     File.open(filename, 'wb') { |fp| fp.write(response.body) }
   end
 
   def get path, params={}
     logger.debug "Client: GET #{path} #{params}"
-    result = client.get path, params do |req|
-      req.request :gzip
-    end
-    parse_response result
+    parse_response client.get path, params
   end
 
   def post path, data
     logger.debug "Client: POST #{path}"
     result = client.post do |req|
       req.url path
-      req.request :gzip
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
       req.body = data
@@ -54,7 +53,6 @@ class Moysklad::Client
   def put path, data
     logger.debug "Client: PUT #{path}"
     result = client.put do |req|
-      req.request :gzip
       req.url path
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
@@ -66,7 +64,6 @@ class Moysklad::Client
   def delete path
     logger.debug "Client: DELETE #{path}"
     result = client.delete do |req|
-      req.request :gzip
       req.url path
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
@@ -84,6 +81,7 @@ class Moysklad::Client
 
   def parse_response res
     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.5'
+  VERSION = '0.4.6'
 end

data/moysklad.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
 
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moysklad
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Danil Pismenny
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !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