oas_parser 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9110cf5aa4a2d8a2a48ddd895fa6f022f3b58dd1
-  data.tar.gz: 70e5357430309ed3d4317de5a7a79e109ea045bd
+  metadata.gz: 7621b9bf0c9a6613ec55ae5e28455a9bf3027290
+  data.tar.gz: f7c08c893f7bb1ade6f3ab34d96e6c97a5fa184c
 SHA512:
-  metadata.gz: 6f78415f5deb0af71f6f3e05074e5f239ebe5c31fef5ff25a2f4a593e802f719d4e4d49f7fccc9aa8d59e456bad7ede1eba213f561225d784f7c7b23b5e28240
-  data.tar.gz: d3e9334eafd9039a9c1fb356c561b3185d465217ba56a78a3ce55e0951e567d1a6c821bce62feb88d4fa4b3fd4d12a287c72a4c9e730c7bd9ad166d5d91d75cb
+  metadata.gz: 42643290ad8e381f90600da01b15ae04c706c33128f746c537ba2c9ef7999f55f261a60fb54ed77907cf179142c118a58befdb5a79b414cb9defd95f0e133569
+  data.tar.gz: 52e6ba6b817e39fdb4745629038b0210fbd2b82c3b9444f9ea33169de7d2ce0694cd9cd8373d1d5ad1e304d1a3723c14eca133a81e044b7d6cda7be8b5b8b3e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.2.0)
+    oas_parser (0.3.0)
       activesupport (~> 5.1.2)
       addressable (~> 2.3)
       builder (~> 3.2.3)

data/lib/oas_parser/response_parser.rb

@@ -31,6 +31,11 @@ module OasParser
         end
       end
 
+      xml_document.xpath('//__text').each do |attribute|
+        value = attribute.children.last.content
+        attribute.parent.content = value
+      end
+
       xml_document.xpath('//__attributes').each(&:remove)
 
       xml_document.to_xml.each_line.reject { |x| x.strip == '' }.join
@@ -75,9 +80,15 @@ module OasParser
       elsif object['properties']
         o = {}
         object['properties'].each do |key, value|
-          if @mode == 'xml' && is_xml_attribute?(value)
-            o['__attributes'] ||= {}
-            o['__attributes'][key] = parameter_value(value)
+          if @mode == 'xml'
+            if is_xml_attribute?(value)
+              o['__attributes'] ||= {}
+              o['__attributes'][key] = parameter_value(value)
+            end
+
+            if is_xml_text?(value)
+              o['__text'] = parameter_value(value)
+            end
           end
 
           o[key] = parameter_value(value)
@@ -145,5 +156,12 @@ module OasParser
       return false unless has_xml_options?(object)
       object['xml']['attribute'] || false
     end
+
+    def is_xml_text?(object)
+      # See: https://github.com/OAI/OpenAPI-Specification/issues/630#issuecomment-350680346
+      return false unless has_xml_options?(object)
+      return true if object['xml']['text'] || false
+      object['xml']['x-text'] || false
+    end
   end
 end

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable