laximo 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cfb39263229869df79357c9e5e3c6d3511d8a33
-  data.tar.gz: bb889d80dc6c345651e22b5a7d501f4f922e95a6
+  metadata.gz: 99626c806c32592f492fe0e24d61994c33bf31be
+  data.tar.gz: e4ff2a1c16f399420784455ff5aff077bc8b7600
 SHA512:
-  metadata.gz: 9557e607046696bbcf1cb2ccc262bc84b5b945cc0e56f33f540c8e895a598e4fa3a56326d33a6ed7d1a16cb410a9fea92ab7d2228281782bce53ab8562d6c2ce
-  data.tar.gz: 766f30bf452ddffcf1194ea364273b706be2751fdaca4387b391b3991ebca1992dcd260302a419e24dbc1ee43773f5e4a78910fbc104f62cf5769dc44ac8eb84
+  metadata.gz: 41c05199fe8bc5247468224cb5a0330750cfa50f9c120891da834cb6cee7e89fa9b2425385f91abe7c553aa2546f27ae1ca7e107a352907e6155f91f9b8ee229
+  data.tar.gz: bbc5bc26cf6e488055f13a4b04db2f1408912c4b1b3f39b9e7aaf3cf0d2b0d2ec513db958f8bd71335615e973dcb2d696553a30040e95f44d56671b3d5e374e6

data/README.md

