fakeit 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12f260511e656b09583cd6c2d2dba67d5b7f947c3242eca95c7b3cf2cec34c0a
-  data.tar.gz: 48625a13975517595721666508dbaa4f151a421ed24bae0e8a6c053e94e995c3
+  metadata.gz: 9ea17f6b5e42fc32d82440e4198d5402d2ba51b02dc36182d50db13d33fea840
+  data.tar.gz: '09f5e2290f08d07a71b539b80cff919a37d0be2a8567b315a280c8c6699e07f7'
 SHA512:
-  metadata.gz: 82d5e751a1591754f540d4fad85caffc8d697d4a81cb92a0d0ce000c4571a08613565aef6e43919db5712579162f96b676541129b071acaf95c55c3da4ffb200
-  data.tar.gz: f480f86e2f9fda5944ee31996b641f1bc0fb3384cab6df126ce2b238cb3759aeb6b2d53dee7d881239369a2f3d8233b315ad3a6e7a592c8f2eb39509b63cd3d9
+  metadata.gz: c139f4c1654a3e4261b31c7cbed720819e3f9aaa74c54042bb297d4e587412811542c7d8fb35d294a66b0bf27bb0ce0328835ed5b47d61a9c02abc45b7708d4a
+  data.tar.gz: cbf4746fbcbfe72714f50af0afcc242f49b6de65056cb7d1edf5058de3a8ed488d9e20314475ae5aefbfc8a4cb132f6d561b52c4a12424700775354d9e15b06b

data/.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
 
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:3.0.0
+      - image: cimg/ruby:3.1.2
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

data/.gitignore

@@ -10,6 +10,4 @@
 # rspec failure tracking
 .rspec_status
 
-.byebug_history
-
 .idea

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.1
   NewCops: enable
+  SuggestExtensions: false
 
 Style/Documentation:
   Enabled: false
@@ -21,3 +22,9 @@ Security/Open:
 
 Style/HashTransformKeys:
   Enabled: false
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
+Metrics/MethodLength:
+  Max: 20

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fakeit (0.10.0)
-      faker (= 2.18.0)
-      openapi_parser (= 0.14.1)
+    fakeit (0.11.0)
+      faker (= 2.22.0)
+      openapi_parser (= 1.0.0)
       rack (~> 2.0)
       rack-cors (~> 1.0)
       rainbow (~> 3.0)
@@ -15,52 +15,53 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    byebug (11.1.3)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    faker (2.18.0)
-      i18n (>= 1.6, < 2)
-    i18n (1.8.11)
+    faker (2.22.0)
+      i18n (>= 1.8.11, < 2)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    openapi_parser (0.14.1)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    json (2.6.2)
+    openapi_parser (1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    rack (2.2.3)
+    rack (2.2.4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rainbow (3.0.0)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rainbow (3.1.1)
     rake (13.0.6)
     regexp-examples (1.5.1)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.19.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.10.0)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
@@ -69,9 +70,9 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    slop (4.9.1)
-    unicode-display_width (2.0.0)
+    simplecov_json_formatter (0.1.4)
+    slop (4.9.3)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
 
 PLATFORMS
@@ -79,9 +80,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  byebug (~> 11.0)
   fakeit!
-  rack-test (~> 1.1)
+  rack-test (~> 2.0)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 1.10)
@@ -89,4 +89,4 @@ DEPENDENCIES
   simplecov (~> 0.18)
 
 BUNDLED WITH
-   2.2.15
+   2.3.7

data/README.md

@@ -98,7 +98,7 @@ Request and response:
   "static_properties": [
     "id"
   ],
