moysklad 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0434de2e989bb1cb0ca34205101ee8c0e978540b
-  data.tar.gz: ccd6cc1de782b6baf31c331b7e20fe9d7a5c5698
+SHA256:
+  metadata.gz: abdc083d3dbc4b8020ce96a71f348d4da052c9a9a85ff66acb1b5c16e3ba1a89
+  data.tar.gz: e925e1cd59dda2dffa9cb16b855989ed35901239ca1e56d08ae9c6d9d4db8bb8
 SHA512:
-  metadata.gz: 9beac30a1c510af7d1aff68e5a24ede6d24ec6cf86fdee7486e0e6826c5410a9b0212523ea649076f6575935af3c7ad751c01c58f78e086a54f77cdc9bd9970b
-  data.tar.gz: cf62d29570bae5e6f4dfae85ee1ca4f283a55a95e28a7b898c1f2bb768d530a011aaae5f72b5ec9a9880b66d310f197788861e62e08ce835e2f9276c3276090c
+  metadata.gz: 10c0597144a06f4c3b243c3f8309a2ae1d241dfbe575280a9dd1d9144c4040a29441229ba392c6ddf51bbb52916f414dbdb14822c5ac22270fed77061f05a966
+  data.tar.gz: 6d374cfec6e3985bad837f7d82a26d50cc9436c3a5f6f5b54c3fe940fa75337f9743e176d70d0e5db1281cffa9a7a0d3e6a3fefbe1e373853a2c5b776b80fbc0

data/.github/workflows/rspec.yml

@@ -0,0 +1,29 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Rspec
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository and submodules
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.1.4
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rspec

data/lib/moysklad/client.rb

@@ -8,8 +8,13 @@ class Moysklad::Client
   URL  ='https://online.moysklad.ru/api/remap/1.1/'
 
   def initialize login: nil, password: nil
-    @client = Faraday.new URL
-    @client.basic_auth login, password
+    @client = Faraday.new URL do |conn|
+      if Faraday::VERSION.split('.').first.to_i < 2
+        conn.request(:basic_auth, login, password)
+      else
+        conn.request(:authorization, :basic, login, password)
+      end
+    end
   end
 
   def download(path, filename)
@@ -28,7 +33,6 @@ class Moysklad::Client
       req.url path
       req.headers['Content-Type'] = 'application/json'
       req.headers['Accept'] = '*/*'
-      puts data
       req.body = data
     end
     parse_response result
@@ -64,8 +68,9 @@ class Moysklad::Client
   end
 
   def parse_response res
+    Moysklad.logger.debug "Response [#{res.status}]: #{res.body}"
+
     if res.status == 200
-      Moysklad.logger.info "Response: #{res.body}"
       return if res.body.blank?
       JSON.parse res.body
     else

data/lib/moysklad/entities/assortment.rb

@@ -1,5 +1,3 @@
-require_relative 'entity'
-
 module Moysklad::Entities
   class Assortment < Entity
   end

data/lib/moysklad/entities/attribute.rb

@@ -1,6 +1,3 @@
-require_relative 'attribute_value'
-require_relative 'meta'
-
 # Атрибут товара (ссылка на его тип и его значение)
 module Moysklad::Entities
   class Attribute < Base

data/lib/moysklad/entities/attribute_metadata.rb

@@ -1,5 +1,3 @@
-require_relative 'attribute_value'
-
 module Moysklad::Entities
   class AttributeMetadata < Base
     attribute :meta, Meta

data/lib/moysklad/entities/attribute_value.rb

@@ -1,11 +1,10 @@
-require_relative 'custom_entity'
-
 module Moysklad::Entities
   class AttributeValue < Virtus::Attribute
     def coerce(value)
-      if value.is_a? String
+      case value
+      when String, Float
         value
-      elsif value.is_a? ::Hash
+      when ::Hash
         if value['meta']['type'] == 'customentity'
           CustomEntity.new value
         else

