laximo 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08247f7af2c6825a9b54dc0f3f1cdc04887389f9
-  data.tar.gz: 1dccf010d351615a04ebe75f7e68e607b1a62c33
+  metadata.gz: 8a8a5cc64dce4a7534adb6d32c38d921f9cd0106
+  data.tar.gz: 39c12a89013080d1a370c1e43cf2fe6c7706969c
 SHA512:
-  metadata.gz: d1e1640972e8ad09d64e18f6efb1c638f5b2a20d0f5f0b439361069f8c0b6ba77482a7b0dde410c770077f2138ecf04395268a7aebace3d6ce6b2548fe70cd8a
-  data.tar.gz: be8d348848579683ff657bbff9269884799116494f11e2bd3af1379d70ee830a71e72ba9ebe74061b3a2eba1aa0fcd6304a52a1446a608a22e923b7f51c214e6
+  metadata.gz: 4857609dc8b4dbae7b3bac1175c9340d49fb836c9ad6e082dae0ce3088f46b161adda840f3bcefbee5d25aeef844667cf7a8bb602bff828c27e152a4ad4fbef6
+  data.tar.gz: 5f9b9d285774cf8440f3bea930f795ab937c893078b9b80a62d134fc65b9bcfcd1f696c7bdb5245a4889ff843af4af17098ea6278ad742edcb234f248c1f391b

data/lib/laximo.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'nokogiri'
 
+require 'cgi'
 require 'uri'
 require 'net/http'
 

data/lib/laximo/oem.rb

@@ -377,8 +377,8 @@ module Laximo
     def list_quick_group(
       catalog:,
       vehicle_id:,
-      ssd:    nil,
-      locale: 'ru_RU'
+      ssd:        nil,
+      locale:     'ru_RU'
     )
 
       resp = ::Laximo::Query.
@@ -397,10 +397,10 @@ module Laximo
       catalog:,
       vehicle_id:,
       quick_group_id:,
-      all:,
-      ssd:        nil,
-      localized:  true,
-      locale:     'ru_RU'
+      all:            1,
+      ssd:            nil,
+      localized:      true,
+      locale:         'ru_RU'
     )
 
       resp = ::Laximo::Query.
@@ -408,7 +408,7 @@ module Laximo
         locale(locale).
         catalog(catalog).
         vehicle_id(vehicle_id).
-        quick_group_id(quick_group_id),
+        quick_group_id(quick_group_id).
         all(all).
         ssd(ssd).
         localized(localized).

data/lib/laximo/respond.rb

@@ -67,7 +67,10 @@ module Laximo
             h[key.to_sym] = snd.value
           }
 
-          h[:children] = nodes_to_hash(node.children, recursive: true) if recursive
+          if recursive
+            children      = nodes_to_hash(node.children, recursive: true)
+            h[:children]  = children unless children.empty?
+          end
           arr << h
 
         }
@@ -120,10 +123,11 @@ module Laximo
           doc.remove_namespaces!
 
           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(unescape(res))
+          ) || []
 
         rescue => ex
 
@@ -143,15 +147,9 @@ module Laximo
 
       end # soap_errors
 
-      def str_to_xml_tags!(str)
-
-        str.gsub!('&apos;', "'")
-        str.gsub!('&quot;', '"')
-        str.gsub!('&gt;', '>')
-        str.gsub!('&lt;', '<')
-        str
-
-      end # str_to_xml_tags!
+      def unescape(str)
+        ::CGI::unescapeHTML str
+      end # unescape
 
     end # Base
 

data/lib/laximo/respond/list_quick_detail.rb

@@ -15,8 +15,13 @@ module Laximo
 
               arr1 << node_to_hash(n2) { |h2, n3|
 
-                h1[:attributes] = nodes_to_hash(n3.xpath('./attribute'))
-                h1[:details]    = nodes_to_hash(n3.xpath('./Detail/attribute'))
+                h2[:details] = n3.xpath('./Detail').inject([]) { |arr2, n4|
+
+                  arr2 << node_to_hash(n4) { |h3, n5|
+                    h3[:attributes] = nodes_to_hash(n5.xpath('./attribute'))
+                  }
+
+                }
 
               }
 

data/lib/laximo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: laximo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ivan Pilyaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Api for Laximo services