moysklad 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a56ce8eb66a010543868f61ec27181f39c1aea72452e8c02597c850f8980f39e
-  data.tar.gz: 58c9aeff4402bb50fc03c3790c8a96ad3e72b51a75e967c46dafe91a4ffee853
+  metadata.gz: 3d6deac98d910e2122e5d088e5f296d5862e0444d321f6020c074d339b2c7e1c
+  data.tar.gz: 32b680c577404846d787bf849f0a9c6b32cdcf857405c49b8c7d8177dd75edb7
 SHA512:
-  metadata.gz: 87330dee8f7938f0afd81f19f8e3bed3935caeafa39d45f8e2d83548ef1b8d37067fc1a42534a6a8ffd7424313a6e33d9ac33851c2f357b980d891ee0cd1e156
-  data.tar.gz: 6e9a856cf5679a24070e66c3d5832e4e68f7fe6c8cd4a091ce12dd89d2a41ff28ef5efe41578b7e48ee9a6ecb550dc1f1ffa33390ed33b3005ff6b587a9fd148
+  metadata.gz: d256705204b4c6823c7d729c47cfd4d2ad62cc9e66688e171033a437c8d84973c469fe35fc86197bcb5a14c6001db1995ca3e16b3f381c9831780f30a994b5ee
+  data.tar.gz: bb721e69e475031587bfedf6c3022640020d867fbb305dd452838a4a68d8dff56d31a2d7725574a6afb11227af3579af977036d86256524cbb105a14f7aefcee

data/lib/moysklad/attributes_converter.rb

@@ -0,0 +1,15 @@
+# Concern
+module AttributesConverter
+  def initialize(data = {})
+    if data['attributes']
+      if data['attributes'].is_a? Array
+        data['attrs'] = data.delete 'attributes'
+      elsif data['attributes'].is_a? Hash
+        # do nothing
+      else
+        raise "Strange attribute class #{data['attribute']}"
+      end
+    end
+    super data
+  end
+end

data/lib/moysklad/client.rb

@@ -1,14 +1,19 @@
 require 'faraday'
+require 'faraday/detailed_logger'
+require 'faraday_curl'
 
 require_relative 'client/errors'
 
 class Moysklad::Client
+  URL  ='https://api.moysklad.ru/api/remap/1.2/'
 
-  # URL = 'https://online.moysklad.ru'
-  URL  ='https://online.moysklad.ru/api/remap/1.1/'
-
-  def initialize login: nil, password: nil
+  def initialize login: nil, password: nil, logger: nil
     @client = Faraday.new URL do |conn|
+      unless logger.nil?
+        conn.response :detailed_logger, logger
+        conn.request :curl, logger, :info
+      end
+
       conn.options.timeout = ENV.fetch('MOYSKLAD_HTTP_TIMEOUT', 120)
       if Faraday::VERSION.split('.').first.to_i < 2
         conn.request(:basic_auth, login, password)
@@ -34,6 +39,7 @@ 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
@@ -45,6 +51,7 @@ 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
@@ -56,6 +63,7 @@ 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

data/lib/moysklad/entities/base.rb

@@ -10,11 +10,6 @@ module Moysklad::Entities
       entity
     end
 
-    def initialize(data = {})
-      data['attrs'] = data.delete 'attributes' if data['attributes']
-      super (data || {}).merge(dump: data)
-    end
-
     def to_json(*args)
       presented = {}
       to_h.each_pair do |k, v|

data/lib/moysklad/entities/custom_entity.rb

@@ -1,17 +1,12 @@
 # Элемент в справочнике (DictionaryEntity)
 module Moysklad::Entities
   class CustomEntity < Base
-    attribute :meta, Meta
-    attribute :accountId,                String
-    attribute :id,                String
-    attribute :name, String
-    attribute :externalCode,      String
-    attribute :description,      String
-
-    # TODO remove
-    def entityMetadataUuid
-      dictionaryId
-    end
+    attribute :meta,         Meta
+    attribute :accountId,    String
+    attribute :id,           String
+    attribute :name,         String
+    attribute :externalCode, String
+    attribute :description,  String
 
     # ID Словаря
     def dictionaryId

data/lib/moysklad/entities/meta.rb

@@ -1,9 +1,9 @@
 module Moysklad::Entities
   class Meta < Base
-    attribute :href, String
+    attribute :href,         String
     attribute :metadataHref, String