data/lib/moysklad/entities/characteristic.rb

@@ -1,5 +1,3 @@
-require_relative 'attribute'
-
 module Moysklad::Entities
   class Characteristic < Attribute
   end

data/lib/moysklad/entities/characteristic_metadata.rb

@@ -1,5 +1,3 @@
-require_relative 'attribute_metadata'
-
 module Moysklad::Entities
   class CharacteristicMetadata < AttributeMetadata
   end

data/lib/moysklad/entities/collection.rb

@@ -1,6 +1,3 @@
-require_relative 'context'
-require_relative 'collection_meta'
-
 module Moysklad::Entities
   class RowItems < Virtus::Attribute
     include ActiveSupport::Inflector

data/lib/moysklad/entities/company_settings_metadata.rb

@@ -1,5 +1,3 @@
-require_relative 'meta'
-
 module Moysklad::Entities
   class EntityMeta < Base
     attribute :href, String

data/lib/moysklad/entities/consignment.rb

@@ -1,6 +1,3 @@
-require_relative 'entity'
-require_relative 'assortment'
-
 module Moysklad::Entities
   class Consignment < Entity
     attribute :meta, Meta

data/lib/moysklad/entities/context.rb

@@ -1,5 +1,3 @@
-require_relative 'employee'
-
 module Moysklad::Entities
   class Context
     include Virtus.model

data/lib/moysklad/entities/counterparty.rb

@@ -1,5 +1,3 @@
-require_relative 'entity'
-
 module Moysklad::Entities
   class Counterparty < Entity
     attribute :email, String
@@ -14,5 +12,9 @@ module Moysklad::Entities
     attribute :kpp, String
     attribute :ogrn, String
     attribute :okpo, String
+
+    attribute :description, String
+    
+    attribute :syncid, String
   end
 end

data/lib/moysklad/entities/country.rb

@@ -1,10 +1,4 @@
 module Moysklad::Entities
-  class Country < Base
-    include CommonObject
-    include Moysklad::Entities::XmlFix
-
-    tag 'country'
-
-    element   :code,              String
+  class Country < Entity
   end
-end
+end

data/lib/moysklad/entities/currency.rb

@@ -1,5 +1,3 @@
-require_relative 'meta'
-
 module Moysklad::Entities
   class Currency < Base
     class Unit < Base

data/lib/moysklad/entities/custom_entity.rb

@@ -1,6 +1,3 @@
-require_relative 'meta'
-require_relative 'context'
-
 # Элемент в справочнике (DictionaryEntity)
 module Moysklad::Entities
   class CustomEntity < Base

data/lib/moysklad/entities/customer_order.rb

@@ -1,10 +1,3 @@
-require_relative 'entity'
-require_relative 'owner'
-require_relative 'group'
-require_relative 'rate'
-require_relative 'customer_order_position'
-require_relative 'time'
-
 module Moysklad::Entities
   # Пример:
   # https://online.moysklad.ru/api/remap/1.1/doc/index.html#документ-заказ-покупателя

data/lib/moysklad/entities/customer_order_position.rb

@@ -1,7 +1,3 @@
-require_relative 'base'
-require_relative 'meta'
-require_relative 'assortment'
-
 module Moysklad::Entities
   class CustomerOrderPosition < Base
     attribute :quantity, Integer

data/lib/moysklad/entities/employee.rb

@@ -1,5 +1,3 @@
-require_relative 'meta'
-
 module Moysklad::Entities
   class Employee < Base
     attribute :meta, Meta

data/lib/moysklad/entities/entity.rb

@@ -1,6 +1,3 @@
-require_relative 'base'
-require_relative 'meta'
-
 module Moysklad::Entities
   class Entity < Base
 

data/lib/moysklad/entities/group.rb

@@ -1,7 +1,10 @@
-require_relative 'meta'
-
 module Moysklad::Entities
   class Group < Base
     attribute :meta, Meta
