moysklad 0.2.1 → 0.3.1

data/lib/moysklad/universe.rb

@@ -14,6 +14,20 @@ module Moysklad
       Client
     end
 
+    def company_settings_metadata
+      Moysklad::Entities::CompanySettingsMetadata.build client.get('entity/companysettings/metadata'), self
+    end
+
+    # Все элементы всех словарей
+    def all_custom_entities
+      list = []
+      dictionaries = company_settings_metadata.customEntities
+      dictionaries.each do |d|
+        list += d.entities(self)
+      end
+      list
+    end
+
     # Ленивое создание universe
     #
     # @param login
@@ -25,8 +39,8 @@ module Moysklad
     @@resources_list = []
     Moysklad::Resources.resources.each do |resource_klass|
       @@resources_list << resource_klass.pluralized_type.to_sym
-      define_method resource_klass.pluralized_type do
-        @resources[resource_klass.type] ||= resource_klass.indexed( client: client )
+      define_method resource_klass.pluralized_type do |opts={}|
+        @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.2.1"
+  VERSION = "0.3.1"
 end

data/lib/moysklad.rb

@@ -1,17 +1,22 @@
-require 'happymapper'
+require 'virtus'
+require 'json'
 require 'active_support'
-require "moysklad/version"
+require 'moysklad/version'
 
 require 'logger'
 
 module Moysklad
   mattr_accessor :custom_logger
-  extend ActiveSupport::Autoload
 
-  autoload :Entities
-  autoload :Resources
-  autoload :Client
-  autoload :Universe
+  %w{
+    entities
+    error
+    resources
+    client
+    universe
+  }.each do |m|
+    require_relative "moysklad/#{m}"
+  end
 
   def self.logger= value
     self.custom_logger = value

data/moysklad.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["danil@brandymint.ru"]
   spec.summary       = %q{Клиент для работы с API moysklad.ru}
   spec.description   = %q{Правильный клиент для работы c REST XML API moyslad.ru, созданный по принципам SOLID}
-  spec.homepage      = "https://github.com/brandymint/moysklad"
+  spec.homepage      = "https://github.com/dapi/moysklad"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'faraday'
-  spec.add_runtime_dependency 'nokogiri-happymapper'
+  spec.add_runtime_dependency 'virtus'
+  # spec.add_runtime_dependency 'nokogiri-happymapper'
   spec.add_runtime_dependency 'activesupport', '>=3.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-collection_matchers"
@@ -35,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency 'guard-ctags-bundler'
   spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'minitest', '~> 5.1'
 end

data/scripts/rest.sh

@@ -11,16 +11,19 @@ fi
 
 if [ -z "$resource" ]; then
   echo "Запуск: rest.sh Resoruce [action]"
-  echo "Например: rest.sh Feature list"
+  echo "Например: rest.sh entity product"
   exit 2
 fi
 
-url="https://online.moysklad.ru/exchange/rest/ms/xml/$1/$2"
+# url_v1.0="https://online.moysklad.ru/exchange/rest/ms/xml/$1/$2"
+# url="https://online.moysklad.ru/api/remap/1.1/"
+url="https://online.moysklad.ru/api/remap/1.1/$resource/$action"
 
 if [ "$action"=="list" ] && [ -n "$start" ]; then
   url="$url?start=$start"
 fi
 
+# url="https://online.moysklad.ru/api/remap/1.1/entity/variant/metadata/characteristics/3e277152-78ac-11e4-7a07-673c000ca568"
 echo $url >&2
 curl --max-redirs 3 -is -u $MS_LOGIN:$MS_PASSWORD $url
 

data/spec/lib/moysklad/entities/customer_order_position_spec.rb