-  "base_path": "/"
+  "base_path": "/api"
 }
 ```
 

data/fakeit.gemspec

@@ -22,23 +22,23 @@ Gem::Specification.new do |spec|
   spec.executables   = 'fakeit'
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.1.2'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'byebug', '~> 11.0'
-  spec.add_development_dependency 'rack-test', '~> 1.1'
+  spec.add_development_dependency 'rack-test', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.10'
   spec.add_development_dependency 'rubocop-rake', '~> 0.5'
   spec.add_development_dependency 'simplecov', '~> 0.18'
 
-  spec.add_dependency 'faker', '2.18.0'
-  spec.add_dependency 'openapi_parser', '0.14.1'
+  spec.add_dependency 'faker', '2.22.0'
+  spec.add_dependency 'openapi_parser', '1.0.0'
   spec.add_dependency 'rack', '~> 2.0'
   spec.add_dependency 'rack-cors', '~> 1.0'
   spec.add_dependency 'rainbow', '~> 3.0'
   spec.add_dependency 'regexp-examples', '1.5.1'
   spec.add_dependency 'slop', '~> 4.8'
   spec.add_dependency 'webrick', '~> 1.7'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/fakeit/app/app_builder.rb

@@ -2,7 +2,6 @@ module Fakeit
   module App
     class AppBuilder
       def initialize(spec_file, options)
-        @options = options
         @config_route = Routes::ConfigRoute.new(options)
         @openapi_route = Routes::OpenapiRoute.new(spec_file)
       end
@@ -10,25 +9,30 @@ module Fakeit
       def build
         proc do |env|
           request = Rack::Request.new(env)
+          base_path = @config_route.options.base_path
+          path_info = request.path_info
 
-          case request.path_info
-          when '/__fakeit_config__'
-            @config_route.call(request)
+          if path_info == '/__fakeit_config__'
+            config(request)
+          elsif path_info.start_with?(base_path)
+            openapi(request, path_info[(base_path.length - 1)..])
+          elsif "#{path_info}/" == base_path
+            openapi(request, '/')
           else
-            request.path_info = trim_base_from_path(request.path_info)
-            @openapi_route.call(request, @config_route.options)
+            Fakeit::App::Helpers::ResponseBuilder.not_found
           end
         end
       end
 
       private
 
-      def trim_base_from_path(path)
-        return path if @options.base_path == '/'
-
-        return path unless path.start_with?(@options.base_path)
+      def config(request)
+        @config_route.call(request)
+      end
 
-        path[@options.base_path.length-1..]
+      def openapi(request, path_info)
+        request.path_info = path_info
+        @openapi_route.call(request, @config_route.options)
       end
     end
   end

data/lib/fakeit/app/options.rb

@@ -3,7 +3,14 @@ module Fakeit
     class Options
       attr_reader :permissive, :use_example, :base_path
 
-      def initialize(permissive: false, use_example: false, static: false, static_types: [], static_properties: [], base_path: "/")
+      def initialize(
+        permissive: false,
+        use_example: false,
+        static: false,
+        static_types: [],
+        static_properties: [],
+        base_path: nil
+      )
         @permissive = permissive
         @use_example = use_example
         @static = static
@@ -11,7 +18,14 @@ module Fakeit
         @static_properties = static_properties
         # Standardize the base path to include trailing slash
         # so that `/base` matches `/base/path` but doesn't match `/basement/path`
-        @base_path = base_path[-1] == '/' ? base_path : "#{base_path}/"
+        @base_path =
+          if base_path.nil?
+            '/'
+          elsif base_path[-1] == '/'
+            base_path
+          else
+            "#{base_path}/"
+          end
       end
 
       def use_static?(type: nil, property: nil)

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

@@ -34,8 +34,7 @@ module Fakeit
           request
             .each_header
             .select { |k, _| k.start_with? 'HTTP_' }
-            .map { |k, v| [k.sub(/^HTTP_/, '').split('_').map(&:capitalize).join('-'), v] }
-            .to_h
+            .to_h { |k, v| [k.sub(/^HTTP_/, '').split('_').map(&:capitalize).join('-'), v] }
         end
 
         def parse_query(query_string)

data/lib/fakeit/middleware/recorder.rb

@@ -15,7 +15,7 @@ module Fakeit
       def log_request(env)
         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

@@ -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/integer_example.rb

@@ -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,7 +49,7 @@ module Fakeit
         if maximum
           exclusiveMaximum ? maximum - 1 : maximum
         else
-          2**(int_bits - 1) - 1
+          (2**(int_bits - 1)) - 1
         end
       end
 

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

@@ -2,7 +2,7 @@ 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]]

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

@@ -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,7 +62,8 @@ 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
 
@@ -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))[]
 

data/lib/fakeit/openapi/loader.rb

@@ -5,7 +5,7 @@ module Fakeit
         URI
           .open(src, &:read)
           .then { parse(src, _1) }
-          .then(&OpenAPIParser.method(:parse))
+          .then { OpenAPIParser.parse(_1, { strict_reference_validation: true }) }
       end
 
       private

data/lib/fakeit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakeit
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Justin Feng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-21 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: 2.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: 2.22.0
 - !ruby/object:Gem::Dependency
   name: openapi_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +250,6 @@ files:
 - lib/fakeit/app/routes/config_route.rb
 - lib/fakeit/app/routes/openapi_route.rb
 - lib/fakeit/core_extensions/array_validator.rb
-- lib/fakeit/core_extensions/reference.rb
 - lib/fakeit/core_extensions/schema.rb
 - lib/fakeit/logger.rb
 - lib/fakeit/middleware/recorder.rb
@@ -276,7 +261,6 @@ files:
 - lib/fakeit/openapi/example/string_example.rb
 - lib/fakeit/openapi/loader.rb
 - lib/fakeit/openapi/operation.rb
-- lib/fakeit/openapi/reference_error.rb
 - lib/fakeit/openapi/schema.rb
 - lib/fakeit/openapi/specification.rb
 - lib/fakeit/validation/validation_error.rb
@@ -285,7 +269,8 @@ files:
 homepage: https://github.com/JustinFeng/fakeit
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -294,14 +279,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Create mock server from Openapi specification

data/lib/fakeit/core_extensions/reference.rb

@@ -1,9 +0,0 @@
-require 'fakeit/openapi/schema'
-
-module OpenAPIParser
-  module Schemas
-    class Reference
-      def to_example(_) = raise(Fakeit::Openapi::ReferenceError, "Invalid $ref at \"#{ref}\"")
-    end
-  end
-end

data/lib/fakeit/openapi/reference_error.rb

@@ -1,6 +0,0 @@
-module Fakeit
-  module Openapi
-    class ReferenceError < StandardError
-    end
-  end
-end