openapi_first 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97a8557c2c782446dcf83c1edc035cfc261f7ae9ad518cc3c8fb5b9e1d97741
-  data.tar.gz: ceae221aef3485c31e7ef95daf5b1275ca109de18b7aacf6341cea3cf9199ef1
+  metadata.gz: f870c2a9a6147e40c7e7da2051172e2adfa4e976c82d60663a97f3b7e7602315
+  data.tar.gz: 1a06921d63a5158255f94f536259e1a0c7bb88eef00a685338ccecba1ec7e330
 SHA512:
-  metadata.gz: 0fca37f03eb1adb6ce7b925b43ba09b6d7f0a49a5ef39d5c0e09f532a55c840a0ff7f9286edb3f970a5dcd7c6eb3431dd28bb2e8e76c384b3bed86723ed2cfc6
-  data.tar.gz: 4256631ab1817269fb602159473dc2130e6ce3e323cf4d3f7c5e90222e4f00b925d9611418810fef13f4d78377ac3ad9a889c026b75d6443cdb6e1b8301282bc
+  metadata.gz: 761aba28e1b69b8916ae86df80130786011ed5e5d8cdb599131e19476c8ec6526ab0574b42e6cb1ccbe11ce2421abbc030c5f0f4c566091447fc07e408a559f4
+  data.tar.gz: 1d6454f4bd3801f6f44e9b23a3e756f46b5cfbf7bcab739b60559e8c96677383216b5e3b41df6e9de2efd11af8b67c3ba1f286631f38e9d7ff93fb1b097a7915

data/.rubocop.yml

@@ -6,3 +6,9 @@ BlockLength:
   Exclude:
   - 'spec/**/*.rb'
   - '*.gemspec'
+Style/HashEachMethods:
+  Enabled: false
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.6.8
+- Performance: About 25% performance increase (i/s) with help of c++ based radix-tree and some optimizations
+- Update dependencies
+
 ## 0.6.7
 - Fix: version number of oas_parser
 

data/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: .
   specs:
-    openapi_first (0.6.7)
+    openapi_first (0.6.8)
       json_schemer (~> 0.2)
-      multi_json (~> 1.13)
-      oas_parser (~> 0.23)
+      multi_json (~> 1.14)
+      mustermann-contrib (~> 1.1.1)
+      oas_parser (~> 0.24)
+      r2ree (~> 0.1)
       rack (~> 2.1)
 
 GEM
@@ -21,7 +23,7 @@ GEM
     ast (2.4.0)
     builder (3.2.4)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     ecma-re-validator (0.2.0)