@@ -5,31 +5,18 @@ describe Moysklad::Entities::CustomerOrderPosition do
     subject {
       p= Moysklad::Entities::CustomerOrderPosition.new 
       p.vat = 18
-      p.basePrice = Moysklad::Entities::Price.new
-      p.basePrice.sum = 123
+      p.price = Moysklad::Entities::Price.new
+      p.price.value = 123
       p.reserve = true
       p
     }
 
-    it 'to_xml' do
-      expect(subject.to_xml).to be_a String
+    it 'to_json' do
+      expect(subject.to_json).to be_a String
     end
 
     it 'to_s' do
       expect(subject.to_s).to be_a String
     end
-
-    it 'include xml' do
-      expect(subject.to_xml).to include '<?xml version="1.0" encoding="utf-8"?>'
-    end
-
-    it 'include customerOrderPosition' do
-      expect(subject.to_xml).to include "<customerOrderPosition"
-    end
-
-    it 'include basePrice' do
-      expect(subject.to_xml).to include "<basePrice"
-    end
   end
-
 end

data/spec/lib/moysklad/entities/customer_order_spec.rb

@@ -3,51 +3,26 @@ require 'spec_helper'
 describe Moysklad::Entities::CustomerOrder do
   context 'generate' do
     subject {
-      p= Moysklad::Entities::CustomerOrderPosition.new 
+      p= Moysklad::Entities::CustomerOrderPosition.new
       p.vat = 18
-      p.basePrice = Moysklad::Entities::Price.new
-      p.basePrice.sum = 123
-      p.reserve = true
+      p.price = Moysklad::Entities::Price.new
+      p.price.value = 123
+      p.reserve = 123
 
       co = Moysklad::Entities::CustomerOrder.new
       co.sum = Moysklad::Entities::Price.new
-      co.sum.sum = 456
+      co.sum.value = 456
       co.description = 'Описание'
-      co.customerOrderPosition = p
+      co.positions = [p]
       co
     }
 
-    it 'to_xml' do
-      expect(subject.to_xml).to be_a String
+    it 'to_json' do
+      expect(subject.to_json).to be_a String
     end
 
     it 'to_s' do
       expect(subject.to_s).to be_a String
     end
-
-    it 'include xml' do
-      expect(subject.to_xml).to include '<?xml version="1.0" encoding="utf-8"?>'
-    end
-
-    it 'include customerOrder' do
-      expect(subject.to_xml).to include "<customerOrder"
-    end
-
-    it 'include customerOrderPosition' do
-      expect(subject.to_xml).to include "<customerOrderPosition"
-    end
   end
-
-  context 'parse' do
-    subject { Moysklad::Entities::CustomerOrder.parse File.read './spec/fixtures/customer_order.xml' }
-
-    it 'include customerOrder' do
-      expect(subject.to_xml).to include "<customerOrder"
-    end
-
-    it 'include customerOrderPosition' do
-      expect(subject.to_xml).to include "<customerOrderPosition"
-    end
-  end
-
 end

data/spec/lib/moysklad/resources/base_spec.rb

@@ -4,58 +4,4 @@ describe Moysklad::Resources::Base do
   it 'should be loaded' do
     expect(described_class).to be_a Class
   end
-
-  describe 'правильно определяет название модели' do
-    let!(:entity_class) { Moysklad::Entities::Computer = Class.new }
-    subject { Moysklad::Resources::Computers = Class.new described_class }
-
-    it do
-      expect(subject.entity_class).to eq entity_class
-    end
-  end
-
-  describe 'испрвляет на лету xml с плохими символами' do
-    let(:xml)    { File.read './spec/fixtures/bad_chars.xml' }
-    let(:client) { Moysklad::Client.new }
-    let(:res) { described_class.new client: client }
-
-    before do
-      allow(described_class).to receive(:entity_class).and_return Moysklad::Entities::CustomEntity
-    end
-
-    subject { res.send :parse_page, xml }
-
-    it do
-      expect{subject}.to_not raise_error 
-    end
-
-    context 'ошибка есть если парсинг напрямую' do
-      before do
-        expect_any_instance_of(described_class).to receive(:parse_content).and_return xml
-      end
-      it do
-        expect{subject}.to raise_error Nokogiri::XML::SyntaxError
-      end
-    end
-
-  end
-
-  describe 'page' do
-    let(:resource) { Moysklad::Resources::Features.new client: client }
-
-    before do
-      stub_rest :Feature
-    end
-
-    subject { resource.page }
-
-    it do
-      expect(subject).to be_a Moysklad::Entities::Page
-      expect(subject.total).to eq feature_list_items_count
-      expect(subject.count).to eq Moysklad::Entities::Collection::DEFAULT_COUNT
-      expect(subject.start).to eq 0
-      expect(subject.items.count).to eq feature_list_items_count
-    end
-
-  end
 end