+    attribute :name, String
+
+    def id
+      URI.parse(meta['href']).path.split('/').last
+    end
   end
 end

data/lib/moysklad/entities/image.rb

@@ -1,4 +1,3 @@
-require_relative 'base'
 module Moysklad::Entities
   class Image < Base
     attribute :meta,  Meta

data/lib/moysklad/entities/meta.rb

@@ -1,5 +1,3 @@
-require_relative 'base'
-
 module Moysklad::Entities
   class Meta < Base
     attribute :href, String

data/lib/moysklad/entities/organization.rb

@@ -1,5 +1,3 @@
-require_relative 'entity'
-
 module Moysklad::Entities
   class Organization < Entity
     attribute :externalCode, String

data/lib/moysklad/entities/price.rb

@@ -1,4 +1,3 @@
-require_relative 'currency'
 module Moysklad::Entities
   class Price < Base
     attribute :value, Float

data/lib/moysklad/entities/price_type.rb

@@ -1,5 +1,3 @@
-require_relative 'base'
-
 module Moysklad::Entities
   class PriceType < Base
     attribute :name,        String

data/lib/moysklad/entities/product.rb

@@ -1,10 +1,3 @@
-require_relative 'currency'
-require_relative 'productfolder'
-require_relative 'uom'
-require_relative 'entity'
-require_relative 'attribute_metadata'
-require_relative 'image'
-
 module Moysklad::Entities
   class Product < Entity
     attribute :accountId,         String

data/lib/moysklad/entities/productfolder.rb

@@ -1,5 +1,3 @@
-require_relative 'entity'
-
 module Moysklad::Entities
   class Productfolder < Entity
     attribute :accountId,         String

data/lib/moysklad/entities/rate.rb

@@ -1,6 +1,3 @@
-require_relative 'base'
-require_relative 'currency'
-
 module Moysklad::Entities
   class Rate < Base
     attribute :currency, Currency

data/lib/moysklad/entities/resource_metadata.rb

@@ -1,8 +1,3 @@
-require_relative 'base'
-require_relative 'attribute_metadata'
-require_relative 'characteristic_metadata'
-require_relative 'price_type'
-
 module Moysklad::Entities
   class ResourceMetadata < Base
     attribute :meta, Meta

data/lib/moysklad/entities/service.rb

@@ -1,9 +1,3 @@
-require_relative 'entity'
-require_relative 'uom'
-require_relative 'owner'
-require_relative 'group'
-require_relative 'price'
-
 module Moysklad::Entities
   class Service < Entity
     attribute :accountId,         String
@@ -13,6 +7,7 @@ module Moysklad::Entities
     attribute :effectiveVat, Float
     attribute :pathName,          String
     attribute :productFolder,     Productfolder
+    attribute :description,       String
 
     attribute :uom,               Uom
 
@@ -20,9 +15,9 @@ module Moysklad::Entities
     attribute :salePrices,        Array[Price]
 
     # Когда загружаем через ассортименты эти поля устанавливаются
-    attribute :stock, Float
-    attribute :reserve, Float
-    attribute :inTransit, Float
-    attribute :quantity, Float
+    # attribute :stock, Float
+    # attribute :reserve, Float
+    # attribute :inTransit, Float
+    # attribute :quantity, Float
   end
 end

data/lib/moysklad/entities/shortcut.rb

@@ -1,5 +1,3 @@
-require_relative 'meta'
-
 module Moysklad::Entities
   class Shortcut < Base
     attribute :meta, Meta

data/lib/moysklad/entities/store.rb

@@ -1,4 +1,3 @@
-require_relative 'entity'
 module Moysklad::Entities
   class Store < Entity
     attribute :address, String

data/lib/moysklad/entities/uom.rb

@@ -1,5 +1,3 @@
-require_relative 'meta'
-
 module Moysklad::Entities
   class Uom < Base
     attribute :meta, Meta

