moysklad 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7ae8b46365bd3f82f6e554164e65f31990c69b
-  data.tar.gz: b1a26c4014c818b508e4146cfb57ff08affb71d9
+  metadata.gz: 4efeba1f53889dcadf798d43f7ead932b79f46aa
+  data.tar.gz: 43231bb4ad37775704644f87741327e9fc060758
 SHA512:
-  metadata.gz: 4624d904cdbeff5bb751bfc2bdf9cd0a0ba3cb17620602d7cb771a3062c61d840d66c5d938ec1c5cd50b145b597fd76a15743caadc71e19d69d26a80e30aee63
-  data.tar.gz: 5ccd7a4e1427e12166b2fc4f8f7b7c43856adcaf6b627e5c2637860346872f96f30f95cd52eb95923f2e2084e8963abc5cfc5ca3000e811ca1ffbf8645ce9555
+  metadata.gz: 4e4b8adea693b27206bf1bbee368589887e85fff11d0c8c019d8f59606aeaa4ba23fcf8beb8517ec5a3c4e77b9130f9bef29f8687b644f7816892ecaefbb1d4f
+  data.tar.gz: c9230163bf46446d6b709b490487048d4e057fcfdf8758b0d15e84d10ccbcb10f1df060b9d9ff0f77169e3b438ce20da4f2d6ec18db90409b00a3b6f003c7845

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 *.rbc
+tags
+gems.tags
 .bundle
 .config
 .yardoc

data/.travis.yml

@@ -1 +1,3 @@
 language: ruby
+rvm:
+  - 2.1.0

data/Guardfile

@@ -9,6 +9,11 @@
 #                          installed the spring binstubs per the docs)
 #  * zeus: 'zeus rspec' (requires the server to be started separetly)
 #  * 'just' rspec: 'rspec'
+guard 'ctags-bundler', :src_path => ["lib", "spec/support"] do
+  watch(/^(app|lib|spec\/support)\/.*\.rb$/)
+  watch('Gemfile.lock')
+end
+
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }

data/Rakefile

@@ -6,3 +6,9 @@ begin
 
 rescue LoadError
 end
+
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']   # optional
+  #t.options = ['--any', '--extra', '--opts'] # optional
+end

data/lib/moysklad/client.rb

@@ -40,7 +40,7 @@ class Moysklad::Client
   def validate res
     return res.body if res.status == 200
 
-    Moysklad::Client::Error.build res
+    Moysklad::Client::Errors.build res
   end
 
 end

data/lib/moysklad/client/errors.rb

@@ -1,6 +1,6 @@
 class Moysklad::Client
   class Errors
-    def self.build
+    def self.build res
       Moysklad.logger.warn "Moyskad::Client: #{res.status}: #{res.env.url.to_s}\n#{res.body}"
 
       case res.status
@@ -10,8 +10,10 @@ class Moysklad::Client
         raise UnauthorizedError.new res
       when 404 
         raise NoResourceFound.new res.body
-      when 500 
+      when 500
         raise ParsedError.new(res)
+      when 502
+        raise HtmlParsedError.new(res)
       else 
         raise ParsedError.new(res)
       end
@@ -36,8 +38,8 @@ class Moysklad::Client
 
   class HtmlParsedError < Error
     def initialize res
-      @result = res
-      @message = parse_title res.body
+      @result  = res
+      @message = "[#{res.status}] #{parse_title res.body}"
     end
 
     private

data/lib/moysklad/entities.rb

@@ -8,6 +8,7 @@ module Moysklad
     autoload :Common
 
     %w{
+      GoodFolder
       Good
       Barcode
       SalePrices
@@ -20,13 +21,17 @@ module Moysklad
       GoodRef
       Base
       CustomerOrder
+      CustomEntity
+      CustomEntityMetadata
       Feature
+      AttributeMetadata
       EmbeddedEntityMetadata
       Price
       StockTO
       Company
       Warehouse
       Collection
+      CustomEntity
       Page
     }.each do |m|
       autoload m

data/lib/moysklad/entities/attribute.rb

@@ -4,8 +4,33 @@ module Moysklad::Entities
 
     tag 'attribute'
 
-    attribute :metadataUuid, String
-    attribute :valueString, String
+    attribute :metadataUuid,    String
+    attribute :valueString,     String
+    attribute :valueText,       String
 
+    attribute :entityValueUuid, String
+
+    # Объект описывающий тип атритуба
+    def metadata universe
+      universe.metadata.subresource_by_name(:GoodFolder).find  metadataUuid
+    end
+
+    def attributeName universe
+      metadata(universe).name
+    end
+
+    def get_value universe
+      md = metadata universe
+      case md.attrType
+      when 'ID_CUSTOM'
+        universe.custom_entities.find( entityValueUuid ).name
+      when 'TEXT'
+        valueText
+      when 'STRING'
+        valueString
+      else
+        raise "Не известный тип мета-аттрибута #{md.uuid}: #{md.attrType}"
+      end
+    end
   end
 end