data/spec/lib/moysklad/resources_spec.rb

@@ -3,8 +3,6 @@ require 'spec_helper'
 describe Moysklad::Resources do
   it 'should be loaded' do
     expect(Moysklad::Resources).to be_a Module
-
-    expect(Moysklad::Resources.resources).to include(Moysklad::Resources::Features)
     expect(Moysklad::Resources.resources).to include(Moysklad::Resources::EmbeddedEntityMetadata)
   end
 end

data/spec/lib/moysklad/universe_spec.rb

@@ -5,14 +5,6 @@ describe Moysklad::Universe do
 
   subject { described_class.new client: client }
 
-  it 'should have a features resoruce' do
-      expect(subject.features).to be_a Moysklad::Resources::Indexed
-  end
-
-  it do
-    expect(subject.features.resource).to be_a Moysklad::Resources::Features
-  end
-
   it do
     expect(subject.embedded_entity_metadata.resource).to be_a Moysklad::Resources::EmbeddedEntityMetadata
   end
@@ -21,10 +13,6 @@ describe Moysklad::Universe do
     expect(subject.resources_list).to have_at_least(10).items
   end
 
-  it do
-    expect(subject.resources_list).to include(:features)
-  end
-
   describe '.build' do
     let(:login)    { 'alala' }
     let(:password) { 'ulala' }
@@ -38,16 +26,5 @@ describe Moysklad::Universe do
     it do
       expect(subject.client).to be_a Moysklad::Client
     end
-
   end
-
-  describe do
-    before do
-      stub_rest :CustomEntityMetadata, :list, 0, './spec/fixtures/resource_forbidden.raw'
-    end
-    it do
-      expect{subject.custom_entity_metadata.all}.to raise_error Moysklad::Client::ResourceForbidden
-    end
-  end
-
 end

data/spec/lib/moysklad_spec.rb

@@ -3,6 +3,5 @@ require 'spec_helper'
 describe Moysklad do
   it 'should be loaded' do
     expect(Moysklad::Entities::Base).to  be_a Class
-    expect(Moysklad::Entities::Company).to be_a Class
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'faraday'
 # https://github.com/vcr/vcr
 require 'webmock/rspec'
 require 'rspec/collection_matchers'
+require 'pry'
 
 Moysklad.logger = Logger.new '/dev/null'
 Dir["./spec/support/**/*.rb"].sort.each { |f| require f}
@@ -42,7 +43,7 @@ RSpec.configure do |config|
     #   # => "be bigger than 2 and smaller than 4"
     # ...rather than:
     #   # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    # expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
   # rspec-mocks config goes here. You can use an alternate test double

data/spec/support/resource.rb

@@ -1,70 +1,5 @@
 module RspecResourceSupport