data/lib/moysklad/entities/variant.rb

@@ -1,7 +1,3 @@
-require_relative 'characteristic'
-require_relative 'shortcut'
-require_relative 'entity'
-
 module Moysklad::Entities
   class Variant < Entity
 

data/lib/moysklad/entities.rb

@@ -1,42 +1,49 @@
 module Moysklad
   module Entities
-    extend ActiveSupport::Autoload
     %w{
-      AttachmentDocument
-      Uom
-      Productfolder
-      Product
-      Bundle
-      Barcode
-      Error
-      Consignment
-      MyCompany
-      Attribute
-      GoodRef
-      Base
-      Counterparty
-      Organization
-      CustomerOrder
-      CustomerOrderPosition
-      CustomEntity
-      Variant
-      AttributeMetadata
-      EmbeddedEntityMetadata
-      CompanySettingsMetadata
-      Price
-      Currency
-      Company
-      Store
-      Service
-      Owner
-      Group
-      Collection
-      Page
-      ResourceMetadata
-      Attribute
-      Characteristic
+      base
+      meta
+      entity
+      country
+      assortment
+      attribute_value
+      attribute
+      attribute_metadata
+      owner
+      group
+      productfolder
+      uom
+      currency     
+      price
+      image
+      employee
+      context
+      product
+      bundle
+      characteristic
+      characteristic_metadata
+      collection_meta
+      collection
+      company_settings_metadata
+      consignment
+      contract
+      counterparty
+      custom_entity
+      rate
+      customer_order
+      customer_order_position
+      organization
+      page
+      price_type
+      rate
+      resource_metadata
+      service
+      shortcut
+      store
+      time
+      variant
     }.each do |m|
-      autoload m
+      require_relative "entities/#{m}"
     end
   end
 end

data/lib/moysklad/resources/assortments.rb

@@ -1,4 +1,3 @@
-require_relative 'load_all'
 module Moysklad::Resources
   class Assortments < Base
     include LoadAll

data/lib/moysklad/resources/base.rb

@@ -1,5 +1,6 @@
-require 'json'
 class Moysklad::Resources::Base
+  include Moysklad::Resources::Positions
+
   PREFIX_PATH = 'entity/'
 
   def self.inherited superclass
@@ -10,8 +11,8 @@ class Moysklad::Resources::Base
   # Возвращает этот-же ресурс только индексированный
   #
   # @return [Moysklad::Resources::Indexed]
-  def self.indexed *args
-    Moysklad::Resources::Indexed.new new(*args)
+  def self.indexed client: nil, list_path: nil
+    Moysklad::Resources::Indexed.new new(client: client, list_path: list_path)
   end
 
   # https://support.moysklad.ru/hc/ru/articles/203404253-REST-сервис-синхронизации-данных

data/lib/moysklad/resources/custom_entities.rb

@@ -2,7 +2,9 @@ module Moysklad::Resources
   # Элементы словаря
   class CustomEntities < Base
     # custom_entity_meta_id - id словаря, элементы которого хотим получить
-    def initialize custom_entity_meta_id: nil, client:, list_path: nil
+    def initialize(custom_entity_meta_id: nil, client: nil, list_path: nil)
+      raise 'Client empty' if client.nil? # support ruby 2.0.0
+
       @custom_entity_meta_id = custom_entity_meta_id
       super client: client, list_path: list_path
     end

data/lib/moysklad/resources/custom_entity_metadata.rb

@@ -5,7 +5,7 @@ module Moysklad::Resources
   # https://online.moysklad.ru/api/remap/1.1/entity/product/metadata/
   class CustomEntityMetadata < Base
 
-    def list
+    def list(_params)
       raise
     end
 

data/lib/moysklad/resources/embedded_entity_metadata.rb

@@ -12,8 +12,8 @@ module Moysklad::Resources
       :embedded_entity_metadata
     end
 
