fakeit 0.10.0 → 0.12.0

data/lib/fakeit/app/routes/openapi_route.rb

@@ -7,7 +7,7 @@ module Fakeit
         def call(request, options)
           @specification
             .operation(request.request_method.downcase.to_sym, request.path_info, options)
-            .then { _1 ? handle(_1, request, options) : Fakeit::App::Helpers::ResponseBuilder.not_found }
+            .then { it ? handle(it, request, options) : Fakeit::App::Helpers::ResponseBuilder.not_found }
         end
 
         private
@@ -33,9 +33,8 @@ module Fakeit
         def headers(request)
           request
             .each_header
-            .select { |k, _| k.start_with? 'HTTP_' }
-            .map { |k, v| [k.sub(/^HTTP_/, '').split('_').map(&:capitalize).join('-'), v] }
-            .to_h
+            .select { |k, _| k.start_with? "HTTP_" }
+            .to_h { |k, v| [k.sub(/^HTTP_/, "").split("_").map(&:capitalize).join("-"), v] }
         end
 
         def parse_query(query_string)
@@ -43,7 +42,7 @@ module Fakeit
           cgi_query = CGI.parse(query_string)
 
           rack_query.merge(cgi_query.slice(*rack_query.keys)) do |_, oldval, newval|
-            newval.is_a?(Array) && newval.size > 1 ? newval : oldval
+            (newval.is_a?(Array) && newval.size > 1) ? newval : oldval
           end
         end
       end

data/lib/fakeit/core_extensions/array_validator.rb

@@ -1,7 +1,7 @@
 module OpenAPIParser
   class SchemaValidator
     class ArrayValidator
-      alias old_impl coerce_and_validate
+      alias_method :old_impl, :coerce_and_validate
 
       def coerce_and_validate(value, schema, **keyword_args)
         coerced_value = schema.parent.is_a?(OpenAPIParser::Schemas::Parameter) ? [*value] : value

data/lib/fakeit/core_extensions/schema.rb

@@ -1,11 +1,11 @@
-require 'fakeit/openapi/schema'
+require "fakeit/openapi/schema"
 
 module OpenAPIParser
   module Schemas
     class Schema
       include Fakeit::Openapi::Schema
 
-      alias old_type type
+      alias_method :old_type, :type
 
       def type = old_type || inferred_type
 
@@ -13,9 +13,9 @@ module OpenAPIParser
 
       def inferred_type
         if properties
-          'object'
+          "object"
         elsif items
-          'array'
+          "array"
         end
       end
     end

data/lib/fakeit/middleware/recorder.rb

@@ -6,16 +6,16 @@ module Fakeit
       def call(env)
         env
           .tap(&method(:log_request))
-          .then { @app.call(_1) }
+          .then { @app.call(it) }
           .tap(&method(:log_response))
       end
 
       private
 
       def log_request(env)
-        env['rack.input']
+        env["rack.input"]
           &.tap { |body| Logger.info("Request body: #{body.read}") }
-          &.tap { |body| body.rewind }
+          &.tap(&:rewind)
       end
 
       def log_response(response) = Logger.info("Response body: #{response[2].first}")

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

@@ -3,7 +3,7 @@ module Fakeit
     module Example
       def array_example(options)
         example_options = add_depth(options)
-        if example_options[:use_static][type: 'array', property: example_options[:property]]
+        if example_options[:use_static][type: "array", property: example_options[:property]]
           generate_array_example(example_options, -> { non_empty_size })
         else
           generate_array_example(example_options, -> { random_array_size(example_options) })
@@ -14,7 +14,7 @@ module Fakeit
 
       def generate_array_example(example_options, get_size)
         size = retries = get_size[]
-        [].tap { generate_items(size, retries, example_options, _1) }
+        [].tap { generate_items(size, retries, example_options, it) }
       end
 
       def random_array_size(example_options)
@@ -33,7 +33,7 @@ module Fakeit
         end
       end
 
-      def add_depth(example_options) = { **example_options, depth: example_options[:depth] + 1 }
+      def add_depth(example_options) = {**example_options, depth: example_options[:depth] + 1}
 
       def need_retry?(item, result, retries) = uniqueItems && result.include?(item) && retries.positive?
 