-
-  def raw_consignment_0_list
-    File.new './spec/fixtures/Consignment_list_0.raw'
-  end
-
-  def raw_consignment_1000_list
-    File.new './spec/fixtures/Consignment_list_1000.raw'
-  end
-
-  def total_consignment_count
-    1280
-  end
-
-  def feature_list_items_count
-    863
-  end
-
-  def raw_feature_list
-    File.new './spec/fixtures/Feature_list.raw'
-  end
-
-  def feature_list_items_count
-    863
-  end
-
-  def stub_rest type, action=:list, start=nil, file=nil
-    url = "https://online.moysklad.ru/exchange/rest/ms/xml/#{type}/#{action}" 
-    url << "?start=#{start}" if start
-    stub_request(:get, url).to_return File.new( file || "./spec/fixtures/#{type}_#{action}.raw" )
-  end
-
-  def stub_stock_rest_with_consignments
-    url = 'https://online.moysklad.ru/exchange/rest/stock/xml?showConsignments=true'
-    stub_request(:get, url).to_return File.new "./spec/fixtures/Stock_showConsignments.raw"
-  end
-
-  def stub_stock_rest
-    url = 'https://online.moysklad.ru/exchange/rest/stock/xml'
-    stub_request(:get, url).to_return File.new "./spec/fixtures/Stock.raw"
-  end
-
-  def client
-    @client ||= Moysklad::Client.new
-  end
-
-  def universe
-    @universe ||= Moysklad::Universe.new client: client
-  end
-
-  def resource_list_url res=nil, start=nil
-    res ||= resource
-    url = Moysklad::Client::URL + '/' + res.send(:list_path)
-    url+="?start=#{start}" if start
-
-    return url
-  end
-
-  def consignments_resource
-    @consignments_resource ||= Moysklad::Resources::Consignments.new client: client
-  end
-
-  def stub_consignments_requests
-    stub_request(:get, resource_list_url(consignments_resource, 0)).to_return(raw_consignment_0_list)
-    stub_request(:get, resource_list_url(consignments_resource, 1000)).to_return(raw_consignment_1000_list)
-  end
-
+  # TODO json stub
 end
 
 RSpec.configure do |config|

data/test.rb