@@ -2,7 +2,7 @@
 
 ### Поддержка web-сервисов:
   * [Laximo.Aftermarket](http://laximo.net/index.php/%D0%A1%D0%BB%D1%83%D0%B6%D0%B5%D0%B1%D0%BD%D0%B0%D1%8F:%D0%9C%D0%BE%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA/:Laximo_Web-services:AM:Laximo.Aftermarket)
-  * [Laximo.OЕМ](http://laximo.net/index.php/%D0%A1%D0%BB%D1%83%D0%B6%D0%B5%D0%B1%D0%BD%D0%B0%D1%8F:%D0%9C%D0%BE%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA/:Laximo_Web-services:OEM:Laximo.OEM) (в разработке)
+  * [Laximo.OЕМ](http://laximo.net/index.php/%D0%A1%D0%BB%D1%83%D0%B6%D0%B5%D0%B1%D0%BD%D0%B0%D1%8F:%D0%9C%D0%BE%D0%B9_%D1%8F%D0%B7%D1%8B%D0%BA/:Laximo_Web-services:OEM:Laximo.OEM)
 
 ### Поддерживаемые версии Ruby
 Ruby 1.9.3+
@@ -63,9 +63,9 @@ Laximo.options.debug              false
   * [Laximo.oem.list_units(catalog, vehicle_id, ssd, category_id: nil, localized: false, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:ListUnits)
   * [Laximo.oem.list_categories(catalog, vehicle_id, ssd, category_id: nil, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:ListCategories)
   * [Laximo.oem.get_filter_by_unit(catalog, unit_id, vehicle_id, filter, ssd, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:GetFilterByUnit)
-  * [Laximo.oem.get_unit_info(catalog, ssd, unit_id: nil, localized: false, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:GetUnitInfo)
-  * [Laximo.oem.list_detail_by_unit(catalog, ssd, unit_id: nil, localized: false, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:ListDetailByUnit)
-  * [Laximo.oem.list_image_map_by_unit(catalog, ssd, unit_id: nil)](http://laximo.net/index.php/Laximo_Web-services:OEM:ListImageMapByUnit)
+  * [Laximo.oem.get_unit_info(catalog, ssd, unit_id, localized: false, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:GetUnitInfo)
+  * [Laximo.oem.list_detail_by_unit(catalog, ssd, unit_id, localized: false, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:ListDetailByUnit)
+  * [Laximo.oem.list_image_map_by_unit(catalog, ssd, unit_id)](http://laximo.net/index.php/Laximo_Web-services:OEM:ListImageMapByUnit)
   * [Laximo.oem.get_filter_by_detail(catalog, unit_id, detail_id, filter, ssd, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:GetFilterByDetail)
   * [Laximo.oem.list_quick_group(catalog, vehicle_id, ssd: nil, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:ListQuickGroup)
   * [Laximo.oem.list_quick_detail(catalog, vehicle_id, quick_group_id, all, ssd: nil, localized: false, locale: 'ru_RU')](http://laximo.net/index.php/Laximo_Web-services:OEM:ListQuickDetail)
@@ -86,12 +86,30 @@ res.error    # nil
 res.result   # [{:detailid=>"31454425", :formattedoem=>"078100105NX", :manufacturer=>"SEAT", ...]
 ```
 
-### Замечание
-После вызова одного из методов апи, может быть возвращены разного рода ошибки. Но, есть спец. ошибки:
-  * `Net::HTTPNotFound` (404) -- ваш ssl-сертификат не позвоялет вызывать данный метод апи
-  * `Net::HTTPBadRequest` (400) -- не задан ssl-сертификат
+### Ошибки
+После вызова одного из методов апи, может быть возвращены разного рода ошибки.
+  * `Laximo::SslCertificateError` - ваш ssl-сертификат не найден или недействителен
+  * `Laximo::SoapInvalidParameterError` - неверное значение параметра в запросе к web-сервису
+  * `Laximo::SoapCatalogNotExistsError` - каталог не зарегистрирован в системе
+  * `Laximo::SoapInvalidRequestError` - не верно сформирован запрос к web-сервису
+  * `Laximo::SoapUnknownCommandError` - команда не известна
+  * `Laximo::SoapAccessDeniedError` - доступ запрещен
+  * `Laximo::SoapNotSupportedError` - функция не поддерживается каталогом
+  * `SoapGroupIsNotSearchableError` - поиск по группе запрещён, в связи с слишком большим количеством входящих в группу узлов
+  * `Laximo::SoapError` - общая ошибка протокола SOAP
+
+```ruby
+res = Laximo.oem.get_filter_by_detail('AP1211', '', '', '', '')
+res.success? # false
+res.error?   # true
+res.error    # <Laximo::SoapInvalidParameterError: UnitId>
+res.result   # []
+```
+
+Помимо переисленного списка ошибок, в ответе могут быть возвращены стандартные ошибки библиотеки `Net::HTTP` и интерпретатора Ruby.
 
 ### Лицензия
 
 Автор: [Tyralion](mailto:piliaiev@gmail.com)
+
 Copyright (c) 2015 DansingBytes.ru, под лицензией BSD

data/lib/laximo.rb

@@ -6,6 +6,7 @@ require 'net/http'
 
 require 'laximo/version'
 require 'laximo/options'
+require 'laximo/errors'
 require 'laximo/request'
 require 'laximo/respond'
 

data/lib/laximo/defaults.rb

@@ -4,7 +4,7 @@ Laximo.options.user_agent        "LaximoRuby [#{Laximo::VERSION}]"
 Laximo.options.timeout           10
 
 Laximo.options.am_soap_action    'http://Aftermarket.Kito.ec'
-Laximo.options.am_soap_endpoint  'https://aws.laximo.net/ec.Kito.Aftermarket/services/Catalog.CatalogHttpSoap12Endpoint/'
+Laximo.options.am_soap_endpoint  'https://aws.laximo.net/ec.Kito.Aftermarket/services/Catalog.CatalogHttpSoap11Endpoint/'
 
 Laximo.options.oem_soap_action   'http://WebCatalog.Kito.ec'
-Laximo.options.oem_soap_endpoint 'https://ws.laximo.net/ec.Kito.WebCatalog/services/Catalog.CatalogHttpSoap12Endpoint/'
+Laximo.options.oem_soap_endpoint 'https://ws.laximo.net/ec.Kito.WebCatalog/services/Catalog.CatalogHttpSoap11Endpoint/'

data/lib/laximo/errors.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+module Laximo
+
+  class Error < ::StandardError; end
+
+  class SslCertificateError < ::Laximo::Error; end
+
+  class SoapError < ::Laximo::Error; end
+
+  class SoapInvalidParameterError < ::Laximo::Error; end
+
+  class SoapCatalogNotExistsError < ::Laximo::Error; end
+
+  class SoapInvalidRequestError < ::Laximo::Error; end
+
+  class SoapUnknownCommandError < ::Laximo::Error; end
+
+  class SoapAccessDeniedError < ::Laximo::Error; end
+
+  class SoapNotSupportedError < ::Laximo::Error; end
+
+  class SoapGroupIsNotSearchableError < ::Laximo::Error; end
+
+  ERRORS = {
+    'E_CATALOGNOTEXISTS'  => SoapCatalogNotExistsError,
+    'E_INVALIDPARAMETER'  => SoapInvalidParameterError,
+    'E_INVALIDREQUEST'    => SoapInvalidRequestError,
+    'E_UNKNOWNCOMMAND'    => SoapUnknownCommandError,
+    'E_ACCESSDENIED'      => SoapAccessDeniedError,
+    'E_NOTSUPPORTED'      => SoapNotSupportedError,
+    'E_GROUP_IS_NOT_SEARCHABLE' => SoapGroupIsNotSearchableError
+
+  }.freeze
+
+end # Laximo

data/lib/laximo/oem.rb

@@ -204,7 +204,7 @@ module Laximo
       catalog,
       vehicle_id,
       ssd,
-      category_id:  nil,
+      category_id:  -1,
       localized:    false,
       locale:       'ru_RU'
     )
@@ -227,7 +227,7 @@ module Laximo
       catalog,
       vehicle_id,
       ssd,
-      category_id:  nil,
+      category_id:  -1,
       locale:       'ru_RU'
     )
 
@@ -270,7 +270,7 @@ module Laximo
     def get_unit_info(
       catalog,
       ssd,
-      unit_id:    nil,
+      unit_id,
       localized:  false,
       locale:     'ru_RU'
     )
@@ -291,7 +291,7 @@ module Laximo
     def list_detail_by_unit(
       catalog,
       ssd,
-      unit_id:    nil,
+      unit_id,
       localized:  false,
       locale:     'ru_RU'
     )
@@ -312,7 +312,7 @@ module Laximo
     def list_image_map_by_unit(
       catalog,
       ssd,
-      unit_id: nil
+      unit_id
     )
 
       resp = ::Laximo::Query.

data/lib/laximo/query.rb

@@ -193,7 +193,7 @@ module Laximo
     private
 
     def escape(str)
-      str.nil? ? nil : ::String.new(str)
+      str.nil? ? nil : String(str)
     end # escape
 
   end # Query

data/lib/laximo/respond.rb

@@ -5,7 +5,8 @@ module Laximo
 
     class Base
 
-      RESPONSE_PATH = '//QueryDataResponse/return'.freeze
+      RESPONSE_RESULT     = '//QueryDataResponse/return'.freeze
+      RESPONSE_SOAP_ERROR = '//Fault/faultstring'.freeze
 
       def initialize(request)
 
@@ -40,7 +41,7 @@ module Laximo
 
       private
 
-      def attrs_to_hash(node)
+      def node_to_hash(node)
 
         return {} if node.nil?
 
@@ -48,9 +49,31 @@ module Laximo
         node.attributes.each { |key, snd|
           h[key.to_sym] = snd.value
         }
+
+        return {} if h.empty?
+        yield(h, node) if block_given?
+
         h
 
-      end # attrs_to_hash
+      end # node_to_hash
+
+      def nodes_to_hash(nodes, recursive: true)
+
+        arr = []
+        nodes.each { |node|
+
+          h = {}
+          node.attributes.each { |key, snd|
+            h[key.to_sym] = snd.value
+          }
+
+          h[:children] = nodes_to_hash(node.children, recursive: true) if recursive
+          arr << h
+
+        }
+        arr
+
+      end # nodes_to_hash
 
       def prepare_request(request)
 
@@ -62,10 +85,30 @@ module Laximo
 
       end # prepare_request
 
-      def prepare_error(err)
+      def prepare_error(http)
 
         @result = []
-        @error  = err
+
+        if http.is_a?(::Net::HTTPBadRequest)
+          @error = ::Laximo::SslCertificateError.new('SSL cetificate not found or invalidate')
+        else
+
+          begin
+
+            doc = ::Nokogiri::XML(http.body)
+            doc.remove_namespaces!
+
+            if (res = doc.xpath(RESPONSE_SOAP_ERROR)).empty?
+              @error = http
+            else
+              @error = soap_errors(res.text)
+            end
+
+          rescue => ex
+            @error = ex
+          end
+
+        end
 
       end # prepare_error
 
@@ -76,21 +119,32 @@ module Laximo
           doc = ::Nokogiri::XML(http.body)
           doc.remove_namespaces!
 
-          res = doc.xpath(RESPONSE_PATH).children[0].to_s
+          res = doc.xpath(RESPONSE_RESULT).children[0].to_s
           str_to_xml_tags!(res)
 
           @error  = nil
-          @result = parsing_result(::Nokogiri::XML(res))
+          @result = parsing_result(::Nokogiri::XML(res)) || []
 
         rescue => ex
-          prepare_error(ex)
+
+          @result = []
+          @error  = ex
+
         end
 
       end # prepare_http
 
+      def soap_errors(err_txt)
+
+        err_name, msg = err_txt.split(':')
+
+        err_cls = Laximo::ERRORS[err_name] || ::Laximo::SoapError
+        err_cls.new(msg)
+
+      end # soap_errors
+
       def str_to_xml_tags!(str)
 
-        str.gsub!('&amp;', '&')
         str.gsub!('&apos;', "'")
         str.gsub!('&quot;', '"')
         str.gsub!('&gt;', '>')

data/lib/laximo/respond/find_detail.rb

@@ -9,20 +9,20 @@ module Laximo
 
         str.xpath('//FindDetails/detail').inject([]) { |arr, node|
 
-          h = attrs_to_hash(node)
+          h = node_to_hash(node)
 
           h[:images] = node.xpath('./images/image').inject([]) { |arr1, n1|
-            arr1 << attrs_to_hash(n1)
+            arr1 << node_to_hash(n1)
           }
 
           h[:properties] = node.xpath('./properties/property').inject([]) { |arr1, n1|
-            arr1 << attrs_to_hash(n1)
+            arr1 << node_to_hash(n1)
           }
 
           h[:replacements] = node.xpath('./replacements/replacement').inject([]) { |arr1, n1|
 
-            h1 = attrs_to_hash(n1)
-            h2 = attrs_to_hash(n1.children[0])
+            h1 = node_to_hash(n1)
+            h2 = node_to_hash(n1.children[0])
             h1.merge!(h2)
 
             arr1 << h1

data/lib/laximo/respond/find_oem.rb

@@ -9,20 +9,20 @@ module Laximo
 
         str.xpath('//FindOEM/detail').inject([]) { |arr, node|
 
-          h = attrs_to_hash(node)
+          h = node_to_hash(node)
 
           h[:images] = node.xpath('./images/image').inject([]) { |arr1, n1|
-            arr1 << attrs_to_hash(n1)
+            arr1 << node_to_hash(n1)
           }
 
           h[:properties] = node.xpath('./properties/property').inject([]) { |arr1, n1|
-            arr1 << attrs_to_hash(n1)
+            arr1 << node_to_hash(n1)
           }
 
           h[:replacements] = node.xpath('./replacements/replacement').inject([]) { |arr1, n1|
 
-            h1 = attrs_to_hash(n1)
-            h2 = attrs_to_hash(n1.children[0])
+            h1 = node_to_hash(n1)
+            h2 = node_to_hash(n1.children[0])
             h1.merge!(h2)
 
             arr1 << h1

data/lib/laximo/respond/find_oem_correction.rb

@@ -9,20 +9,14 @@ module Laximo
 
         str.xpath('//FindOEMCorrection/detail').inject([]) { |arr, node|
 
-          h = attrs_to_hash(node)
+          h = node_to_hash(node)
 
-          h[:images] = node.xpath('./images/image').inject([]) { |arr1, n1|
-            arr1 << attrs_to_hash(n1)
-          }
-
-          h[:properties] = node.xpath('./properties/property').inject([]) { |arr1, n1|
-            arr1 << attrs_to_hash(n1)
-          }
-
-          h[:replacements] = node.xpath('./replacements/replacement').inject([]) { |arr1, n1|
+          h[:images]        = nodes_to_hash(node.xpath('./images/image'))
+          h[:properties]    = nodes_to_hash(node.xpath('./properties/property'))
+          h[:replacements]  = node.xpath('./replacements/replacement').inject([]) { |arr1, n1|
 
-            h1 = attrs_to_hash(n1)
-            h2 = attrs_to_hash(n1.children[0])
+            h1 = node_to_hash(n1)
+            h2 = node_to_hash(n1.children[0])
             h1.merge!(h2)
 
             arr1 << h1

data/lib/laximo/respond/find_replacements.rb

@@ -6,11 +6,7 @@ module Laximo
     class FindReplacements < Laximo::Respond::Base
 
       def parsing_result(str)
-
-        str.xpath('//FindReplacements/row').inject([]) { |arr, node|
-          arr << attrs_to_hash(node)
-        }
-
+        nodes_to_hash(str.xpath('//FindReplacements/row'), recursive: false)
       end # parsing_result
 
     end # FindReplacements

data/lib/laximo/respond/find_vehicle_by_frame.rb

@@ -6,8 +6,18 @@ module Laximo
     class FindVehicleByFrame < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//FindVehicleByFrame/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # FindVehicleByFrame
 

data/lib/laximo/respond/find_vehicle_by_vin.rb

@@ -6,8 +6,18 @@ module Laximo
     class FindVehicleByVin < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//FindVehicleByVIN/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # FindVehicleByVin
 

data/lib/laximo/respond/find_vehicle_by_wizard.rb

@@ -6,8 +6,18 @@ module Laximo
     class FindVehicleByWizard < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//FindVehicleByWizard/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # FindVehicleByWizard
 

data/lib/laximo/respond/find_vehicle_by_wizard2.rb

@@ -6,7 +6,17 @@ module Laximo
     class FindVehicleByWizard2 < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
+
+        str.xpath('//FindVehicleByWizard/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
       end
 
     end # FindVehicleByWizard2

data/lib/laximo/respond/get_catalog_info.rb

@@ -6,8 +6,26 @@ module Laximo
     class GetCatalogInfo < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetCatalogInfo/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node)
+
+          h[:features]    = nodes_to_hash(node.xpath('./features/feature'))
+          h[:operations]  = node.xpath('./extensions/operations/opration').inject([]) { |arr1, n1|
+
+            h1 = node_to_hash(n1)
+            h1[:params] = nodes_to_hash(n1.xpath('./params/param'))
+
+            arr1 << h1
+
+          }
+
+          arr << h
+
+        }
+
+      end # parsing_result
 
     end # GetCatalogInfo
 

data/lib/laximo/respond/get_filter_by_detail.rb

@@ -6,8 +6,8 @@ module Laximo
     class GetFilterByDetail < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+        nodes_to_hash(str.xpath('//GetFilterByDetail/row'))
+      end # parsing_result
 
     end # GetFilterByDetail
 

data/lib/laximo/respond/get_filter_by_unit.rb

@@ -6,8 +6,18 @@ module Laximo
     class GetFilterByUnit < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetFilterByUnit/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:values] = nodes_to_hash(n1.xpath('./values/row'))
+          }
+
+          arr < h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # GetFilterByUnit
 

data/lib/laximo/respond/get_unit_info.rb

@@ -6,8 +6,18 @@ module Laximo
     class GetUnitInfo < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetUnitInfo/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # GetUnitInfo
 

data/lib/laximo/respond/get_vehicle_info.rb

@@ -6,8 +6,18 @@ module Laximo
     class GetVehicleInfo < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetVehicleInfo/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # GetVehicleInfo
 

data/lib/laximo/respond/get_wizard.rb

@@ -6,8 +6,18 @@ module Laximo
     class GetWizard < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetWizard/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:options] = nodes_to_hash(node.xpath('./options/row'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # GetWizard
 

data/lib/laximo/respond/get_wizard2.rb

@@ -6,8 +6,18 @@ module Laximo
     class GetWizard2 < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetWizard2/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:options] = nodes_to_hash(node.xpath('./options/row'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # GetWizard2
 

data/lib/laximo/respond/get_wizard_next_step2.rb

@@ -6,8 +6,21 @@ module Laximo
     class GetWizardNextStep2 < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//GetWizardNextStep2').inject([]) { |arr, node|
+
+          h = {}
+
+          h[:previous_step] = nodes_to_hash(node.xpath('./previousStep/row'))
+          h[:currentStep]   = node_to_hash(node.xpath('./currentStep')[0]) { |h1, n2|
+            h1[:options] = nodes_to_hash(n2.xpath('./options/row'))
+          }
+
+          arr << h
+
+        }
+
+      end # parsing_result
 
     end # GetWizardNextStep2
 

data/lib/laximo/respond/list_catalogs.rb

@@ -6,8 +6,27 @@ module Laximo
     class ListCatalogs < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//ListCatalogs/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node)
+
+          h[:features] = nodes_to_hash(node.xpath('./features/feature'))
+
+          h[:operations] = node.xpath('./extensions/operations/opration').inject([]) { |arr1, n1|
+
+            h1 = node_to_hash(n1)
+            h1[:params] = nodes_to_hash(n1.xpath('./params/param'))
+
+            arr1 << h1
+
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # ListCatalogs
 

data/lib/laximo/respond/list_categories.rb

@@ -6,8 +6,8 @@ module Laximo
     class ListCategories < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+        nodes_to_hash(str.xpath('//ListCategories/row'))
+      end # parsing_result
 
     end # ListCategories
 

data/lib/laximo/respond/list_detail_by_unit.rb

@@ -6,8 +6,18 @@ module Laximo
     class ListDetailByUnit < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//ListDetailsByUnit/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # ListDetailByUnit
 

data/lib/laximo/respond/list_image_map_by_unit.rb

@@ -6,8 +6,8 @@ module Laximo
     class ListImageMapByUnit < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+        nodes_to_hash(str.xpath('//ListImageMapByUnit/row'))
+      end # parsing_result
 
     end # ListImageMapByUnit
 

data/lib/laximo/respond/list_manufacturer.rb

@@ -6,11 +6,7 @@ module Laximo
     class ListManufacturer < Laximo::Respond::Base
 
       def parsing_result(str)
-
-        str.xpath('//ListManufacturer/row').inject([]) { |arr, node|
-          arr << attrs_to_hash(node)
-        }
-
+        nodes_to_hash(str.xpath('//ListManufacturer/row'))
       end # parsing_result
 
     end # ListManufacturer

data/lib/laximo/respond/list_quick_detail.rb

@@ -6,8 +6,29 @@ module Laximo
     class ListQuickDetail < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//ListQuickDetail/Category').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+
+            h1[:unit] = n1.xpath('./Unit').inject([]) { |arr1, n2|
+
+              arr1 << node_to_hash(n2) { |h2, n3|
+
+                h1[:attributes] = nodes_to_hash(n3.xpath('./attribute'))
+                h1[:details]    = nodes_to_hash(n3.xpath('./Detail/attribute'))
+
+              }
+
+            }
+
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # ListQuickDetail
 

data/lib/laximo/respond/list_quick_group.rb

@@ -6,8 +6,8 @@ module Laximo
     class ListQuickGroup < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+        nodes_to_hash(str.xpath('//ListQuickGroups/row'))
+      end # parsing_result
 
     end # ListQuickGroup
 

data/lib/laximo/respond/list_units.rb

@@ -6,8 +6,18 @@ module Laximo
     class ListUnits < Laximo::Respond::Base
 
       def parsing_result(str)
-        str
-      end
+
+        str.xpath('//ListUnits/row').inject([]) { |arr, node|
+
+          h = node_to_hash(node) { |h1, n1|
+            h1[:attributes] = nodes_to_hash(n1.xpath('./attribute'))
+          }
+
+          arr << h unless h.empty?
+
+        }
+
+      end # parsing_result
 
     end # ListUnits
 

data/lib/laximo/respond/manufacturer_info.rb

@@ -6,11 +6,7 @@ module Laximo
     class Manufacturer_Info < Laximo::Respond::Base
 
       def parsing_result(str)
-
-        str.xpath('//ManufacturerInfo/row').inject([]) { |arr, node|
-          arr << attrs_to_hash(node)
-        }
-
+        nodes_to_hash(str.xpath('//ManufacturerInfo/row'))
       end # parsing_result
 
     end # Manufacturer_Info

data/lib/laximo/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Laximo
 
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.1'.freeze
 
 end # Laximo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laximo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Ivan Piliaiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,6 +39,7 @@ files:
 - lib/laximo.rb
 - lib/laximo/am.rb
 - lib/laximo/defaults.rb
+- lib/laximo/errors.rb
 - lib/laximo/oem.rb
 - lib/laximo/options.rb
 - lib/laximo/query.rb