@@ -41,7 +41,7 @@ module Fakeit
 
       def min_array = minItems || 1
 
-      def max_array(depth) = maxItems || min_array + (depth > 1 ? 2 : 9)
+      def max_array(depth) = maxItems || (min_array + ((depth > 1) ? 2 : 9))
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Fakeit
   module Openapi
     module Example
       def boolean_example(example_options)
-        example_options[:use_static][type: 'boolean', property: example_options[:property]] || Faker::Boolean.boolean
+        example_options[:use_static][type: "boolean", property: example_options[:property]] || Faker::Boolean.boolean
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Fakeit
       DEFAULT_BITS = 32
 
       def integer_example(example_options)
-        if example_options[:use_static][type: 'integer', property: example_options[:property]]
+        if example_options[:use_static][type: "integer", property: example_options[:property]]
           static_integer_example
         else
           random_integer_example
@@ -29,7 +29,7 @@ module Fakeit
         end
       end
 
-      def int_rand_begin = min_int / int_multiple + int_rand_begin_adjust
+      def int_rand_begin = (min_int / int_multiple) + int_rand_begin_adjust
 
       def int_rand_end = max_int / int_multiple
 
@@ -49,12 +49,12 @@ module Fakeit
         if maximum
           exclusiveMaximum ? maximum - 1 : maximum
         else
-          2**(int_bits - 1) - 1
+          (2**(int_bits - 1)) - 1
         end
       end
 
       def int_bits
-        return DEFAULT_BITS unless format =~ /int\d+/
+        return DEFAULT_BITS unless /int\d+/.match?(format)
 
         format[/\d+/].to_i
       end

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

@@ -2,10 +2,10 @@ module Fakeit
   module Openapi
     module Example
       MIN_NUM = -2**31
-      MAX_NUM = 2**31 - 1
+      MAX_NUM = (2**31) - 1
 
       def number_example(example_options)
-        if example_options[:use_static][type: 'number', property: example_options[:property]]
+        if example_options[:use_static][type: "number", property: example_options[:property]]
           static_number_example
         else
           random_number_example
@@ -14,11 +14,11 @@ module Fakeit
 
       private
 
-      def static_number_example = (num_rand_end * num_multiple).then { multipleOf ? _1 : _1.round(2) }
+      def static_number_example = (num_rand_end * num_multiple).then { multipleOf ? it : it.round(2) }
 
       def random_number_example
         (Faker::Number.between(from: num_rand_begin, to: num_rand_end) * num_multiple)
-          .then { multipleOf ? _1 : _1.round(2) }
+          .then { multipleOf ? it : it.round(2) }
       end
 
       def num_rand_begin = multipleOf ? (min_num / multipleOf).ceil : min_num

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

@@ -2,34 +2,34 @@ module Fakeit
   module Openapi
     module Example
       STATIC_FORMAT_HANDLERS = {
-        'uri' => -> { 'https://some.uri' },
-        'uuid' => -> { '11111111-1111-1111-1111-111111111111' },
-        'guid' => -> { '11111111-1111-1111-1111-111111111111' },
-        'email' => -> { 'some@email.com' },
-        'date' => -> { Date.today.iso8601 },
-        'date-time' => lambda do
+        "uri" => -> { "https://some.uri" },
+        "uuid" => -> { "11111111-1111-1111-1111-111111111111" },
+        "guid" => -> { "11111111-1111-1111-1111-111111111111" },
+        "email" => -> { "some@email.com" },
+        "date" => -> { Date.today.iso8601 },
+        "date-time" => lambda do
           now = Time.now
           Time.new(now.year, now.month, now.day, 0, 0, 0, now.utc_offset).iso8601
         end,
-        'binary' => -> { 'binary' },
-        'byte' => -> { 'Ynl0ZQ==' }
+        "binary" => -> { "binary" },
+        "byte" => -> { "Ynl0ZQ==" }
       }.freeze
 
       RANDOM_FORMAT_HANDLERS = {
-        'uri' => -> { Faker::Internet.url },
-        'uuid' => -> { SecureRandom.uuid },
-        'guid' => -> { SecureRandom.uuid },
-        'email' => -> { Faker::Internet.email },
-        'date' => -> { Faker::Date.backward(days: 100).iso8601 },
-        'date-time' => -> { Faker::Time.backward(days: 100).iso8601 },
-        'binary' => -> { Faker::String.random(length: 1..30) },
-        'byte' => -> { Base64.strict_encode64(Faker::String.random(length: 1..30)) }
+        "uri" => -> { Faker::Internet.url },
+        "uuid" => -> { SecureRandom.uuid },
+        "guid" => -> { SecureRandom.uuid },
+        "email" => -> { Faker::Internet.email },
+        "date" => -> { Faker::Date.backward(days: 100).iso8601 },
+        "date-time" => -> { Faker::Time.backward(days: 100).iso8601 },
+        "binary" => -> { Faker::String.random(length: 1..30) },
+        "byte" => -> { Base64.strict_encode64(Faker::String.random(length: 1..30)) }
       }.freeze
 
       def string_example(example_options)
         @string_pattern ||= Regexp.new(pattern) if pattern
 