@@ -32,7 +34,7 @@ GEM
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    json_schemer (0.2.8)
+    json_schemer (0.2.10)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -41,33 +43,36 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     multi_json (1.14.1)
-    mustermann (1.0.3)
-    mustermann-contrib (1.0.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-contrib (1.1.1)
       hansi (~> 0.2.0)
-      mustermann (= 1.0.3)
-    nokogiri (1.10.7)
+      mustermann (= 1.1.1)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    oas_parser (0.23.0)
+    oas_parser (0.24.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
       deep_merge (~> 1.2.1)
       hash-deep-merge
-      mustermann-contrib (~> 1.0.3s)
+      mustermann-contrib (~> 1.1.1)
       nokogiri
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.3)
-    rack (2.1.1)
+    r2ree (0.1.2)
+    rack (2.2.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (10.5.0)
-    regexp_parser (1.6.0)
+    rake (13.0.1)
+    regexp_parser (1.7.0)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -81,14 +86,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.79.0)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     thread_safe (0.3.6)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
@@ -100,12 +107,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler (~> 2)
   openapi_first!
   pry
   rack-test (~> 1)
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  rake (~> 13)
+  rspec (~> 3)
   rubocop
 
 BUNDLED WITH

data/README.md

@@ -4,7 +4,7 @@ OpenapiFirst helps to implement HTTP APIs based on an [OpenApi](https://www.open
 
 ## TL;DR
 
-Start with writing an OpenAPI file that describes the API, which you are about to write. Use a [validator](http://speccy.io/) to make sure the file is valid.
+Start with writing an OpenAPI file that describes the API, which you are about to write. Use a [validator](https://github.com/stoplightio/spectral/) to make sure the file is valid.
 In the following examples, the OpenAPI file is named `openapi/openapi.yaml`.
 
 Now implement your API:
@@ -230,7 +230,7 @@ end
 
 ## Mocking
 
-Currently out of scope.
+Out of scope. Use [Prism](https://github.com/stoplightio/prism) or [fakeit](https://github.com/JustinFeng/fakeit).
 
 ## Alternatives
 
@@ -238,9 +238,11 @@ This gem is inspired by [committee](https://github.com/interagent/committee), wh
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+Run `bin/setup` to install dependencies.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+Run `bundle exec rspec` to run the tests.
+
+See `bundle exec rake -T` for rubygems related tasks.
 
 ### Run benchmarks
 

data/benchmarks/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: ..
   specs:
-    openapi_first (0.6.6)
+    openapi_first (0.6.8)
       json_schemer (~> 0.2)
-      multi_json (~> 1.13)
-      oas_parser (~> 0.23)
+      multi_json (~> 1.14)
+      mustermann-contrib (~> 1.1.1)
+      oas_parser (~> 0.24)
+      r2ree (~> 0.1)
       rack (~> 2.1)
 
 GEM
@@ -26,11 +28,12 @@ GEM
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (>= 0.6.1)
       rack (>= 1.5)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     deep_merge (1.2.1)
-    dry-configurable (0.9.0)
+    dry-configurable (0.11.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
@@ -38,11 +41,11 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.5)
+    dry-logic (1.0.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (1.2.2)
+    dry-types (1.3.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
@@ -59,21 +62,16 @@ GEM
       rack (>= 1.3.0)
       rack-accept
     hana (1.3.5)
-    hanami-router (2.0.0.alpha1)
-      dry-inflector (~> 0.1)
-      hanami-utils (~> 2.0.alpha)
+    hanami-router (2.0.0.alpha2)
       mustermann (~> 1.0)
       mustermann-contrib (~> 1.0)
       rack (~> 2.0)
-    hanami-utils (2.0.0.alpha1)
-      concurrent-ruby (~> 1.0)
-      transproc (~> 1.0)
     hansi (0.2.0)
     hash-deep-merge (0.1.1)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     json_schema (0.20.8)
-    json_schemer (0.2.8)
+    json_schemer (0.2.10)
       ecma-re-validator (~> 0.2)
       hana (~> 1.3)
       regexp_parser (~> 1.5)
@@ -82,30 +80,33 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     multi_json (1.14.1)
-    mustermann (1.0.3)
-    mustermann-contrib (1.0.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    mustermann-contrib (1.1.1)
       hansi (~> 0.2.0)
-      mustermann (= 1.0.3)
+      mustermann (= 1.1.1)
     mustermann-grape (1.0.1)
       mustermann (>= 1.0.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    oas_parser (0.23.0)
+    oas_parser (0.24.0)
       activesupport (>= 4.0.0)
       addressable (~> 2.3)
       builder (~> 3.2.3)
       deep_merge (~> 1.2.1)
       hash-deep-merge
-      mustermann-contrib (~> 1.0.3s)
+      mustermann-contrib (~> 1.1.1)
       nokogiri
     openapi_parser (0.8.0)
     public_suffix (4.0.3)
-    rack (2.1.1)
+    r2ree (0.1.2)
+    rack (2.2.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-protection (2.0.8.1)
       rack
-    regexp_parser (1.6.0)
+    regexp_parser (1.7.0)
+    ruby2_keywords (0.0.2)
     seg (1.2.0)
     sinatra (2.0.8.1)
       mustermann (~> 1.0)
@@ -117,7 +118,6 @@ GEM
       seg
     thread_safe (0.3.6)
     tilt (2.0.10)
-    transproc (1.1.1)
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uri_template (0.7.0)

data/lib/openapi_first/definition.rb

@@ -1,9 +1,16 @@
 # frozen_string_literal: true
 
+require 'r2ree'
+
 module OpenapiFirst
   class Definition
     def initialize(parsed)
       @spec = parsed
+      normalized_paths = @spec.paths.map do |path|
+        path.path.gsub('{', ':').gsub('}', '')
+      end
+      @path_tree = R2ree.new(normalized_paths)
+      @paths = @spec.paths
     end
 
     def operations
@@ -11,8 +18,10 @@ module OpenapiFirst
     end
 
     def find_operation!(request)
-      @spec
-        .path_by_path(request.path)
+      path_index = @path_tree.find(request.path)
+      raise OasParser::PathNotFound if path_index == -1
+
+      @paths[path_index]
         .endpoint_by_method(request.request_method.downcase)
     end
 

data/lib/openapi_first/operation_resolver.rb

@@ -55,9 +55,16 @@ module OpenapiFirst
         env[QUERY_PARAMS],
         env[REQUEST_BODY]
       ].tap(&:compact!)
-      hash = {}.merge!(*sources)
-      hash.define_singleton_method(:env) { env }
-      hash
+      Params.new(env).merge!(*sources)
+    end
+  end
+
+  class Params < Hash
+    attr_reader :env
+
+    def initialize(env)
+      @env = env
+      super
     end
   end
 end

data/lib/openapi_first/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OpenapiFirst
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

data/openapi_first.gemspec

@@ -33,12 +33,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'json_schemer', '~> 0.2'
-  spec.add_dependency 'multi_json', '~> 1.13'
-  spec.add_dependency 'oas_parser', '~> 0.23'
+  spec.add_dependency 'multi_json', '~> 1.14'
+  spec.add_dependency 'mustermann-contrib', '~> 1.1.1'
+  spec.add_dependency 'oas_parser', '~> 0.24'
+  spec.add_dependency 'r2ree', '~> 0.1'
   spec.add_dependency 'rack', '~> 2.1'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '~> 2'
   spec.add_development_dependency 'rack-test', '~> 1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake', '~> 13'
+  spec.add_development_dependency 'rspec', '~> 3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_first
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Andreas Haller
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -30,28 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: mustermann-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: oas_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.24'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: r2ree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 description: 
 email:
 - andreas.haller@posteo.de