oas_parser 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e23a282d082e25eaa924c99c5c712d5dea421c10
-  data.tar.gz: 843d323be359ce6d6f93fb7f131cfb8a0e0a06b9
+  metadata.gz: f3c162b9a3ad868ac7bd502154850707c02d1b1c
+  data.tar.gz: 7ff14242ea28262097ec1cc3d21adf2ca70d7004
 SHA512:
-  metadata.gz: 22fd955e2530e087f31d47a31ce42d13f14b7315d2f75815e8330d2756cd1b53e87cca4c4dbf34a598e8dff3ea0087aebc6b7aa4d38f63f5ec765ef9952af1f0
-  data.tar.gz: 1de8809dc639360474c0784af4072ae55a4a1155c28d929b4f8298368c4502b7ef4a6daa4b2e6c9631ddada0478593d538e26f5060eaf54245d5b863e3bc2941
+  metadata.gz: 87d32af56fe2cd99ed3353b128e143a724f8704948cabf8e1b57697130c24559af55ef045d3ecd36c3cb8cc517e52245bc53c252aadf2ddeceafe6ad16a355ed
+  data.tar.gz: 5ba21605bd9d4af9b25369d57ffcc7989985c06a3bd1317338efc53eff0afb68e186054d7d8dfa73cbe37f990a9c65f00fa94be0134422f5066eab5da6a3a7e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oas_parser (0.7.0)
+    oas_parser (0.8.0)
       activesupport (~> 5.1.2)
       addressable (~> 2.3)
       builder (~> 3.2.3)
@@ -26,7 +26,7 @@ GEM
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.18)
+    ffi (1.9.21)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -90,7 +90,7 @@ GEM
     simplecov-html (0.10.2)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/oas_parser.rb

@@ -11,6 +11,7 @@ require 'deep_merge'
 
 require_relative 'oas_parser/payload.rb'
 require_relative 'oas_parser/raw_accessor.rb'
+require_relative 'oas_parser/abstract_attribute.rb'
 
 Dir["#{File.dirname(__FILE__)}/oas_parser/**/*.rb"].each do |file|
   require file

data/lib/oas_parser/abstract_attribute.rb

@@ -0,0 +1,48 @@
+module OasParser
+  class AbstractAttribute
+    include OasParser::RawAccessor
+
+    def array?
+      type == 'array'
+    end
+
+    def object?
+      type == 'object'
+    end
+
+    def collection?
+      array? || object?
+    end
+
+    def properties
+      return convert_property_schema_to_properties(raw['properties']) if object?
+      return convert_property_schema_to_properties(items) if array?
+      nil
+    end
+
+    def has_xml_options?
+      raw['xml'].present?
+    end
+
+    def is_xml_attribute?
+      return false unless has_xml_options?
+      raw['xml']['attribute'] || false
+    end
+
+    def is_xml_text?
+      # See: https://github.com/OAI/OpenAPI-Specification/issues/630#issuecomment-350680346
+      return false unless has_xml_options?
+      return true if raw['xml']['text'] || false
+      raw['xml']['x-text'] || false
+    end
+
+    def has_xml_name?
+      return false unless has_xml_options?
+      xml_name || false
+    end
+
+    def xml_name
+      raw['xml']['name']
+    end
+  end
+end

data/lib/oas_parser/parameter.rb

@@ -1,6 +1,5 @@
 module OasParser
-  class Parameter
-    include OasParser::RawAccessor
+  class Parameter < AbstractAttribute
     raw_keys :name, :in, :description, :style, :enum, :schema,
              :minimum, :maximum, :required
 
@@ -19,18 +18,6 @@ module OasParser
       raw['format'] || (schema ? schema['format'] : nil)
     end
 
-    def array?
-      type == 'array'
-    end
-
-    def object?
-      type == 'object'
-    end
-
-    def collection?
-      array? || object?
-    end
-
     def items
       schema['items']
     end
@@ -43,12 +30,6 @@ module OasParser
       raw['default'] || (schema ? schema['default'] : nil)
     end
 
-    def properties
-      return convert_property_schema_to_properties(raw['properties']) if object?
-      return convert_property_schema_to_properties(items) if array?
-      nil
-    end
-
     def convert_property_schema_to_properties(schema)
       schema.map do |name, definition|
         OasParser::Property.new(self, raw, name, definition)

data/lib/oas_parser/property.rb

@@ -1,6 +1,5 @@
 module OasParser
-  class Property
-    include OasParser::RawAccessor
+  class Property < AbstractAttribute
     raw_keys :name, :description, :type, :format, :enum, :minimum, :maximum,
              :example, :default, :items
 
@@ -19,24 +18,6 @@ module OasParser
       schema['required'].include? name
     end
 
-    def array?
-      type == 'array'
-    end
-
-    def object?
-      type == 'object'
-    end
-
-    def collection?
-      array? || object?
-    end
-
-    def properties
-      return convert_property_schema_to_properties(raw['properties']) if object?
-      return convert_property_schema_to_properties(items) if array?
-      nil
-    end
-
     def convert_property_schema_to_properties(schema)
       schema = schema['properties'] if schema['properties']
       schema.map do |name, definition|

data/lib/oas_parser/version.rb

@@ -1,3 +1,3 @@
 module OasParser
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oas_parser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Adam Butler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -198,6 +198,7 @@ files:
 - bin/console
 - bin/setup
 - lib/oas_parser.rb
+- lib/oas_parser/abstract_attribute.rb
 - lib/oas_parser/callback.rb
 - lib/oas_parser/definition.rb
 - lib/oas_parser/endpoint.rb