data/lib/moysklad/entities/attribute_metadata.rb

@@ -0,0 +1,27 @@
+module Moysklad::Entities
+  # https://online.moysklad.ru/exchange/rest/ms/xml/Metadata/list
+  class AttributeMetadata < Base
+    include CommonObject
+
+    tag 'attributeMetadata'
+
+    # ID_CUSTOM - элемент из dictionary
+    # TEXT
+    # STRING
+    attribute :attrType,            String
+    attribute :entityMetadataUuid,  String
+    attribute :feature,             Boolean
+    attribute :position,            Integer
+    attribute :required,            Boolean
+    attribute :dictionaryMetadataUuid, String
+
+    def dictionatyMetadata universe
+      universe.custom_entity_metadata.find dictionaryMetadataUuid
+    end
+
+    def entityMetadata universe
+      universe.metadata.find entityMetadataUuid
+    end
+
+  end
+end

data/lib/moysklad/entities/base.rb

@@ -2,5 +2,15 @@ module Moysklad::Entities
   class Base
     #include Object
 
+    private
+
+    def cache ns, key
+      @cache||={}
+      @cache[ns]||={}
+      cc = @cache[ns]
+
+      cc[key] = yield unless cc.has_key? key
+      cc[key]
+    end
   end
 end

data/lib/moysklad/entities/common.rb

@@ -3,7 +3,6 @@ module Moysklad::Entities::Common
 
   included do
     include HappyMapper
-    include Moysklad::Entities::XmlFix
 
     attribute :readMode,    String
     attribute :changeMode,  String

data/lib/moysklad/entities/custom_entity.rb

@@ -0,0 +1,18 @@
+# https://online.moysklad.ru/exchange/rest/ms/xml/CustomEntity/list
+# Элемент пользовательского справочника
+# (значения перечисляемых свойств)
+module Moysklad::Entities
+  class CustomEntity < Base
+    include CommonObject
+    include XmlFix
+
+    tag 'customEntity'
+
+    attribute :entityMetadataUuid,     String 
+
+    def entityMetadata universe
+      universe.custom_entity_metadata.find entityMetadataUuid
+    end
+
+  end
+end

data/lib/moysklad/entities/custom_entity_metadata.rb

@@ -0,0 +1,35 @@
+# https://online.moysklad.ru/exchange/rest/ms/xml/CustomEntityMetadata/list
+#
+# Пользовательские справочники
+module Moysklad::Entities
+  class CustomEntityMetadata < Base
+    include CommonObject
+    include XmlFix
+
+    tag 'customEntityMetadata'
+
+    attribute :uniqueCode,     Boolean 
+    attribute :codeValueType,  Integer
+    attribute :independentNameGenerator, Boolean
+
+    attribute :partialReserve, Boolean
+
+    attribute :editOnlyByAuthor, Boolean
+
+    attribute :noEditFromOtherPlaceSource, Boolean
+
+    attribute :noApplicableFromOtherPlaceSource, Boolean
+
+    attribute :noEditFromOtherPlaceTarget, Boolean
+
+    attribute :noApplicableFromOtherPlaceTarget, Boolean
+
+    # Список перечисляемых значений данного справочника
+    #
+    # @return [Array[CustomEntity]]
+    def entities universe
+      universe.custom_entities.where entityMetadataUuid: uuid
+    end
+
+  end
+end

data/lib/moysklad/entities/customer_order.rb

@@ -1,6 +1,10 @@
 module Moysklad::Entities
+  # Пример:
+  # https://support.moysklad.ru/hc/ru/articles/203402923-Пример-загрузки-заказа-покупателя-через-REST-API
+  #
   class CustomerOrder < Base
     include CommonObject
+    include XmlFix
 
     tag 'customerOrder'
 

data/lib/moysklad/entities/customer_order_position.rb

@@ -1,6 +1,7 @@
 module Moysklad::Entities
   class CustomerOrderPosition < Base
     include HappyMapper
+    include XmlFix
 
     tag 'customerOrderPosition'
 

data/lib/moysklad/entities/embedded_entity_metadata.rb

@@ -10,6 +10,8 @@ module Moysklad::Entities
     attribute :independentNameGenerator, Boolean
     attribute :partialReserve,           Boolean
 
+    has_many  :attributeMetadata,        AttributeMetadata
+
     element :code,          String
   end
 end

data/lib/moysklad/entities/feature.rb

@@ -8,9 +8,8 @@ module Moysklad::Entities
 
     attribute :archived,    Boolean
 