-    def self.indexed *args
-      Moysklad::Resources::EmbeddedEntityMetadataIndexed.new new(*args)
+    def self.indexed client: nil, list_path: nil
+      Moysklad::Resources::EmbeddedEntityMetadataIndexed.new new(client: client, list_path: list_path)
     end
   end
 end

data/lib/moysklad/resources/indexed.rb

@@ -1,7 +1,3 @@
-require_relative 'where_filter'
-require_relative 'load_all'
-require_relative 'indexed_cache'
-
 module Moysklad::Resources
   class Indexed  < SimpleDelegator
     WrongEntriesCountError = Class.new StandardError
@@ -58,7 +54,7 @@ module Moysklad::Resources
       cached_index
     end
 
-    def pull_list(params)
+    def pull_list(params={})
       load_all(params)
     end
 

data/lib/moysklad/resources/positions.rb

@@ -0,0 +1,15 @@
+# API сервиса МойСклад позволяет оперировать с такими документами как Отгрузка, Заказ покупателя, Счёт покупателю, Розничная продажа. 
+# Перечисленные документы содержат позиции, работать с которыми можно как в составе отдельного документа, так и с помощью специальных ресурсов для управления позициями документа.
+
+module Moysklad::Resources::Positions
+  # Создаем позицию документа по uuid
+  #
+  # @return [Moysklad::Entities::Base]
+  def create_position model_uuid, position
+    position.class.build client.post(create_position_path(model_uuid), position.to_json)
+  end
+
+  def create_position_path(model_uuid)
+    [prefix_path, model_uuid, 'positions'].join('/')
+  end
+end

data/lib/moysklad/resources/stock.rb

@@ -6,7 +6,7 @@ module Moysklad::Resources
     end
 
     def all
-      page.items
+      list
     end
 
     def find

data/lib/moysklad/resources/subresource.rb

@@ -1,4 +1,3 @@
-require_relative 'where_filter'
 module Moysklad::Resources
   class Subresource < Struct.new(:items)
     include WhereFilter

data/lib/moysklad/resources.rb

@@ -1,26 +1,39 @@
 module Moysklad::Resources
   mattr_accessor :resources
 
-  extend ActiveSupport::Autoload
-
   def self.register_resource resource_class
     self.resources ||= []
     self.resources << resource_class
   end
 
-  require_relative 'resources/base'
-  require_relative 'resources/indexed'
-  require_relative 'resources/custom_entities'
-  require_relative 'resources/assortments'
+  %w{
+    positions
+    base
+    load_all
+    assortments
+    custom_entities
+    custom_entity_metadata
+    embedded_entity_metadata
+    where_filter
+    indexed_cache
+    indexed
+    embedded_entity_metadata_indexed
+    products
+    stock
+    subresource
+  }.each do |m|
+    require_relative "resources/#{m}"
+  end
 
   # Простые ресурсы, которые создаются автоматически
-  %w{Products Productfolders Uoms PriceType Countries Variants
+  %w{Productfolders Uoms PriceType Countries Variants
     Counterparty
     Organization
+    Service
+    Bundle
     CustomerOrders Store
     Currency
-    Workflows
-    Companies Consignments MyCompanies}.each do |klass_name|
+    Consignments Group}.each do |klass_name|
     const_set klass_name, Class.new( Base )
   end
 end

data/lib/moysklad/universe.rb

@@ -40,7 +40,7 @@ module Moysklad
     Moysklad::Resources.resources.each do |resource_klass|
       @@resources_list << resource_klass.pluralized_type.to_sym
       define_method resource_klass.pluralized_type do |opts={}|
-        @resources[resource_klass.type] ||= resource_klass.indexed( opts.merge client: client )
+        @resources[resource_klass.type] ||= resource_klass.indexed( **opts.merge(client: client) )
       end
     end
 

data/lib/moysklad/version.rb

@@ -1,3 +1,3 @@
 module Moysklad
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end