moysklad 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba3855e983122b5158c941697b4dc46309d9a7fa81bac691a90d4dbbed6238b
-  data.tar.gz: 4edcfda4ffd7ff9156251a5f0f5e7d2de51c2c40c3b1fec1f5d84f77e407d9e5
+  metadata.gz: 11853c0cd626e6f922838a5d91e0cb83a48092f359ddc8b1437374d0ccf0c29a
+  data.tar.gz: 61dbc0e2db3b56ba8ed1200dd8b2d91b5e7500a926bd32c839c92d2e73ce58a4
 SHA512:
-  metadata.gz: 4f19a54c763da441522e474ecd87bfbdfac9656af8e9c598132b7e8101d7dfc71a7d570386fbd78e4c188a1c4038f24c1f3c8c69878f9ab3181a9fd887ba7863
-  data.tar.gz: 1531d71f523c7b0d51f07b1c7beed2be02dad3b1094e714e6917aa69b9c187fa4687b71b1a54e6639350725e84178f32305729a12c7d4a7994627c2499634e38
+  metadata.gz: 5aeaa2c2892de2abed0dcabe6f30a88428bbe0635a67a548330aa049af6b303be2743394ceb8e2a41f73407addaa9bc606b26b51ca8c4dd43b62dbec701b8759
+  data.tar.gz: c177b77a933b4ae86d18a353f7eb96d2a1e370707251cce96e22ef7138e04a531ef9aac159593fc7410e64ed784fd7a78bdd3e5575e72e0b0771d68f3a4c8be1

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/entities/image.rb

@@ -4,7 +4,6 @@ module Moysklad::Entities
     attribute :title, String
     attribute :filename, String
     attribute :size, Integer
-
     attribute :updated, Time
     attribute :miniature, Meta
     attribute :tiny, Meta

data/lib/moysklad/entities/images.rb

@@ -0,0 +1,15 @@
+module Moysklad::Entities
+  class ImagesMeta < Base
+    attribute :href, String
+    attribute :type, String
+    attribute :mediaType, String
+    attribute :size, Integer
+    attribute :limit, Integer
+    attribute :offset, Integer
+  end
+
+  class Images < Base
+    attribute :meta, ImagesMeta
+  end
+end
+

data/lib/moysklad/entities/meta.rb

@@ -4,6 +4,7 @@ module Moysklad::Entities
     attribute :metadataHref, String
     attribute :type,         String
     attribute :mediaType,    String # application/json
+    attribute :downloadHref, String
 
     def id
       @id ||= href.split('/').last

data/lib/moysklad/entities/product.rb

@@ -17,7 +17,7 @@ module Moysklad::Entities
     attribute :buyPrice,          Currency
     attribute :salePrices,        Array[Price]
 
-    attribute :image,             Image
+    attribute :images,            Images # MetaArray
 
     attribute :article,           String
     attribute :weighed,           Boolean
@@ -44,5 +44,9 @@ module Moysklad::Entities
         universe.features.where goodUuid: uuid
       end
     end
+
+    def product_images(universe)
+      Moysklad::Resources::ProductImages.new(client: universe.client, list_path: images.meta.href).list
+    end
   end
 end

data/lib/moysklad/entities.rb

@@ -17,6 +17,7 @@ module Moysklad
       price_type
       price
       image
+      images
       employee
       context
       product

data/lib/moysklad/resources/product_images.rb

@@ -0,0 +1,14 @@
+module Moysklad::Resources
+  class ProductImages < Base
+    # Публичный чтобы был доступен из индекса
+    def cache_key
+      [list_path].join(':')
+    end
+
+    private
+
+    def item_path
+      raise
+    end
+  end
+end

data/lib/moysklad/resources.rb

@@ -13,6 +13,7 @@ module Moysklad::Resources
     assortments
     custom_entities
     custom_entity_metadata
+    product_images
     embedded_entity_metadata
     where_filter
     indexed_cache

data/lib/moysklad/version.rb

@@ -1,3 +1,3 @@
 module Moysklad
-  VERSION = '0.4.5'
+  VERSION = '0.4.7'
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moysklad
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Danil Pismenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -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
@@ -308,6 +322,7 @@ files:
 - lib/moysklad/entities/entity.rb
 - lib/moysklad/entities/group.rb
 - lib/moysklad/entities/image.rb
+- lib/moysklad/entities/images.rb
 - lib/moysklad/entities/meta.rb
 - lib/moysklad/entities/organization.rb
 - lib/moysklad/entities/owner.rb
@@ -337,6 +352,7 @@ files:
 - lib/moysklad/resources/indexed_cache.rb
 - lib/moysklad/resources/load_all.rb
 - lib/moysklad/resources/positions.rb
+- lib/moysklad/resources/product_images.rb
 - lib/moysklad/resources/products.rb
 - lib/moysklad/resources/stock.rb
 - lib/moysklad/resources/subresource.rb