-        if example_options[:use_static][type: 'string', property: example_options[:property]]
+        if example_options[:use_static][type: "string", property: example_options[:property]]
           static_string_example
         else
           random_string_example
@@ -44,7 +44,8 @@ module Fakeit
           elsif pattern then static_string_pattern
           elsif format then static_string_format
           elsif length_constraint then static_string_with_length
-          else 'string'
+          else
+            "string"
           end
         end
       end
@@ -61,11 +62,12 @@ module Fakeit
         elsif pattern then random_string_pattern
         elsif format then random_string_format
         elsif length_constraint then string_with_length
-        else Faker::Book.title
+        else
+          Faker::Book.title
         end
       end
 
-      def static_string_with_length = '1' * max_string_length
+      def static_string_with_length = "1" * max_string_length
 
       def static_string_format = (STATIC_FORMAT_HANDLERS[format] || method(:unknown_format))[]
 
@@ -81,7 +83,7 @@ module Fakeit
 
       def min_string_length = minLength || 0
 
-      def max_string_length = maxLength || min_string_length + 10
+      def max_string_length = maxLength || (min_string_length + 10)
 
       def random_string_format = (RANDOM_FORMAT_HANDLERS[format] || method(:unknown_format))[]
 
@@ -89,7 +91,7 @@ module Fakeit
 
       def unknown_format
         Logger.info("Unknown string format: #{format}")
-        'Unknown string format'
+        "Unknown string format"
       end
     end
   end

data/lib/fakeit/openapi/loader.rb

@@ -4,20 +4,20 @@ module Fakeit
       def load(src)
         URI
           .open(src, &:read)
-          .then { parse(src, _1) }
-          .then(&OpenAPIParser.method(:parse))
+          .then { parse(src, it) }
+          .then { OpenAPIParser.parse(it, {strict_reference_validation: true}) }
       end
 
       private
 
       def parse(src, content)
         case File.extname(src)
-        when '.json'
+        when ".json"
           JSON.parse(content)
-        when '.yml', '.yaml'
+        when ".yml", ".yaml"
           YAML.safe_load(content, [Date, Time])
         else
-          raise 'Invalid openapi specification file'
+          raise "Invalid openapi specification file"
         end
       end
     end

data/lib/fakeit/openapi/operation.rb

@@ -12,8 +12,8 @@ module Fakeit
       def headers
         response_headers
           .to_h
-          .transform_values { _1.schema.to_example(example_options) }
-          .tap { _1['Content-Type'] = response_content_type if response_content_type }
+          .transform_values { it.schema.to_example(example_options) }
+          .tap { it["Content-Type"] = response_content_type if response_content_type }
       end
 
       def body
@@ -31,11 +31,11 @@ module Fakeit
       def serialise(body) = body.is_a?(String) ? body : JSON.generate(body)
 
       def example_options
-        { use_example: @app_options.use_example, use_static: @app_options.method(:use_static?), depth: 0 }
+        {use_example: @app_options.use_example, use_static: @app_options.method(:use_static?), depth: 0}
       end
 
       def response_content
-        response.last.content&.find { |k, _| k =~ %r{^application/.*json} || k == 'application/pdf' }
+        response.last.content&.find { |k, _| k =~ %r{^application/.*json} || k == "application/pdf" }
       end
 
       def response_schema = response_content&.last