@@ -0,0 +1,177 @@
+#!/bin/bash ruby
+$LOAD_PATH.unshift './lib'
+require 'moysklad'
+require 'byebug'
+require 'pry'
+universe = Moysklad::Universe.build login: ENV['MS_LOGIN'], password: ENV['MS_PASSWORD']
+
+
+# goods -> products
+# good_folders -> productfolders
+# features -> variants
+# consignments -> assortments
+# stock.listWithConsignments
+# uom -> done
+# warehouses
+#
+# custom_entities -> значения словарей (придется брать по-одному)
+#
+# custom_entity_metadata -> словари
+#   https://online.moysklad.ru/api/remap/1.1/entity/companysettings/metadata/
+#
+#   https://online.moysklad.ru/api/remap/1.1/entity/product/metadata/
+#   https://online.moysklad.ru/api/remap/1.1/entity/variant/metadata/
+#
+#   attributes + characteristics
+#
+# embeded_entity_metada -> свойства
+#
+# https://online.moysklad.ru/api/remap/1.1/entity/companysettings/metadata/
+# https://online.moysklad.ru/api/remap/1.1/entity/variant/metadata/
+# https://online.moysklad.ru/api/remap/1.1/entity/product/metadata/
+#
+# stores =  universe.stores.all
+
+# binding.pry
+# puts universe.uoms.list
+#
+# Список словарей
+# m = universe.company_settings_metadata
+##
+## Список аттрибутов
+#dictionaries = m.customEntities
+
+#dictionaries.each do |a|
+  #puts '---'
+  #puts a.meta.href
+  #puts a.entityMeta.href
+  #binding.pry
+  #puts a.entities(universe).map { |e| [e.id, e.name].join(':') }.join(', ')
+#end
+
+a = universe.counterparties.all(filter: { phone: '79033891228' })
+
+
+binding.pry
+
+# products = universe.products.all
+
+o = universe.organizations.all
+
+organization = o.first
+
+cp = Moysklad::Entities::Counterparty.new(
+  name: 'Письменный Данил Викторович (test)',
+  externalCode: 'test-couterpaty',
+  actualAddress: 'Чебоксары, ул. Водопроводная, дом 7',
+  email: 'danil@brandymint.ru',
+  tags: ['kiiiosk'],
+  phone: '+79033891228'
+)
+agent = universe.counterparties.create cp
+assortment = {
+  meta: {
+    "href"=>"https://online.moysklad.ru/api/remap/1.1/entity/product/022528e1-fcfe-11e6-7a69-97110054d4e7",
+    "metadataHref"=>"https://online.moysklad.ru/api/remap/1.1/entity/product/metadata",
+    "type"=>"product",
+    "mediaType"=>"application/json"
+  }
+}
+positions = [
+  Moysklad::Entities::CustomerOrderPosition.new(
+    quantity: 1,
+    price: 123,
+    discount: 0,
+    vat: 0,
+    reserve: 1,
+    assortment: assortment
+  )
+]
+customer_order = Moysklad::Entities::CustomerOrder.new(
+  name: "TEST-#{Time.now.to_i}",
+  code: '123456',
+  moment: Moysklad::Entities::Time.now,
+  vatEnabled: false,
+  applicable: false,
+  organization: organization,
+  agent: agent,
+  # state: state,
+  positions: positions,
+  description: 'Тестовый заказ'
+)
+
+order = universe.customer_orders.create customer_order
+
+binding.pry
+puts order
+
+# puts universe.currencies.findWhere isoCode: '643'
+# Получаем рекурсивно действительно все значения
+#custom_entities = universe.all_custom_entities
+#binding.pry
+#puts custom_entities.count
+#
+# Все элементы словаря
+# list = universe.custom_entities(custom_entity_meta_id: 'e63c1592-807b-11e4-90a2-8ecb00113f68').all
+# puts  list
+# attrs = universe.variants.metadata.attrs
+# attr = attrs.first
+# e63c1592-807b-11e4-90a2-8ecb00113f68
+# entities = attr.entities universe
+#id = "022528e1-fcfe-11e6-7a69-97110054d4e7"
+#byebug
+#products = universe.products.all(expand: :productFolder)
+#byebug
+#products.each do |p|
+  #puts p.dump.to_json
+  ## binding.pry if p.externalCode == 'fhiI8yDIjwC-1-kiIbSO62'
+  ## puts "#{p.externalCode}\t#{p.id}\t#{p.name}"
+#end
+# product.image.download(client)
+
+#products.rows.each do |p|
+  #binding.pry if p.attrs.count > 0
+#end
+
+
+#puts products.count
+
+#products.rows.each do |p|
+  #next unless p.characteristics
+  #puts p.characteristics.map { |c| c.meta.href }
+##  #puts p.characteristics.join('; ')
+#end
+# puts products.metadata
+#roduct = products.rows.first
+
+# Товар с attributes
+# product = universe.products.get "02bbdea5-dbde-11e6-7a69-8f55000f3f4e"
+
+#product_folders = universe.productfolders.list
+#puts product_folders.rows.map { |pf| pf['dump'] }
+#puts product_folders.meta.size
+#puts universe.productfolders.get product_folders.rows.first.id
+
+# variants = universe.variants.list
+# byebug
+## puts variants.meta.size
+#variants.rows.each do |v|
+  #next unless v.characteristics
+  #puts v.characteristics.map { |c| c.meta.href }
+  ## puts v.characteristics.join('; ')
+#end
+#puts products.meta.size
+## puts universe.variants.get variants.rows.first.id
+##
+# stores = universe.stores.list
+#puts stores.meta.size
+## puts universe.stores.get stores.rows.first.id
+#
+
+# consignments = universe.consignments.all
+#
+#stockstore_uri = universe.stores.all.last.meta.href
+#puts stockstore_uri
+#list = universe.assortments.all stockstore: stockstore_uri
+#binding.pry
+#puts list.count