kirei 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df4eacd42ab9ef8cc4b3474e4c58b5ccdc0dc7c7b3631fdf4640a5ea38febc3b
-  data.tar.gz: 3203e23caa1ffa4cc1352b3d87bc30df0639c4434cfa26ae8b5cb3133a8586d7
+  metadata.gz: 2bde9dc5680f9744ab2eb1d0fce8fce8019f2177ee263d1b8d6d82bb9c6fff73
+  data.tar.gz: 48732a443adf3d134fcf0fcdabc5e191b794f31a7966e36c1f83e80a9fe9585f
 SHA512:
-  metadata.gz: 9bffc31e1489abec7e249e6f9328f0cd1337ee2a007bab192583de9b2d98c8bf2816ad743991f8c1ef073235da8fb072804a0a9d1af0248b28b3cd520bbfb8fe
-  data.tar.gz: e7ecfe6be3594b7ea70d12646d38a1b4e11e824453c63adfda37d96877791ca30fe2748098336cab13f25b774be92700065bbafeee84e648679242c2c1d47ad7
+  metadata.gz: f5a4a532eb8181cf02d7725bed41c8492eb11e0b879e4a51ad430674e220dbb5b26c1b5a44aa29790f6af8f7a1b9ccc132262bb239815f3c290c75c2e7edaaea
+  data.tar.gz: 604c5d622a63e5817e39b99d3029d2e15caa1c90a370cb44e9b2a0a321db8317c8da1686543a7267beef957abb149501c200fd0c5d2a148513210c7ab03e9ae5

data/README.md

@@ -21,7 +21,7 @@ TL;DR:
 
 This gem follows SemVer, however only after a stable release 1.0.0 is made.
 
-A changelog is maintained in the [CHANGELOG.md](CHANGELOG.md) file and/or the GitHub Releases page.
+A changelog is maintained via the [GitHub Releases page](https://github.com/swiknaba/kirei/releases).
 
 ## Installation
 

data/kirei.gemspec

@@ -31,12 +31,11 @@ Gem::Specification.new do |spec|
     "kirei.gemspec",
     ".irbrc",
     "lib/**/*",
-    # do not include RBIs for gems, because users might use different verions
+    # do not include RBIs for gems, because users might use different versions
     "sorbet/rbi/dsl/**/*.rbi",
     "sorbet/rbi/shims/**/*.rbi",
     "LICENSE",
     "README.md",
-    "CHANGELOG.md",
   ]
 
   spec.bindir = "bin"

data/lib/cli/commands/new_app/files/db_rake.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: true
 
 # rubocop:disable Metrics/ClassLength
 

data/lib/kirei/controller.rb

@@ -41,32 +41,9 @@ module Kirei
       @after_hooks.add(block) if block
     end
 
-    sig { returns(String) }
-    def req_host
-      env.fetch("HTTP_HOST")
-    end
-
-    sig { returns(String) }
-    def req_domain
-      T.must(req_host.split(":").first).split(".").last(2).join(".")
-    end
-
-    sig { returns(T.nilable(String)) }
-    def req_subdomain
-      parts = T.must(req_host.split(":").first).split(".")
-      return if parts.size <= 2
-
-      T.must(parts[0..-3]).join(".")
-    end
-
-    sig { returns(Integer) }
-    def req_port
-      env.fetch("SERVER_PORT")&.to_i
-    end
-
-    sig { returns(T::Boolean) }
-    def req_ssl?
-      env.fetch("HTTPS", env.fetch("rack.url_scheme", "http")) == "https"
+    sig { returns(Routing::Request) }
+    def request
+      @request ||= T.let(Routing::Request.new(env: env), T.nilable(Routing::Request))
     end
 
     sig { returns(T::Hash[String, T.untyped]) }

data/lib/kirei/routing/base.rb

@@ -35,12 +35,13 @@ module Kirei
         # -> use https://github.com/cyu/rack-cors ?
         #
 
-        route = router.get(http_verb, req_path)
+        lookup_verb = http_verb == Verb::HEAD ? Verb::GET : http_verb
+        route = router.get(lookup_verb, req_path)
         return NOT_FOUND if route.nil?
 
         router.current_env = env # expose the env to the controller
 