-    has_many :attribute, Moysklad::Entities::Attribute
-
-    has_many :barcode, Moysklad::Entities::Barcode
+    has_many  :attributes,  Moysklad::Entities::Attribute
+    has_many  :barcodes,    Moysklad::Entities::Barcode
 
   end
 end

data/lib/moysklad/entities/good.rb

@@ -1,31 +1,34 @@
 module Moysklad::Entities
   class Good < Base
     include CommonObject
+    include Moysklad::Entities::XmlFix
 
     tag 'good'
 
     attribute :isSerialTrackable, Boolean
-
     attribute :buyPrice,          Float
     attribute :buyCurrencyUuid,   String
-
     attribute :minPrice,          Float
-
     attribute :salePrice,         Float
     attribute :saleCurrencyUuid,  String
-
     attribute :weight,            Float
     attribute :volume,            Float
-
     attribute :parentUuid,        String
-
     attribute :productCode,       String
-
     attribute :uomUuid,           String
 
-    element :code,          String
+    element   :code,              String
+    element   :salePrices,        Moysklad::Entities::SalePrices
+
+    has_many  :attributes,        Attribute
 
-    element :salePrices,          Moysklad::Entities::SalePrices
+    # preferences
+    # images
 
+    def features universe
+      cache :features, universe do
+        universe.features.where goodUuid: uuid
+      end
+    end
   end
 end

data/lib/moysklad/entities/good_folder.rb

@@ -0,0 +1,9 @@
+module Moysklad::Entities
+  class GoodFolder < Base
+    include CommonObject
+
+    tag 'goodFolder'
+
+    attribute :productCode,   String
+  end
+end

data/lib/moysklad/entities/price.rb

@@ -10,6 +10,6 @@ module Moysklad::Entities
     end
 
     attribute :sumInCurrency, Float
-    attribute :sum, Float
+    attribute :sum,           Float
   end
 end

data/lib/moysklad/entities/xml_fix.rb

@@ -1,11 +1,15 @@
 module Moysklad::Entities::XmlFix
   extend ::ActiveSupport::Concern
 
-  included do
-
-    def to_xml
-      super(Nokogiri::XML::Builder.new(encoding: 'utf-8')).to_xml 
+  def to_xml builder = nil,default_namespace = nil,tag_from_parent = nil
+    unless builder
+      builder = Nokogiri::XML::Builder.new(encoding: 'utf-8')
+      write_out_to_xml = true
     end
+
+    result = super builder, default_namespace, tag_from_parent
+
+    write_out_to_xml ? result.to_xml : result
   end
-end
 
+end

data/lib/moysklad/resources.rb

@@ -8,20 +8,16 @@ module Moysklad::Resources
     self.resources << resource_class
   end
 
-  autoload :Base
-  autoload :Cached
-  autoload :Indexed
-
+  require_relative 'resources/base'
+  require_relative 'resources/indexed'
   require_relative 'resources/stock'
-
-  class Metadata < Base
-    def self.entity_class
-      Moysklad::Entities::EmbeddedEntityMetadata
-    end
-  end
+  require_relative 'resources/metadata'
+  require_relative 'resources/custom_entity_metadata'
+  require_relative 'resources/metadata_indexed'
+  require_relative 'resources/subresource'
 
   # Простые ресурсы
-  %w{Goods Features CustomerOrders Warehouses Attributes Companies Consignments MyCompanies}.each do |klass_name|
+  %w{Goods GoodFolders Features CustomEntities CustomerOrders Warehouses Companies Consignments MyCompanies}.each do |klass_name|
     const_set klass_name, Class.new( Base )
   end
 

data/lib/moysklad/resources/base.rb

@@ -6,6 +6,10 @@ class Moysklad::Resources::Base
     Moysklad::Resources.register_resource superclass
   end
 
+  def self.indexed *args
+    Moysklad::Resources::Indexed.new new(*args)
+  end
+
   # https://support.moysklad.ru/hc/ru/articles/203404253-REST-сервис-синхронизации-данных
   def initialize client: nil
     raise "Должен быть Moysklad::Client" unless client.is_a? Moysklad::Client
@@ -20,7 +24,7 @@ class Moysklad::Resources::Base
     parse_collection client.get list_path, params
   end
 
-  def find uuid
+  def get uuid
     parse client.get item_path uuid
   end
 
@@ -43,12 +47,17 @@ class Moysklad::Resources::Base
   def self.entity_class
     ActiveSupport::Inflector.constantize "Moysklad::Entities::#{type.to_s}"
   end
+
   private
 
   attr_reader :client
 
   def prepare_resource resource
-    resource
+    if resource.is_a? Moysklad::Entities::Base
+      resource.to_xml.to_s
+    else
+      resource.to_s
+    end
   end
 
   def parse content