-    attribute :type, String
-    attribute :mediaType, String # application/json
+    attribute :type,         String
+    attribute :mediaType,    String # application/json
 
     def id
       @id ||= href.split('/').last

data/lib/moysklad/entities/organization.rb

@@ -1,5 +1,6 @@
 module Moysklad::Entities
   class Organization < Entity
+    include AttributesConverter
     attribute :externalCode, String
     attribute :archived, Boolean
     attribute :companyType, String

data/lib/moysklad/entities/price.rb

@@ -2,7 +2,7 @@ module Moysklad::Entities
   class Price < Base
     attribute :value, Float
     attribute :currency, Currency
-    attribute :priceType, String # Цена продажи/ Распродажа
+    attribute :priceType, PriceType # Цена продажи/ Распродажа
 
     def self.from_money money
       raise 'not implemented'

data/lib/moysklad/entities/product.rb

@@ -1,5 +1,6 @@
 module Moysklad::Entities
   class Product < Entity
+    include AttributesConverter
     attribute :accountId,         String
     attribute :owner,             Owner
     attribute :group,             Group

data/lib/moysklad/entities/resource_metadata.rb

@@ -1,5 +1,6 @@
 module Moysklad::Entities
   class ResourceMetadata < Base
+    include AttributesConverter
     attribute :meta, Meta
     attribute :attrs, Array[AttributeMetadata]
     attribute :characteristics, Array[CharacteristicMetadata]

data/lib/moysklad/entities/store.rb

@@ -1,5 +1,6 @@
 module Moysklad::Entities
   class Store < Entity
+    include AttributesConverter
     attribute :address, String
     attribute :description, String
     attribute :parent, Hash

data/lib/moysklad/entities.rb

@@ -13,7 +13,8 @@ module Moysklad
       group
       productfolder
       uom
-      currency     
+      currency
+      price_type
       price
       image
       employee
@@ -34,7 +35,6 @@ module Moysklad
       customer_order_position
       organization
       page
-      price_type
       rate
       resource_metadata
       service

data/lib/moysklad/universe.rb

@@ -15,25 +15,20 @@ module Moysklad
     end
 
     def company_settings_metadata
-      Moysklad::Entities::CompanySettingsMetadata.build client.get('entity/companysettings/metadata'), self
+      @company_settings_metadata ||= Moysklad::Entities::CompanySettingsMetadata.build client.get('context/companysettings/metadata'), self
     end
 
     # Все элементы всех словарей
     def all_custom_entities
-      list = []
-      dictionaries = company_settings_metadata.customEntities
-      dictionaries.each do |d|
-        list += d.entities(self)
-      end
-      list
+      @all_custom_entities ||= company_settings_metadata.customEntities.map { |d| d.entities(self) }.flatten
     end
 
     # Ленивое создание universe
     #
     # @param login
     # @param password
-    def self.build login: nil, password: nil
-      new client: client_class.new(login: login, password: password)
+    def self.build login: nil, password: nil, logger: nil
+      new client: client_class.new(login: login, password: password, logger: nil)
     end
 
     @@resources_list = []
@@ -47,7 +42,5 @@ module Moysklad
     def class_by_resource resource
       "Moysklad::Resources::#{resource.to_s.singularize.capitalize}".constantize
     end
-
   end
-
 end

data/lib/moysklad/version.rb

@@ -1,3 +1,3 @@
 module Moysklad
-  VERSION = '0.3.4'
+  VERSION = '0.4.1'
 end

data/lib/moysklad.rb

@@ -2,6 +2,7 @@ require 'virtus'
 require 'json'
 require 'active_support'
 require 'moysklad/version'
+require 'moysklad/attributes_converter'
 
 require 'logger'
 

data/moysklad.gemspec

@@ -37,4 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-ctags-bundler'
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'minitest', '~> 5.1'
+  spec.add_development_dependency 'faraday-detailed_logger'
+  spec.add_development_dependency 'faraday_curl', '~> 0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moysklad
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Danil Pismenny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-24 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -220,6 +220,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: faraday-detailed_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_curl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Правильный клиент для работы c REST XML API moyslad.ru, созданный по
   принципам SOLID
 email:
@@ -238,6 +266,7 @@ files:
 - README.md
 - Rakefile
 - lib/moysklad.rb
+- lib/moysklad/attributes_converter.rb
 - lib/moysklad/client.rb
 - lib/moysklad/client/errors.rb
 - lib/moysklad/entities.rb