-        params = case route.verb
+        params = case http_verb
                  when Verb::GET
                    query = T.cast(env.fetch("QUERY_STRING"), String)
                    query.split("&").to_h do |p|
@@ -50,14 +51,15 @@ module Kirei
                    end
                  when Verb::POST, Verb::PUT, Verb::PATCH
                    # TODO: based on content-type, parse the body differently
-                   #       build-in support for JSON & XML
+                   #       built-in support for JSON & XML
                    body = T.cast(env.fetch("rack.input"), T.any(IO, StringIO))
                    res = Oj.load(body.read, Kirei::OJ_OPTIONS)
                    body.rewind # TODO: maybe don't rewind if we don't need to?
                    T.cast(res, T::Hash[String, T.untyped])
-                 else
-                   Logging::Logger.logger.warn("Unsupported HTTP verb: #{http_verb.serialize} send to #{req_path}")
+                 when Verb::HEAD, Verb::DELETE, Verb::OPTIONS, Verb::TRACE, Verb::CONNECT
                    {}
+                 else
+                   T.absurd(http_verb)
         end
 
         req_id = T.cast(env["HTTP_X_REQUEST_ID"], T.nilable(String))
@@ -86,10 +88,17 @@ module Kirei
         }
         Logging::Metric.inject_defaults(statsd_timing_tags)
 
-        status, headers, response_body = T.cast(
-          controller.new(params: params).public_send(route.action),
-          RackResponseType,
-        )
+        status, headers, response_body = case http_verb
+                                         when Verb::HEAD, Verb::OPTIONS, Verb::TRACE, Verb::CONNECT
+                                           [200, {}, []]
+                                         when Verb::GET, Verb::POST, Verb::PUT, Verb::PATCH, Verb::DELETE
+                                           T.cast(
+                                             controller.new(params: params).public_send(route.action),
+                                             RackResponseType,
+                                           )
+                                         else
+                                           T.absurd(http_verb)
+        end
 
         after_hooks = collect_hooks(controller, :after_hooks)
         run_hooks(after_hooks)

data/lib/kirei/routing/request.rb

@@ -0,0 +1,40 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Kirei
+  module Routing
+    class Request < T::Struct
+      extend T::Sig
+
+      const :env, T::Hash[String, T.untyped]
+
+      sig { returns(String) }
+      def host
+        env.fetch("HTTP_HOST")
+      end
+
+      sig { returns(String) }
+      def domain
+        T.must(host.split(":").first).split(".").last(2).join(".")
+      end
+
+      sig { returns(T.nilable(String)) }
+      def subdomain
+        parts = T.must(host.split(":").first).split(".")
+        return if parts.size <= 2
+
+        T.must(parts[0..-3]).join(".")
+      end
+
+      sig { returns(Integer) }
+      def port
+        env.fetch("SERVER_PORT")&.to_i
+      end
+
+      sig { returns(T::Boolean) }
+      def ssl?
+        env.fetch("HTTPS", env.fetch("rack.url_scheme", "http")) == "https"
+      end
+    end
+  end
+end

data/lib/kirei/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Kirei
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kirei
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ludwig Reinmiedl
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -164,7 +163,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".irbrc"
-- CHANGELOG.md
 - README.md
 - bin/kirei
 - kirei.gemspec
@@ -199,6 +197,7 @@ files:
 - lib/kirei/routing/nilable_hooks_type.rb
 - lib/kirei/routing/rack_env_type.rb
 - lib/kirei/routing/rack_response_type.rb
+- lib/kirei/routing/request.rb
 - lib/kirei/routing/route.rb
 - lib/kirei/routing/router.rb
 - lib/kirei/routing/verb.rb
@@ -216,7 +215,6 @@ licenses:
 metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/swiknaba/kirei
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,8 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Kirei is a typed Ruby micro/REST-framework for building scalable and performant
   microservices.

data/CHANGELOG.md

@@ -1,16 +0,0 @@
-# Changelog
-
-## [Unreleased]
-
-## [0.1.0] - 2023-09-02
-
-- Initial release
-- added base model
-- added database connection
-- WIP: basic cli to scaffold a new project
-
-## [0.2.0] - 2023-09-02
-
-- added routing
-- added base controller
-- added database tasks (create, drop, migrate, rollback, generate migration)