data/lib/fakeit/openapi/schema.rb

@@ -1,9 +1,9 @@
-require 'fakeit/openapi/example/array_example'
-require 'fakeit/openapi/example/boolean_example'
-require 'fakeit/openapi/example/integer_example'
-require 'fakeit/openapi/example/number_example'
-require 'fakeit/openapi/example/object_example'
-require 'fakeit/openapi/example/string_example'
+require "fakeit/openapi/example/array_example"
+require "fakeit/openapi/example/boolean_example"
+require "fakeit/openapi/example/integer_example"
+require "fakeit/openapi/example/number_example"
+require "fakeit/openapi/example/object_example"
+require "fakeit/openapi/example/string_example"
 
 module Fakeit
   module Openapi
@@ -32,20 +32,20 @@ module Fakeit
 
       def all_of_example(example_options)
         all_of
-          .select { _1.type == 'object' }
-          .map { _1.to_example(example_options) }
+          .select { it.type == "object" }
+          .map { it.to_example(example_options) }
           .reduce(&:merge)
       end
 
       def any_of_example(example_options)
         any_of_options(example_options)
-          .map { _1.to_example(example_options) }
+          .map { it.to_example(example_options) }
           .reduce(&:merge)
       end
 
       def any_of_options(example_options)
         any_of
-          .select { _1.type == 'object' }
+          .select { it.type == "object" }
           .then do |options|
             if example_options[:use_static][property: example_options[:property]]
               options
@@ -56,7 +56,7 @@ module Fakeit
       end
 
       def type_based_example(example_options)
-        send("#{type}_example", example_options) if %w[string integer number boolean array object].include?(type)
+        send(:"#{type}_example", example_options) if %w[string integer number boolean array object].include?(type)
       end
     end
   end

data/lib/fakeit/openapi/specification.rb

@@ -12,7 +12,7 @@ module Fakeit
 
         @doc
           .request_operation(method, path)
-          &.then { Operation.new(_1, options) }
+          &.then { Operation.new(it, options) }
       end
 
       private
@@ -24,8 +24,8 @@ module Fakeit
 
         @mtime = new_mtime
         @doc = Fakeit::Openapi.load(@spec_file)
-      rescue StandardError => _e
-        Logger.warn(Rainbow('Invalid spec file, use previous snapshot instead').red)
+      rescue
+        Logger.warn(Rainbow("Invalid spec file, use previous snapshot instead").red)
       end
     end
   end

data/lib/fakeit/validation/validator.rb

@@ -9,7 +9,7 @@ module Fakeit
         validate_body(body) unless request_content_types.empty?
         @operation.validate_path_params(options)
         @operation.validate_request_parameter(params, headers, options)
-      rescue StandardError => e
+      rescue => e
         raise ValidationError, e.message
       end
 
@@ -19,12 +19,12 @@ module Fakeit
         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
+          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'
+      def can_validate?(media_type) = media_type =~ %r{^application/.*json} || media_type == "multipart/form-data"
 
       def request_content_types = request_body&.content&.keys.to_a
 

data/lib/fakeit/version.rb

@@ -1,3 +1,3 @@
 module Fakeit
-  VERSION = '0.10.0'.freeze
+  VERSION = "0.12.0".freeze
 end

data/lib/fakeit.rb

@@ -1,15 +1,17 @@
-require 'json'
-require 'yaml'
-require 'open-uri'
-require 'base64'
-require 'openapi_parser'
-require 'faker'
-require 'regexp-examples'
-require 'rack'
-require 'logger'
-require 'rainbow'
+require "base64"
+require "faker"
+require "json"
+require "logger"
+require "openapi_parser"
+require "open-uri"
+require "rack"
+require "rackup"
+require "rainbow"
+require "regexp-examples"
+require "webrick"
+require "yaml"
 
-Dir.glob(File.join(File.dirname(__FILE__), 'fakeit', '**/*.rb')).each { require _1 }
+Dir.glob(File.join(File.dirname(__FILE__), "fakeit", "**/*.rb")).each { require it }
 
 module Fakeit
   class << self