fakeit 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 110dc63680d60c4b438f4d2162c7164a6306519e4852cd68dbb36de630210a20
-  data.tar.gz: 9ccc8d513d56cb66f6ed5438841052add1206cf2f5f0710cefa1956b2d2ffb72
+  metadata.gz: '08e498097efdfb3a803d5fcafc2f755b37f74ade0b0d409ba9ea36cd0ffbc0fd'
+  data.tar.gz: 77abcf6e9aa8db912d6b6a158a2cc8a95bbced90311617692e1f67f99e1d7249
 SHA512:
-  metadata.gz: 23e5abad04ebea0e94c2bb643f77ecd86b4daec69ca13df18713a4c2ca2e601c019110435041d510281a41edd753ac3baf013a8fe1fbd606480eb7eea232bba6
-  data.tar.gz: fb0fd7e1a33e71b434baa3a3c8a053a41cd8f29d3d93454b73d41fd9c8bf847974553964367b03039f7905444d061843bd0557feda246e7686a50c75c6fccb75
+  metadata.gz: cce0c415a9e2fb40b9b55178dd9b85b8b8f643453ab3e3d4a2203269af0ca7650adca35b464c30f7e82c3b29e8f2319ff1a8543ee8f3d0f793dfa28945f038f5
+  data.tar.gz: ac9ca06debd2181ee4332edbd30e7a3413f1cf4caeec7981340c6189258615411928364836601b8772be3d8efa87dd72e69e18870b8bd1e0c5dbcf3eb5ee821c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fakeit (0.5.3)
+    fakeit (0.6.0)
       faker (= 2.11.0)
       openapi_parser (= 0.8.0)
       rack (~> 2.0)

data/docs/static.md

@@ -6,6 +6,7 @@ Static value generation rule
 |---|---|---|
 |complex|oneOf|first item|
 | |anyOf|same as allOf|
+|boolean|N/A|`true`|
 |array|N/A|size is `1`|
 | |minItems|size is minItems|
 |string|N/A|`string`|

data/lib/fakeit/app/app.rb

@@ -36,7 +36,7 @@ module Fakeit
 
       def validate(operation, request)
         operation.validate(
-          body: request.body&.read.to_s,
+          body: BodyParser.parse(request),
           params: parse_query(request.query_string),
           headers: headers(request)
         )

data/lib/fakeit/app/body_parser.rb

@@ -0,0 +1,30 @@
+module Fakeit
+  module App
+    class BodyParser
+      class << self
+        def parse(request)
+          case request.media_type
+          when %r{^application/.*json}
+            { media_type: request.media_type, data: parse_json(request.body.read) }
+          when 'multipart/form-data'
+            { media_type: request.media_type, data: parse_form_data(request.params) }
+          else
+            { media_type: request.media_type, data: request.body.read }
+          end
+        end
+
+        private
+
+        def parse_json(body)
+          JSON.parse(body)
+        rescue StandardError
+          raise Fakeit::Validation::ValidationError, 'Invalid json payload'
+        end
+
+        def parse_form_data(params)
+          params.transform_values { |v| v.class == Hash && v[:tempfile] ? v[:tempfile].read : v }
+        end
+      end
+    end
+  end
+end

data/lib/fakeit/openapi/example/array_example.rb

@@ -18,17 +18,17 @@ module Fakeit
       end
 
       def random_array_size(example_options)
-        uniqueItems ? min_array : Faker::Number.between(from: min_array, to: max_array(example_options[:depth]))
+        uniqueItems ? unique_array_size : Faker::Number.between(from: min_array, to: max_array(example_options[:depth]))
       end
 
       def generate_items(size, retries, example_options, result)
-        loop do
+        while result.size < size
           item = items.to_example(example_options)
 
           if need_retry?(item, result, retries)
             retries -= 1
-          elsif (result << item).size >= size
-            break
+          else
+            result << item
           end
         end
       end
@@ -41,6 +41,10 @@ module Fakeit
         uniqueItems && result.include?(item) && retries.positive?
       end
 
+      def unique_array_size
+        [min_array, 1].max
+      end
+
       def min_array
         minItems || 1
       end

data/lib/fakeit/validation/validator.rb

@@ -5,13 +5,10 @@ module Fakeit
         @operation = operation
       end
 
-      def validate(body: '', params: {}, headers: {})
+      def validate(body: {}, params: {}, headers: {})
         options = OpenAPIParser::SchemaValidator::Options.new(coerce_value: true)
 
-        if request_content_type
-          body_data = parse(body)
-          @operation.validate_request_body(request_content_type, body_data)
-        end
+        validate_body(body) unless request_content_types.empty?
         @operation.validate_path_params(options)
         @operation.validate_request_parameter(params, headers, options)
       rescue StandardError => e
@@ -20,14 +17,21 @@ module Fakeit
 
       private
 
-      def parse(body)
-        JSON.parse(body)
-      rescue StandardError
-        raise ValidationError, 'Invalid json payload'
+      def validate_body(body)
+        if request_content_types.include?(body[:media_type])
+          @operation.validate_request_body(body[:media_type], body[:data]) if can_validate?(body[:media_type])
+        else
+          raise ValidationError, 'Invalid request content type' if body[:media_type]
+          raise ValidationError, 'Request body is required' if request_body.required
+        end
+      end
+
+      def can_validate?(media_type)
+        media_type =~ %r{^application/.*json} || media_type == 'multipart/form-data'
       end
 
-      def request_content_type
-        request_body&.content&.find { |k, _| k =~ %r{^application/.*json} }&.first
+      def request_content_types
+        request_body&.content&.keys.to_a
       end
 
       def request_body

data/lib/fakeit/version.rb

@@ -1,3 +1,3 @@
 module Fakeit
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakeit
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Feng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -215,6 +215,7 @@ files:
 - fakeit.gemspec
 - lib/fakeit.rb
 - lib/fakeit/app/app.rb
+- lib/fakeit/app/body_parser.rb
 - lib/fakeit/app/options.rb
 - lib/fakeit/core_extensions/findable.rb
 - lib/fakeit/core_extensions/path_item_finder.rb